Browse Source

Merge branch 'dev' of ssh://gitea.yvvas.com:4022/craft-in-america/vue-wp into dev

tags/1.0.2^2
J 3 years ago
parent
commit
a4385fb2cc

+ 8
- 7
plugins/cia-post-types/includes/p2p-mappings.php View File

20
 }
20
 }
21
 
21
 
22
 function register_all_one_offs() {
22
 function register_all_one_offs() {
23
-    register_connections_for('object', ['object', 'exhibition', 'guide', 'technique', 'post', 'publication']);
24
-    register_connections_for('artist', ['artist', 'object', 'technique', 'publication']);
25
-    register_connections_for('short', ['short', 'exhibition', 'event', 'object', 'guide', 'post', 'technique', 'publication']);
23
+    register_connections_for('post', ['post', 'publication']);
24
+    register_connections_for('artist', ['artist', 'object', 'technique', 'post', 'publication']);
25
+    register_connections_for('exhibition', ['exhibition','technique', 'post', 'publication']);
26
+    register_connections_for('event', ['event', 'object', 'guide', 'technique', 'post', 'publication']);
27
+    register_connections_for('episode', ['episode', 'object', 'guide', 'technique', 'post', 'publication']);
28
+    register_connections_for('short', ['short', 'exhibition', 'event', 'object', 'guide', 'technique', 'post', 'publication']);
26
     register_connections_for('technique', ['technique', 'post', 'publication']);
29
     register_connections_for('technique', ['technique', 'post', 'publication']);
27
     register_connections_for('guide', ['technique', 'exhibition', 'post', 'publication']);
30
     register_connections_for('guide', ['technique', 'exhibition', 'post', 'publication']);
28
-    register_connections_for('exhibition', ['exhibition','technique', 'publication']);
29
-    register_connections_for('event', ['event', 'object', 'post', 'guide', 'technique', 'publication']);
30
-    register_connections_for('episode', ['episode', 'object', 'guide', 'technique', 'publication']);
31
-    register_connections_for('post', ['post']);
31
+    register_connections_for('object', ['object', 'exhibition', 'guide', 'technique', 'post', 'publication']);
32
+    register_connections_for('publication', ['publication']);
32
 }
33
 }
33
 
34
 
34
 function all_connection_types() {
35
 function all_connection_types() {

+ 5
- 0
vue-theme/editor-style.css View File

125
     position: inherit !important;
125
     position: inherit !important;
126
     background: none !important;
126
     background: none !important;
127
     color: black !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
+
128
 }
133
 }
129
 
134
 

+ 17
- 0
vue-theme/functions.php View File

387
             break;
387
             break;
388
     }
388
     }
389
 }
389
 }
390
+// Add Author to Custom Post Type
391
+function add_author_support_to_posts() {
392
+    $args = array(
393
+       'public'   => true,
394
+       '_builtin' => false
395
+    );
396
+
397
+    $output = 'names';
398
+
399
+    $post_types = get_post_types( $args, $output ); 
400
+
401
+    foreach ( $post_types  as $post_type ) {
402
+        add_post_type_support( $post_type, 'author' );
403
+    }
404
+
405
+}
406
+add_action( 'init', 'add_author_support_to_posts' );

+ 10
- 0
vue-theme/index.php View File

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

BIN
vue-theme/screenshot.png View File


+ 1
- 1
vue-theme/src/app.vue View File

36
             /* background-color: green*/
36
             /* background-color: green*/
37
             background-color: $cia_white2
37
             background-color: $cia_white2
38
             width: 100%
38
             width: 100%
39
-            padding: 0 0 3vh 0
39
+            padding: 0 0 1vh 0
40
             
40
             
41
             /* :--headings, a */
41
             /* :--headings, a */
42
             a
42
             a

+ 21
- 12
vue-theme/src/components/navigation/navigation.vue View File

19
 
19
 
20
             //- hardcoded menu
20
             //- hardcoded menu
21
             li.f-grow
21
             li.f-grow
22
-            li.t-up PBS Series 
22
+            li.t-up
23
+                router-link(to="/episode") PBS Series
23
                 ul.submenu 
24
                 ul.submenu 
24
                     li
25
                     li
25
                         router-link(to="/episode") Episodes
26
                         router-link(to="/episode") Episodes
28
                     li
29
                     li
29
                         router-link(to="/technique") Techniques
30
                         router-link(to="/technique") Techniques
30
             li.f-grow
31
             li.f-grow
31
-            li.t-up Artists
32
+            li.t-up
33
+                router-link(to="/artist/sorted/by-material") Artists
32
                 ul.submenu
34
                 ul.submenu
33
                     li
35
                     li
34
                         router-link(to="/artist/sorted/by-alpha") A - Z
36
                         router-link(to="/artist/sorted/by-alpha") A - Z
35
                     li
37
                     li
36
                         router-link(to="/artist/sorted/by-material") By Material
38
                         router-link(to="/artist/sorted/by-material") By Material
37
             li.f-grow
39
             li.f-grow
38
-            li.t-up Exhibitions
40
+            li.t-up 
41
+                router-link(to="/exhibition/sorted/by-current-and-upcoming") Exhibitions
39
                 ul.submenu 
42
                 ul.submenu 
40
                     li
43
                     li
41
                         router-link(to="/exhibition/sorted/by-current-and-upcoming") Current/Upcoming
44
                         router-link(to="/exhibition/sorted/by-current-and-upcoming") Current/Upcoming
42
                     li
45
                     li
43
-                        router-link(to="/exhibition/sorted/by-date") Past
46
+                        router-link(to="/exhibition/sorted/by-past") Past
44
                     li
47
                     li
45
                         router-link(to="/object") Explore Craft Objects
48
                         router-link(to="/object") Explore Craft Objects
46
             li.f-grow
49
             li.f-grow
47
-            li.t-up Center 
50
+            li.t-up  
51
+                router-link(to="/page/center") Center
48
                 ul.submenu 
52
                 ul.submenu 
49
                     li
53
                     li
50
                         router-link(to="/page/center") Info
54
                         router-link(to="/page/center") Info
55
                     li
59
                     li
56
                         router-link(to="/page/library") Library
60
                         router-link(to="/page/library") Library
57
             li.f-grow
61
             li.f-grow
58
-            li.t-up Education  
62
+            li.t-up   
63
+                router-link(to="/guide") Education
59
                 ul.submenu 
64
                 ul.submenu 
60
                     li
65
                     li
61
                         router-link(to="/guide") Education Guides
66
                         router-link(to="/guide") Education Guides
71
                         router-link(to="/page/library") Library
76
                         router-link(to="/page/library") Library
72
                     
77
                     
73
             li.f-grow
78
             li.f-grow
74
-            li.t-up Resources   
79
+            li.t-up    
80
+                router-link(to="/page/artists-resources") Resources
75
                 ul.submenu 
81
                 ul.submenu 
76
                     li
82
                     li
77
                         router-link(to="/page/artists-resources") Opportunities
83
                         router-link(to="/page/artists-resources") Opportunities
82
                     li
88
                     li
83
                         router-link(to="/page/community-craft-calendar") Community Craft Calendar 
89
                         router-link(to="/page/community-craft-calendar") Community Craft Calendar 
84
             li.f-grow
90
             li.f-grow
85
-            li.t-up Support   
91
+            li.t-up    
92
+                router-link(to="/page/donate") Support
86
                 ul.submenu 
93
                 ul.submenu 
87
                     li
94
                     li
88
                         router-link(to="/page/donate") Donate
95
                         router-link(to="/page/donate") Donate
89
                     li
96
                     li
90
                         router-link(to="/page/shop") Shop 
97
                         router-link(to="/page/shop") Shop 
91
             li.f-grow
98
             li.f-grow
92
-            li.t-up About    
99
+            li.t-up    
100
+                router-link(to="/page/about") About 
93
                 ul.submenu 
101
                 ul.submenu 
94
                     li
102
                     li
95
                         router-link(to="/page/about") Craft in America 
103
                         router-link(to="/page/about") Craft in America 
103
                         router-link(to="/page/contact") Contact 
111
                         router-link(to="/page/contact") Contact 
104
             li.f-grow
112
             li.f-grow
105
             li.t-up 
113
             li.t-up 
106
-                a(@click="toggleSearch") search
114
+                a(@click="toggleSearch") 🔍 
107
         ul(v-if="isSearchOpen").search.w-max
115
         ul(v-if="isSearchOpen").search.w-max
108
             li.f-row.w-max
116
             li.f-row.w-max
109
                 input(v-model="searchTerms" @keyup.enter="sendSearch" tabindex="10")
117
                 input(v-model="searchTerms" @keyup.enter="sendSearch" tabindex="10")
110
-                button.b-none.bg-none(@click="sendSearch" tabindex="11") 🔍
118
+                button.b-none.bg-none(@click="sendSearch" tabindex="11") 🔍 search
111
 
119
 
112
     .mobile-menu
120
     .mobile-menu
113
         .f-row.start
121
         .f-row.start
164
                 // 'education',
172
                 // 'education',
165
                 // 'resources',
173
                 // 'resources',
166
                 // 'support',
174
                 // 'support',
167
-                // 'about',
175
+                'page/about',
168
                 '🔍'
176
                 '🔍'
169
             ]
177
             ]
170
             const ignore = [
178
             const ignore = [
261
                 background-color: $lighter
269
                 background-color: $lighter
262
                 padding: 0 0.5em 0.5em
270
                 padding: 0 0.5em 0.5em
263
                 opacity: 0
271
                 opacity: 0
272
+                top: 23px
264
 
273
 
265
                 //- submenu hover
274
                 //- submenu hover
266
                 &:hover 
275
                 &:hover 

+ 49
- 13
vue-theme/src/components/sidebars/sidebar.vue View File

6
             h3.t-up sort {{ type }}
6
             h3.t-up sort {{ type }}
7
             ul.t-up
7
             ul.t-up
8
                 li 
8
                 li 
9
-                    //- ?type=articles //
9
+                    //- post?type=articles //
10
                     router-link(v-if="type === 'post' " :to="`/${type}?type=articles`")
10
                     router-link(v-if="type === 'post' " :to="`/${type}?type=articles`")
11
                         p in the news
11
                         p in the news
12
                 li 
12
                 li 
13
-                    //- ?type=releases //
13
+                    //- post?type=releases //
14
                     router-link(v-if="type === 'post' " :to="`/${type}?type=releases`")
14
                     router-link(v-if="type === 'post' " :to="`/${type}?type=releases`")
15
                         p press releases 
15
                         p press releases 
16
                 li 
16
                 li 
17
-                    //- ?type=talks //
17
+                    //- event?type=concerts //
18
+                    router-link(v-if="type === 'event' " :to="`/${type}?type=concerts`")
19
+                        p concerts 
20
+                li 
21
+                    //- event?type=openings //
22
+                    router-link(v-if="type === 'event' " :to="`/${type}?type=openings`")
23
+                        p openings 
24
+                li 
25
+                    //- event?type=talks //
18
                     router-link(v-if="type === 'event' " :to="`/${type}?type=talks`")
26
                     router-link(v-if="type === 'event' " :to="`/${type}?type=talks`")
19
                         p talks 
27
                         p talks 
28
+                li 
29
+                    //- event?type=workshops //
30
+                    router-link(v-if="type === 'event' " :to="`/${type}?type=workshops`")
31
+                        p workshops 
32
+
20
                     //- by type //
33
                     //- by type //
21
                 li(v-for="option in sortOptions")
34
                 li(v-for="option in sortOptions")
22
                     router-link(:to="`/${type}/sorted/${sortTypes[option]}`")
35
                     router-link(:to="`/${type}/sorted/${sortTypes[option]}`")
24
                 li
37
                 li
25
                     router-link(v-if="shouldShowDateSort.includes(type) " :to="`/${type}/sorted/by-current-and-upcoming`")
38
                     router-link(v-if="shouldShowDateSort.includes(type) " :to="`/${type}/sorted/by-current-and-upcoming`")
26
                         p by current and upcoming
39
                         p by current and upcoming
27
-                li
28
-                    router-link(:to="`/${type}/sorted/by-date`")
29
-                        p by all
40
+                //- li
41
+                //-     router-link(v-if="type === ('event', 'exhibition') " :to="`/${type}/sorted/by-past`")
42
+                //-         p by past 
43
+
30
         
44
         
31
         //- if {{type}} has sorted by-material show material options
45
         //- if {{type}} has sorted by-material show material options
32
         .shadow(v-if="shouldShowMaterialSort.includes(type) && layout !== 'single'")
46
         .shadow(v-if="shouldShowMaterialSort.includes(type) && layout !== 'single'")
46
                         router-link(:to="`/${type}/sorted/by-alpha#${charaSet[0]}`")
60
                         router-link(:to="`/${type}/sorted/by-alpha#${charaSet[0]}`")
47
                             p.alpha {{ charaSet }}
61
                             p.alpha {{ charaSet }}
48
 
62
 
63
+        //- if type has sorted by-episode show episode options           
64
+        .shadow(v-if="shouldShowEpisodeSort.includes(type) && layout !== 'single'")
65
+            h3.t-up {{ type }} episode  
66
+            ul.t-up
67
+                li.f-row.start.wrap
68
+                    template(v-for="episodeSet in episodeSets") 
69
+                        router-link(:to="`/${type}/sorted/by-episode#${episodeSet}`")
70
+                            p {{ episodeSet }}&nbsp;&nbsp;
71
+
49
         //- p2p types and related posts
72
         //- p2p types and related posts
50
         .shadow(v-if="layout === 'single' && Object.keys(related).length" v-for="p2pPostType in Object.keys(related)")
73
         .shadow(v-if="layout === 'single' && Object.keys(related).length" v-for="p2pPostType in Object.keys(related)")
51
             related-sidebar(:posts-by-type="related" :post-type="p2pPostType")
74
             related-sidebar(:posts-by-type="related" :post-type="p2pPostType")
103
                 'by artist': `${sortTypes.artist}`,     //:2
126
                 'by artist': `${sortTypes.artist}`,     //:2
104
                 'by episode': `${sortTypes.episode}`,   //:3
127
                 'by episode': `${sortTypes.episode}`,   //:3
105
                 'by type': `${sortTypes.subtype}`,      //:4
128
                 'by type': `${sortTypes.subtype}`,      //:4
106
-                // 'by articles': `articles`,              //:5
129
+                'by past': `${sortTypes.past}`,         //:5
130
+                // 'by articles': `articles`,           
107
                 subtype: 'by-type',
131
                 subtype: 'by-type',
108
             },
132
             },
109
             charaSets: [
133
             charaSets: [
110
-                // '0 a b', 'c d e', 'f g h',
111
-                // 'i j k', 'l m n', 'o p q',
112
-                // 'r s t', 'u v w', 'x y z'
113
                 '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 
134
                 '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 
114
                 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
135
                 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
115
             ],
136
             ],
137
+            episodeSets: [
138
+                'inspiration', 'home', 'jewelery', 'harmony', 'storytellers', 
139
+                'democracy', 'identity', 'quilts', 'visionaries', 'california', 
140
+                'neighbors', 'borders', 'nature', 'teachers', 'music', 
141
+                'celebration', 'service', 'industry', 'holiday', 'forge',
142
+            ],
116
             materials: materials,
143
             materials: materials,
117
             shouldShowListSort: [
144
             shouldShowListSort: [
118
                 'artist', 'exhibition', 'event', 
145
                 'artist', 'exhibition', 'event', 
120
                 'publication', 'technique', 'post'
147
                 'publication', 'technique', 'post'
121
             ],
148
             ],
122
             shouldShowMaterialSort: [
149
             shouldShowMaterialSort: [
123
-                'artist', 'exhibition', 'event',
124
-                'short', 'guide', 'object',
125
-                'technique',
150
+                'artist',
151
+                'short', 'guide',
152
+                'technique', 'publication',
153
+            ],
154
+            shouldShowEpisodeSort: [
155
+                'artist',
156
+                'short', 'guide',
157
+                'technique'
126
             ],
158
             ],
127
             shouldShowAlphaSort: [
159
             shouldShowAlphaSort: [
128
                 'artist'
160
                 'artist'
153
                     opts = [
185
                     opts = [
154
                         // Object.keys(this.sortTypes)[4],
186
                         // Object.keys(this.sortTypes)[4],
155
                         // Object.keys(this.sortTypes)[1],
187
                         // Object.keys(this.sortTypes)[1],
188
+                        Object.keys(this.sortTypes)[5],
156
                     ]
189
                     ]
157
                     break
190
                     break
158
                 case 'event':
191
                 case 'event':
159
                     opts = [
192
                     opts = [
160
                         // Object.keys(this.sortTypes)[4],
193
                         // Object.keys(this.sortTypes)[4],
161
                         // Object.keys(this.sortTypes)[1],
194
                         // Object.keys(this.sortTypes)[1],
195
+                        Object.keys(this.sortTypes)[5],
162
                     ]
196
                     ]
163
                     break
197
                     break
164
                 case 'post':
198
                 case 'post':
213
     position: sticky
247
     position: sticky
214
     top: 40px
248
     top: 40px
215
     width: 100%
249
     width: 100%
250
+    font-size: x-small
216
     p, h3
251
     p, h3
217
         margin: 0
252
         margin: 0
218
         padding: 0 0 $ms--4 0
253
         padding: 0 0 $ms--4 0
247
         position: sticky
282
         position: sticky
248
         min-width: 25%
283
         min-width: 25%
249
         width: 25%
284
         width: 25%
285
+        font-size: revert
250
         > section 
286
         > section 
251
             > * 
287
             > * 
252
                 display: inherit 
288
                 display: inherit 

+ 30
- 5
vue-theme/src/pages/index.vue View File

138
                         max-height: $max-card-img-height
138
                         max-height: $max-card-img-height
139
                     p.excerpt
139
                     p.excerpt
140
                         -webkit-line-clamp: $card-line-clamp
140
                         -webkit-line-clamp: $card-line-clamp
141
+                &.flipped
142
+                    li 
143
+                        &:nth-of-type(4)
144
+                            /* p.excerpt, p.read-more
145
+                                display: none */
146
+                            header
147
+                                padding: 0.57em 0 
148
+                                a
149
+                                    display: none
141
             &.max 
150
             &.max 
142
                 > ul
151
                 > ul
143
                     grid-template-columns: 
152
                     grid-template-columns: 
144
                         auto
153
                         auto
145
                     grid-template-rows: 
154
                     grid-template-rows: 
146
                         auto
155
                         auto
156
+            &.stickies
157
+                ul
158
+                    &.flipped
159
+                        li
160
+                            &:nth-of-type(4)
161
+                                header
162
+                                    padding: 0 
163
+                                    a
164
+                                        display: block
165
+                
147
 /* min-width 768px */
166
 /* min-width 768px */
148
 @media (min-width: $medium)
167
 @media (min-width: $medium)
149
     .page--index 
168
     .page--index 
153
                 ul
172
                 ul
154
                     display: grid
173
                     display: grid
155
                     grid-template-columns: 
174
                     grid-template-columns: 
156
-                        49.5% 24.25% 24.25%
175
+                        49.5% 24.35% 24.35%
157
                     grid-template-rows: repeat(2, 1fr)
176
                     grid-template-rows: repeat(2, 1fr)
158
                     gap: 0 $ms--2
177
                     gap: 0 $ms--2
159
                     li
178
                     li
185
                             grid-column-start: 3
204
                             grid-column-start: 3
186
                     &.flipped
205
                     &.flipped
187
                         grid-template-columns: 
206
                         grid-template-columns: 
188
-                            24.25% 24.25% 49.5% 
207
+                            24.35% 24.35% 49.5% 
189
                         li
208
                         li
190
                             &:nth-of-type(1)
209
                             &:nth-of-type(1)
191
                                 grid-row-end: 2
210
                                 grid-row-end: 2
200
                         max-height: $max-card-img-height
219
                         max-height: $max-card-img-height
201
                 &.stickies
220
                 &.stickies
202
                     .post 
221
                     .post 
203
-                        min-width: 24.25%
222
+                        min-width: 24.35%
223
+                        max-width: 33%
204
                     ul
224
                     ul
205
                         &.flipped
225
                         &.flipped
206
                             grid-template-columns: 
226
                             grid-template-columns: 
207
-                                24.25% 24.25% 49.5% 
227
+                                24.35% 24.35% 49.5% 
208
                             li
228
                             li
209
                                 &:nth-of-type(1)
229
                                 &:nth-of-type(1)
210
                                     grid-row-end: 2
230
                                     grid-row-end: 2
214
                                 &:nth-of-type(5)
234
                                 &:nth-of-type(5)
215
                                     grid-row-start: 1
235
                                     grid-row-start: 1
216
                                     grid-row-end: 3
236
                                     grid-row-end: 3
237
+                                &:nth-of-type(4)
238
+                                    header
239
+                                        padding: 0 
240
+                                        a
241
+                                            display: block
217
                         &[class^="sticky-"]
242
                         &[class^="sticky-"]
218
                             display: flex
243
                             display: flex
219
                         &.sticky-1
244
                         &.sticky-1
223
                                     width: 100%
248
                                     width: 100%
224
                         &.sticky-5
249
                         &.sticky-5
225
                             grid-template-columns: 
250
                             grid-template-columns: 
226
-                                24.25% 24.25% 49.5%
251
+                                24.35% 24.35% 49.5%
227
                             grid-template-rows: 
252
                             grid-template-rows: 
228
                                 repeat(2, 1fr)
253
                                 repeat(2, 1fr)
229
                             gap: 3% 1%
254
                             gap: 3% 1%

+ 1
- 0
vue-theme/src/pages/mixin-post-types.js View File

73
                 post.type == 'page' && post.slug == 'staff' || 
73
                 post.type == 'page' && post.slug == 'staff' || 
74
                 post.type == 'page' && post.slug == 'board' || 
74
                 post.type == 'page' && post.slug == 'board' || 
75
                 post.type == 'page' && post.slug == 'donate' || 
75
                 post.type == 'page' && post.slug == 'donate' || 
76
+                post.type == 'page' && post.slug == 'shop' || 
76
                 post.type == 'page' && post.slug == 'library' || 
77
                 post.type == 'page' && post.slug == 'library' || 
77
                 post.type == 'page' && post.slug == 'artists-resources' || 
78
                 post.type == 'page' && post.slug == 'artists-resources' || 
78
                 post.type == 'page' && post.slug == 'craft-resources-map' || 
79
                 post.type == 'page' && post.slug == 'craft-resources-map' || 

+ 14
- 5
vue-theme/src/pages/single.vue View File

255
             position: relative
255
             position: relative
256
             width: 100% 
256
             width: 100% 
257
             padding-bottom: 56.25%
257
             padding-bottom: 56.25%
258
-            margin-bottom: 7em
258
+            margin-bottom: $ms-7
259
             &__wrapper
259
             &__wrapper
260
                 display: contents
260
                 display: contents
261
             /* TBD if kept- edit ot test */
261
             /* TBD if kept- edit ot test */
266
         .wp-block-gallery
266
         .wp-block-gallery
267
             margin: 0 0 0.5em 0
267
             margin: 0 0 0.5em 0
268
             grid-gap: $ms--5
268
             grid-gap: $ms--5
269
-            
270
-            > .wp-block-image     
269
+            > .wp-block-image  
271
                 figcaption
270
                 figcaption
272
                     position: inherit
271
                     position: inherit
273
                     background: none
272
                     background: none
273
+                    font-size: $ms--1
274
                     color: $cia_black
274
                     color: $cia_black
275
+                    max-height: 9%
276
+                    overflow: visible 
277
+                    padding: 0 
278
+                    margin-bottom: 2.5em
279
+            figcaption
280
+                flex-direction: column
275
 
281
 
276
         /* iframe container 16:9 */
282
         /* iframe container 16:9 */
277
         [class^="iframe-container"]
283
         [class^="iframe-container"]
331
             margin: 0 0.65em 0 0
337
             margin: 0 0.65em 0 0
332
         &.f-col
338
         &.f-col
333
             flex-direction: row
339
             flex-direction: row
334
-            .wp-block-embed, .is-type-video
335
-                margin-bottom: $ms-9
340
+            .wp-block-gallery
341
+                .wp-block-image  
342
+                    figcaption
343
+                        max-height: 5%
344
+                        margin-bottom: $ms-4            
336
 </style>
345
 </style>

+ 22
- 7
vue-theme/src/sss/_lightbox.sss View File

1
+@import './variables.sss'
2
+@import './theme.sss'
3
+
1
 .vel-fade
4
 .vel-fade
2
     &-enter-active, &-active
5
     &-enter-active, &-active
3
         transition: all 0.3s ease
6
         transition: all 0.3s ease
4
     &-enter-from, &-leave-to
7
     &-enter-from, &-leave-to
5
-        opacity: 0
8
+        opacity: 1
6
 
9
 
7
 .vel-img
10
 .vel-img
8
     &-swiper
11
     &-swiper
14
         position: absolute
17
         position: absolute
15
         top: 50%
18
         top: 50%
16
         transform: translate(-50% -50%)
19
         transform: translate(-50% -50%)
17
-        transition: 0.3s linear
18
-        will-change: transform opacity
19
-    background-color: rgba(0, 0, 0, 0.7)
20
-    box-shadow: 0 5px 20px 2px rgba(0, 0, 0, 0.7)
20
+        /* transition: 0.3s linear */
21
+        /* will-change: transform opacity */
22
+    /* background-color: rgba(0, 0, 0, 0.7) */
23
+    box-shadow: 0.5px 0.5px 0.5px 0px rgb(0 0 0 / 30%)
21
     display: block
24
     display: block
22
     max-height: 80vh
25
     max-height: 80vh
23
     max-width: 80vw
26
     max-width: 80vw
25
     transition: transform 0.3s ease-in-out
28
     transition: transform 0.3s ease-in-out
26
 
29
 
27
 .vel-modal
30
 .vel-modal
28
-    background: rgba(0, 0, 0, 0.5)
31
+    background: rgba(255, 255, 255, 0.9)
29
     bottom: 0
32
     bottom: 0
30
     left: 0
33
     left: 0
31
     margin: 0
34
     margin: 0
33
     right: 0
36
     right: 0
34
     top: 0
37
     top: 0
35
     z-index: 10003
38
     z-index: 10003
39
+    img
40
+        transition: none
41
+        &:hover
42
+            filter: grayscale(0%) brightness(100%)
36
 
43
 
37
 .vel-img, .vel-img-wrapper
44
 .vel-img, .vel-img-wrapper
38
     user-select: none
45
     user-select: none
39
 
46
 
40
 .vel-btns-wrapper
47
 .vel-btns-wrapper
41
     .btn__close, .btn__next, .btn__prev
48
     .btn__close, .btn__next, .btn__prev
42
-        color: #fff
49
+        color: $cia_black 
43
         cursor: pointer
50
         cursor: pointer
44
         font-size: 32px
51
         font-size: 32px
45
         opacity: 0.6
52
         opacity: 0.6
94
 
101
 
95
 .vel-modal.is-rtl .vel-img-title
102
 .vel-modal.is-rtl .vel-img-title
96
     direction: rtl
103
     direction: rtl
104
+    display: block
97
 
105
 
98
 .vel-loading
106
 .vel-loading
99
     left: 50%
107
     left: 50%
166
     width: 1em
174
     width: 1em
167
 
175
 
168
 .vel-toolbar
176
 .vel-toolbar
177
+    display: none
169
     border-radius: 4px
178
     border-radius: 4px
170
     bottom: 8px
179
     bottom: 8px
171
     display: flex
180
     display: flex
176
     position: absolute
185
     position: absolute
177
     transform: translate(-50%)
186
     transform: translate(-50%)
178
     .toolbar-btn
187
     .toolbar-btn
188
+        display: none
179
         color: #fff
189
         color: #fff
180
         cursor: pointer
190
         cursor: pointer
181
         flex-shrink: 0
191
         flex-shrink: 0
188
 .vel-toolbar, .vel-toolbar .toolbar-btn
198
 .vel-toolbar, .vel-toolbar .toolbar-btn
189
     background-color: #2d2d2d
199
     background-color: #2d2d2d
190
     user-select: none
200
     user-select: none
201
+
202
+figcaption
203
+    position: inherit
204
+    background: none
205
+    color: $cia_black

+ 1
- 1
vue-theme/src/sss/variables.sss View File

1
 @import './_ratios.sss'
1
 @import './_ratios.sss'
2
 
2
 
3
-$transition: 500ms
3
+$transition: 300ms
4
 
4
 
5
 $min-width: 20em
5
 $min-width: 20em
6
 $max-width: 74em
6
 $max-width: 74em

+ 1
- 1
vue-theme/src/utils/helpers.js View File

75
 const formatDate = (unix, includeTime) => {
75
 const formatDate = (unix, includeTime) => {
76
     const d = new Date(parseInt(unix) * 1000)
76
     const d = new Date(parseInt(unix) * 1000)
77
     return includeTime
77
     return includeTime
78
-        ? d.toLocaleString('en-US', { timeZone: 'UTC' })
78
+        ? d.toLocaleString('en-US', { timeZone: 'UTC', dateStyle: 'short', timeStyle: 'short' })
79
         : d.toLocaleDateString('en-US', { timeZone: 'UTC' })
79
         : d.toLocaleDateString('en-US', { timeZone: 'UTC' })
80
 }
80
 }
81
 
81
 

Loading…
Cancel
Save