Explorar el Código

update and reorder menu items

tags/1.0.3
Alej hace 2 años
padre
commit
c108a5a91b
Se han modificado 1 ficheros con 54 adiciones y 61 borrados
  1. 54
    61
      vue-theme/src/components/navigation/navigation.vue

+ 54
- 61
vue-theme/src/components/navigation/navigation.vue Ver fichero

1
 // Replace with calls to menu system
1
 // Replace with calls to menu system
2
 <template lang="pug">
2
 <template lang="pug">
3
 nav.main.w-max
3
 nav.main.w-max
4
-    .menu.f-col
4
+    .menu.f-col.t-up 
5
         ul.f-row.w-max
5
         ul.f-row.w-max
6
             li.f-row.start
6
             li.f-row.start
7
                 router-link(to="/")
7
                 router-link(to="/")
8
                     img(src="../../star.svg")
8
                     img(src="../../star.svg")
9
                 router-link(to="/")
9
                 router-link(to="/")
10
-                    h1.t-serif.t-up craft in america
10
+                    h1.t-serif craft in america
11
             //- li.f-grow
11
             //- li.f-grow
12
             //- li(v-for="item in menuItems")
12
             //- li(v-for="item in menuItems")
13
             //-     router-link(v-if="['event','exhibition'].includes(item)" :to="`/${item}/sorted/${sortTypes.currentAndUpcoming}`")
13
             //-     router-link(v-if="['event','exhibition'].includes(item)" :to="`/${item}/sorted/${sortTypes.currentAndUpcoming}`")
19
 
19
 
20
             //- hardcoded menu
20
             //- hardcoded menu
21
             li.f-grow
21
             li.f-grow
22
-            li.t-up
22
+            li.f-grow
23
                 router-link(to="/episode") PBS Series
23
                 router-link(to="/episode") PBS Series
24
                 ul.submenu 
24
                 ul.submenu 
25
                     li
25
                     li
29
                     li
29
                     li
30
                         router-link(to="/technique") Techniques
30
                         router-link(to="/technique") Techniques
31
             li.f-grow
31
             li.f-grow
32
-            li.t-up
33
                 router-link(to="/artist/sorted/by-material") Artists
32
                 router-link(to="/artist/sorted/by-material") Artists
34
                 ul.submenu
33
                 ul.submenu
35
                     li
34
                     li
36
                         router-link(to="/artist/sorted/by-alpha") A - Z
35
                         router-link(to="/artist/sorted/by-alpha") A - Z
37
                     li
36
                     li
38
                         router-link(to="/artist/sorted/by-material") By Material
37
                         router-link(to="/artist/sorted/by-material") By Material
39
-            li.f-grow
40
-            li.t-up 
38
+            li.f-grow 
41
                 router-link(to="/exhibition/sorted/by-current-and-upcoming") Exhibitions
39
                 router-link(to="/exhibition/sorted/by-current-and-upcoming") Exhibitions
42
                 ul.submenu 
40
                 ul.submenu 
43
                     li
41
                     li
44
                         router-link(to="/exhibition/sorted/by-current-and-upcoming") Current/Upcoming
42
                         router-link(to="/exhibition/sorted/by-current-and-upcoming") Current/Upcoming
45
                     li
43
                     li
46
                         router-link(to="/exhibition/sorted/by-past") Past
44
                         router-link(to="/exhibition/sorted/by-past") Past
47
-                    li
48
-                        router-link(to="/object") Explore Craft Objects
49
-            li.f-grow
50
-            li.t-up  
45
+            li.f-grow  
51
                 router-link(to="/page/center") Center
46
                 router-link(to="/page/center") Center
52
-                ul.submenu 
47
+                ul.submenu
53
                     li
48
                     li
54
                         router-link(to="/page/center") Info
49
                         router-link(to="/page/center") Info
55
                     li
50
                     li
56
-                        router-link(to="/event/sorted/by-current-and-upcoming") Events Current/Upcoming
51
+                        router-link(to="/event/sorted/by-current-and-upcoming") Events
57
                     li
52
                     li
58
-                        router-link(to="/event?type=talks") Talks & Interviews
53
+                        router-link(to="/page/recorded-talks-and-interviews") Recorded Talks + Interviews
59
                     li
54
                     li
60
                         router-link(to="/page/library") Library
55
                         router-link(to="/page/library") Library
61
-            li.f-grow
62
-            li.t-up   
56
+            li.f-grow   
63
                 router-link(to="/guide") Education
57
                 router-link(to="/guide") Education
64
                 ul.submenu 
58
                 ul.submenu 
65
                     li
59
                     li
67
                     li
61
                     li
68
                         router-link(to="/page/video-resources-for-educators") Video Resources 
62
                         router-link(to="/page/video-resources-for-educators") Video Resources 
69
                     li
63
                     li
70
-                        router-link(to="/page/craft-in-schools") Craft in Schools  
71
-                    li
72
-                        router-link(to="/page/craft-resources-map") Craft Resource Map 
64
+                        router-link(to="/page/craft-in-schools") Craft in Schools 
65
+            li.f-grow    
66
+                router-link(to="/page/artists-resources") Resources
67
+                ul.submenu 
73
                     li
68
                     li
74
                         router-link(to="/publication") Publications 
69
                         router-link(to="/publication") Publications 
75
                     li
70
                     li
76
-                        router-link(to="/page/library") Library
77
-                    
78
-            li.f-grow
79
-            li.t-up    
80
-                router-link(to="/page/artists-resources") Resources
81
-                ul.submenu 
71
+                        router-link(to="/object") Explore Craft Objects
82
                     li
72
                     li
83
                         router-link(to="/page/artists-resources") Opportunities
73
                         router-link(to="/page/artists-resources") Opportunities
84
                     li
74
                     li
87
                         router-link(to="/page/craft-resources-map") Craft Resources Map 
77
                         router-link(to="/page/craft-resources-map") Craft Resources Map 
88
                     li
78
                     li
89
                         router-link(to="/page/community-craft-calendar") Community Craft Calendar 
79
                         router-link(to="/page/community-craft-calendar") Community Craft Calendar 
90
-            li.f-grow
91
-            li.t-up    
80
+            li.f-grow    
92
                 router-link(to="/page/donate") Support
81
                 router-link(to="/page/donate") Support
93
                 ul.submenu 
82
                 ul.submenu 
94
                     li
83
                     li
95
                         router-link(to="/page/donate") Donate
84
                         router-link(to="/page/donate") Donate
96
                     li
85
                     li
97
                         router-link(to="/page/shop") Shop 
86
                         router-link(to="/page/shop") Shop 
98
-            li.f-grow
99
-            li.t-up    
87
+            li.f-grow 
100
                 router-link(to="/page/about") About 
88
                 router-link(to="/page/about") About 
101
                 ul.submenu 
89
                 ul.submenu 
102
                     li
90
                     li
103
                         router-link(to="/page/about") Craft in America 
91
                         router-link(to="/page/about") Craft in America 
104
-                    //- li
105
-                    //-     router-link(to="/page/mission") Mission 
106
                     li
92
                     li
107
                         router-link(to="/page/board") Board of Directors 
93
                         router-link(to="/page/board") Board of Directors 
108
                     li
94
                     li
109
                         router-link(to="/page/staff") Staff 
95
                         router-link(to="/page/staff") Staff 
110
                     li
96
                     li
111
                         router-link(to="/page/contact") Contact 
97
                         router-link(to="/page/contact") Contact 
112
-            li.f-grow
113
-            li.t-up 
114
-                a(@click="toggleSearch") 🔍 
98
+            li.f-grow 
99
+                a(@click="toggleSearch") 🔍
115
         ul(v-if="isSearchOpen").search.w-max
100
         ul(v-if="isSearchOpen").search.w-max
116
             li.f-row.w-max
101
             li.f-row.w-max
117
                 input(v-model="searchTerms" @keyup.enter="sendSearch" tabindex="10")
102
                 input(v-model="searchTerms" @keyup.enter="sendSearch" tabindex="10")
127
         label(for="toggle-mobile-menu" aria-label="Menu").drop-down &#9776;
112
         label(for="toggle-mobile-menu" aria-label="Menu").drop-down &#9776;
128
         input(id="toggle-mobile-menu" type="checkbox").hide
113
         input(id="toggle-mobile-menu" type="checkbox").hide
129
 
114
 
130
-        ul.drop-down.w-max
131
-            li(v-for="item in menuItems")
132
-                router-link(@click="uncheck" v-if="item == 'about'" :to="`/page/${item}`")
133
-                    h5.t-up {{ item }}
115
+        ul.drop-down.w-max.t-up
116
+            li(v-for="item in menuItems").f-row.center
117
+                router-link(@click="uncheck" v-if="item == 'about' || item == 'donate'" :to="`/page/${item}`")
118
+                    h5 {{ item }}
134
                 router-link(@click="uncheck" v-else= "" :to="`/${item}`")
119
                 router-link(@click="uncheck" v-else= "" :to="`/${item}`")
135
-                    h5.t-up {{ item }}
120
+                    h5 {{ item }}
121
+            li.f-col.center
122
+                h5
123
+                    input(v-model="searchTerms" @keyup.enter="sendSearch" tabindex="10")
124
+                    button(@click="sendSearch" tabindex="11") 🔍 search
125
+
136
 </template>
126
 </template>
137
 
127
 
138
 <script>
128
 <script>
158
             router.push({ path: '/search', query: { s: searchTerms.value } })
148
             router.push({ path: '/search', query: { s: searchTerms.value } })
159
             searchTerms.value = ''
149
             searchTerms.value = ''
160
             toggleSearch()
150
             toggleSearch()
151
+            document.getElementById('toggle-mobile-menu').checked = false
161
         }
152
         }
162
 
153
 
163
         /**
154
         /**
171
             const extras = [
162
             const extras = [
172
                 'blog',
163
                 'blog',
173
                 // 'artist-resources',
164
                 // 'artist-resources',
165
+                'donate',
174
                 'about',
166
                 'about',
175
-                '🔍'
176
             ]
167
             ]
177
             const ignore = [
168
             const ignore = [
178
                 'page',
169
                 'page',
205
 @import '../../sss/variables.sss'
196
 @import '../../sss/variables.sss'
206
 @import '../../sss/theme.sss'
197
 @import '../../sss/theme.sss'
207
 
198
 
208
-nav.main
199
+nav.main 
209
     position: sticky
200
     position: sticky
210
     top: 0
201
     top: 0
211
     background-color: $cia_grey
202
     background-color: $cia_grey
226
                 width: $ms-3
217
                 width: $ms-3
227
                 height: $ms-3
218
                 height: $ms-3
228
                 padding: 0
219
                 padding: 0
229
-    
220
+
230
     .menu > ul
221
     .menu > ul
231
         position: relative
222
         position: relative
232
         padding: 0 0 0 $ms-0
223
         padding: 0 0 0 $ms-0
233
         &.search
224
         &.search
234
-            background-color: #fefefe
225
+            background-color: #fefefe 
235
             box-shadow: 1px 1px 1px $lighter
226
             box-shadow: 1px 1px 1px $lighter
236
             position: absolute
227
             position: absolute
237
             top: 36px
228
             top: 36px
262
                     display: block 
253
                     display: block 
263
                     cursor: pointer
254
                     cursor: pointer
264
                     transition: $transition
255
                     transition: $transition
265
-            ul.submenu
266
-                display: block  
267
-                position: absolute
268
-                background-color: $lighter
269
-                padding: 0 0.5em 0.5em
270
-                opacity: 0
271
-                top: 23px
256
+                    ul.submenu
257
+                        display: block 
272
 
258
 
273
-                //- submenu hover
274
-                &:hover 
275
-                    display: block  
259
+                ul.submenu
260
+                    display: none  
261
+                    position: absolute
262
+                    /* background-image: linear-gradient(180deg, rgba(255,255,255, 0), $lighter, $lighter, $lighter, $lighter, $lighter, $lighter, $lighter, $lighter) */
276
                     background-color: $lighter
263
                     background-color: $lighter
277
-                    opacity: 1
278
-                    transition: $transition
264
+                    padding: 0.3em 0.3em 0.3em
265
+                    opacity: 0
266
+                    top: 24px
279
 
267
 
280
-                > li 
281
-                    line-height: 1.4
282
-                    width: max-content
283
-                    background-color: $lighter
284
-                    //- list hover
268
+                    //- submenu hover
285
                     &:hover 
269
                     &:hover 
286
                         display: block  
270
                         display: block  
287
-                        background-color: $lighter
271
+                        opacity: 1
272
+                        transition: $transition
273
+
274
+                    > li 
275
+                        line-height: 1.4
276
+                        /* width: max-content */
277
+                        /* background-color: $lighter */
278
+                        //- list hover
279
+                        /* &:hover 
280
+                            display: block  
281
+                            background-color: $lighter */
288
                     
282
                     
289
     
283
     
290
     .mobile-menu
284
     .mobile-menu
348
         .menu > ul
342
         .menu > ul
349
             max-width: $max-width
343
             max-width: $max-width
350
 
344
 
351
-    
352
 </style>
345
 </style>

Loading…
Cancelar
Guardar