Skip to content

Commit ca5206d

Browse files
committed
[Frontend] Fixing issues with theme coloring
Fixes #933
1 parent 573f1f9 commit ca5206d

File tree

6 files changed

+7
-16
lines changed

6 files changed

+7
-16
lines changed

platform/commonUI/general/res/sass/_mixins.scss

-10
Original file line numberDiff line numberDiff line change
@@ -268,16 +268,6 @@
268268
text-shadow: rgba(black, $sVal) 0 3px 7px;
269269
}
270270

271-
@function pullForward($c, $p: 20%) {
272-
// For dark interfaces, lighter things come forward
273-
@return lighten($c, $p);
274-
}
275-
276-
@function pushBack($c, $p: 20%) {
277-
// For dark interfaces, darker things move back
278-
@return darken($c, $p);
279-
}
280-
281271
@function percentToDecimal($p) {
282272
@return $p / 100%;
283273
}

platform/commonUI/themes/espresso/res/sass/_constants.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ $colorCreateBtn: $colorKey;
6161
$colorGridLines: rgba(#fff, 0.05);
6262
$colorInvokeMenu: #fff;
6363
$colorObjHdrTxt: $colorBodyFg;
64-
$colorObjHdrIc: pullForward($colorObjHdrTxt, 20%);
64+
$colorObjHdrIc: darken($colorObjHdrTxt, 20%);
6565
$colorTick: pullForward($colorBodyBg, 20%);
6666

6767
// Menu colors

platform/commonUI/themes/snow/res/sass/_constants.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ $colorCreateBtn: $colorKey;
6161
$colorGridLines: rgba(#000, 0.05);
6262
$colorInvokeMenu: #fff;
6363
$colorObjHdrTxt: $colorBodyFg;
64-
$colorObjHdrIc: pushBack($colorObjHdrTxt, 30%);
65-
$colorTick: pullForward($colorBodyBg, 30%);
64+
$colorObjHdrIc: lighten($colorObjHdrTxt, 20%);
65+
$colorTick: lighten($colorBodyFg, 10%);
6666

6767
// Menu colors
6868
$colorMenuBg: pushBack($colorBodyBg, 10%);

platform/features/conductor-v2/res/sass/_time-conductor-base.scss

+2-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
top: 50%;
6767
z-index: 2;
6868
&:before {
69-
background-color: $c;
69+
background: $colorObjHdrIc;
7070
content: '';
7171
display: block;
7272
position: absolute;
@@ -77,7 +77,6 @@
7777
z-index: 2;
7878
@include animation-duration(12s);
7979
&:before {
80-
//background: red;
8180
height: ceil($handH * 0.7);
8281
}
8382
}
@@ -178,7 +177,7 @@
178177
}
179178

180179
.l-time-conductor-inputs-and-ticks {
181-
$c: $colorTick;
180+
$c: $colorTimeCondTicks; //$colorTick;
182181
height: $r1H;
183182
mct-conductor-axis {
184183
display: block;

platform/features/conductor-v2/res/sass/time-conductor-espresso.scss

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
@import "constants";
3232

3333
// Thematic constants
34+
$colorTimeCondTicks: pullForward($colorBodyBg, 30%);
3435
$colorTimeCondKeyBg: #4e70dc;
3536
$colorTimeCondKeyFg: #fff;
3637
$colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%);

platform/features/conductor-v2/res/sass/time-conductor-snow.scss

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
@import "constants";
3232

3333
// Thematic constants
34+
$colorTimeCondTicks: pullForward($colorBodyBg, 30%);
3435
$colorTimeCondKeyBg: #6178dc;
3536
$colorTimeCondKeyFg: #fff;
3637
$colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%);

0 commit comments

Comments
 (0)