craft-in-america
/
vue-wp
보기 4
좋아요 2
포크 0
코드 이슈 8 풀 리퀘스트 0 릴리즈 6 위키 Activity
소스 검색

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

tags/1.0.3
Alej 3 년 전
부모
c8a83b1f0c bc6151c3b2
커밋
62845fd05b
14개의 변경된 파일과 173개의 추가작업 그리고 129개의 파일을 삭제
통합 보기 변경상태 보기
  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
92
93 
     $material_sorts = ['by_material'];
 93 
     $material_sorts = ['by_material'];
94 
     $by_material_types = [
 94 
     $by_material_types = [
95 
-        'artist', 'guide', 'short',
96 
-        'object', 'publication', 'technique'
95 
+        'artist', 'exhibition', 'short', 'technique', 'guide',  'object', 'publication'
97 
     ];
 96 
     ];
98 
     _make_sorts($by_material_types, $material_sorts);
 97 
     _make_sorts($by_material_types, $material_sorts);
99
98

+ 1
- 1
plugins/cia-endpoints/includes/formats.php 파일 보기

43 
     $filtered[hero] = get_post_meta( $item->ID, 'hero_header', true );
 43 
     $filtered[hero] = get_post_meta( $item->ID, 'hero_header', true );
44
44
45 
     // Materials + type endpoints
 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 
     if( in_array($item->post_type, $posts_with_type) ) {
 47 
     if( in_array($item->post_type, $posts_with_type) ) {
48 
         $filtered[materials] = make_taxonomy_endpoint_for(get_the_terms( $item, 'material'));
 48 
         $filtered[materials] = make_taxonomy_endpoint_for(get_the_terms( $item, 'material'));
49 
         $filtered[subtypes] = make_taxonomy_endpoint_for(get_the_terms( $item, $item->post_type . '_type' ));
 49 
         $filtered[subtypes] = make_taxonomy_endpoint_for(get_the_terms( $item, $item->post_type . '_type' ));

+ 24
- 18
vue-theme/editor-style.css 파일 보기

6 
 /* Editor Main column width */
 6 
 /* Editor Main column width */
7 
 .wp-block {
 7 
 .wp-block {
8 
     max-width: 805px;
 8 
     max-width: 805px;
9 
-    /* padding: 0 !important; */
10 
     margin: 0 auto 0.5em auto;
 9 
     margin: 0 auto 0.5em auto;
11 
 }
 10 
 }
12
11
25 
     max-width: none;
 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 
 body {
 46 
 body {
29 
     font-family: Questrial, sans-serif;
 47 
     font-family: Questrial, sans-serif;
30 
     color: #0d0d0d;
 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 
     margin-top: 0;
 54 
     margin-top: 0;
37 
     margin-bottom: 1em !important;
 55 
     margin-bottom: 1em !important;
38 
 }
 56 
 }
61 
     margin-top: 0.83333em;
 79 
     margin-top: 0.83333em;
62 
     margin-bottom: 0;
 80 
     margin-bottom: 0;
63 
 }
 81 
 }
64 
-h3{
82 
+h3 {
65 
     font-size: 1.44em;
 83 
     font-size: 1.44em;
66 
     /* margin-top: 1em; */
 84 
     /* margin-top: 1em; */
67 
     margin-bottom: 1em;
 85 
     margin-bottom: 1em;
82 
     margin-bottom: 1.728em;
 100 
     margin-bottom: 1.728em;
83 
 }
 101 
 }
84
102
85 
-ul{
103 
+ul {
86 
     padding: 0;
 104 
     padding: 0;
87 
 }
 105 
 }
88
106
120 
     letter-spacing: 4em;
 138 
     letter-spacing: 4em;
121 
     padding-left: 4em;
 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 
     }
 146 
     }
147 
 }
 147 
 }
148 
 add_action( 'init', 'no_default_jquery' );
 148 
 add_action( 'init', 'no_default_jquery' );
149 
+
149 
 // REMOVE emoji support
 150 
 // REMOVE emoji support
150 
 remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
 151 
 remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
151 
 remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
 152 
 remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
156 
 function webapptiv_remove_block_library_css() {
 157 
 function webapptiv_remove_block_library_css() {
157 
     wp_dequeue_style( 'wp-block-library' );
 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 
 // add_action( 'wp_enqueue_scripts', 'webapptiv_remove_block_library_css' );
 163 
 // add_action( 'wp_enqueue_scripts', 'webapptiv_remove_block_library_css' );
160
164
161 
 // header( 'Access-Control-Allow-Origin: http://localhost:8080' );
 165 
 // header( 'Access-Control-Allow-Origin: http://localhost:8080' );

+ 3
- 2
vue-theme/index.php 파일 보기

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

+ 3
- 1
vue-theme/src/components/breadcrumb.vue 파일 보기

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

+ 4
- 1
vue-theme/src/components/card.vue 파일 보기

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

+ 65
- 57
vue-theme/src/components/footer.vue 파일 보기

54 
             li
 54 
             li
55 
                 h5
55 
                 h5
56 
                     router-link(to="/episode") PBS Series
 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 
             li
64 
             li
65 
                 h5
 65 
                 h5
66 
                     router-link(to="/artist") Artists
 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 
             li
 72 
             li
74 
                 h5
73 
                 h5
75 
                     router-link(to="/exhibition") Exhibitions
 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 
             li
 80 
             li
83 
                 h5
 81 
                 h5
84 
                     router-link(to="/page/center") Center
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 
             li
 92 
             li
95 
                 h5
 93 
                 h5
96 
                     router-link(to="") Education
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 
             li
 102 
             li
107 
                 h5
 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 
     .sub-footer.f-col.start
 127 
     .sub-footer.f-col.start
118 
         h6 Craft in America &copy; 2010&ndash;{{ today }}
128 
         h6 Craft in America &copy; 2010&ndash;{{ today }}
141 
     background-color: $cia_red
 151 
     background-color: $cia_red
142 
     footer.main
 152 
     footer.main
143 
         display: flex
 153 
         display: flex
144 
-        flex-wrap: wrap
145 
         align-items: flex-start
154 
         align-items: flex-start
146
155
147 
         min-width: $min-width
 156 
         min-width: $min-width
148 
-        /* background-color: $cia_red */
149 
         // ALL <ul> tags
 157 
         // ALL <ul> tags
150 
         ul
 158 
         ul
151 
             list-style: none
 159 
             list-style: none
163 
                 h4
 171 
                 h4
164 
                     margin: $ms-0 0 $ms--3
 172 
                     margin: $ms-0 0 $ms--3
165 
                 h5
173 
                 h5
174 
+                    font-size: 0.85em
166 
                     /* margin: $ms-0 0 $ms--1 */
 175 
                     /* margin: $ms-0 0 $ms--1 */
167 
                     margin: $ms-0 0 0
 176 
                     margin: $ms-0 0 0
168 
                 a, a:link, a:visited
 177 
                 a, a:link, a:visited
170 
                     text-decoration: none
 179 
                     text-decoration: none
171 
                 a:hover
 180 
                 a:hover
172 
                     color: $light
 181 
                     color: $light
173 
-                    /* background: $light */
174 
                     /* Hovered links */
 182 
                     /* Hovered links */
175 
                 a:active
 183 
                 a:active
176 
                     color: $cia_red2
 184 
                     color: $cia_red2
194 
     /* 768px */
 202 
     /* 768px */
195 
     @media (min-width: $medium)
 203 
     @media (min-width: $medium)
196 
         footer.main > ul
 204 
         footer.main > ul
205 
+            flex-wrap: wrap
197 
             /* background-color: darkgreen */
 206 
             /* background-color: darkgreen */
198 
             background-color: $cia_red
 207 
             background-color: $cia_red
199 
             &:nth-child(n+2)
 208 
             &:nth-child(n+2)
200 
                 align-items: flex-start
 209 
                 align-items: flex-start
201 
                 flex-direction: row
 210 
                 flex-direction: row
202 
-                flex-wrap: wrap
203 
                 > li
 211 
                 > li
204 
                     width: 32%
 212 
                     width: 32%
213 
+                    h5
214 
+                        font-size: 0.95em
205 
     /* 960px */
 215 
     /* 960px */
206 
     @media (min-width: $large)
 216 
     @media (min-width: $large)
207 
         footer.main > ul
 217 
         footer.main > ul
218 
+            flex-wrap: wrap
208 
             /* background-color: purple */
 219 
             /* background-color: purple */
209 
             background-color: $cia_red
 220 
             background-color: $cia_red
210 
             &:nth-child(n+2)
 221 
             &:nth-child(n+2)
211 
                 > li
 222 
                 > li
212 
-                    width: 33%
223 
+                    /* width: 33% */
213 
     /* 1080px */
 224 
     /* 1080px */
214 
     @media (min-width: $extra-large)
 225 
     @media (min-width: $extra-large)
215 
         footer.main > ul
 226 
         footer.main > ul
227 
+            flex-wrap: wrap
216 
             /* background-color: rebeccapurple */
 228 
             /* background-color: rebeccapurple */
217 
             background-color: $cia_red
 229 
             background-color: $cia_red
218 
             &:nth-child(n+2)
 230 
             &:nth-child(n+2)
219 
                 /* margin: 0 0 $ms-2 0 */
 231 
                 /* margin: 0 0 $ms-2 0 */
220 
                 > li
 232 
                 > li
221 
-                    width: 43%
233 
+                    /* width: 43% */
222 
     /* 1200px */
 234 
     /* 1200px */
223 
     @media (min-width: $huge)
 235 
     @media (min-width: $huge)
224 
         footer.main
236 
         footer.main
225 
             max-width: $max-width
 237 
             max-width: $max-width
226 
             margin: 0 auto
 238 
             margin: 0 auto
227 
             > ul
 239 
             > ul
240 
+                flex-wrap: wrap
228 
                 /* background-color: orange */
 241 
                 /* background-color: orange */
229 
                 background-color: $cia_red
 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 
 </style>
 244 
 </style>

+ 9
- 10
vue-theme/src/components/navigation/navigation.vue 파일 보기

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

+ 1
- 1
vue-theme/src/components/sidebars/events.vue 파일 보기

7 
             featured-image(:post="post", thumbsize="'standard'")
 7 
             featured-image(:post="post", thumbsize="'standard'")
8 
         router-link(:to="`/event/${post.slug}`")
 8 
         router-link(:to="`/event/${post.slug}`")
9 
             p.t-up {{ post.title }}
 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 
 </template>
 11 
 </template>
12
12
13 
 <script>
 13 
 <script>

+ 2
- 2
vue-theme/src/components/sidebars/exhibitions.vue 파일 보기

7 
             featured-image(:post="post", thumbsize="'standard'")
 7 
             featured-image(:post="post", thumbsize="'standard'")
8 
         router-link(:to="`/exhibition/${post.slug}`")
 8 
         router-link(:to="`/exhibition/${post.slug}`")
9 
             p.t-up {{ post.title }}
 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 
 </template>
 11 
 </template>
12
12
13 
 <script>
 13 
 <script>
55 
         this.getPosts()
 55 
         this.getPosts()
56 
     },
 56 
     },
57 
 }
 57 
 }
58 
-</script>
58 
+</script>

+ 41
- 31
vue-theme/src/components/sidebars/sidebar.vue 파일 보기

28 
                 li
28 
                 li
29 
                     //- event?type=workshops //
 29 
                     //- event?type=workshops //
30 
                     router-link(v-if="type === 'event' " :to="`/${type}?type=workshops`")
 30 
                     router-link(v-if="type === 'event' " :to="`/${type}?type=workshops`")
31 
-                        p workshops
31 
+                        p workshops
32
32
33 
                     //- by type //
 33 
                     //- by type //
34 
                 li(v-for="option in sortOptions")
 34 
                 li(v-for="option in sortOptions")
41 
                 //-     router-link(v-if="type === ('event', 'exhibition') " :to="`/${type}/sorted/by-past`")
 41 
                 //-     router-link(v-if="type === ('event', 'exhibition') " :to="`/${type}/sorted/by-past`")
42 
                 //-         p by past
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 
         .shadow(v-if="shouldShowMaterialSort.includes(type) && layout !== 'single'")
 54 
         .shadow(v-if="shouldShowMaterialSort.includes(type) && layout !== 'single'")
47 
             h3.t-up {{ type }} by material
 55 
             h3.t-up {{ type }} by material
48 
             ul.t-up
 56 
             ul.t-up
51 
                         router-link(:to="`/${type}/sorted/by-material#${material}`")
 59 
                         router-link(:to="`/${type}/sorted/by-material#${material}`")
52 
                             p {{ material }}
 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 
         .shadow(v-if="shouldShowEpisodeSort.includes(type) && layout !== 'single'")
 63 
         .shadow(v-if="shouldShowEpisodeSort.includes(type) && layout !== 'single'")
65 
-            h3.t-up {{ type }} episode
64 
+            h3.t-up {{ type }} by episode
66 
             ul.t-up
 65 
             ul.t-up
67 
                 li.f-row.start.wrap
 66 
                 li.f-row.start.wrap
68 
                     template(v-for="episodeSet in episodeSets")
67 
                     template(v-for="episodeSet in episodeSets")
69 
                         router-link(:to="`/${type}/sorted/by-episode#${episodeSet}`")
 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 
         //- p2p types and related posts
 80 
         //- p2p types and related posts
73 
         .shadow(v-if="layout === 'single' && Object.keys(related).length" v-for="p2pPostType in Object.keys(related)")
 81 
         .shadow(v-if="layout === 'single' && Object.keys(related).length" v-for="p2pPostType in Object.keys(related)")
127 
                 'by episode': `${sortTypes.episode}`,   //:3
 135 
                 'by episode': `${sortTypes.episode}`,   //:3
128 
                 'by type': `${sortTypes.subtype}`,      //:4
 136 
                 'by type': `${sortTypes.subtype}`,      //:4
129 
                 'by past': `${sortTypes.past}`,         //:5
 137 
                 'by past': `${sortTypes.past}`,         //:5
130 
-                // 'by articles': `articles`,
131 
-                subtype: 'by-type',
138 
+                // subtype: 'by-type',
132 
             },
 139 
             },
133 
             charaSets: [
 140 
             charaSets: [
134 
                 '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
141 
                 '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
135 
                 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
 142 
                 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
136 
             ],
 143 
             ],
137 
             episodeSets: [
 144 
             episodeSets: [
138 
-                'inspiration', 'home', 'jewelery', 'harmony', 'storytellers',
145 
+                'inspiration', 'home', 'jewelry', 'harmony', 'storytellers',
139 
                 'democracy', 'identity', 'quilts', 'visionaries', 'california',
146 
                 'democracy', 'identity', 'quilts', 'visionaries', 'california',
140 
                 'neighbors', 'borders', 'nature', 'teachers', 'music',
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 
             materials: materials,
 155 
             materials: materials,
144 
             shouldShowListSort: [
 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 
             shouldShowMaterialSort: [
 160 
             shouldShowMaterialSort: [
150 
-                'artist',
151 
-                'short', 'guide',
152 
-                'technique', 'publication',
161 
+                'artist', 'exhibition', 'short', 'technique',
162 
+                'guide', 'object', 'publication'
153 
             ],
 163 
             ],
154 
             shouldShowEpisodeSort: [
 164 
             shouldShowEpisodeSort: [
155 
-                'artist',
156 
-                'short', 'guide',
157 
-                'technique'
165 
+                'artist', 'short', 'technique', 'guide'
166 
+
158 
             ],
 167 
             ],
159 
             shouldShowAlphaSort: [
 168 
             shouldShowAlphaSort: [
160 
                 'artist'
 169 
                 'artist'
163 
                 'exhibition', 'event'
 172 
                 'exhibition', 'event'
164 
             ],
 173 
             ],
165 
             shouldShowTypeSort: [
 174 
             shouldShowTypeSort: [
166 
-                'short', 'guide', 'object',
167 
-                'publication', 'technique', 'post', 'event'
175 
+                'artist'
168 
             ]
 176 
             ]
169 
         }
 177 
         }
170 
     },
 178 
     },
175 
                 case 'artist':
 183 
                 case 'artist':
176 
                     opts = [
 184 
                     opts = [
177 
                         Object.keys(this.sortTypes)[0],
 185 
                         Object.keys(this.sortTypes)[0],
178 
-                        Object.keys(this.sortTypes)[3],
179 
                         Object.keys(this.sortTypes)[1],
 186 
                         Object.keys(this.sortTypes)[1],
187 
+                        Object.keys(this.sortTypes)[3],
180 
                         Object.keys(this.sortTypes)[4],
 188 
                         Object.keys(this.sortTypes)[4],
181 
                         // `by ${this.type} type`,
 189 
                         // `by ${this.type} type`,
182 
                     ]
 190 
                     ]
184 
                 case 'exhibition':
 192 
                 case 'exhibition':
185 
                     opts = [
 193 
                     opts = [
186 
                         // Object.keys(this.sortTypes)[4],
 194 
                         // Object.keys(this.sortTypes)[4],
187 
-                        // Object.keys(this.sortTypes)[1],
195 
+                        Object.keys(this.sortTypes)[1],
188 
                         Object.keys(this.sortTypes)[5],
 196 
                         Object.keys(this.sortTypes)[5],
189 
                     ]
 197 
                     ]
190 
                     break
 198 
                     break
251 
     p, h3
 259 
     p, h3
252 
         margin: 0
 260 
         margin: 0
253 
         padding: 0 0 $ms--4 0
 261 
         padding: 0 0 $ms--4 0
262 
+        &.date
263 
+            font-size: $ms--1
254
264
255 
     > section
 265 
     > section
256 
         > *
 266 
         > *

+ 6
- 2
vue-theme/src/pages/index.vue 파일 보기

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

+ 9
- 1
vue-theme/src/pages/single.vue 파일 보기

329 
             img
 329 
             img
330 
                 height: $ms-3
 330 
                 height: $ms-3
331 
                 width: $ms-3
 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 
 @media (min-width: $medium)
 342 
 @media (min-width: $medium)
335 
     .page--single
 343 
     .page--single

Write Preview
Loading…
취소
저장