diff --git a/src/css/_variables.scss b/src/css/_variables.scss index ecda9eb..aeb4559 100644 --- a/src/css/_variables.scss +++ b/src/css/_variables.scss @@ -1,4 +1,4 @@ -$font-family: Arial, sans-serif; +$font-family: Roboto, Arial, sans-serif; $font-color: #191919; $popup-width: 420px; $popup-height: 463px; diff --git a/src/css/popup.scss b/src/css/popup.scss index 3e9644a..c7a1ec5 100644 --- a/src/css/popup.scss +++ b/src/css/popup.scss @@ -17,11 +17,18 @@ html { h1 { font-size: 24px; font-weight: normal; - line-height: 1.2; + line-height: 1.5; margin-top: 1rem; margin-bottom: 3rem; } + h2 { + font-size: 20px; + font-weight: normal; + line-height: 1.5; + margin-top: 1rem; + } + .text-red { color: $red; } @@ -100,21 +107,24 @@ html { text-align: center; margin-top: 3rem; - h1 { - margin: 0.75rem; - line-height: 1.2; + h2 { + max-height: 90px; + overflow: hidden; } p { - margin-top: 0.75rem; + margin-top: 0; + margin-bottom: 1rem; + max-height: 16px; + overflow: hidden; } .timer { - margin-top: 2.5rem; + margin-top: 2rem; } .btn-stop-timer { - margin-top: 3rem; + margin-top: 1.5rem; background-color: $red; border: none; border-radius: 50%; diff --git a/src/js/components/App/TimerView.js b/src/js/components/App/TimerView.js index 45aeda8..208dd90 100644 --- a/src/js/components/App/TimerView.js +++ b/src/js/components/App/TimerView.js @@ -11,14 +11,17 @@ export default function TimerView({ timedActivity, onStopTimer }) { return (
{timedActivity.customer_name}
++ {timedActivity.customer_name} +
+{timedActivity.assignment_name}
+{timedActivity.task_name}
+