Merge branch 'dev'

src/App.vue

@@ -55,6 +55,17 @@ footer {
   width: 100%;
 }
 
+#ytb-player {
+  background: #504746;
+  margin-top: 16px;
+  border-radius: 16px;
+  padding: 0 24px 12px 24px;
+}
+
+#pomodoro {
+  width: 100%;
+}
+
 #container {
   display: flex;
   flex-direction: row;
@@ -82,16 +93,15 @@ footer {
 @media (min-width: 330px) {
   #right-side {
     display: flex;
-    width: 50%;
+    width: 60%;
     flex-direction: column;
     margin-right: 32px;
     margin-left: 32px;
   }
 }
 
-
 #todo-container {
-  width: 50%;
+  width: 30%;
   margin-right: 16px;
   max-width: 500px;
 }

src/components/Pomodoro.vue

@@ -1,4 +1,5 @@
 <template>
+  <div id="container">
     <div class="pomodoro">
       <div id="dot-container">
         <span class="dot"></span>
@@ -31,9 +32,12 @@
         </div>
       </div>
     </div>
+    <stats></stats>
+  </div>
 </template>
 
 <script>
+import Stats from "@/components/Stats";
 const MINUTES = 25;
 const RANGE_MINUTES = 5;
 const SECONDS = 0;
@@ -42,6 +46,7 @@ const LONG_PAUSE = 30;
 
 export default {
   name: "Pomodoro",
+  components: {Stats},
   data () {
     return {
       minutes: MINUTES,
@@ -190,6 +195,18 @@ export default {
 <style scoped>
 .pomodoro {
   text-align: center;
+  color: white;
+  background: #504746;
+  border-radius: 16px;
+  padding-top: 8px;
+  padding-bottom: 16px;
+  margin-right: 16px;
+}
+
+#container {
+  display: flex;
+  flex-direction: row;
+  margin-top: 8px;
 }
 
 #time {
@@ -204,7 +221,6 @@ export default {
 
 #startStop > button{
   font-size: 32px;
-  width: 120px;
   text-align: center;
 }
 
@@ -244,19 +260,11 @@ export default {
   width: 10vw;
 }
 
-@media (max-width: 490px) {
+@media (max-width: 635px) {
   #message {
     display: none;
   }
-}
 
-@media (min-width: 490px) {
-  #message {
-    font-size: 1.6rem;
-  }
-}
-
-@media (max-width: 390px) {
   .dot {
     display: none;
   }
@@ -266,7 +274,11 @@ export default {
   }
 }
 
-@media (min-width: 390px) {
+@media (min-width: 635px) {
+  #message {
+    font-size: 1.6rem;
+  }
+
   .dot {
     height: 25px;
     width: 25px;
@@ -285,9 +297,8 @@ export default {
     display: inline-block;
   }
 }
-
 .arrow {
-  border: solid black;
+  border: solid white;
   border-width: 0 6px 6px 0;
   font-size: 1rem;
   display: inline-block;

src/components/Stats.vue

@@ -0,0 +1,27 @@
+<template>
+  <div id="container-stats">
+    NEWS COMING SOON 👀
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "Stats",
+}
+</script>
+
+<style scoped>
+
+#container-stats {
+  background: #504746;
+  width: 100%;
+  border-radius: 16px;
+  padding: 10% 12px 8px 12px;
+  color: white;
+  text-align: center;
+  vertical-align: center;
+  font-size: 24px;
+}
+
+</style>