Skip to content

Color Variables Cleanup #806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobbieTheWagner merged 5 commits into from
May 28, 2018
Merged

Color Variables Cleanup #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe247ca
Base color cleanup
nummi May 24, 2018
a72fe1d
Special color cleanup
nummi May 24, 2018
833c6ac
Rename special colors
nummi May 24, 2018
4e3ea92
Source reorder base colors by shade
nummi May 24, 2018
de0547b
Rename base colors
nummi May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/styles/base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ html, body {

body, input {
font-family: var(--font-sans-serif);
color: var(--base26);
color: var(--base14);
}

body, div, nav {
Expand Down
148 changes: 48 additions & 100 deletions app/styles/colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,111 +1,59 @@
.theme--light {
--base00: #ffffff;
--base01: #f3f3f3;
--base03: #ededed;
--base05: #dedede;
--base06: #d1d1d1;
--base07: #cccccc;
--base08: #cacaca;
--base10: #b4b4b4;
--base11: #b3b3b3;
--base12: #b2b2b2;
--base13: #aaaaaa;
--base14: #a3a3a3;
--base15: #999999;
--base16: #888888;
--base17: #777777;
--base18: #737373;
--base19: #6e6e6e;
--base20: #676767;
--base21: #555555;
--base22: #505050;
--base23: #444444;
--base24: #404040;
--base25: #3d3d3d;
--base26: #333333;
--base27: #303030;
--base28: #222222;
--base29: #000000;
--base30: #bcbcbc;
--base31: #464646;
--base32: #d6d6d6;
--base33: #666666;
--base34: #cecece;
--base35: #f5f5f5;
--base36: #e7e7e7;
--base02: #ededed;
--base03: #d6d6d6;
--base04: #d1d1d1;
--base05: #cacaca;
--base06: #b3b3b3;
--base07: #a3a3a3;
--base08: #888888;
--base09: #777777;
--base10: #737373;
--base11: #676767;
--base12: #555555;
--base13: #404040;
--base14: #333333;
--base15: #222222;

Copy link
Copy Markdown
Contributor Author

@nummi nummi May 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shades of gray cut in half and I can't see any difference. Waaaat.

--spec00: #fffec2;
--spec01: #ffffee;
--spec02: #ff0000;
--spec03: #f23818;
--spec04: #990099;
--spec05: #990000;
--spec06: #6e68c6;
--spec07: #4281eb;
--spec08: #3879d9;
--spec09: #2b7fb3;
--spec10: #000099;
--spec11: #3F81EE;
--spec12: #7c027c;
--spec13: #4977d2;
--spec14: #ecf1fa;
--spec15: #cd61a7;
--spec16: #7fb56d;
--spec17: #328509;
--spec18: #9c0f9c;
--spec01: #ff0000;
--spec02: #990000;
--spec03: #000099;
--spec04: #3F81EE;
--spec05: #7c027c;
--spec06: #ecf1fa;
--spec07: #cd61a7;
--spec08: #7fb56d;
--spec09: #328509;
}

.theme--dark {
--base00: #242424;
--base01: #242424;
--base03: #121212;
--base05: #212121;
--base06: #2E2E2E;
--base07: #333333;
--base08: #353535;
--base10: #4B4B4B;
--base11: #4C4C4C;
--base12: #4D4D4D;
--base13: #555555;
--base14: #5C5C5C;
--base15: #666666;
--base16: #777777;
--base17: #888888;
--base18: #8C8C8C;
--base19: #919191;
--base20: #989898;
--base21: #AAAAAA;
--base22: #AFAFAF;
--base23: #BBBBBB;
--base24: #BFBFBF;
--base25: #C2C2C2;
--base26: #CCCCCC;
--base27: #CFCFCF;
--base28: #DDDDDD;
--base29: #FFFFFF;
--base30: #434343;
--base31: #B9B9B9;
--base32: #292929;
--base33: #999999;
--base34: #313131;
--base35: #0A0A0A;
--base36: #181818;
--base02: #121212;
--base03: #292929;
--base04: #2E2E2E;
--base05: #353535;
--base06: #4C4C4C;
--base07: #5C5C5C;
--base08: #777777;
--base09: #888888;
--base10: #8C8C8C;
--base11: #989898;
--base12: #AAAAAA;
--base13: #BFBFBF;
--base14: #CCCCCC;
--base15: #DDDDDD;

--spec00: #00013D;
--spec01: #000011;
--spec02: #00FFFF;
--spec03: #0DC7E7;
--spec04: #66FF66;
--spec05: #66FFFF;
--spec06: #919739;
--spec07: #BD7E14;
--spec08: #C78626;
--spec09: #D4804C;
--spec10: #FFFF66;
--spec11: #C07E11;
--spec12: #83FD83;
--spec13: #B6882D;
--spec14: #130E05;
--spec15: #cd61a7;
--spec16: #7fb56d;
--spec17: #328509;
--spec18: #9c0f9c;
--spec01: #00FFFF;
--spec02: #66FFFF;
--spec03: #FFFF66;
--spec04: #C07E11;
--spec05: #83FD83;
--spec06: #130E05;
--spec07: #cd61a7;
--spec08: #7fb56d;
--spec09: #328509;
}
18 changes: 9 additions & 9 deletions app/styles/component_tree.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
margin: 3px 3px 0 3px;
border-radius: 4px;
font-size: 12px;
color: var(--base21);
color: var(--base12);

}

.component-tree-item--component {
color: var(--spec12);
color: var(--spec05);

&:hover {
background-color: var(--spec14);
background-color: var(--spec06);

.component-tree-item__view-element { opacity: 1; }
}
Expand All @@ -41,11 +41,11 @@

.component-tree-item__bracket::before {
content: '{{';
color: var(--base14);
color: var(--base07);
}
.component-tree-item__bracket::after {
content: '}}';
color: var(--base14);
color: var(--base07);
}

.component-tree-item__expand {
Expand Down Expand Up @@ -73,7 +73,7 @@
opacity: 0;
cursor: pointer;

polygon, rect, path { fill: var(--base28); }
polygon, rect, path { fill: var(--base15); }
}


Expand All @@ -83,12 +83,12 @@

.component-tree-item--selected {
color: var(--base00);
background: var(--spec13);
&:hover { background: var(--spec13); }
background: var(--spec04);
&:hover { background: var(--spec04); }

.component-tree-item__bracket::before,
.component-tree-item__bracket::after {
color: var(--base14);
color: var(--base07);
}

.component-tree-item__expand,
Expand Down
2 changes: 1 addition & 1 deletion app/styles/drag_handle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
height: 100%;
margin-left: 3px;
width: 1px;
border-left: 1px solid var(--base30);
border-left: 1px solid var(--base06);
pointer-events: none;
}

Expand Down
2 changes: 1 addition & 1 deletion app/styles/dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
margin: 0;
padding: 0 16px 0 5px;
font-size: 12px;
color: var(--base31);
color: var(--base13);
border: 0;
background-color: transparent;
-moz-appearance: none;
Expand Down
12 changes: 6 additions & 6 deletions app/styles/error_page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@

.error-page {
padding: 10px;
background: var(--base03);
background: var(--base02);
position: absolute;
top: 0;
left: 0;
width: 100%;
min-height: 100%;
color: var(--base22);
color: var(--base13);
-moz-box-sizing: border-box;
box-sizing: border-box;
}
Expand All @@ -33,13 +33,13 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
background: var(--base00);
border: 1px solid var(--base06);
border: 1px solid var(--base04);
border-radius: 5px;
margin: auto;
}

.error-page__content a {
color: var(--spec03);
color: var(--spec01);
text-decoration: none;
}

Expand All @@ -49,7 +49,7 @@
padding-top: 15px;
padding-bottom: 30px;
margin-bottom: 10px;
border-bottom: 1px solid var(--base06);
border-bottom: 1px solid var(--base04);
position: relative;
}

Expand Down Expand Up @@ -83,7 +83,7 @@
.error-page__list {
padding-left: 16px;
padding-bottom: 5px;
border-bottom: 1px solid var(--base06);
border-bottom: 1px solid var(--base04);
}

.error-page__list li {
Expand Down
6 changes: 3 additions & 3 deletions app/styles/list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

text-align: left;
user-select: none;
border-bottom: 1px solid var(--base08);
border-bottom: 1px solid var(--base05);

height: 30px;

Expand All @@ -55,7 +55,7 @@
.list:not(.list_no-alternate-color) .list__content {

.list__row {
background: var(--base03);
background: var(--base02);

&:nth-of-type(2n) {
background: var(--base00);
Expand Down Expand Up @@ -200,7 +200,7 @@
top: 0px;

font-size: 75%;
color: var(--base18);
color: var(--base10);
}
}

Expand Down
Loading
⚡