Przeglądaj źródła

Merge branch 'dev' of craft-in-america/vue-wp into master

master
Alej 2 lat temu
rodzic
commit
6d43f038c7

+ 4
- 8
vue-theme/src/components/navigation/navigation.vue Wyświetl plik

57
             li.f-grow    
57
             li.f-grow    
58
                 router-link(to="/page/artists-resources") Resources
58
                 router-link(to="/page/artists-resources") Resources
59
                 ul.submenu 
59
                 ul.submenu 
60
+                    li 
61
+                        a(href="https://www.craftvideodictionary.org" target="_blank") Craft Video Dictionary Website
60
                     li
62
                     li
61
                         router-link(to="/publication") Publications 
63
                         router-link(to="/publication") Publications 
62
                     li
64
                     li
69
                         router-link(to="/page/craft-resources-map") Craft Resources Map 
71
                         router-link(to="/page/craft-resources-map") Craft Resources Map 
70
                     li
72
                     li
71
                         router-link(to="/page/community-craft-calendar") Community Craft Calendar 
73
                         router-link(to="/page/community-craft-calendar") Community Craft Calendar 
72
-                    li 
73
-                        a(href="https://www.craftvideodictionary.org" target="_blank") Craft Video Dictionary Website
74
-
75
-             
76
             li.f-grow    
74
             li.f-grow    
77
                 router-link(to="/page/donate") Support
75
                 router-link(to="/page/donate") Support
78
                 ul.submenu 
76
                 ul.submenu 
149
 
147
 
150
         /**
148
         /**
151
          * Navigation items
149
          * Navigation items
152
-         * Auto-includes declared postTypes
153
-         * and extra items
154
-         * TIP: Add things to the ignore array
155
-         * to remove from the nav
150
+         * Auto-includes declared postTypes and extra items
151
+         * TIP: Add things to the ignore array to remove from the nav
156
          */
152
          */
157
         const menuItems = computed(() => {
153
         const menuItems = computed(() => {
158
             const extras = [
154
             const extras = [

+ 1
- 2
vue-theme/src/pages/mixin-post-types.js Wyświetl plik

65
             json.text = post && post.content ? post.content : post.title
65
             json.text = post && post.content ? post.content : post.title
66
             
66
             
67
             // hero title for non-list pages: center, about etc - needs a better method
67
             // hero title for non-list pages: center, about etc - needs a better method
68
+            // post.type == 'page' && post.slug == 'thing' || post.type == 'page' && post.slug == 'otherthing'
68
             if (
69
             if (
69
                 post.type == 'page' && post.slug == 'center' || 
70
                 post.type == 'page' && post.slug == 'center' || 
70
                 post.type == 'page' && post.slug == 'about' || 
71
                 post.type == 'page' && post.slug == 'about' || 
82
                 post.type == 'page' && post.slug == 'craft-in-schools' || 
83
                 post.type == 'page' && post.slug == 'craft-in-schools' || 
83
                 post.type == 'page' && post.slug == 'mailing-list' ||
84
                 post.type == 'page' && post.slug == 'mailing-list' ||
84
                 post.type == 'page' && post.slug == 'handwork-celebrating-american-craft-2026' 
85
                 post.type == 'page' && post.slug == 'handwork-celebrating-american-craft-2026' 
85
-
86
                 
86
                 
87
             ) { 
87
             ) { 
88
                 json.text = post.title 
88
                 json.text = post.title 
89
             }
89
             }
90
-            // post.type == 'page' && post.slug == 'thing' || post.type == 'page' && post.slug == 'otherthing'
91
             return json
90
             return json
92
         },
91
         },
93
         _clearHero(store) {
92
         _clearHero(store) {

Ładowanie…
Anuluj
Zapisz