Sfoglia il codice sorgente

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

master
Alej 2 anni fa
parent
commit
6d43f038c7

+ 4
- 8
vue-theme/src/components/navigation/navigation.vue Vedi File

@@ -57,6 +57,8 @@ nav.main.w-max
57 57
             li.f-grow    
58 58
                 router-link(to="/page/artists-resources") Resources
59 59
                 ul.submenu 
60
+                    li 
61
+                        a(href="https://www.craftvideodictionary.org" target="_blank") Craft Video Dictionary Website
60 62
                     li
61 63
                         router-link(to="/publication") Publications 
62 64
                     li
@@ -69,10 +71,6 @@ nav.main.w-max
69 71
                         router-link(to="/page/craft-resources-map") Craft Resources Map 
70 72
                     li
71 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 74
             li.f-grow    
77 75
                 router-link(to="/page/donate") Support
78 76
                 ul.submenu 
@@ -149,10 +147,8 @@ export default {
149 147
 
150 148
         /**
151 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 153
         const menuItems = computed(() => {
158 154
             const extras = [

+ 1
- 2
vue-theme/src/pages/mixin-post-types.js Vedi File

@@ -65,6 +65,7 @@ const heroUtils = {
65 65
             json.text = post && post.content ? post.content : post.title
66 66
             
67 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 69
             if (
69 70
                 post.type == 'page' && post.slug == 'center' || 
70 71
                 post.type == 'page' && post.slug == 'about' || 
@@ -82,12 +83,10 @@ const heroUtils = {
82 83
                 post.type == 'page' && post.slug == 'craft-in-schools' || 
83 84
                 post.type == 'page' && post.slug == 'mailing-list' ||
84 85
                 post.type == 'page' && post.slug == 'handwork-celebrating-american-craft-2026' 
85
-
86 86
                 
87 87
             ) { 
88 88
                 json.text = post.title 
89 89
             }
90
-            // post.type == 'page' && post.slug == 'thing' || post.type == 'page' && post.slug == 'otherthing'
91 90
             return json
92 91
         },
93 92
         _clearHero(store) {

Loading…
Annulla
Salva