Merge pull request #9 from creativecommons/style-fixes

hugosolar · web-flow · commit 7f03ac800875 · 2020-05-07T10:18:44.000-04:00
Styles and markup parent theme fixes
diff --git a/assets/css/styles.css b/assets/css/styles.css
diff --git a/assets/img/logos/cc/letterheart.svg b/assets/img/logos/cc/letterheart.svg
@@ -1,6 +1,6 @@
 <svg
   xmlns="http://www.w3.org/2000/svg"
-  preserveAspectRatio="xMidyMid meet"
+  preserveAspectRatio="xMidYMid meet"
   viewBox="0 0 80 72">
   <g id="letterheart" fill="currentColor">
     <path
diff --git a/assets/img/logos/cc/lettermark.svg b/assets/img/logos/cc/lettermark.svg
@@ -1,6 +1,6 @@
 <svg
   xmlns="http://www.w3.org/2000/svg"
-  preserveAspectRatio="xMidyMid meet"
+  preserveAspectRatio="xMidYMid meet"
   viewBox="0 0 72 72">
   <g id="lettermark" fill="currentColor">
     <path
diff --git a/assets/img/logos/cc/logomark.svg b/assets/img/logos/cc/logomark.svg
@@ -1,6 +1,6 @@
 <svg
   xmlns="http://www.w3.org/2000/svg"
-  preserveAspectRatio="xMidyMid meet"
+  preserveAspectRatio="xMidYMid meet"
   viewBox="0 0 304 73">
   <g id="logomark" fill="currentColor">
     <path
diff --git a/assets/img/logos/products/certificates.svg b/assets/img/logos/products/certificates.svg
@@ -1,6 +1,6 @@
 <svg
   xmlns="http://www.w3.org/2000/svg"
-  preserveAspectRatio="xMidyMid meet"
+  preserveAspectRatio="xMidYMid meet"
   viewBox="0 0 160 174">
   <g id="certificates" fill="currentColor">
     <path
diff --git a/assets/img/logos/products/global_network.svg b/assets/img/logos/products/global_network.svg
@@ -1,6 +1,6 @@
 <svg
   xmlns="http://www.w3.org/2000/svg"
-  preserveAspectRatio="xMidyMid meet"
+  preserveAspectRatio="xMidYMid meet"
   viewBox="0 0 250 79">
   <g id="globalnetwork" fill="currentColor">
     <path
diff --git a/assets/img/logos/products/open_source.svg b/assets/img/logos/products/open_source.svg
@@ -1,6 +1,6 @@
 <svg
   xmlns="http://www.w3.org/2000/svg"
-  preserveAspectRatio="xMidyMid meet"
+  preserveAspectRatio="xMidYMid meet"
   viewBox="0 0 250 76">
   <g id="opensource" fill="currentColor">
     <path
diff --git a/assets/img/logos/products/search.svg b/assets/img/logos/products/search.svg
@@ -1,6 +1,6 @@
 <svg
   xmlns="http://www.w3.org/2000/svg"
-  preserveAspectRatio="xMidyMid meet"
+  preserveAspectRatio="xMidYMid meet"
   viewBox="0 0 250 81">
   <g id="search" fill="currentColor">
     <path
diff --git a/assets/img/logos/products/vocabulary.svg b/assets/img/logos/products/vocabulary.svg
@@ -1,6 +1,6 @@
 <svg
   xmlns="http://www.w3.org/2000/svg"
-  preserveAspectRatio="xMidyMid meet"
+  preserveAspectRatio="xMidYMid meet"
   viewBox="0 0 250 41">
   <g id="vocabulary" fill="currentColor">
     <path
diff --git a/front/package.json b/front/package.json
@@ -5,15 +5,15 @@
   "main": "index.js",
   "dependencies": {},
   "devDependencies": {
-    "@creativecommons/vocabulary": "^1.0.0-beta.11",
+    "@creativecommons/vocabulary": "^1.0.0-beta.14",
     "@glidejs/glide": "^3.4.1",
     "bulma": "^0.8.2",
     "copy-webpack-plugin": "^5.1.1",
-    "css-loader": "^3.5.2",
+    "css-loader": "^3.5.3",
     "mini-css-extract-plugin": "^0.9.0",
-    "node-sass": "^4.13.1",
+    "node-sass": "^4.14.1",
     "sass-loader": "^8.0.2",
-    "style-loader": "^1.1.4",
+    "style-loader": "^1.2.1",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   },
diff --git a/front/src/styles/base.scss b/front/src/styles/base.scss
@@ -17,14 +17,28 @@
 		margin-top: $space-larger;
 	}
 }
+.main-header {
+	.navbar {
+		.navbar-menu {
+			.menu-item {
+				&.current-menu-item {
+					color: $color-black;
+					&>a {
+						color: $color-black;
+					}
+				}
+				&.current-menu-ancestor {
+					&>a {
+						color: $color-black;
+					}
+				}
+			}
+		}
+	}
+}
 .push-up {
 	margin-top: -4rem;
 }
-.text-format {
-	p {
-		margin-bottom: $space-normal;
-	}
-}
 
 .terms-list {
 	h6 {
@@ -44,4 +58,55 @@
 			}
 		}
 	}
+}
+.text-format {
+	p {
+		margin-bottom: $space-big;
+	}
+	ul {
+		padding-left: $space-big;
+		list-style: disc;
+		li {
+			margin-bottom: $space-normal;
+		}
+	}
+	ol {
+		list-style: none;
+		counter-reset: custom-order-counter;
+		li {
+			margin-bottom: $space-normal;
+			counter-increment: custom-order-counter;
+			&:before {
+				content: counter(custom-order-counter) ".- ";
+				color: $color-dark-turquoise;
+			}
+		}
+	}
+	.wp-caption {
+		margin-bottom: 1.75rem;
+		max-width: 100%;
+		.wp-caption-text {
+			color: $color-dark-gray;
+			font-size: .8rem;
+			font-style: italic;
+			line-height: $space-big;
+			padding-top: $space-small;
+		}
+	}
+	.alignright {
+		float: right;
+		margin: .4rem 0 1.75rem 1.8rem
+	}
+	.alignleft {
+		float: left;
+		margin: .4rem 1.8rem 1.75rem 0;
+	}
+	.aligncenter {
+		clear: both;
+		display: block;
+		margin: 0 auto 1.75em;
+	}
+	h1, h2, h3, h4, h5, h6 {
+		margin-bottom: $space-normal;
+	}
 }
diff --git a/front/src/styles/modules.scss b/front/src/styles/modules.scss
@@ -123,6 +123,11 @@
 .side-navigation {
 	.list-pages {
 		.page_item {
+			&.current_page_item {
+				&>a {
+					color: $color-black;
+				}
+			}
 			a {
 				display: block;
 				padding: $space-normal;
diff --git a/inc/class-cc-site.php b/inc/class-cc-site.php
@@ -129,6 +129,8 @@ static function page_title() {
 			return 'Content not found';
 		} elseif ( is_author() ) {
 			return 'Author: ' . $get->display_name;
+		} elseif ( is_home() ) {
+			return 'Blog';
 		} else {
 			the_title();
 		}
diff --git a/inc/class-walkers.php b/inc/class-walkers.php
@@ -18,7 +18,10 @@ public function start_lvl( &$output, $depth = 0, $args = array() ) {
 		$output .= "<div class='navbar-dropdown'>";
 	}
 	public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
-		$li_classes   = 'navbar-item ' . $item->title;
+		$classes   = empty( $item->classes ) ? array() : (array) $item->classes;
+		$classes[] = 'menu-item-' . $item->ID;
+		$class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args, $depth ) );
+		$li_classes   = 'navbar-item ' . $item->post_name . ' ' . $class_names;
 		$has_children = $args->walker->has_children;
 		$li_classes  .= $has_children ? ' has-dropdown is-hoverable' : '';
 		if ( $has_children ) {
diff --git a/inc/partials/entry/page-footer.php b/inc/partials/entry/page-footer.php
@@ -1 +1,7 @@
-<?php dynamic_sidebar( 'page-footer' );
+<?php if ( is_active_sidebar( 'page-footer' ) ): ?>
+<footer class="entry-footer padding-vertical-bigger">
+	<div class="container">
+		<?php dynamic_sidebar( 'page-footer' ); ?>
+	</div>
+</footer>
+<?php endif; ?>
diff --git a/page.php b/page.php
@@ -38,12 +38,10 @@
 					<div class="text-format">
 						<?php the_content(); ?>
 					</div>
-					<footer class="entry-footer">
-						<?php get_template_part( 'inc/partials/entry/page', 'footer' ); ?>
-					</footer>
 				</section>
 			</div>
 		</div>
 	</div>
+	<?php get_template_part( 'inc/partials/entry/page', 'footer' ); ?>
 </section>
 <?php get_footer(); ?>
