Commit 72f616f8 authored by Curtis Adam's avatar Curtis Adam

Update the theme switch colors of the pomodoro timer

parent 65b0426e
......@@ -416,15 +416,17 @@ $themes: (
$presentation_clock_minute_arm: map-get($map, "presentation_clock_minute_arm");
$presentation_clock_second_arm: map-get($map, "presentation_clock_second_arm");
//pomodoro colors
$pomodoro_yellow: map-get($map, "pomodoro_yellow");
$pomodoro_green: map-get($map, "pomodoro_green");
$pomodoro_white: map-get($map, "pomodoro_white");
$pomodoro_orange: map-get($map, "pomodoro_orange");
$pomodoro_dark_orange: map-get($map, "pomodoro_dark_orange");
$pomodoro_blue: map-get($map, "pomodoro_blue");
$pomodoro_orange_link: map-get($map, "pomodoro_orange_link");
$pomodoro_stroke_orange: map-get($map, "pomodoro_stroke_orange");
$pomodoro_stroke_blue: map-get($map, "pomodoro_stroke_blue");
$pomodoro_timer_face: map-get($map, "pomodoro_timer_face");
$pomodoro_timer_hand_circle: map-get($map, "pomodoro_timer_hand_circle");
$pomodoro_timer_hand_hour: map-get($map, "pomodoro_timer_hand_hour");
$pomodoro_timer_hand_min: map-get($map, "pomodoro_timer_hand_min");
$pomodoro_timer_arc: map-get($map, "pomodoro_timer_arc");
$pomodoro_timer_arc_progress: map-get($map, "pomodoro_timer_arc_progress");
$pomodoro_timer_arc_break: map-get($map, "pomodoro_timer_arc_break");
$pomodoro_timer_bold_text: map-get($map, "pomodoro_timer_bold_text");
$pomodoro_timer_label: map-get($map, "pomodoro_timer_label");
$pomodoro_timer_text: map-get($map, "pomodoro_timer_text");
$pomodoro_timer_title: map-get($map, "pomodoro_timer_title");
.star-ratings .current-rating {
color: $current_rating !important;
}
......@@ -2465,47 +2467,51 @@ $themes: (
//pomodoro
.pomodoroTimer {
.pomodoroInstructions {
color: $pomodoro_white !important;
color: $pomodoro_timer_text !important;
}
h3 {
color: $pomodoro_orange !important;
color: $pomodoro_timer_title !important;
}
a:visited {
color: $pomodoro_orange_link !important;
color: $hyperlink !important;
}
.pomodoroFace {
fill: $pomodoro_green !important;
fill: $pomodoro_timer_face !important;
}
.pomodoroHour {
fill: $pomodoro_timer_hand_hour !important;
}
.pomodoroGreen {
color: $pomodoro_green !important;
.pomodoroMin {
fill: $pomodoro_timer_hand_min !important;
}
.pomodoroHour, .pomodoroMin, .handCircle {
fill: $pomodoro_yellow !important;
.handCircle {
fill: $pomodoro_timer_hand_circle !important;
}
.pomArc {
stroke: $pomodoro_stroke_orange !important;
stroke: $pomodoro_timer_arc !important;
}
.breakArc {
stroke: $pomodoro_stroke_blue !important;
stroke: $pomodoro_timer_arc_break !important;
}
.progressArc {
stroke: $pomodoro_dark_orange !important;
stroke: $pomodoro_timer_arc_progress !important;
}
b {
color: $pomodoro_dark_orange !important;
color: $pomodoro_timer_bold_text !important;
}
label {
color: $pomodoro_blue !important;
color: $pomodoro_timer_label !important;
}
}
}
......
......@@ -424,6 +424,18 @@
"presentation_clock_hour_marks": black,
"presentation_clock_hour_arm": black,
"presentation_clock_minute_arm": black,
"presentation_clock_second_arm": $thm_red
"presentation_clock_second_arm": $thm_red,
//pomodoro colors
"pomodoro_timer_face":$thm_green,
"pomodoro_timer_hand_circle":$thm_orange,
"pomodoro_timer_hand_hour":white,
"pomodoro_timer_hand_min":white,
"pomodoro_timer_arc":$thm_orange,
"pomodoro_timer_arc_progress":$thm_red,
"pomodoro_timer_arc_break":$thm_dark_blue,
"pomodoro_timer_bold_text": $thm_red,
"pomodoro_timer_label": $thm_dark_blue,
"pomodoro_timer_text": white,
"pomodoro_timer_title": $thm_orange
);
}
......@@ -30,26 +30,7 @@
$divider: #BDBDBD;
$accent_300: #f0efef;
$background: yellow;
$pomodoro_yellow: #FDE016;
$pomodoro_green: #33D275;
$pomodoro_white: white;
$pomodoro_orange: #FFAA30;
$pomodoro_dark_orange: #FE5E3E;
$pomodoro_blue: #178FFF;
$pomodoro_orange_link: #FE5E3E;
$pomodoro_stroke_orange: #FF9F30;
$pomodoro_stroke_blue: #178FFF;
@return (
//pomodoro colors
"pomodoro_yellow":$pomodoro_yellow,
"pomodoro_green":$pomodoro_green,
"pomodoro_white":$pomodoro_white,
"pomodoro_orange":$pomodoro_orange,
"pomodoro_dark_orange":$pomodoro_dark_orange,
"pomodoro_blue":$pomodoro_blue,
"pomodoro_orange_link":$pomodoro_orange_link,
"pomodoro_stroke_orange":$pomodoro_stroke_orange,
"pomodoro_stroke_blue":$pomodoro_stroke_blue,
//global colors
"thm_dark_blue":$thm_dark_blue,
"thm_blue":$thm_blue,
......@@ -445,6 +426,18 @@
"presentation_clock_hour_marks": $thm_gray,
"presentation_clock_hour_arm": $thm_gray,
"presentation_clock_minute_arm": $thm_gray,
"presentation_clock_second_arm": $thm_red
"presentation_clock_second_arm": $thm_red,
//pomodoro colors
"pomodoro_timer_face":$thm_green,
"pomodoro_timer_hand_circle":$thm_orange,
"pomodoro_timer_hand_hour":white,
"pomodoro_timer_hand_min":white,
"pomodoro_timer_arc":$thm_orange,
"pomodoro_timer_arc_progress":$thm_red,
"pomodoro_timer_arc_break":$thm_dark_blue,
"pomodoro_timer_bold_text": $thm_red,
"pomodoro_timer_label": $thm_dark_blue,
"pomodoro_timer_text": white,
"pomodoro_timer_title": $thm_orange
);
}
......@@ -28,7 +28,7 @@
<path class="breakArc"/>
</svg>
{{#unless isActiveRoute regex='box|memo'}}
<h2 class="text-center pomodoroInstructions">click clock to <span class="pomodoroGreen">start</span></h2>
<h2 class="text-center pomodoroInstructions">Pomodoro Timer</h2>
{{/unless}}
<!--empty audio tag to make the sounds work on chrome for android-->
<audio id="chromeMobile" preload="auto">
......
......@@ -32,9 +32,9 @@
<br>
{{#if isActiveRoute
'home'}}
<a href="demo" class="hidden-xs btn btn-lg btn-raised btn-success">{{_
<a href="demo" class="hidden-xs btn btn-lg btn-raised btn-primary">{{_
"intro.learnMore" lastAppTitle=(getLastAppTitle)}}</a>
<a href="about" class="visible-xs btn btn-lg btn-raised btn-success">{{_
<a href="about" class="visible-xs btn btn-lg btn-raised btn-primary">{{_
"intro.learnMoreMobile" lastAppTitle=(getLastAppTitle)}}</a>
{{/if}}
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment