Преглед на файлове

cleaning up typographic defaults

Eddie Machado преди 12 години
родител
ревизия
4e2b3a852a
променени са 2 файла, в които са добавени 18 реда и са изтрити 44 реда
  1. 18 33
      library/scss/breakpoints/_base.scss
  2. 0 11
      library/scss/partials/_typography.scss

+ 18 - 33
library/scss/breakpoints/_base.scss

@@ -17,7 +17,7 @@ GENERAL STYLES
 
 body {
 	font-family: $lato;
-  font-size: $baseFontSize / 16 * 100%;
+	font-size: 100%;
 	line-height: 1.5;
 	color: $text-color;
 	background-color: $gray;
@@ -107,9 +107,6 @@ H1, H2, H3, H4, H5 STYLES
 ******************************************************************/
 
 h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5 {
-  margin: $leading 0 0;
-  font-family: $lato;
-  line-height: $leading;
 	text-rendering: optimizelegibility;
 	font-weight: 500;
 	/*
@@ -124,27 +121,30 @@ h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5 {
 }
 
 h1, .h1 {
-  font-size: 3 * $scale * 1rem;
-  line-height: 3 * $leading;
-  margin-top: 2 * $leading;
+	font-size: 2.5em;
+	line-height: 1.333em;
 }
 
 h2, .h2 {
-  font-size: 2 * $scale * 1rem;
-  line-height: 2 * $leading;
-  margin-top: 2 * $leading;
+	font-size: 1.75em;
+	line-height: 1.4em;
+	margin-bottom: 0.375em;
 }
 
 h3, .h3 {
-	font-size: 1 * $scale * 1rem;
+	font-size: 1.125em;
 }
 
 h4, .h4 {
-	font-size: $scale / 2 * 1rem;
+	font-size: 1.1em;
+	font-weight: 700;
 }
 
 h5, .h5 {
-	font-size: $scale / 3 * 1rem;
+	font-size: 0.846em;
+	line-height: 2.09em;
+	text-transform: uppercase;
+	letter-spacing: 2px;
 }
 
 /*********************
@@ -311,26 +311,18 @@ POSTS & CONTENT STYLES
 
 		/* entry content */
 		.entry-content {
-			padding: $leading 0;
+			padding: 1.5em 1.5em 0;
 
 			p {
-				margin: 0 0 $leading;
+				margin: 0 0 1.5em;
 			}
 
 
 			ul, ol, table, dl {}
 
 			ul, ol {
-				margin: $leading 0;
-
-				li {
-					line-height: $leading;
-				}
 
-				ul, ol {
-			    margin-top: 0;
-    			margin-bottom: 0;
-				}
+				li {}
 
 			}
 
@@ -349,7 +341,7 @@ POSTS & CONTENT STYLES
 			table {
 				width: 100%;
 				border: 1px solid $gray;
-  			margin-top: $leading;
+				margin-bottom: 1.5em;
 
 				caption {
 					margin: 0 0 7px;
@@ -358,11 +350,6 @@ POSTS & CONTENT STYLES
 					text-transform: uppercase;
 					letter-spacing: 1px;
 				}
-
-				td, th {
-    			padding: 0;
-    			line-height: $baseLineHeight * $baseFontSize - 0px;
-  			}
 			}
 
 			tr {
@@ -374,6 +361,7 @@ POSTS & CONTENT STYLES
 			}
 
 			td {
+				padding: 7px;
 				border-right: 1px solid $gray;
 
 				&:last-child {
@@ -392,8 +380,6 @@ POSTS & CONTENT STYLES
 			}
 
 			blockquote {
-  			line-height: $leading;
-  			margin-top: $leading 0;
 				margin: 0 0 1.5em 0.75em;
 				padding: 0 0 0 0.75em;
 				border-left: 3px solid $blue;
@@ -447,7 +433,6 @@ POSTS & CONTENT STYLES
 				padding: 1.5em;
 				margin: 0 0 1.5em;
 				border-radius: 3px;
-				vertical-align: bottom;
 			}
 
 		} /* end .entry-content */

+ 0 - 11
library/scss/partials/_typography.scss

@@ -58,22 +58,11 @@ $serif:             "Georgia", Cambria, Times New Roman, Times, serif;
 */
 $lato:              'Lato', $sans-serif;
 
-// Typesetting variables
-$baseFontSize:      22; // in pixels. This would result in 22px on desktop
-$baseLineHeight:    1.5; // how large the line height is as a multiple of font size
-$leading:           $baseLineHeight * 1rem;
-
-// Rate of growth for headings
-// I actually like this to be slightly smaller then the leading. Makes for tight headings.
-$scale:             1.414;
-
 /*
 some nice typographical defaults
 more here: http://www.newnet-soft.com/blog/csstypography
 */
 p {
-  line-height: $leading;
-  margin-top: $leading 0 0;
   -ms-word-break: break-all;
   -ms-word-wrap: break-all;
       word-break: break-word;