ソースを参照

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

tabs-content
K Rob 3年前
コミット
c930df57d5

+ 5
- 0
frontend/assets/sass/main.scss ファイルの表示

5
 
5
 
6
 html {
6
 html {
7
     background-color: $black;
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
 // Color Variables
1
 // Color Variables
2
 $yellow: #F7F5A6;
2
 $yellow: #F7F5A6;
3
-$light-green: #49E64D;
3
+$light-green: #C2F279;
4
 $dark-green: #4D9127;
4
 $dark-green: #4D9127;
5
 $red: #FF3660;
5
 $red: #FF3660;
6
 $light-blue: #05DBF2;
6
 $light-blue: #05DBF2;

+ 1
- 0
frontend/src/App.vue ファイルの表示

79
     top: 50px
79
     top: 50px
80
     max-width: 960px
80
     max-width: 960px
81
     width:100%
81
     width:100%
82
+    margin: 0 auto
82
 </style>
83
 </style>

+ 26
- 14
frontend/src/components/MainNav.vue ファイルの表示

1
 <template lang="pug">
1
 <template lang="pug">
2
 w-toolbar.mt6.py1(bottom fixed)
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
             //- p.text-upper pending matches
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
             //- p.text-upper active chats
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
             w-icon.mr1.icon-area-graph(xl)
16
             w-icon.mr1.icon-area-graph(xl)
17
             //- p.text-upper survey
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
             //- p.text-upper settings
21
             //- p.text-upper settings
22
 </template>
22
 </template>
23
 
23
 
30
 </script>
30
 </script>
31
 
31
 
32
 <style lang="sass">
32
 <style lang="sass">
33
+@import '../assets/sass/main.scss'
33
 .w-toolbar
34
 .w-toolbar
34
     max-width: 960px
35
     max-width: 960px
35
     width:100%
36
     width:100%
36
     margin: auto
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
 </style>
49
 </style>
38
 
50
 

読み込み中…
キャンセル
保存