Merge branch 'release/Release_for_2.1.0'

Author: DNZ\darius

sass/base/heading.scss

@@ -0,0 +1,30 @@
+/*	HEADERS
+*	Always try to use a .head class for SEO reasons
+*	Only style on h1-h6 when the client uses an editor like TinyMCE and you can't influence the classes
+*/
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+.head,
+.head1,
+.head2,
+.head3,
+.head4,
+.head5,
+.head6 {
+	font-family: $font-sec;
+    margin: 0 0 .8rem;
+    line-height: 1.3;
+    font-size: 2.4rem;
+}
+
+h1, .head1 	{ font-size: 3.0rem; margin-bottom: .2rem; }
+h2, .head2 	{ font-size: 2.6rem; margin-bottom: .3rem; }
+h3, .head3 	{ font-size: 2.4rem; margin-bottom: .2rem; }
+h4, .head4 	{ font-size: 2.2rem; margin-bottom: .2rem; }
+h5, .head5 	{ font-size: 2.0rem; margin-bottom: .4rem; }
+h6, .head6 	{ font-size: 1.6rem; margin-bottom: .6rem; }

sass/main.scss

@@ -6,6 +6,7 @@
 @import 'layout/static_content';
 
 /* 	Base
-	These base files here so they overwrite the grid  
+	These base files here so they overwrite the grid
 */
-@import 'base/defaults';
+@import 'base/defaults';
+@import 'base/heading';

sass/variables.scss

@@ -1,20 +1,20 @@
-/* 	
+/*
 	---------- VARIABLES ----------
 	Castlecss-core variables
 	Do not edit this file!
 	Create a copy and edit or add your own variables there
-	or download the full project for a ready-to-go setup here: https://github.com/CastleCSS/castlecss 
+	or download the boilerplate for a ready-to-go setup here: https://github.com/CastleCSS/castlecss-boilerplate
 	-------------------------------
 */
 
-/* 
-	Base colors 
-	Color 01 and 02 reservered for white and black 
+/*
+	Base colors
+	Color 01 and 02 reservered for white and black
 */
 $color01:  	#fff;
 $color02:  	#000;
 
-/*	
+/*
 	Theme colors
 */
 $theme01: 	#1B94BF;	// Knight blue
@@ -23,15 +23,16 @@ $theme03:	#12637F;	// Falcon blue
 $theme04:	#FFC200;	// Royal yellow
 $theme05:	#FFFFFF;	// Destroyer white
 
-/* 
+/*
 	Notification colors
 */
-$alert:		#FFD700;
-$negative:	#FF7878;
-$positive:	#29C85D;
+$alert:		#c0dbff;
+$warning:	#ffe283;
+$negative:	#feb3b3;
+$positive:	#c3e5cd;
 $disabled:	#CDCDC1;
 
-/* 
+/*
 	Breakpoints
 	You can edit or add breakpoints
 */
@@ -42,7 +43,7 @@ $b4: 1024px;
 $b5: 1280px;
 $b6: 1600px;
 
-/*	
+/*
 	Mapping for breakpoint loops
 	Must be the same amount as breakpoints above
 */
@@ -56,9 +57,9 @@ $breakpoint-map: (
 );
 $amount-breakpoints: length($breakpoint-map);
 
-/* 	
+/*
 	Container sizes
-	Must be the same amount of breakpoints and $breakpoint-map as above 
+	Must be the same amount of breakpoints and $breakpoint-map as above
 */
 $container: 100%;
 $container-b1: 100%;
@@ -68,27 +69,27 @@ $container-b4: 996px;
 $container-b5: 1224px;
 $container-b6: 1400px;
 
-/* 	
+/*
 	Container map
-	Must be the same amount of breakpoints and $breakpoint-map as above 
+	Must be the same amount of breakpoints and $breakpoint-map as above
 */
 $container-map: (
 	1: $container-b1,
 	2: $container-b2,
 	3: $container-b3,
 	4: $container-b4,
 	5: $container-b5,
-	6: $container-b6,	
+	6: $container-b6,
 );
 
-/*	
-	Flexbox grid, set to true or false for flexbox 
+/*
+	Flexbox grid, set to true or false for flexbox
 */
 $flexbox-grid:	 true;
 
-/* 	
+/*
 	Grid gutters
-	Must be the same amount of breakpoints $breakpoint-map as above 
+	Must be the same amount of breakpoints $breakpoint-map as above
 */
 $grid-gutter:	 12px;
 $grid-gutter-b1: 12px;
@@ -98,22 +99,22 @@ $grid-gutter-b4: 12px;
 $grid-gutter-b5: 12px;
 $grid-gutter-b6: 12px;
 
-/*	
+/*
 	Default margin and padding
 */
 
 $padding-default: 	12px;
 $margin-default: 	12px;
 
-/*	
+/*
 	Standard border-radius
 */
 $radius:	5px;
 
-/*	
+/*
 	Fonts
 */
 $font-pri: Arial, Helvetica, sans-serif;
 $font-sec: Arial, Helvetica, sans-serif;
 $font-size-default: 1.6rem;
-$line-height-default: 1.5;
+$line-height-default: 1.5;