Skip to content

Commit 212185e

Browse files
SraccitySraccity
authored
Reverting "#74: Colours"
Reverting "#74: Colours" Merge pull request #77 from algorithms-in-action/revert-74-Colours
2 parents a3e4fc0 + 620f07f commit 212185e

File tree

17 files changed

+499
-358
lines changed

17 files changed

+499
-358
lines changed

‎src/components/DataStructures/Array/Array1DRenderer/Array1DRenderer.module.scss

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
.array_1d {
44
flex-shrink: 0;
55

6-
.bottom_caption {
7-
// added for msort_arr_td
8-
caption-side: bottom;
9-
text-align: center;
10-
margin-top: 15px;
11-
font-size: 13px;
12-
color: var(--array-2d-row-col-value-color);
13-
font-family: Menlo, "Liberation Mono", Courier, monospace;
14-
}
15-
16-
.captionmsort_arr_td {
17-
caption-side: bottom;
18-
// caption-side: top;
19-
text-align: right;
20-
margin-top: 70px;
21-
// margin-top: 0px;
22-
}
6+
.bottom_caption {
7+
// added for msort_arr_td
8+
caption-side: bottom;
9+
text-align: center;
10+
margin-top: 15px;
11+
font-size: 13px;
12+
color: var(--array-2d-row-col-value-color);
13+
font-family: Menlo, "Liberation Mono", Courier, monospace;
14+
}
15+
16+
.captionmsort_arr_td {
17+
caption-side: bottom;
18+
// caption-side: top;
19+
text-align: right;
20+
margin-top: 70px;
21+
// margin-top: 0px;
22+
}
2323

2424

2525

@@ -39,7 +39,7 @@
3939
// position: absolute;
4040
// width: 100%;
4141
// height: 3px;
42-
// background-color: var(--apple);
42+
// background-color: var(--array-1d-row-col-bg-selected);
4343
// opacity: 0.4;
4444
// margin-right: 4px;
4545
// z-index: 1;
@@ -66,19 +66,19 @@
6666

6767
.variable {
6868
font-size: 18px;
69-
color: var(--peach);
69+
color: var(--array-1d-row-col-variable);
7070
}
7171

7272
&.selected {
73-
background-color: var(--peach);
73+
background-color: var(--array-1d-row-col-bg-selected);
7474

7575
span {
7676
color: var(--array-2d-row-col-selected);
7777
}
7878
}
7979

8080
&.selected1 {
81-
background-color: var(--sky);
81+
background-color: var(--array-2d-row-col-bg-selected1);
8282

8383
span {
8484
color: var(--array-2d-row-col-selected);
@@ -100,25 +100,25 @@
100100
color: var(--array-2d-row-col-selected);
101101
}
102102
}
103-
103+
104104
&.selected4 {
105-
background-color: var(--peach);
105+
background-color: var(--array-2d-row-col-bg-selected4);
106106

107107
span {
108108
color: var(--array-2d-row-col-selected);
109109
}
110-
}
110+
}
111111

112112
&.selected5 {
113-
background-color: var(--apple);
113+
background-color: var(--array-2d-row-col-bg-selected5);
114114

115115
span {
116116
color: var(--array-2d-row-col-selected);
117117
}
118118
}
119119

120120
&.patched {
121-
background-color: var(--leaf);
121+
background-color: var(--array-1d-row-col-bg-patched);
122122

123123
span {
124124
color: var(--array-2d-row-col-patched);
@@ -169,17 +169,17 @@
169169
height: 0.6em;
170170
transition-duration: 0.1s;
171171
margin-bottom: m#{i}n(1vh, 1em);
172-
172+
173173
--not-started-section: rgba(0, 0, 0, 0); // transparent
174-
--in-progress-section: rgb(169, 169, 169);
175-
--current-section: var(--peach);
176-
--finished-section: rgb(0, 0, 0);
174+
--in-progress-section: rgb(169, 169, 169);
175+
--current-section: var(--array-1d-row-col-bg-selected);
176+
--finished-section: rgb(0, 0, 0);
177177

178178
.stackSubElement {
179179
transition-duration: 0.1s;
180-
--j-section: rgb(58, 177, 167);
181-
--i-section: rgb(28, 185, 41);
182-
--p-section: rgb(176, 25, 187); // pink pivot
180+
--j-section: rgb(58, 177, 167);
181+
--i-section: rgb(28, 185, 41);
182+
--p-section: rgb(176, 25, 187); // pink pivot
183183
}
184184
}
185185

@@ -188,4 +188,4 @@
188188
font-size: 0.8em;
189189
}
190190
}
191-
}
191+
}

‎src/components/DataStructures/Array/Array1DTracer.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
// used to display one array in the form of a single bar chart, such as
2-
// Binary Search Tree
3-
// Heap Sort
4-
// Merge Sort
5-
// Quick Sort
6-
71
/* eslint-disable class-methods-use-this */
82
/* eslint-disable consistent-return */
93
/* eslint-disable no-plusplus */

‎src/components/DataStructures/Array/Array2DRenderer/Array2DRenderer.module.scss

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@
5151

5252
.variable {
5353
font-size: 18px;
54-
color: var(--array-2d-row-col-value-color); //var(--array-2d-row-col-sorted);
54+
color: var(--array-2d-row-col-value-color);//var(--array-2d-row-col-sorted);
5555
}
5656

5757
&.selected {
58-
background-color: var(--sky);
58+
background-color: var(--array-2d-row-col-bg-selected);
5959

6060
span {
6161
color: var(--array-2d-row-col-selected);
6262
}
6363
}
6464

6565
&.selected1 {
66-
background-color: var(--leaf);
66+
background-color: var(--array-2d-row-col-bg-selected1);
6767

6868
span {
6969
color: var(--array-2d-row-col-selected);
@@ -84,10 +84,10 @@
8484
span {
8585
color: var(--array-2d-row-col-selected);
8686
}
87-
}
87+
}
8888

8989
&.variableGreen {
90-
background-color: var(--leaf);
90+
background-color: var(--simple-fill-var-green);
9191

9292
span {
9393
color: var(--array-2d-row-col-selected);
@@ -96,15 +96,15 @@
9696

9797
&.variableOrange {
9898
// more of a yellow, really
99-
background-color: var(--peach);
99+
background-color: var(--simple-fill-var-orange);
100100

101101
span {
102102
color: var(--array-2d-row-col);
103103
}
104104
}
105105

106106
&.variableRed {
107-
background-color: var(--apple);
107+
background-color: var(--simple-fill-var-red);
108108

109109
span {
110110
color: var(--array-2d-row-col-selected);
@@ -113,25 +113,25 @@
113113

114114

115115
&.selected4 {
116-
background-color: var(--apple);
116+
background-color: var(--array-2d-row-col-bg-selected4);
117117

118118
span {
119119
color: var(--array-2d-row-col-selected);
120120
}
121-
}
121+
}
122122

123123
&.selected5 {
124-
background-color: var(--peach);
124+
background-color: var(--array-2d-row-col-bg-selected5);
125125

126126
span {
127127
color: var(--array-2d-row-col-selected);
128128
}
129-
}
129+
}
130130

131131

132132

133133
&.patched {
134-
background-color: var(--peach);
134+
background-color: var(--array-2d-row-col-bg-patched);
135135

136136
span {
137137
color: var(--array-2d-row-col-patched);
@@ -167,7 +167,7 @@
167167
&.faded {
168168
opacity: 0.2
169169
}
170-
170+
171171
}
172172
}
173173
}
@@ -176,33 +176,33 @@
176176
caption-side: bottom;
177177
text-align: right;
178178
margin-top: -12px; // need to squeeze a bit
179-
color: var(--array-2d-row-col-value-color);
180-
}
179+
color: var(--array-2d-row-col-value-color);
180+
}
181181

182182
.captionBFS {
183183
caption-side: bottom;
184184
text-align: center;
185185
margin-top: -12px; // need to squeeze a bit
186-
color: var(--array-2d-row-col-value-color);
186+
color: var(--array-2d-row-col-value-color);
187187
}
188188

189189
.captionDFSrec {
190190
caption-side: bottom;
191191
margin-top: -12px; // doesn't hurt to squeeze a bit like above
192192
text-align: right;
193-
color: var(--array-2d-row-col-value-color);
193+
color: var(--array-2d-row-col-value-color);
194194
}
195195

196196
.captionmsort_lista_td {
197197
caption-side: bottom;
198198
font-size: 14px; // squeeze a bit
199199
text-align: right;
200-
color: var(--array-2d-row-col-value-color);
200+
color: var(--array-2d-row-col-value-color);
201201
}
202202

203203
// redefined in 1D array
204204
.captionmsort_arr_td {
205205
caption-side: bottom;
206206
text-align: right;
207-
color: var(--array-2d-row-col-value-color);
208-
}
207+
color: var(--array-2d-row-col-value-color);
208+
}

‎src/components/DataStructures/Array/Array2DTracer.js

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
// used to display graphs, such as in the case of:
2-
// A*
3-
// Breadth First Search
4-
// Depth First Search
5-
// Dijkstra's
6-
// Kruskal
7-
// Prim
8-
// Warshall
9-
// Union Find
10-
11-
// Or tables, such as in the case of:
12-
// Horspool's
13-
// Merge Sort List
14-
// Union find
15-
161
/* eslint-disable no-plusplus */
172
/* eslint-disable class-methods-use-this */
183
/* eslint-disable max-classes-per-file */
@@ -182,7 +167,7 @@ class Array2DTracer extends Tracer {
182167

183168
// add variable to item if not undefined or null
184169
if (idx !== null && idx !== undefined)
185-
newData[row][idx].variables.push(v);
170+
newData[row][idx].variables.push(v);
186171

187172
// update this.data
188173
this.data = newData;

‎src/components/DataStructures/Array/TwoArray1DTracer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable class-methods-use-this */
22

3-
/* draw two arrays in the same box (currently unused) */
3+
/* draw two arrays in the same box */
44

55
import Array2DTracer from './Array2DTracer';
66
import Array1DRenderer from './Array1DRenderer/index';

‎src/components/DataStructures/Array/TwoArray2DRenderer/TwoArray2DRenderer.module.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525

2626
&.selected {
27-
background-color: var(--sky);
27+
background-color: var(--two-array-2d-row-col-bg-selected);
2828

2929
span {
3030
color: var(--two-array-2d-row-col-selected);
@@ -33,7 +33,7 @@
3333

3434

3535
&.patched {
36-
background-color: var(--sky);
36+
background-color: var(--two-array-2d-row-col-bg-patched);
3737

3838
span {
3939
color: var(--two-array-2d-row-col-patched);
@@ -43,7 +43,7 @@
4343

4444
&.sorted {
4545
background-color: var(--array-2d-row-bg-sorted);
46-
46+
4747
span {
4848
color: var(--array-2d-row-col-sorted);
4949
}
@@ -58,4 +58,4 @@
5858
}
5959
}
6060
}
61-
}
61+
}

0 commit comments

Comments
 (0)