Commit eacfce14 authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel 🏀

Merge branch '1355-replace-the-orange-cards-dot-with-a-pomodoro-tomato' into 'staging'

Resolve "Replace the orange .cards dot with a pomodoro tomato"

Closes #1355

See merge request arsnova/flashcards!1580
parents c30e0b49 9fabe479
......@@ -418,7 +418,6 @@ $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_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");
......@@ -2347,10 +2346,6 @@ $themes: (
color: $thm_green !important;
}
.color-dot {
color: $thm_orange !important;
}
.color-cards {
color: $thm_green !important;
}
......@@ -2500,10 +2495,6 @@ $themes: (
color: $hyperlink !important;
}
.pomodoroFace {
fill: $pomodoro_timer_face !important;
}
.pomodoroHour {
fill: $pomodoro_timer_hand_hour !important;
}
......
......@@ -428,7 +428,6 @@
"presentation_clock_minute_arm": black,
"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,
......
......@@ -430,7 +430,6 @@
"presentation_clock_minute_arm": $thm_gray,
"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,
......
......@@ -14,7 +14,6 @@
</feMerge>
</filter>
<!--have to put the filter in a style attribute so the url works-->
<circle class="pomodoroFace" style="filter:url(#drop-shadow);" cx="50" cy="50" r="40"/>
<g class="pomodoroHands" style="filter:url(#drop-shadow);">
<polygon class="pomodoroHour" points="50,25 53,50 47,50" transform="{{getHourRotation}}"/>
<polygon class="pomodoroMin" points="50,10 53,50 47,50" transform="{{getMinuteRotation}}"/>
......
......@@ -17,6 +17,12 @@
.pomodoroClock {
max-height: 87vh;
cursor: pointer;
background-image: url("/img/pomodoro/pomodoro.svg");
background-repeat: no-repeat;
background-position: center;
background-size: 80% 80%;
-webkit-filter: drop-shadow(5px 5px 5px rgba(0, 0, 0, 0.25));
filter: drop-shadow(5px 5px 5px rgba(0, 0, 0, 0.25));
}
.numSlider {
......
......@@ -97,7 +97,14 @@
font-size: 5vw;
font-weight: bold;
vertical-align: -6%;
text-shadow: 5px 5px 20px rgba(0, 0, 0, 0.7);
background-image: url("/img/pomodoro/pomodoro.svg");
background-repeat: no-repeat;
background-position: center;
background-position-y: 80%;
background-size: 60% 60%;
color: rgba(0,0,0,0);
-webkit-filter: drop-shadow(5px 5px 20px rgba(0, 0, 0, 0.7));
filter: drop-shadow(5px 5px 20px rgba(0, 0, 0, 0.7));
}
.logo-header-chars {
......@@ -208,7 +215,8 @@
position: absolute;
height: 100%;
width: 100%;
background-color: #4A5C66; //rgba(0, 0, 0, 0.8);
background-color: #4A5C66;
text-align: center;
}
.bigDiv .pomodoroTimer {
......
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path d="M62,31.6C62.8,47,48.9,60,32.1,60S0.4,46.2,2.1,30.9C4.5,9.4,20.4,8,32.1,8C39.2,8,60.2,1.8,62,31.6z" fill="#ef4d3c"/><path d="m11 27c6.2-9.6 16.8-6.8 19.6-10.4 0 6.9 5 3.5 7.5 6.6 3.2 4 4.4 11.1 8.2 12.5-3.7-7.9 2.3-7.6-6.1-18.2 4.5 2.8 6.8 0 12.9 2.5-5.3-8.4-13.6-6-13.6-6s5.2-4.8 9.6-2.3c-4.6-6.8-17.9 1.8-17.9 1.8s-5.5-9.4-17.3.5c6.9-2.8 14.5 0 14.5 0s-12.5-3.1-17.4 13" fill="#8cc63e"/><g fill="#64892f"><path d="M11,27c0,0,7.3-13.5,19.9-12.3C19.8,9.6,11,20.4,11,27z"/><path d="m13.9 14c0 0 9.2-6.9 17.3 0-2.4-8.4-14.7-4.5-17.3 0"/><path d="m33.2 14.9c12.2 5.6 8.1 12 13.1 21-3.4-7.5 5-21-13.1-21"/><path d="m28.4 14c0 0 2.8-4.2 3.8-9.4.1-.7 3.1-.6 3 .1-1 6.7 1.7 10.4 1.7 10.4s-2.1.7-4.7.7c-2.6.1-3.8-1.8-3.8-1.8"/></g><ellipse cx="33.7" cy="4.6" rx="1.5" ry=".6" fill="#8cc63e"/></svg>
\ No newline at end of file
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