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

vue-theme/src/components/footer.vue

@@ -1,53 +1,49 @@
 <template lang="pug">
 .footer-wrapper.t-up.t-sans
     footer.main.w-max.f-row.between
-        ul.f-col
+        ul.f-col.t-cntr
             //- address contact   
             li
                 h4 Craft in America
-                ul
-                    li 8415 W. Third St.
-                    li Los Angeles, CA 90048
-                    li Tues–Sat, 12PM–6PM
-                    li (310) 659-9022 office
-                    li (323) 951-0610 center
-                    li
-                        router-link(to="mailto:info@craftinamerica.org") info@craftinamerica.org
+                    ul
+                        h5
+                            li 8415 W. Third St.
+                            li Los Angeles, CA 90048
+                            li Tues–Sat, 12PM–6PM
+                            li (310) 659-9022 office
+                            li (323) 951-0610 center
+                            li
+                                router-link(to="mailto:info@craftinamerica.org") info@craftinamerica.org
             //- social media   
             li
                 h4 Connect with Us
+                <br>
                 ul.f-row
                     li
-                        h3 
-                            a(href="https://www.facebook.com/CraftinAmerica")
-                                //- img(src="../assets/facebook-brands.svg")
-                                //- replace with respective icon 
-                                svg(aria-hidden="true" focusable="false" data-prefix="fab" data-icon="facebook" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512")
-                                    path(fill="currentColor" d="M504 256C504 119 393 8 256 8S8 119 8 256c0 123.78 90.69 226.38 209.25 245V327.69h-63V256h63v-54.64c0-62.15 37-96.48 93.67-96.48 27.14 0 55.52 4.84 55.52 4.84v61h-31.28c-30.8 0-40.41 19.12-40.41 38.73V256h68.78l-11 71.69h-57.78V501C413.31 482.38 504 379.78 504 256z")
-                    li
-                        h3 
-                            a(href="http://www.youtube.com/user/craftinamerica")
-                                //- img(src="../star.svg")
-                                //- replace with respective icon 
-                                svg(aria-hidden="true" focusable="false" data-prefix="fab" data-icon="youtube" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512")
-                                    path(fill="currentColor" d="M549.655 124.083c-6.281-23.65-24.787-42.276-48.284-48.597C458.781 64 288 64 288 64S117.22 64 74.629 75.486c-23.497 6.322-42.003 24.947-48.284 48.597-11.412 42.867-11.412 132.305-11.412 132.305s0 89.438 11.412 132.305c6.281 23.65 24.787 41.5 48.284 47.821C117.22 448 288 448 288 448s170.78 0 213.371-11.486c23.497-6.321 42.003-24.171 48.284-47.821 11.412-42.867 11.412-132.305 11.412-132.305s0-89.438-11.412-132.305zm-317.51 213.508V175.185l142.739 81.205-142.739 81.201z")
-                    li
-                        h3 
-                            a(href="http://www.instagram.com/craftinamerica")
-                                //- img(src="../star.svg")
-                                //- replace with respective icon 
-                                svg(aria-hidden="true" focusable="false" data-prefix="fab" data-icon="instagram" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512")
-                                    path(fill="currentColor" d="M224.1 141c-63.6 0-114.9 51.3-114.9 114.9s51.3 114.9 114.9 114.9S339 319.5 339 255.9 287.7 141 224.1 141zm0 189.6c-41.1 0-74.7-33.5-74.7-74.7s33.5-74.7 74.7-74.7 74.7 33.5 74.7 74.7-33.6 74.7-74.7 74.7zm146.4-194.3c0 14.9-12 26.8-26.8 26.8-14.9 0-26.8-12-26.8-26.8s12-26.8 26.8-26.8 26.8 12 26.8 26.8zm76.1 27.2c-1.7-35.9-9.9-67.7-36.2-93.9-26.2-26.2-58-34.4-93.9-36.2-37-2.1-147.9-2.1-184.9 0-35.8 1.7-67.6 9.9-93.9 36.1s-34.4 58-36.2 93.9c-2.1 37-2.1 147.9 0 184.9 1.7 35.9 9.9 67.7 36.2 93.9s58 34.4 93.9 36.2c37 2.1 147.9 2.1 184.9 0 35.9-1.7 67.7-9.9 93.9-36.2 26.2-26.2 34.4-58 36.2-93.9 2.1-37 2.1-147.8 0-184.8zM398.8 388c-7.8 19.6-22.9 34.7-42.6 42.6-29.5 11.7-99.5 9-132.1 9s-102.7 2.6-132.1-9c-19.6-7.8-34.7-22.9-42.6-42.6-11.7-29.5-9-99.5-9-132.1s-2.6-102.7 9-132.1c7.8-19.6 22.9-34.7 42.6-42.6 29.5-11.7 99.5-9 132.1-9s102.7-2.6 132.1 9c19.6 7.8 34.7 22.9 42.6 42.6 11.7 29.5 9 99.5 9 132.1s2.7 102.7-9 132.1z")
-                    li
-                        h3 
-                            a(href="https://twitter.com/CraftinAmerica")
-                                //- img(src="../star.svg")
-                                //- replace with respective icon                 
-                                svg(aria-hidden="true" focusable="false" data-prefix="fab" data-icon="twitter" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400")
-                                    path(fill="currentColor" d="M400,200c0,110.5-89.5,200-200,200S0,310.5,0,200S89.5,0,200,0S400,89.5,400,200z M163.4,305.5 c88.7,0,137.2-73.5,137.2-137.2c0-2.1,0-4.2-0.1-6.2c9.4-6.8,17.6-15.3,24.1-25c-8.6,3.8-17.9,6.4-27.7,7.6 c10-6,17.6-15.4,21.2-26.7c-9.3,5.5-19.6,9.5-30.6,11.7c-8.8-9.4-21.3-15.2-35.2-15.2c-26.6,0-48.2,21.6-48.2,48.2 c0,3.8,0.4,7.5,1.3,11c-40.1-2-75.6-21.2-99.4-50.4c-4.1,7.1-6.5,15.4-6.5,24.2c0,16.7,8.5,31.5,21.5,40.1c-7.9-0.2-15.3-2.4-21.8-6 c0,0.2,0,0.4,0,0.6c0,23.4,16.6,42.8,38.7,47.3c-4,1.1-8.3,1.7-12.7,1.7c-3.1,0-6.1-0.3-9.1-0.9c6.1,19.2,23.9,33.1,45,33.5 c-16.5,12.9-37.3,20.6-59.9,20.6c-3.9,0-7.7-0.2-11.5-0.7C110.8,297.5,136.2,305.5,163.4,305.5")
-            li
-                h5
-                    a(href="https://visitor.r20.constantcontact.com/d.jsp?llr=fyb4y9cab&p=oi&m=fyb4y9cab&sit=olvymhdeb&f=ee3616e1-10de-4a59-b451-1a882111b1f5", target="_blank") Join email list
+                        a(href="http://www.youtube.com/user/craftinamerica")
+                            svg(aria-hidden="true" focusable="false" data-prefix="fab" data-icon="youtube" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512")
+                                path(fill="currentColor" d="M549.655 124.083c-6.281-23.65-24.787-42.276-48.284-48.597C458.781 64 288 64 288 64S117.22 64 74.629 75.486c-23.497 6.322-42.003 24.947-48.284 48.597-11.412 42.867-11.412 132.305-11.412 132.305s0 89.438 11.412 132.305c6.281 23.65 24.787 41.5 48.284 47.821C117.22 448 288 448 288 448s170.78 0 213.371-11.486c23.497-6.321 42.003-24.171 48.284-47.821 11.412-42.867 11.412-132.305 11.412-132.305s0-89.438-11.412-132.305zm-317.51 213.508V175.185l142.739 81.205-142.739 81.201z")
+                    li 
+                        a(href="https://www.facebook.com/CraftinAmerica")
+                            //- img(src="../assets/facebook-brands.svg")
+                            //- replace with respective icon 
+                            svg(aria-hidden="true" focusable="false" data-prefix="fab" data-icon="facebook" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512")
+                                path(fill="currentColor" d="M504 256C504 119 393 8 256 8S8 119 8 256c0 123.78 90.69 226.38 209.25 245V327.69h-63V256h63v-54.64c0-62.15 37-96.48 93.67-96.48 27.14 0 55.52 4.84 55.52 4.84v61h-31.28c-30.8 0-40.41 19.12-40.41 38.73V256h68.78l-11 71.69h-57.78V501C413.31 482.38 504 379.78 504 256z")
+                    li 
+                        a(href="http://www.instagram.com/craftinamerica")
+                            svg(aria-hidden="true" focusable="false" data-prefix="fab" data-icon="instagram" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512")
+                                path(fill="currentColor" d="M224.1 141c-63.6 0-114.9 51.3-114.9 114.9s51.3 114.9 114.9 114.9S339 319.5 339 255.9 287.7 141 224.1 141zm0 189.6c-41.1 0-74.7-33.5-74.7-74.7s33.5-74.7 74.7-74.7 74.7 33.5 74.7 74.7-33.6 74.7-74.7 74.7zm146.4-194.3c0 14.9-12 26.8-26.8 26.8-14.9 0-26.8-12-26.8-26.8s12-26.8 26.8-26.8 26.8 12 26.8 26.8zm76.1 27.2c-1.7-35.9-9.9-67.7-36.2-93.9-26.2-26.2-58-34.4-93.9-36.2-37-2.1-147.9-2.1-184.9 0-35.8 1.7-67.6 9.9-93.9 36.1s-34.4 58-36.2 93.9c-2.1 37-2.1 147.9 0 184.9 1.7 35.9 9.9 67.7 36.2 93.9s58 34.4 93.9 36.2c37 2.1 147.9 2.1 184.9 0 35.9-1.7 67.7-9.9 93.9-36.2 26.2-26.2 34.4-58 36.2-93.9 2.1-37 2.1-147.8 0-184.8zM398.8 388c-7.8 19.6-22.9 34.7-42.6 42.6-29.5 11.7-99.5 9-132.1 9s-102.7 2.6-132.1-9c-19.6-7.8-34.7-22.9-42.6-42.6-11.7-29.5-9-99.5-9-132.1s-2.6-102.7 9-132.1c7.8-19.6 22.9-34.7 42.6-42.6 29.5-11.7 99.5-9 132.1-9s102.7-2.6 132.1 9c19.6 7.8 34.7 22.9 42.6 42.6 11.7 29.5 9 99.5 9 132.1s2.7 102.7-9 132.1z")
+                    li 
+                        a(href="https://twitter.com/CraftinAmerica")
+                            svg(aria-hidden="true" focusable="false" data-prefix="fab" data-icon="twitter" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400")
+                                path(fill="currentColor" d="M400,200c0,110.5-89.5,200-200,200S0,310.5,0,200S89.5,0,200,0S400,89.5,400,200z M163.4,305.5 c88.7,0,137.2-73.5,137.2-137.2c0-2.1,0-4.2-0.1-6.2c9.4-6.8,17.6-15.3,24.1-25c-8.6,3.8-17.9,6.4-27.7,7.6 c10-6,17.6-15.4,21.2-26.7c-9.3,5.5-19.6,9.5-30.6,11.7c-8.8-9.4-21.3-15.2-35.2-15.2c-26.6,0-48.2,21.6-48.2,48.2 c0,3.8,0.4,7.5,1.3,11c-40.1-2-75.6-21.2-99.4-50.4c-4.1,7.1-6.5,15.4-6.5,24.2c0,16.7,8.5,31.5,21.5,40.1c-7.9-0.2-15.3-2.4-21.8-6 c0,0.2,0,0.4,0,0.6c0,23.4,16.6,42.8,38.7,47.3c-4,1.1-8.3,1.7-12.7,1.7c-3.1,0-6.1-0.3-9.1-0.9c6.1,19.2,23.9,33.1,45,33.5 c-16.5,12.9-37.3,20.6-59.9,20.6c-3.9,0-7.7-0.2-11.5-0.7C110.8,297.5,136.2,305.5,163.4,305.5")
+                    li 
+                        a(href="https://www.tiktok.com/@craft_in_america")                                
+                            svg(aria-hidden="true" focusable="false" data-prefix="fab" data-icon="tiktok" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 3333 3333" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd")
+                                path(fill="currentColor" d="M1667 0c920 0 1667 746 1667 1667 0 920-746 1667-1667 1667C747 3334 0 2588 0 1667 0 747 746 0 1667 0zm361 744c31 262 177 418 430 434v294c-147 14-276-34-426-124v550c0 700-763 918-1069 417-197-322-76-889 556-911v311c-48 8-99 20-146 36-141 47-220 137-198 294 43 301 595 390 549-198V745h305z")
+                li
+                    <br>
+                        a(href="https://visitor.r20.constantcontact.com/d.jsp?llr=fyb4y9cab&p=oi&m=fyb4y9cab&sit=olvymhdeb&f=ee3616e1-10de-4a59-b451-1a882111b1f5", target="_blank") Join our email list
                             
         //- menu links
         ul.f-col
@@ -76,29 +72,53 @@
                         li
                             router-link(to="/exhibition/sorted/by-current-and-upcoming") &nbsp; Current/Upcoming
                         li
-                            router-link(to="/object") &nbsp; Explore Craft Objects
+                            router-link(to="/exhibition/sorted/by-past") &nbsp; Past
             li
                 h5
                     router-link(to="/page/center") Center 
                     ul.f-col
                         li
                             router-link(to="/page/center") &nbsp; Info
-                        li
-                            router-link(to="/exhibition/sorted/by-current-and-upcoming") &nbsp; Exhibitions
                         li 
                             router-link(to="/event/sorted/by-current-and-upcoming") &nbsp; Events 
                         li
                             router-link(to="/event?type=talks") &nbsp; Talks &amp; Interviews
+                        li 
+                            router-link(to="/page/library") &nbsp; Library 
             li
                 h5
                     router-link(to="/guide") Education 
                     ul.f-col
                         li
                             router-link(to="/guide") &nbsp; Guides 
-                        li 
+                        li
+                            router-link(to="/page/video-resources-for-educators") &nbsp; Video Resources 
+                        li
+                            router-link(to="/page/craft-in-schools") &nbsp; Craft in Schools  
+            li
+                h5    
+                    router-link(to="/page/artists-resources") Resources
+                    ul.f-col  
+                        li
                             router-link(to="/publication") &nbsp; Publications 
-                        li 
-                            router-link(to="/page/library") &nbsp; Library 
+                        li
+                            router-link(to="/object") &nbsp; Explore Craft Objects
+                        li
+                            router-link(to="/page/artists-resources") &nbsp; Opportunities
+                        li
+                            router-link(to="/artist/sorted/by-type") &nbsp; Organizations and Institutions 
+                        li
+                            router-link(to="/page/craft-resources-map") &nbsp; Craft Resources Map 
+                        li
+                            router-link(to="/page/community-craft-calendar") &nbsp; Community Craft Calendar 
+            li
+                h5    
+                    router-link(to="/page/donate") Support
+                    ul.f-col  
+                        li
+                            router-link(to="/page/donate") &nbsp; Donate
+                        li
+                            router-link(to="/page/shop") &nbsp; Shop 
             li
                 h5
                     router-link(to="/blog") News 
@@ -125,7 +145,7 @@
                             router-link(to="/page/contact") &nbsp; Contact   
 
     .sub-footer.f-col.start
-        h6 Craft in America &copy; 2010&ndash;{{ today }} 
+        h6 Craft in America &copy; 2010 &ndash; {{ today }} 
         //- actually the bottom of the page
 
 </template>
@@ -156,8 +176,6 @@ export default {
         min-width: $min-width
         // ALL <ul> tags
         ul
-            list-style: none
-            /* width: 100% */
             > li
                 width: 100%
         // OUTER <ul> tags
@@ -168,10 +186,10 @@ export default {
             > li
                 color: $cia_white
                 padding: 0 0 $ms--6
-                h4
-                    margin: $ms-0 0 $ms--3
+                h4            
+                    margin: $ms-0 0 $ms--3 
                 h5 
-                    font-size: 0.85em 
+                    font-size: 0.77em 
                     /* margin: $ms-0 0 $ms--1 */
                     margin: $ms-0 0 0
                 a, a:link, a:visited
@@ -190,7 +208,7 @@ export default {
                         padding: 0 0 $ms--5
                 svg 
                     height: 1.5em
-
+                    padding: 0 $ms--5
 
     .sub-footer
         background-color: #820000
@@ -199,38 +217,45 @@ export default {
             font-size: $ms--2
             color: $cia_grey
             margin: 0
-    /* 768px */
-    @media (min-width: $medium)
+
+    /* <768px */
+    @media (min-width: 640px)
         footer.main > ul
             flex-wrap: wrap
-            /* background-color: darkgreen */
-            background-color: $cia_red
             &:nth-child(n+2)
                 align-items: flex-start
                 flex-direction: row
                 > li
                     width: 32%
                     h5 
-                        font-size: 0.95em 
-    /* 960px */
+                        font-size: 0.8em 
+    /* <768px */
+    @media (min-width: $medium)
+        footer.main > ul
+            flex-wrap: wrap
+            &:nth-child(n+2)
+                align-items: flex-start
+                flex-direction: row
+                > li
+                    width: 32%
+    /* <960px */
     @media (min-width: $large)
         footer.main > ul
             flex-wrap: wrap
-            /* background-color: purple */
-            background-color: $cia_red
             &:nth-child(n+2)
                 > li
                     /* width: 33% */
-    /* 1080px */
+    /* <1080px */
     @media (min-width: $extra-large)
         footer.main > ul
             flex-wrap: wrap
-            /* background-color: rebeccapurple */
-            background-color: $cia_red
             &:nth-child(n+2)
                 /* margin: 0 0 $ms-2 0 */
                 > li
                     /* width: 43% */
+                    h5 
+                        font-size: 0.95em 
+
     /* 1200px */
     @media (min-width: $huge)
         footer.main 
@@ -238,7 +263,4 @@ export default {
             margin: 0 auto
             > ul
                 flex-wrap: wrap
-                /* background-color: orange */
-                background-color: $cia_red
-
 </style>

vue-theme/src/components/sidebars/events.vue

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

vue-theme/src/sss/_reset.sss

@@ -28,7 +28,7 @@ body
     font-family: Helvetica, Arial, sans-serif
 
 /* Remove list-style in navigation tags */
-nav
+nav, footer
     ol, ul
         list-style: none