Merge pull request #13 from INN/3780-largo-0.6.4

3780 largo 0.6.4
INN · Aug 14, 2019 · 80fd0d5 · 80fd0d5
2 parents e727aef + 8565383
commit 80fd0d5
Show file tree

Hide file tree

Showing 14 changed files with 153 additions and 82 deletions.
diff --git a/wp-content/themes/largo b/wp-content/themes/largo
diff --git a/wp-content/themes/wisconsinwatch/css/child.css b/wp-content/themes/wisconsinwatch/css/child.css
diff --git a/wp-content/themes/wisconsinwatch/css/child.css.map b/wp-content/themes/wisconsinwatch/css/child.css.map
diff --git a/wp-content/themes/wisconsinwatch/css/child.min.css b/wp-content/themes/wisconsinwatch/css/child.min.css
diff --git a/wp-content/themes/wisconsinwatch/css/editor-styles.css b/wp-content/themes/wisconsinwatch/css/editor-styles.css
diff --git a/wp-content/themes/wisconsinwatch/css/editor-styles.css.map b/wp-content/themes/wisconsinwatch/css/editor-styles.css.map
diff --git a/wp-content/themes/wisconsinwatch/css/editor-styles.min.css b/wp-content/themes/wisconsinwatch/css/editor-styles.min.css
diff --git a/wp-content/themes/wisconsinwatch/functions.php b/wp-content/themes/wisconsinwatch/functions.php
@@ -35,6 +35,16 @@ function wcij_includes() {
 }
 add_action( 'after_setup_theme', 'wcij_includes', 10 ); // must run after function Largo() which runs with priority 10
 
+
+/**
+ * Enqueue editor styles
+ */
+function wcij_editor_styles() {
+	$suffix = ( LARGO_DEBUG )? '' : '.min';
+	add_editor_style( 'css/child' . $suffix . '.css' );
+}
+add_action( 'after_setup_theme', 'wcij_editor_styles', 15 ); // running at 15 so it comes after Gutenberg's styles
+
 /**
  * Include compiled style.css
  */
@@ -85,7 +95,7 @@ function largo_child_enqueue() {
 		'largo-child',
 		get_stylesheet_directory_uri() . '/js/largo-child.js',
 		array('jquery'),
-		'20180207'
+		filemtime( get_stylesheet_directory() . '/js/largo-child.js' )
 	);
 }
 add_action( 'wp_enqueue_scripts', 'largo_child_enqueue' );

diff --git a/wp-content/themes/wisconsinwatch/gruntfile.js b/wp-content/themes/wisconsinwatch/gruntfile.js
@@ -10,6 +10,7 @@ module.exports = function(grunt) {
 
     var CSS_LESS_FILES = {
         'css/child.css': 'less/style.less',
+        'css/editor-styles.css': 'less/editor-styles.less'
     };
 
     grunt.initConfig({

diff --git a/wp-content/themes/wisconsinwatch/less/editor-styles.less b/wp-content/themes/wisconsinwatch/less/editor-styles.less
@@ -0,0 +1,2 @@
+@import 'vars.less';
+@import 'typography.less';
diff --git a/wp-content/themes/wisconsinwatch/less/legacy-css.less b/wp-content/themes/wisconsinwatch/less/legacy-css.less
@@ -1,35 +1,3 @@
-body {
-  font-family: 'freight-text-pro', Georgia, serif;
-  font-weight: 400;
-}
-h1, h2, h3, h4, h5, h6 {
-  font-family: 'minion-pro', Georgia, serif;
-  font-weight: 600;
-}
-h5.top-tag,
-h5.top-date,
-.sidebar2 h5,
-.widgettitle,
-.byline,
-.sticky-footer-container h4,
-.global-nav,
-.navbar,
-#topics-bar ul,
-#supplementary ul.menu,
-#supplementary p,
-#site-footer .widget_text h5,
-#boilerplate,
-p.wp-caption-text,
-p.wp-media-credit,
-#dark-top p,
-.widget.largo-series-posts,
-.widget.largo-series-posts p,
-.widget p,
-.widget ul,
-.single-post .sidebar2 {
-  font-family: @sans;
-  letter-spacing: 0.035em;
-}
 #dark-top {
   letter-spacing: 0.065em;
 }
@@ -95,10 +63,6 @@ body.normal.page .hero {
 .single-post .hero {
   background-color: #fff;
 }
-p.intro,
-p.wp-caption-text {
-  font-style: normal;
-}
 .entry-content p.wp-media-credit {
   font-size: 13px;
 }

diff --git a/wp-content/themes/wisconsinwatch/less/style.less b/wp-content/themes/wisconsinwatch/less/style.less
@@ -1,5 +1,6 @@
 @import 'legacy-css.less';
 @import 'vars.less';
+@import 'typography.less';
 @import 'header.less';
 @import 'forms.less';
 @import 'trust-project.less';

diff --git a/wp-content/themes/wisconsinwatch/less/typography.less b/wp-content/themes/wisconsinwatch/less/typography.less
@@ -0,0 +1,39 @@
+h5.top-tag,
+h5.top-date,
+.sidebar2 h5,
+.widgettitle,
+.byline,
+.sticky-footer-container h4,
+.global-nav,
+.navbar,
+#topics-bar ul,
+#supplementary ul.menu,
+#supplementary p,
+#site-footer .widget_text h5,
+#boilerplate,
+p.wp-caption-text,
+p.wp-media-credit,
+.wp-block-gallery figcaption,
+.wp-block-image figcaption,
+#dark-top p,
+.widget.largo-series-posts,
+.widget.largo-series-posts p,
+.widget p,
+.widget ul,
+.single-post .sidebar2 {
+  font-family: @sans;
+  letter-spacing: 0.035em;
+}
+body {
+  font-family: 'freight-text-pro', Georgia, serif;
+  font-weight: 400;
+}
+h1, h2, h3, h4, h5, h6 {
+  font-family: 'minion-pro', Georgia, serif;
+  font-weight: 600;
+}
+p.intro,
+p.wp-caption-text,
+.wp-block-image figcaption {
+  font-style: normal;
+}
diff --git a/wp-content/themes/wisconsinwatch/series-split.php b/wp-content/themes/wisconsinwatch/series-split.php
@@ -46,7 +46,7 @@
 		<h1 class="entry-title"><?php the_title(); ?></h1>
 		<?php
 		if ( $opt['show_series_byline'] )
-			echo '<h5 class="byline">' . largo_byline( false ) . '</h5>';
+			echo '<h5 class="byline">' . largo_byline( false , null, get_the_ID() ) . '</h5>';
 		if ( $opt['show_sharebar'] )
 			largo_post_social_links();
 		?>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@import 'vars.less';
		@import 'typography.less';