X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=assets%2Fmain%2Fsass%2Fmain.scss;h=9c23c73e0867d0dc10f86be2258b7b7f0471150f;hb=55b8c3714d4e9687629821abd2c80e34737ab4ce;hp=034f3c1df3328f41cdf1236db6b25a810e8357eb;hpb=8af2079e4b096e77ba2f922d6a18224ce01cb7bd;p=editorial.git

diff --git a/assets/main/sass/main.scss b/assets/main/sass/main.scss
index 034f3c1..9c23c73 100644
--- a/assets/main/sass/main.scss
+++ b/assets/main/sass/main.scss
@@ -4,12 +4,11 @@
 @import 'libs/vendor';
 @import 'libs/breakpoints';
 @import 'libs/html-grid';
-@import 'libs/fixed-grid';
 @import 'font-awesome.min.css';
-@import url('https://fonts.googleapis.com/css?family=Merriweather:300,700,300italic,700italic|Source+Sans+Pro:900');
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,600,400italic,600italic|Roboto+Slab:400,700');
 
 /*
-	Massively by HTML5 UP
+	Editorial by HTML5 UP
 	html5up.net | @ajlkn
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 */
@@ -17,28 +16,16 @@
 // Breakpoints.
 
 	@include breakpoints((
-		default:   (1681px,   null     ),
-		xlarge:    (1281px,   1680px   ),
-		large:     (981px,    1280px   ),
-		medium:    (737px,    980px    ),
-		small:     (481px,    736px    ),
-		xsmall:    (361px,    480px    ),
-		xxsmall:   (null,     360px    )
+		xlarge:   ( 1281px,  1680px ),
+		large:    ( 981px,   1280px ),
+		medium:   ( 737px,   980px  ),
+		small:    ( 481px,   736px  ),
+		xsmall:   ( 361px,   480px  ),
+		xxsmall:  ( null,    360px  ),
+		xlarge-to-max:    '(min-width: 1681px)',
+		small-to-xlarge:  '(min-width: 481px) and (max-width: 1680px)'
 	));
 
-// Mixins.
-
-	@mixin color($p) {
-		@include color-typography($p);
-		@include color-box($p);
-		@include color-button($p);
-		@include color-form($p);
-		@include color-list($p);
-		@include color-section($p);
-		@include color-table($p);
-		@include color-pagination($p);
-	}
-
 // Base.
 
 	@import 'base/reset';
@@ -48,25 +35,29 @@
 // Component.
 
 	@import 'components/row';
-	@import 'components/box';
-	@import 'components/button';
+	@import 'components/section';
 	@import 'components/form';
+	@import 'components/box';
 	@import 'components/icon';
 	@import 'components/image';
+	@import 'components/list';
 	@import 'components/actions';
 	@import 'components/icons';
-	@import 'components/list';
-	@import 'components/section';
-	@import 'components/table';
+	@import 'components/contact';
 	@import 'components/pagination';
+	@import 'components/table';
+	@import 'components/button';
+	@import 'components/mini-posts';
+	@import 'components/features';
+	@import 'components/posts';
 
 // Layout.
 
 	@import 'layout/wrapper';
-	@import 'layout/intro';
-	@import 'layout/header';
-	@import 'layout/nav';
 	@import 'layout/main';
+	@import 'layout/sidebar';
+	@import 'layout/header';
+	@import 'layout/banner';
 	@import 'layout/footer';
-	@import 'layout/navPanel';
+    @import 'layout/menu';
     @import 'layout/ghost';