Merge pull request #2908 from chmelevskij/chore/move-styles-into-components

refactor: move styles closer to the components

Author: asizon

src/components/quad-status/BatteryLegend.vue

@@ -32,3 +32,19 @@ export default {
   },
 };
 </script>
+
+<style>
+.battery-legend {
+  display: inline;
+  position: relative;
+  top: -2px;
+  margin-top: 0;
+  left: 0;
+  right: 0;
+  width: 40px;
+  text-align: left;
+  color: silver;
+  margin-left: -8px;
+  padding-right: 4px;
+}
+</style>

src/components/status-bar/StatusBar.vue

@@ -69,20 +69,48 @@ export default {
 
     configuratorVersion: {
       type: String,
-      default: '',
+      default: "",
     },
     firmwareVersion: {
       type: String,
-      default: '',
+      default: "",
     },
     firmwareId: {
       type: String,
-      default: '',
+      default: "",
     },
     hardwareId: {
       type: String,
-      default: '',
+      default: "",
     },
   },
 };
 </script>
+
+<style>
+/** Status bar **/
+#status-bar {
+  position: fixed;
+  display: flex;
+  bottom: 0;
+  width: calc(100% - 20px);
+  height: 20px;
+  line-height: 20px;
+  padding: 0 10px 0 10px;
+  border-top: 1px solid #7d7d79;
+  background-color: #bfbeb5;
+}
+
+#status-bar > * ~ * {
+  padding-left: 10px;
+  margin-left: 10px;
+  border-left: 1px solid #7d7d79;
+}
+
+/** Status bar (phones) **/
+@media all and (max-width: 575px) {
+  #status-bar {
+    display: none;
+  }
+}
+</style>

src/components/status-bar/StatusBarVersion.vue

@@ -16,20 +16,29 @@ export default {
   props: {
     configuratorVersion: {
       type: String,
-      default: '',
+      default: "",
     },
     firmwareVersion: {
       type: String,
-      default: '',
+      default: "",
     },
     firmwareId: {
       type: String,
-      default: '',
+      default: "",
     },
     hardwareId: {
       type: String,
-      default: '',
+      default: "",
     },
   },
 };
 </script>
+
+<style>
+.version {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  margin-left: auto;
+}
+</style>

src/css/dark-theme.css

@@ -46,6 +46,7 @@ body {
     background-color: #393b3a;
 }
 
+/* NOTE: need to think on how to load the dark theme with vue */
 #status-bar {
     background-color: #414443;
 }

src/css/main.css

@@ -656,21 +656,6 @@ input[type="number"]::-webkit-inner-spin-button {
     width: 31px;
 }
 
-
-.battery-legend {
-    display: inline;
-    position: relative;
-    top: -2px;
-    margin-top: 0;
-    left: 0;
-    right: 0;
-    width: 40px;
-    text-align: left;
-    color: silver;
-    margin-left: -8px;
-    padding-right: 4px
-}
-
 .quad-status-contents progress::-webkit-progress-bar {
     height: 12px;
     background-color: #eee;
@@ -1457,43 +1442,6 @@ li.active .ic_mission {
     }
 }
 
-
-
-/** Status bar **/
-#status-bar {
-    position: fixed;
-    display: flex;
-    bottom: 0;
-    width: calc(100% - 20px);
-    height: 20px;
-    line-height: 20px;
-    padding: 0 10px 0 10px;
-    border-top: 1px solid #7d7d79;
-    background-color: #bfbeb5;
-}
-
-#status-bar > * ~ * {
-    padding-left: 10px;
-    margin-left: 10px;
-    border-left: 1px solid #7d7d79;
-}
-
-#status-bar .version {
-    margin: 0;
-    padding: 0;
-    border: 0;
-    margin-left: auto;
-}
-
-/** Status bar (phones) **/
-@media all and (max-width: 575px) {
-    #status-bar {
-        display: none;
-    }
-}
-
-
-
 #cache {
     display: none;
 }