Skip to content

Commit

Permalink
fix: dont include scss exports in normal bundle (#102)
Browse files Browse the repository at this point in the history
  • Loading branch information
adamraider authored Apr 3, 2019
1 parent a2d1ab6 commit 566845c
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 56 deletions.
25 changes: 0 additions & 25 deletions packages/core/src/global/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,3 @@ $ray-color-gray-10: hsl(0, 0%, 100% - 10%);
$ray-color-gray-30: hsl(0, 0%, 100% - 30%);
$ray-color-gray-50: hsl(0, 0%, 100% - 50%);
$ray-color-gray-60: hsl(0, 0%, 100% - 60%);

:export {
ray-color-white: $ray-color-white;
ray-color-black: $ray-color-black;
ray-color-blue-10: $ray-color-blue-10;
ray-color-blue-20: $ray-color-blue-20;
ray-color-blue-50: $ray-color-blue-50;
ray-color-blue-60: $ray-color-blue-60;
ray-color-blue-70: $ray-color-blue-70;
ray-color-red-10: $ray-color-red-10;
ray-color-red-20: $ray-color-red-20;
ray-color-red-50: $ray-color-red-50;
ray-color-red-60: $ray-color-red-60;
ray-color-red-70: $ray-color-red-70;
ray-color-green-10: $ray-color-green-10;
ray-color-green-20: $ray-color-green-20;
ray-color-green-70: $ray-color-green-70;
ray-color-green-80: $ray-color-green-80;
ray-color-green-90: $ray-color-green-90;
ray-color-gray-02: $ray-color-gray-02;
ray-color-gray-10: $ray-color-gray-10;
ray-color-gray-30: $ray-color-gray-30;
ray-color-gray-50: $ray-color-gray-50;
ray-color-gray-60: $ray-color-gray-60;
}
26 changes: 0 additions & 26 deletions packages/core/src/global/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,29 +83,3 @@ $ray-layout-grid-max-width: (
) !default;

$ray-layout-grid-default-column-span: 4 !default;

:export {
@each $key, $value in $ray-layout-grid-breakpoints {
ray-breakpoint-#{$key}: $value;
}

@each $key, $value in $ray-layout-grid-columns {
ray-grid-breakpoint-columns-#{$key}: $value;
}

@each $key, $value in $ray-layout-grid-default-margin {
ray-grid-margin-#{$key}: $value;
}

@each $key, $value in $ray-layout-grid-default-gutter {
ray-grid-gutter-#{$key}: $value;
}

@each $key, $value in $ray-layout-grid-column-width {
ray-grid-column-width-#{$key}: $value;
}

@each $key, $value in $ray-layout-grid-max-width {
ray-grid-max-width-#{$key}: $value;
}
}
50 changes: 50 additions & 0 deletions packages/core/src/ray-exports.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
@import 'global/variables';

:export {
@each $key, $value in $ray-layout-grid-breakpoints {
ray-breakpoint-#{$key}: $value;
}

@each $key, $value in $ray-layout-grid-columns {
ray-grid-breakpoint-columns-#{$key}: $value;
}

@each $key, $value in $ray-layout-grid-default-margin {
ray-grid-margin-#{$key}: $value;
}

@each $key, $value in $ray-layout-grid-default-gutter {
ray-grid-gutter-#{$key}: $value;
}

@each $key, $value in $ray-layout-grid-column-width {
ray-grid-column-width-#{$key}: $value;
}

@each $key, $value in $ray-layout-grid-max-width {
ray-grid-max-width-#{$key}: $value;
}

ray-color-white: $ray-color-white;
ray-color-black: $ray-color-black;
ray-color-blue-10: $ray-color-blue-10;
ray-color-blue-20: $ray-color-blue-20;
ray-color-blue-50: $ray-color-blue-50;
ray-color-blue-60: $ray-color-blue-60;
ray-color-blue-70: $ray-color-blue-70;
ray-color-red-10: $ray-color-red-10;
ray-color-red-20: $ray-color-red-20;
ray-color-red-50: $ray-color-red-50;
ray-color-red-60: $ray-color-red-60;
ray-color-red-70: $ray-color-red-70;
ray-color-green-10: $ray-color-green-10;
ray-color-green-20: $ray-color-green-20;
ray-color-green-70: $ray-color-green-70;
ray-color-green-80: $ray-color-green-80;
ray-color-green-90: $ray-color-green-90;
ray-color-gray-02: $ray-color-gray-02;
ray-color-gray-10: $ray-color-gray-10;
ray-color-gray-30: $ray-color-gray-30;
ray-color-gray-50: $ray-color-gray-50;
ray-color-gray-60: $ray-color-gray-60;
}
12 changes: 8 additions & 4 deletions packages/docs-app/src/components/ColorTable/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import React from 'react';
import Color from 'color';
import * as colors from '../../../../core/src/global/_colors.scss';
import * as rayVars from '../../../../core/src/ray-exports.scss';

const colorKeys = Object.keys(rayVars).filter(rayVar =>
rayVar.includes('rayColor')
);

function toKebab(str) {
return str.replace(/([a-z])([A-Z0-9])/g, '$1-$2').toLowerCase();
Expand All @@ -18,8 +22,8 @@ function ColorTable() {
</tr>
</thead>
<tbody>
{Object.keys(colors).map(colorKey => {
const color = Color(colors[colorKey]);
{colorKeys.map(colorKey => {
const color = Color(rayVars[colorKey]);
const textColor = color.isDark() ? 'white' : 'black';

return (
Expand All @@ -32,7 +36,7 @@ function ColorTable() {
<td>
<div
style={{
backgroundColor: colors[colorKey],
backgroundColor: rayVars[colorKey],
display: 'inline-block',
padding: '.25rem .5rem',
marginRight: '1rem',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { pickBy, range } from 'lodash';

import * as gridVars from '../../../../core/src/global/_variables.scss';
import * as gridVars from '../../../../core/src/ray-exports.scss';

/* eslint-disable react/prop-types */
function GridDocumentation() {
Expand Down

0 comments on commit 566845c

Please sign in to comment.