소스 검색

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

tags/1.0.0^2
maeda 3 년 전
부모
커밋
91c68d2ba1
2개의 변경된 파일21개의 추가작업 그리고 11개의 파일을 삭제
  1. 8
    8
      plugins/cia-post-types/includes/p2p-mappings.php
  2. 13
    3
      vue-theme/src/components/sidebars/sidebar.vue

+ 8
- 8
plugins/cia-post-types/includes/p2p-mappings.php 파일 보기

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']);
24
-    register_connections_for('artist', ['artist', 'object', 'technique']);
25
-    register_connections_for('short', ['technique', 'short', 'object', 'guide', 'technique']);
26
-    register_connections_for('technique', ['technique', 'post']);
27
-    register_connections_for('guide', ['technique', 'exhibition', 'post']);
28
-    register_connections_for('exhibition', ['technique']);
29
-    register_connections_for('event', ['event', 'object', 'guide', 'technique']);
30
-    register_connections_for('episode', ['object', 'episode', 'guide', 'technique']);
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']);
26
+    register_connections_for('technique', ['technique', 'post', 'publication']);
27
+    register_connections_for('guide', ['technique', 'exhibition', 'post', 'publication']);
28
+    register_connections_for('exhibition', ['technique', 'publication']);
29
+    register_connections_for('event', ['event', 'object', 'guide', 'technique', 'publication']);
30
+    register_connections_for('episode', ['object', 'episode', 'guide', 'technique', 'publication']);
31
 }
31
 }
32
 
32
 
33
 function all_connection_types() {
33
 function all_connection_types() {

+ 13
- 3
vue-theme/src/components/sidebars/sidebar.vue 파일 보기

15
                     router-link(v-if="shouldShowDateSort.includes(type) && layout !== 'single'" :to="`/${type}/sorted/by-current-and-upcoming`")
15
                     router-link(v-if="shouldShowDateSort.includes(type) && layout !== 'single'" :to="`/${type}/sorted/by-current-and-upcoming`")
16
                         p by current and upcoming
16
                         p by current and upcoming
17
         
17
         
18
-        //- if {{type}} sorted by-material show material options
18
+        //- if {{type}} has sorted by-material show material options
19
         .shadow(v-if="shouldShowMaterialSort.includes(type) && layout !== 'single'")
19
         .shadow(v-if="shouldShowMaterialSort.includes(type) && layout !== 'single'")
20
             h3.t-up {{ type }} by material
20
             h3.t-up {{ type }} by material
21
             ul.t-up
21
             ul.t-up
24
                         router-link(:to="`/${type}/sorted/by-material#${material}`")
24
                         router-link(:to="`/${type}/sorted/by-material#${material}`")
25
                             p {{ material }}
25
                             p {{ material }}
26
 
26
 
27
-        //- if artist sorted by-alpha show alpha options           
27
+        //- if artist has sorted by-alpha show alpha options           
28
         .shadow(v-if="['artist'].includes(type) && layout !== 'single'")
28
         .shadow(v-if="['artist'].includes(type) && layout !== 'single'")
29
             h3.t-up {{ type }} alpha 
29
             h3.t-up {{ type }} alpha 
30
             ul.t-up
30
             ul.t-up
187
         > *
187
         > *
188
             padding: $ms-0
188
             padding: $ms-0
189
             margin: 0 0 $ms-0 0
189
             margin: 0 0 $ms-0 0
190
+            display: table-cell
190
         > .post
191
         > .post
191
             /* background-color: blue */
192
             /* background-color: blue */
192
     ul
193
     ul
197
         li
198
         li
198
             padding: 0 0 $ms-0 0
199
             padding: 0 0 $ms-0 0
199
             img
200
             img
200
-                width: 100%
201
+                display: none
201
     .shadow
202
     .shadow
202
         background-color: white
203
         background-color: white
203
 
204
 
205
+
204
 /* width larger than $medium  */
206
 /* width larger than $medium  */
205
 @media (min-width: $medium)
207
 @media (min-width: $medium)
206
     aside.sidebar
208
     aside.sidebar
209
+        position: sticky
207
         min-width: 25%
210
         min-width: 25%
208
         width: 25%
211
         width: 25%
212
+        > section 
213
+            > * 
214
+                display: inherit 
209
         ul
215
         ul
210
             flex-direction: column
216
             flex-direction: column
217
+            li 
218
+                img 
219
+                    width: 100%
220
+
211
 </style>
221
 </style>

Loading…
취소
저장