craft-in-america
/
vue-wp
Прати 4
Волим 2
Креирај огранак 0
Код Дискусије 8 Захтеви за спајање 0 Издања 6 Вики Activity
Преглед изворни кода

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

tags/1.0.3
Alej пре 3 година
родитељ
eab1a053f3 b5ffc1344c
комит
bc6151c3b2
14 измењених фајлова са 173 додато и 129 уклоњено
Подељен поглед Покажи статистику Diff
  1. 1
    2
      plugins/cia-endpoints/cia-end-points.php
  2. 1
    1
      plugins/cia-endpoints/includes/formats.php
  3. 24
    18
      vue-theme/editor-style.css
  4. 4
    0
      vue-theme/functions.php
  5. 3
    2
      vue-theme/index.php
  6. 3
    1
      vue-theme/src/components/breadcrumb.vue
  7. 4
    1
      vue-theme/src/components/card.vue
  8. 65
    57
      vue-theme/src/components/footer.vue
  9. 9
    10
      vue-theme/src/components/navigation/navigation.vue
  10. 1
    1
      vue-theme/src/components/sidebars/events.vue
  11. 2
    2
      vue-theme/src/components/sidebars/exhibitions.vue
  12. 41
    31
      vue-theme/src/components/sidebars/sidebar.vue
  13. 6
    2
      vue-theme/src/pages/index.vue
  14. 9
    1
      vue-theme/src/pages/single.vue

+ 1
- 2
plugins/cia-endpoints/cia-end-points.php Прегледај датотеку 

@@ -92,8 +92,7 @@ add_action( 'rest_api_init', function () {
92 92
93 93 
     $material_sorts = ['by_material'];
94 94 
     $by_material_types = [
95 
-        'artist', 'guide', 'short',
96 
-        'object', 'publication', 'technique'
95 
+        'artist', 'exhibition', 'short', 'technique', 'guide',  'object', 'publication'
97 96 
     ];
98 97 
     _make_sorts($by_material_types, $material_sorts);
99 98

+ 1
- 1
plugins/cia-endpoints/includes/formats.php Прегледај датотеку 

@@ -43,7 +43,7 @@ function default_post_format( $item, $include_content ) {
43 43 
     $filtered[hero] = get_post_meta( $item->ID, 'hero_header', true );
44 44
45 45 
     // Materials + type endpoints
46 
-    $posts_with_type = ['artist', 'exhibition', 'event', 'short', 'guide', 'object', 'publication', 'technique' ];
46 
+    $posts_with_type = ['artist', 'exhibition', 'event', 'short', 'technique', 'guide', 'object', 'publication' ];
47 47 
     if( in_array($item->post_type, $posts_with_type) ) {
48 48 
         $filtered[materials] = make_taxonomy_endpoint_for(get_the_terms( $item, 'material'));
49 49 
         $filtered[subtypes] = make_taxonomy_endpoint_for(get_the_terms( $item, $item->post_type . '_type' ));

+ 24
- 18
vue-theme/editor-style.css Прегледај датотеку 

@@ -6,7 +6,6 @@
6 6 
 /* Editor Main column width */
7 7 
 .wp-block {
8 8 
     max-width: 805px;
9 
-    /* padding: 0 !important; */
10 9 
     margin: 0 auto 0.5em auto;
11 10 
 }
12 11 
 
@@ -25,14 +24,33 @@
25 24 
     max-width: none;
26 25 
 }
27 26
27 
+.wp-block-group {
28 
+    padding: 0.1em !important;
29 
+}
30 
+
31 
+.wp-block-columns {
32 
+    grid-gap: 1em !important;
33 
+}
34 
+
35 
+.wp-block-image figcaption {
36 
+    position: inherit !important;
37 
+    background: none !important;
38 
+    color: black !important;
39 
+    max-height: 5% !important;
40 
+    overflow: visible !important;
41 
+    padding: 0 !important;
42 
+    margin-bottom: 1.9699em !important
43 
+
44 
+}
45 
+
28 46 
 body {
29 47 
     font-family: Questrial, sans-serif;
30 48 
     color: #0d0d0d;
31 
-    font-size:15.2px;
49 
+    font-size: 1.110770em;
32 50 
 }
33 51
34 
-p{
35 
-    line-height: 1.4;
52 
+p {
53 
+    line-height: 1.2;
36 54 
     margin-top: 0;
37 55 
     margin-bottom: 1em !important;
38 56 
 }
 
@@ -61,7 +79,7 @@ h2 {
61 79 
     margin-top: 0.83333em;
62 80 
     margin-bottom: 0;
63 81 
 }
64 
-h3{
82 
+h3 {
65 83 
     font-size: 1.44em;
66 84 
     /* margin-top: 1em; */
67 85 
     margin-bottom: 1em;
 
@@ -82,7 +100,7 @@ h6 {
82 100 
     margin-bottom: 1.728em;
83 101 
 }
84 102
85 
-ul{
103 
+ul {
86 104 
     padding: 0;
87 105 
 }
88 106 
 
@@ -120,15 +138,3 @@ hr .wp-block-separator, .is-style-dots:before {
120 138 
     letter-spacing: 4em;
121 139 
     padding-left: 4em;
122 140 
 }
123 
-
124 
-.wp-block-image figcaption {
125 
-    position: inherit !important;
126 
-    background: none !important;
127 
-    color: black !important;
128 
-    max-height: 5% !important;
129 
-    overflow: visible !important;
130 
-    padding: 0 !important;
131 
-    margin-bottom: 0.75em !important;
132 
-
133 
-}
134 
-

+ 4
- 0
vue-theme/functions.php Прегледај датотеку 

@@ -146,6 +146,7 @@ function no_default_jquery( ) {
146 146 
     }
147 147 
 }
148 148 
 add_action( 'init', 'no_default_jquery' );
149 
+
149 150 
 // REMOVE emoji support
150 151 
 remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
151 152 
 remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
 
@@ -156,6 +157,9 @@ remove_action( 'admin_print_styles', 'print_emoji_styles' );
156 157 
 function webapptiv_remove_block_library_css() {
157 158 
     wp_dequeue_style( 'wp-block-library' );
158 159 
 }
160 
+// REMOVE wp-container-id class for every block which causes wierd dislay: flex inclusions
161 
+remove_filter( 'render_block', 'wp_render_layout_support_flag', 10, 2 );
162 
+
159 163 
 // add_action( 'wp_enqueue_scripts', 'webapptiv_remove_block_library_css' );
160 164
161 165 
 // header( 'Access-Control-Allow-Origin: http://localhost:8080' );

+ 3
- 2
vue-theme/index.php Прегледај датотеку 

@@ -2,14 +2,15 @@
2 2 
 <html <?php language_attributes(); ?>>
3 3 
     <head>
4 4 
         <!-- Google tag (gtag.js) -->
5 
-        <script async src="https://www.googletagmanager.com/gtag/js?id=AW-10996061145"></script>
5 
+        <script async src="https://www.googletagmanager.com/gtag/js?id=GT-55XG6M7"></script>
6 6 
         <script>
7 7 
         window.dataLayer = window.dataLayer || [];
8 8 
         function gtag(){dataLayer.push(arguments);}
9 9 
         gtag('js', new Date());
10 10
11 
-        gtag('config', 'AW-10996061145');
11 
+        gtag('config', 'GT-55XG6M7');
12 12 
         </script>
13 
+
13 14 
         <title><?php wp_title(); ?></title>
14 15 
         <meta charset="<?php bloginfo( 'charset' ); ?>">
15 16 
         <meta name="viewport" content="width=device-width, initial-scale=1">

+ 3
- 1
vue-theme/src/components/breadcrumb.vue Прегледај датотеку 

@@ -5,9 +5,11 @@ nav.breadcrumb.f-row.start.t-up
5 5 
         h5.t-up {{ type }}
6 6 
     router-link(v-else-if="type == 'post'" :to="`/blog`")
7 7 
         h5.t-up blog
8 
+    router-link(v-else-if="type == 'page'" :to="`/`")
9 
+        h5.t-up
8 10 
     router-link(v-else :to="`/${type}`")
9 11 
         h5.t-up {{ type }}
10 
-    h5 &nbsp;➤&nbsp;
12 
+    h5 &nbsp;＞&nbsp;
11 13 
     router-link(v-if="type == 'post'" :to="`/blog/${post.slug}`")
12 14 
         h5 {{ post.title }}
13 15 
     router-link(v-else :to="`/${type}/${post.slug}`")

+ 4
- 1
vue-theme/src/components/card.vue Прегледај датотеку 

@@ -81,7 +81,7 @@ export default {
81 81 
         padding: $ms--3
82 82 
         margin: 0
83 83 
     h1
84 
-        font-size: $ms-1
84 
+        font-size: $ms-0
85 85 
         padding: 0
86 86 
         line-height: initial
87 87 
         display: -webkit-box
 
@@ -107,6 +107,9 @@ export default {
107 107 
         &--info
108 108 
             .featured-or-hero-image img
109 109 
                 max-height: $max-card-img-height
110 
+        h1
111 
+            font-size: $ms-1
112 
+
110 113 
         p
111 114 
             &.excerpt, &.read-more
112 115 
                 overflow: hidden

+ 65
- 57
vue-theme/src/components/footer.vue Прегледај датотеку 

@@ -54,65 +54,75 @@
54 54 
             li
55 55 
                 h5
56 56 
                     router-link(to="/episode") PBS Series
57 
-                ul.f-col.start
58 
-                    li
59 
-                        router-link(to="/episode") &nbsp; Episodes
60 
-                    li
61 
-                        router-link(to="/short") &nbsp; Shorts
62 
-                    li
63 
-                        router-link(to="/technique") &nbsp; Techniques
57 
+                    ul.f-col.start
58 
+                        li
59 
+                            router-link(to="/episode") &nbsp; Episodes
60 
+                        li
61 
+                            router-link(to="/short") &nbsp; Shorts
62 
+                        li
63 
+                            router-link(to="/technique") &nbsp; Techniques
64 64 
             li
65 65 
                 h5
66 66 
                     router-link(to="/artist") Artists
67 
-                ul.f-col
68 
-                    li
69 
-                        router-link(to="/artist/sorted/by-alpha") &nbsp; A-Z
70 
-                    li
71 
-                        router-link(to="/artist/sorted/by-material") &nbsp; by Material
72 
-
67 
+                    ul.f-col
68 
+                        li
69 
+                            router-link(to="/artist/sorted/by-alpha") &nbsp; A-Z
70 
+                        li
71 
+                            router-link(to="/artist/sorted/by-material") &nbsp; by Material
73 72 
             li
74 73 
                 h5
75 74 
                     router-link(to="/exhibition") Exhibitions
76 
-                ul.f-col
77 
-                    li
78 
-                        router-link(to="/exhibition/sorted/by-current-and-upcoming") &nbsp; Current/Upcoming
79 
-                    li
80 
-                        router-link(to="/object") &nbsp; Objects
81 
-
75 
+                    ul.f-col
76 
+                        li
77 
+                            router-link(to="/exhibition/sorted/by-current-and-upcoming") &nbsp; Current/Upcoming
78 
+                        li
79 
+                            router-link(to="/object") &nbsp; Explore Craft Objects
82 80 
             li
83 81 
                 h5
84 82 
                     router-link(to="/page/center") Center
85 
-                ul.f-col
86 
-                    li
87 
-                        router-link(to="/page/center") &nbsp; Info
88 
-                    li
89 
-                        router-link(to="/exhibition") &nbsp; Exhibitions
90 
-                    li
91 
-                        router-link(to="/event/sorted/by-current-and-upcoming") &nbsp; Events
92 
-                    li
93 
-                        router-link(to="/event?type=talks") &nbsp; Talks &amp; Interviews
83 
+                    ul.f-col
84 
+                        li
85 
+                            router-link(to="/page/center") &nbsp; Info
86 
+                        li
87 
+                            router-link(to="/exhibition") &nbsp; Exhibitions
88 
+                        li
89 
+                            router-link(to="/event/sorted/by-current-and-upcoming") &nbsp; Events
90 
+                        li
91 
+                            router-link(to="/event?type=talks") &nbsp; Talks &amp; Interviews
94 92 
             li
95 93 
                 h5
96 94 
                     router-link(to="") Education
97 
-                ul.f-col
98 
-                    li
99 
-                        router-link(to="/guide") &nbsp; Guides
100 
-                    li
101 
-                        router-link(to="/publication") &nbsp; Publications
102 
-                    li
103 
-                        router-link(to="/page/library") &nbsp; Library
104 
-
105 
-
95 
+                    ul.f-col
96 
+                        li
97 
+                            router-link(to="/guide") &nbsp; Guides
98 
+                        li
99 
+                            router-link(to="/publication") &nbsp; Publications
100 
+                        li
101 
+                            router-link(to="/page/library") &nbsp; Library
106 102 
             li
107 103 
                 h5
108 
-                    router-link(to="") News
109 
-                ul.f-col
110 
-                    li
111 
-                        router-link(to="/blog") &nbsp; Blog Posts
112 
-                    li
113 
-                        router-link(to="/posts?type=releases") &nbsp; Press Releases
114 
-                    li
115 
-                        router-link(to="/posts?type=articles") &nbsp; In the News
104 
+                    router-link(to="") News
105 
+                    ul.f-col
106 
+                        li
107 
+                            router-link(to="/blog") &nbsp; Blog Posts
108 
+                        li
109 
+                            router-link(to="/posts?type=articles") &nbsp; In the News
110 
+                        li
111 
+                            router-link(to="/posts?type=releases") &nbsp; Press Releases
112 
+                        li
113 
+                            router-link(to="/page/community-craft-calendar") &nbsp; Community Craft Calendar
114 
+            li
115 
+                h5
116 
+                    router-link(to="/page/about") About
117 
+                    ul.f-col
118 
+                        li
119 
+                            router-link(to="/page/about") &nbsp; Craft in America
120 
+                        li
121 
+                            router-link(to="/page/board") &nbsp; Board of Directors
122 
+                        li
123 
+                            router-link(to="/page/staff") &nbsp; Staff
124 
+                        li
125 
+                            router-link(to="/page/contact") &nbsp; Contact
116 126
117 127 
     .sub-footer.f-col.start
118 128 
         h6 Craft in America &copy; 2010&ndash;{{ today }} 
@@ -141,11 +151,9 @@ export default {
141 151 
     background-color: $cia_red
142 152 
     footer.main
143 153 
         display: flex
144 
-        flex-wrap: wrap
145 154 
         align-items: flex-start
146 155
147 156 
         min-width: $min-width
148 
-        /* background-color: $cia_red */
149 157 
         // ALL <ul> tags
150 158 
         ul
151 159 
             list-style: none
 
@@ -163,6 +171,7 @@ export default {
163 171 
                 h4
164 172 
                     margin: $ms-0 0 $ms--3
165 173 
                 h5
174 
+                    font-size: 0.85em
166 175 
                     /* margin: $ms-0 0 $ms--1 */
167 176 
                     margin: $ms-0 0 0
168 177 
                 a, a:link, a:visited
 
@@ -170,7 +179,6 @@ export default {
170 179 
                     text-decoration: none
171 180 
                 a:hover
172 181 
                     color: $light
173 
-                    /* background: $light */
174 182 
                     /* Hovered links */
175 183 
                 a:active
176 184 
                     color: $cia_red2
 
@@ -194,43 +202,43 @@ export default {
194 202 
     /* 768px */
195 203 
     @media (min-width: $medium)
196 204 
         footer.main > ul
205 
+            flex-wrap: wrap
197 206 
             /* background-color: darkgreen */
198 207 
             background-color: $cia_red
199 208 
             &:nth-child(n+2)
200 209 
                 align-items: flex-start
201 210 
                 flex-direction: row
202 
-                flex-wrap: wrap
203 211 
                 > li
204 212 
                     width: 32%
213 
+                    h5
214 
+                        font-size: 0.95em
205 215 
     /* 960px */
206 216 
     @media (min-width: $large)
207 217 
         footer.main > ul
218 
+            flex-wrap: wrap
208 219 
             /* background-color: purple */
209 220 
             background-color: $cia_red
210 221 
             &:nth-child(n+2)
211 222 
                 > li
212 
-                    width: 33%
223 
+                    /* width: 33% */
213 224 
     /* 1080px */
214 225 
     @media (min-width: $extra-large)
215 226 
         footer.main > ul
227 
+            flex-wrap: wrap
216 228 
             /* background-color: rebeccapurple */
217 229 
             background-color: $cia_red
218 230 
             &:nth-child(n+2)
219 231 
                 /* margin: 0 0 $ms-2 0 */
220 232 
                 > li
221 
-                    width: 43%
233 
+                    /* width: 43% */
222 234 
     /* 1200px */
223 235 
     @media (min-width: $huge)
224 236 
         footer.main
225 237 
             max-width: $max-width
226 238 
             margin: 0 auto
227 239 
             > ul
240 
+                flex-wrap: wrap
228 241 
                 /* background-color: orange */
229 242 
                 background-color: $cia_red
230 
-    /* 1440px */
231 
-    @media (min-width: $ultra)
232 
-        footer.main
233 
-            > ul
234 
-                /* background-color: teal */
235 
-                background-color: $cia_red
243 
+
236 244 
 </style>

+ 9
- 10
vue-theme/src/components/navigation/navigation.vue Прегледај датотеку 

@@ -101,12 +101,12 @@ nav.main.w-max
101 101 
                 ul.submenu
102 102 
                     li
103 103 
                         router-link(to="/page/about") Craft in America
104 
+                    //- li
105 
+                    //-     router-link(to="/page/mission") Mission
104 106 
                     li
105 
-                        router-link(to="/page/mission") Mission
107 
+                        router-link(to="/page/board") Board of Directors
106 108 
                     li
107 109 
                         router-link(to="/page/staff") Staff
108 
-                    li
109 
-                        router-link(to="/page/board") Board of Directors
110 110 
                     li
111 111 
                         router-link(to="/page/contact") Contact
112 112 
             li.f-grow
 
@@ -129,7 +129,9 @@ nav.main.w-max
129 129
130 130 
         ul.drop-down.w-max
131 131 
             li(v-for="item in menuItems")
132 
-                router-link(@click="uncheck" :to="`/${item}`")
132 
+                router-link(@click="uncheck" v-if="item == 'about'" :to="`/page/${item}`")
133 
+                    h5.t-up {{ item }}
134 
+                router-link(@click="uncheck" v-else= "" :to="`/${item}`")
133 135 
                     h5.t-up {{ item }}
134 136 
 </template>
135 137 
 
@@ -157,7 +159,6 @@ export default {
157 159 
             searchTerms.value = ''
158 160 
             toggleSearch()
159 161 
         }
160 
-
161 162
162 163 
         /**
163 164 
          * Navigation items
 
@@ -169,10 +170,8 @@ export default {
169 170 
         const menuItems = computed(() => {
170 171 
             const extras = [
171 172 
                 'blog',
172 
-                // 'education',
173 
-                // 'resources',
174 
-                // 'support',
175 
-                'page/about',
173 
+                // 'artist-resources',
174 
+                'about',
176 175 
                 '🔍'
177 176 
             ]
178 177 
             const ignore = [
 
@@ -279,7 +278,7 @@ nav.main
279 278 
                     transition: $transition
280 279
281 280 
                 > li
282 
-                    line-height: 1.5
281 
+                    line-height: 1.4
283 282 
                     width: max-content
284 283 
                     background-color: $lighter
285 284 
                     //- list hover

+ 1
- 1
vue-theme/src/components/sidebars/events.vue Прегледај датотеку 

@@ -7,7 +7,7 @@ ul.t-up
7 7 
             featured-image(:post="post", thumbsize="'standard'")
8 8 
         router-link(:to="`/event/${post.slug}`")
9 9 
             p.t-up {{ post.title }}
10 
-        p {{ dateFrom(post.start, true) }} &ndash; {{ dateFrom(post.end, true).split(',')[1] }}
10 
+        p.date  {{ dateFrom(post.start, true) }} &ndash; {{ dateFrom(post.end, true).split(',')[1] }}
11 11 
 </template>
12 12
13 13 
 <script>

+ 2
- 2
vue-theme/src/components/sidebars/exhibitions.vue Прегледај датотеку 

@@ -7,7 +7,7 @@ ul.t-up
7 7 
             featured-image(:post="post", thumbsize="'standard'")
8 8 
         router-link(:to="`/exhibition/${post.slug}`")
9 9 
             p.t-up {{ post.title }}
10 
-        p {{ dateFrom(post.start, false) }} &ndash; {{ dateFrom(post.end, false) }}
10 
+        p.date {{ dateFrom(post.start, false) }} &ndash; {{ dateFrom(post.end, false) }}
11 11 
 </template>
12 12
13 13 
 <script>
 
@@ -55,4 +55,4 @@ export default {
55 55 
         this.getPosts()
56 56 
     },
57 57 
 }
58 
-</script>
58 
+</script>

+ 41
- 31
vue-theme/src/components/sidebars/sidebar.vue Прегледај датотеку 

@@ -28,7 +28,7 @@ aside.sidebar
28 28 
                 li
29 29 
                     //- event?type=workshops //
30 30 
                     router-link(v-if="type === 'event' " :to="`/${type}?type=workshops`")
31 
-                        p workshops
31 
+                        p workshops
32 32
33 33 
                     //- by type //
34 34 
                 li(v-for="option in sortOptions")
 
@@ -41,8 +41,16 @@ aside.sidebar
41 41 
                 //-     router-link(v-if="type === ('event', 'exhibition') " :to="`/${type}/sorted/by-past`")
42 42 
                 //-         p by past
43 43
44 
+        //- if artist has sorted by-alpha show alpha sets
45 
+        .shadow(v-if="['artist'].includes(type) && layout !== 'single'")
46 
+            h3.t-up {{ type }} by alpha
47 
+            ul.t-up
48 
+                li.f-row.start.wrap
49 
+                    template(v-for="charaSet in charaSets")
50 
+                        router-link(:to="`/${type}/sorted/by-alpha#${charaSet[0]}`")
51 
+                            p.alpha {{ charaSet }}
44 52
45 
-        //- if {{type}} has sorted by-material show material options
53 
+        //- if {{type}} has sorted by-material show material sets
46 54 
         .shadow(v-if="shouldShowMaterialSort.includes(type) && layout !== 'single'")
47 55 
             h3.t-up {{ type }} by material
48 56 
             ul.t-up
 
@@ -51,23 +59,23 @@ aside.sidebar
51 59 
                         router-link(:to="`/${type}/sorted/by-material#${material}`")
52 60 
                             p {{ material }}
53 61
54 
-        //- if artist has sorted by-alpha show alpha options
55 
-        .shadow(v-if="['artist'].includes(type) && layout !== 'single'")
56 
-            h3.t-up {{ type }} alpha
57 
-            ul.t-up
58 
-                li.f-row.start.wrap
59 
-                    template(v-for="charaSet in charaSets")
60 
-                        router-link(:to="`/${type}/sorted/by-alpha#${charaSet[0]}`")
61 
-                            p.alpha {{ charaSet }}
62 
-
63 
-        //- if type has sorted by-episode show episode options
62 
+        //- if {{type}} has sorted by-episode show episode sets
64 63 
         .shadow(v-if="shouldShowEpisodeSort.includes(type) && layout !== 'single'")
65 
-            h3.t-up {{ type }} episode
64 
+            h3.t-up {{ type }} by episode
66 65 
             ul.t-up
67 66 
                 li.f-row.start.wrap
68 67 
                     template(v-for="episodeSet in episodeSets")
69 68 
                         router-link(:to="`/${type}/sorted/by-episode#${episodeSet}`")
70 
-                            p {{ episodeSet }}&nbsp;&nbsp;
69 
+                            p {{ episodeSet }} &nbsp;&nbsp;
70 
+
71 
+        //- if {{type}} has sorted by-type show subtype sets
72 
+        .shadow(v-if="shouldShowTypeSort.includes(type) && layout !== 'single'")
73 
+            h3.t-up {{ type }} type
74 
+            ul.t-up
75 
+                li
76 
+                    template(v-for="subtypeSet in subtypeSets")
77 
+                        router-link(:to="`/${type}/sorted/by-type#${subtypeSet}`")
78 
+                            p {{ subtypeSet }}
71 79
72 80 
         //- p2p types and related posts
73 81 
         .shadow(v-if="layout === 'single' && Object.keys(related).length" v-for="p2pPostType in Object.keys(related)")
 
@@ -127,34 +135,35 @@ export default {
127 135 
                 'by episode': `${sortTypes.episode}`,   //:3
128 136 
                 'by type': `${sortTypes.subtype}`,      //:4
129 137 
                 'by past': `${sortTypes.past}`,         //:5
130 
-                // 'by articles': `articles`,
131 
-                subtype: 'by-type',
138 
+                // subtype: 'by-type',
132 139 
             },
133 140 
             charaSets: [
134 141 
                 '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
135 142 
                 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
136 143 
             ],
137 144 
             episodeSets: [
138 
-                'inspiration', 'home', 'jewelery', 'harmony', 'storytellers',
145 
+                'inspiration', 'home', 'jewelry', 'harmony', 'storytellers',
139 146 
                 'democracy', 'identity', 'quilts', 'visionaries', 'california',
140 147 
                 'neighbors', 'borders', 'nature', 'teachers', 'music',
141 
-                'celebration', 'service', 'industry', 'holiday', 'forge',
148 
+                'celebration', 'service', 'industry', 'holiday', 'forge',
149 
+                'crossroads', 'threads', 'family', 'messages', 'process',
150 
+                'origins', 'community', 'landscape', 'memory'
151 
+            ],
152 
+            subtypeSets: [
153 
+                'schools', 'museums', 'collectors', 'organizations', 'galleries'
142 154 
             ],
143 155 
             materials: materials,
144 156 
             shouldShowListSort: [
145 
-                'artist', 'exhibition', 'event',
146 
-                'short', 'guide', 'object',
147 
-                'publication', 'technique', 'post'
157 
+                'artist', 'exhibition', 'event', 'short',
158 
+                'technique', 'guide', 'object', 'publication', 'post'
148 159 
             ],
149 160 
             shouldShowMaterialSort: [
150 
-                'artist',
151 
-                'short', 'guide',
152 
-                'technique', 'publication',
161 
+                'artist', 'exhibition', 'short', 'technique',
162 
+                'guide', 'object', 'publication'
153 163 
             ],
154 164 
             shouldShowEpisodeSort: [
155 
-                'artist',
156 
-                'short', 'guide',
157 
-                'technique'
165 
+                'artist', 'short', 'technique', 'guide'
166 
+
158 167 
             ],
159 168 
             shouldShowAlphaSort: [
160 169 
                 'artist'
 
@@ -163,8 +172,7 @@ export default {
163 172 
                 'exhibition', 'event'
164 173 
             ],
165 174 
             shouldShowTypeSort: [
166 
-                'short', 'guide', 'object',
167 
-                'publication', 'technique', 'post', 'event'
175 
+                'artist'
168 176 
             ]
169 177 
         }
170 178 
     },
 
@@ -175,8 +183,8 @@ export default {
175 183 
                 case 'artist':
176 184 
                     opts = [
177 185 
                         Object.keys(this.sortTypes)[0],
178 
-                        Object.keys(this.sortTypes)[3],
179 186 
                         Object.keys(this.sortTypes)[1],
187 
+                        Object.keys(this.sortTypes)[3],
180 188 
                         Object.keys(this.sortTypes)[4],
181 189 
                         // `by ${this.type} type`,
182 190 
                     ]
 
@@ -184,7 +192,7 @@ export default {
184 192 
                 case 'exhibition':
185 193 
                     opts = [
186 194 
                         // Object.keys(this.sortTypes)[4],
187 
-                        // Object.keys(this.sortTypes)[1],
195 
+                        Object.keys(this.sortTypes)[1],
188 196 
                         Object.keys(this.sortTypes)[5],
189 197 
                     ]
190 198 
                     break
 
@@ -251,6 +259,8 @@ aside.sidebar
251 259 
     p, h3
252 260 
         margin: 0
253 261 
         padding: 0 0 $ms--4 0
262 
+        &.date
263 
+            font-size: $ms--1
254 264
255 265 
     > section
256 266 
         > *

+ 6
- 2
vue-theme/src/pages/index.vue Прегледај датотеку 

@@ -153,8 +153,12 @@ export default {
153 153 
                         auto
154 154 
                     grid-template-rows:
155 155 
                         auto
156 
-            &.stickies
156 
+            &.stickies // stickies grid on mobile
157 157 
                 ul
158 
+                    display: grid
159 
+                    grid-template-columns: repeat(2, 1fr)
160 
+                    grid-gap: $ms--2
161 
+
158 162 
                     &.flipped
159 163 
                         li
160 164 
                             &:nth-of-type(4)
 
@@ -220,7 +224,7 @@ export default {
220 224 
                 &.stickies
221 225 
                     .post
222 226 
                         min-width: 24.35%
223 
-                        max-width: 33%
227 
+                        max-width: 32.73%
224 228 
                     ul
225 229 
                         &.flipped
226 230 
                             grid-template-columns:

+ 9
- 1
vue-theme/src/pages/single.vue Прегледај датотеку 

@@ -329,7 +329,15 @@ export default {
329 329 
             img
330 330 
                 height: $ms-3
331 331 
                 width: $ms-3
332 
-
332 
+        .wp-block-group
333 
+            padding: 0.1em !important
334 
+        * .has-background
335 
+            padding: 1em
336 
+        .wp-block-columns
337 
+            grid-gap: 1em
338 
+            margin: 0
339 
+        .wp-block-column
340 
+            margin: 0
333 341
334 342 
 @media (min-width: $medium)
335 343 
     .page--single

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