Skip to content

Commit fd58fdf

Browse files
tbantle22tbantle22
authored
Merge pull request #183 from dolthub/taylor/colors
web: Rename custom colors
2 parents 9ce1538 + cd26ac8 commit fd58fdf

File tree

72 files changed

+303
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+303
-293
lines changed

‎web/components/AceEditor/ace-editor.css‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44

55
.ace-github-dark .ace_gutter {
6-
@apply text-white bg-ld-darkerblue;
6+
@apply text-white bg-storm-600;
77
}
88

99
.ace-github-dark .ace_print-margin {
@@ -29,24 +29,24 @@
2929

3030
.ace-github-dark .ace_marker-layer .ace_selection {
3131
@screen lg {
32-
@apply bg-gray-600;
32+
@apply bg-stone-500;
3333
}
3434
}
3535

3636
.ace-github-dark .ace_gutter-active-line {
37-
@apply bg-gray-600;
37+
@apply bg-stone-500;
3838
}
3939

4040
.ace-github-dark .ace_entity.ace_name.ace_tag,
4141
.ace-github-dark .ace_keyword,
4242
.ace-github-dark .ace_meta.ace_tag,
4343
.ace-github-dark .ace_storage {
44-
@apply text-ld-orange;
44+
@apply text-coral-400;
4545
}
4646

4747
.ace-github .ace_constant.ace_buildin,
4848
.ace-github .ace_support.ace_function {
49-
@apply text-acc-hoverlinkblue;
49+
@apply text-sky-600;
5050
}
5151

5252
.ace-github-dark .ace_constant.ace_buildin,

‎web/components/CellButtons/index.module.css‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111

1212
.check {
13-
@apply inline-block h-5 w-5 ml-1.5 mb-1 text-acc-green;
13+
@apply inline-block h-5 w-5 ml-1.5 mb-1 text-green-500;
1414
}
1515

1616
.error {
@@ -28,13 +28,13 @@
2828
}
2929

3030
.foreignKeyDropdown {
31-
@apply absolute -top-[0.3rem] left-[8.2rem] bg-white widget-shadow-hover z-100 rounded px-3 py-1 border border-ld-lightgrey w-fit;
31+
@apply absolute -top-[0.3rem] left-[8.2rem] bg-white widget-shadow-hover z-100 rounded px-3 py-1 border border-stone-100 w-fit;
3232

3333
a {
34-
@apply text-acc-linkblue font-semibold font-sans;
34+
@apply text-link-1 font-semibold font-sans;
3535

3636
&:hover {
37-
@apply text-acc-hoverlinkblue;
37+
@apply text-link-2;
3838
}
3939
}
4040
}
@@ -52,9 +52,9 @@
5252
}
5353

5454
.history:hover .button:disabled ~ .popup {
55-
@apply block absolute -top-0.5 left-24 bg-white widget-shadow-hover z-100 rounded px-3 py-2 border border-ld-lightgrey max-w-[12rem];
55+
@apply block absolute -top-0.5 left-24 bg-white widget-shadow-hover z-100 rounded px-3 py-2 border border-stone-100 max-w-[12rem];
5656
}
5757

5858
.loading {
59-
@apply italic text-ld-darkgrey;
59+
@apply italic text-storm-200;
6060
}

‎web/components/CommitGraph/utils.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ export function getCommits(
2020

2121
// colors to choose from for branch paths
2222
export const branchPathColors = [
23-
customColors["ld-darkblue"],
24-
customColors["ld-orange"],
25-
customColors["acc-hoverlinkblue"],
26-
customColors["ld-brightgreen"],
23+
customColors.ocean["700"],
24+
customColors.coral["400"],
25+
customColors.sky["600"],
26+
customColors.mint["200"],
2727
"#C5A15A",
2828
"#FA7978",
29-
customColors["acc-darkgrey"],
30-
customColors["acc-green"],
29+
customColors.stone["500"],
30+
customColors.green["500"],
3131
"#5C5AC5",
3232
"#EB7340",
3333
];

‎web/components/DataTable/AddRowsButton/index.module.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
@screen lg {
55
@apply block fixed right-5 bottom-5 z-10;
66
a {
7-
@apply text-ld-darkgrey font-normal text-sm;
7+
@apply text-storm-200 font-normal text-sm;
88
}
99
svg {
10-
@apply text-ld-darkgrey bg-white rounded-full;
10+
@apply text-storm-200 bg-white rounded-full;
1111
}
1212
}
1313
}
@@ -17,7 +17,7 @@
1717
}
1818

1919
.expand {
20-
@apply hidden border border-ld-darkgrey rounded-2xl px-2 pb-[0.1rem] bg-white;
20+
@apply hidden border border-storm-200 rounded-2xl px-2 pb-[0.1rem] bg-white;
2121

2222
svg {
2323
@apply inline-block mb-[0.2rem] mr-1;

‎web/components/DataTable/Table/index.module.css‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
th,
4141
td {
42-
@apply border-b border-ld-lightgrey relative pr-10 pl-6 lg:pl-2;
42+
@apply border-b border-stone-100 relative pr-10 pl-6 lg:pl-2;
4343

4444
&:first-of-type {
4545
@apply pl-0 pr-1 border-none bg-white min-w-0;
@@ -50,7 +50,7 @@
5050
@apply text-left text-primary;
5151
}
5252
tbody {
53-
@apply whitespace-nowrap text-ld-darkergrey;
53+
@apply whitespace-nowrap text-stone-500;
5454

5555
&::after {
5656
@apply bg-white absolute left-0 h-80 bottom-0 lg:w-[10000px];
@@ -60,16 +60,16 @@
6060
}
6161

6262
tr.addedRow:hover {
63-
@apply bg-[#ebffef];
63+
@apply bg-mint-50;
6464
}
6565
tr.removedRow:hover {
66-
@apply bg-[#fff3f4];
66+
@apply bg-coral-50;
6767
}
6868
td.added:hover {
69-
@apply text-acc-green;
69+
@apply text-green-500;
7070
}
7171
tr:hover {
72-
@apply bg-ld-lightblue;
72+
@apply bg-stone-50;
7373
}
7474
}
7575

@@ -78,23 +78,23 @@
7878
}
7979

8080
.key {
81-
@apply inline-block ml-2 text-ld-darkgrey mb-0.5;
81+
@apply inline-block ml-2 text-storm-200 mb-0.5;
8282
}
8383

8484
.added {
85-
@apply text-acc-green;
85+
@apply text-green-500;
8686
}
8787

8888
.removed {
89-
@apply text-acc-hoverred;
89+
@apply text-red-500;
9090
}
9191

9292
.addedRow {
93-
@apply bg-[#defbe4];
93+
@apply bg-green-50;
9494
}
9595

9696
.removedRow {
97-
@apply bg-[#ffeaec];
97+
@apply bg-red-50/70;
9898
}
9999

100100
.cell {
@@ -109,16 +109,16 @@
109109
}
110110

111111
.cellIsNull {
112-
@apply text-acc-grey;
112+
@apply text-stone-300;
113113
}
114114
.cell:hover,
115115
.active {
116-
@apply bg-ld-lightgrey text-primary;
116+
@apply bg-stone-100 text-primary;
117117

118118
@screen lg {
119119
/* Applies background color to full column on hover */
120120
&::after {
121-
@apply bg-ld-lightblue absolute left-0 w-full h-[10000px] -top-[5000px];
121+
@apply bg-stone-50 absolute left-0 w-full h-[10000px] -top-[5000px];
122122
content: "\00a0";
123123
z-index: -5;
124124
}
@@ -131,7 +131,7 @@
131131
@apply min-w-[20rem];
132132
}
133133
&:hover {
134-
@apply bg-gray-100;
134+
@apply bg-stone-50;
135135
}
136136
}
137137

@@ -162,12 +162,12 @@
162162
}
163163

164164
.primaryKey {
165-
@apply text-acc-hoverblue;
165+
@apply text-sky-900;
166166
}
167167

168168
.added .cell:hover,
169169
.added .active {
170-
@apply text-acc-green;
170+
@apply text-green-500;
171171
}
172172

173173
.addedRow .cell:hover,
@@ -177,7 +177,7 @@
177177

178178
.removed .cell:hover,
179179
.removed .active {
180-
@apply text-acc-red;
180+
@apply text-red-400;
181181
}
182182

183183
.removedRow .cell:hover,

‎web/components/DataTable/index.module.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020

2121
.gradientOverlay {
22-
@apply sticky right-0 w-12 bg-gradient-to-r from-transparent to-ld-darkgrey opacity-10;
22+
@apply sticky right-0 w-12 bg-gradient-to-r from-transparent to-storm-200 opacity-10;
2323
@screen lg {
2424
@apply hidden;
2525
}

‎web/components/DatabaseHeaderAndNav/AddItemDropdown/index.module.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020

2121
.disabledItem {
22-
@apply text-ld-darkgrey font-semibold;
22+
@apply text-storm-200 font-semibold;
2323
}
2424

2525
.button {

‎web/components/DatabaseHeaderAndNav/index.module.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212

1313
.headerDetails {
14-
@apply inline-block h-fit py-6 px-8 justify-between bg-ld-mediumblue relative;
14+
@apply inline-block h-fit py-6 px-8 justify-between bg-storm-500 relative;
1515

1616
@screen lg {
1717
@apply flex pt-6 h-28;
@@ -53,7 +53,7 @@
5353
}
5454

5555
a {
56-
@apply px-0.5 hover:text-ld-blue;
56+
@apply px-0.5 hover:text-sky-300;
5757
}
5858

5959
@screen lg {
@@ -92,5 +92,5 @@
9292
}
9393

9494
.resetButton {
95-
@apply mr-5 text-xl text-white hover:text-ld-lightblue hidden lg:block;
95+
@apply mr-5 text-xl text-white hover:text-stone-50 hidden lg:block;
9696
}

‎web/components/DatabaseNav/index.module.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
}
3636

3737
.disabledTab {
38-
@apply flex justify-center ml-4 mr-12 text-acc-lightgrey;
38+
@apply flex justify-center ml-4 mr-12 text-stone-100;
3939
}
4040

4141
.innerTab {

‎web/components/DatabaseOptionsDropdown/index.module.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212

1313
.optionButton {
14-
@apply flex items-center text-xs mx-2 my-3 py-0.5 font-semibold hover:text-acc-hoverblue;
14+
@apply flex items-center text-xs mx-2 my-3 py-0.5 font-semibold hover:text-sky-900;
1515

1616
.help {
1717
@apply mb-1;

0 commit comments

Comments
 (0)