Преглед изворни кода

:art: background colors added to html, body, and w-toolbar, navbar icons color also updated

tags/0.0.3^2
K Rob пре 3 година
родитељ
комит
8b9b6c179d

+ 5
- 0
frontend/assets/sass/main.scss Прегледај датотеку

@@ -5,4 +5,9 @@
5 5
 
6 6
 html {
7 7
     background-color: $black;
8
+    font-size: $base-font-size;
9
+}
10
+body{
11
+    margin:0;
12
+    font-family: 'Source Code Pro', monospace;
8 13
 }

+ 1
- 1
frontend/assets/sass/variables.scss Прегледај датотеку

@@ -1,6 +1,6 @@
1 1
 // Color Variables
2 2
 $yellow: #F7F5A6;
3
-$light-green: #49E64D;
3
+$light-green: #C2F279;
4 4
 $dark-green: #4D9127;
5 5
 $red: #FF3660;
6 6
 $light-blue: #05DBF2;

+ 1
- 0
frontend/src/App.vue Прегледај датотеку

@@ -79,4 +79,5 @@ export default {
79 79
     top: 50px
80 80
     max-width: 960px
81 81
     width:100%
82
+    margin: 0 auto
82 83
 </style>

+ 26
- 14
frontend/src/components/MainNav.vue Прегледај датотеку

@@ -1,23 +1,23 @@
1 1
 <template lang="pug">
2 2
 w-toolbar.mt6.py1(bottom fixed)
3
-    router-link.w-flex.column(:to='`/`')
4
-        w-button.pa8(bg-color='primary')
5
-            w-icon.mr1.icon-home(xl)
6
-    router-link.w-flex.column(:to='`/pairs`')
7
-        w-button.pa8(bg-color='primary')
8
-            w-icon.mr1.icon-people(xl)
3
+    router-link.w-flex.column.exact-active-link(:to='`/`')
4
+        w-button.pa8()
5
+            w-icon.mr1.icon-home(xl :class="{ 'icon-selected': $route.path === '/' }")
6
+    router-link.w-flex.column.exact-active-link(:to='`/pairs`')
7
+        w-button.pa8()
8
+            w-icon.mr1.icon-people(xl, :class="{ 'icon-selected': $route.path === '/pairs' }")
9 9
             //- p.text-upper pending matches
10
-    router-link.w-flex.column(:to='`/messages`')
11
-        w-button.pa8(bg-color='primary')
12
-            w-icon.mr1.icon-chat(xl)
10
+    router-link.w-flex.column.exact-active-link(:to='`/messages`')
11
+        w-button.pa8()
12
+            w-icon.mr1.icon-chat(xl, :class="{ 'icon-selected': $route.path === '/messages' }")
13 13
             //- p.text-upper active chats
14
-    router-link.w-flex.column(:to='`/onboarding`')
15
-        w-button.pa8(bg-color='primary')
14
+    router-link.w-flex.column.exact-active-link(:to='`/onboarding`')
15
+        w-button.pa8()
16 16
             w-icon.mr1.icon-area-graph(xl)
17 17
             //- p.text-upper survey
18
-    router-link.w-flex.column(:to='`/settings`')
19
-        w-button.pa8(bg-color='primary' disabled)
20
-            w-icon.mr1.icon-cog(xl)
18
+    router-link.w-flex.column.exact-active-link(:to='`/settings`')
19
+        w-button.pa8(disabled)
20
+            w-icon.mr1.icon-cog(xl :class="{ 'icon-selected': $route.path === '/settings' }")
21 21
             //- p.text-upper settings
22 22
 </template>
23 23
 
@@ -30,9 +30,21 @@ export default {
30 30
 </script>
31 31
 
32 32
 <style lang="sass">
33
+@import '../assets/sass/main.scss'
33 34
 .w-toolbar
34 35
     max-width: 960px
35 36
     width:100%
36 37
     margin: auto
38
+    background: $dark-grey
39
+    color: $light-grey
40
+
41
+    .w-button
42
+        background-color: $dark-grey
43
+    
44
+    .icon-selected
45
+        color: $light-green
46
+    
47
+    a
48
+        color:$light-grey
37 49
 </style>
38 50
 

Loading…
Откажи
Сачувај