Merge pull request #13 from HGNM/consolidate-css

Consolidate CSS
HGNM · Jun 11, 2016 · 05fa4d1 · 05fa4d1
2 parents 02d5534 + 6533fe1
commit 05fa4d1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/header.php b/header.php
@@ -83,7 +83,6 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 
 		<link rel="stylesheet" href="<?php echo get_stylesheet_uri(); ?>" type="text/css" media="screen" />
-		<link rel="stylesheet" href="<?php _e (get_stylesheet_directory_uri() . '/css/magnific-popup.css'); ?>" type="text/css" media="screen" />
 		<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
 		<link rel="shortcut icon" sizes="16x16 32x32 48x48 64x64" href="http://hgnm.org/favicon.ico">
 		<link rel="apple-touch-icon-precomposed" href="<?php _e (get_stylesheet_directory_uri() . '/img/favicon-152.png'); ?>">

diff --git a/css/magnific-popup.css → scss/_magnific-popup.scss b/css/magnific-popup.css → scss/_magnific-popup.scss
diff --git a/scss/style.scss b/scss/style.scss
@@ -1840,3 +1840,9 @@ iframe {
         page-break-after: avoid;
     }
 }
+
+/* ==========================================================================
+   Import plugin styles
+   ========================================================================== */
+
+@import "magnific-popup";
diff --git a/style.css b/style.css