Explorar el Código

adjust themes so that font definitions are at top, apply fonts on .reveal instead of body

Hakim El Hattab hace 11 años
padre
commit
17f3cf4332
Se han modificado 5 ficheros con 101 adiciones y 41 borrados
  1. 21 10
      css/theme/beige.css
  2. 21 5
      css/theme/default.css
  3. 18 7
      css/theme/serif.css
  4. 22 9
      css/theme/simple.css
  5. 19 10
      css/theme/sky.css

+ 21 - 10
css/theme/beige.css

@@ -6,7 +6,7 @@
  */
 
 /*********************************************
- * FONT-FACE DEFINITIONS
+ * FONTS
  *********************************************/
 
 @font-face {
@@ -21,16 +21,32 @@
 	font-style: normal;
 }
 
+.reveal {
+	font-family: 'Lato', Times, 'Times New Roman', serif;
+	font-size: 36px;
+	font-weight: 200;
+	letter-spacing: -0.02em;
+}
+
+.reveal h1, 
+.reveal h2, 
+.reveal h3, 
+.reveal h4, 
+.reveal h5, 
+.reveal h6 {
+	font-family: 'League Gothic', Impact, sans-serif;
+	line-height: 0.9em;
+	letter-spacing: 0.02em;
+	
+	text-transform: uppercase;
+}
+
 
 /*********************************************
  * GLOBAL STYLES
  *********************************************/
 
 body {
-	font-family: 'Lato', Times, 'Times New Roman', serif;
-	font-size: 36px;
-	font-weight: 200;
-	letter-spacing: -0.02em;
 	color: #333;
 
 	background: #f7f3de;
@@ -68,11 +84,6 @@ body {
 .reveal h6 {
 	margin: 0 0 20px 0;
 	color: #333;
-	font-family: 'League Gothic', Impact, sans-serif;
-	line-height: 0.9em;
-	letter-spacing: 0.02em;
-	
-	text-transform: uppercase;
 }
 
 .reveal h1 {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 21 - 5
css/theme/default.css


+ 18 - 7
css/theme/serif.css

@@ -8,19 +8,32 @@
  */
 
 /*********************************************
- * FONT-FACE DEFINITIONS
+ * FONTS
  *********************************************/
 
+.reveal {
+	font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;
+	font-size: 36px;
+	font-weight: 200;
+	letter-spacing: -0.02em;
+}
+
+.reveal h1, 
+.reveal h2, 
+.reveal h3, 
+.reveal h4, 
+.reveal h5, 
+.reveal h6 {
+	font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;
+	line-height: 0.9em;	
+}
+
 
 /*********************************************
  * GLOBAL STYLES
  *********************************************/
 
 body {
-	font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;
-	font-size: 36px;
-	font-weight: 200;
-	letter-spacing: -0.02em;
 	color: black !important;
 
 	background: #F0F1EB;
@@ -51,8 +64,6 @@ body {
 .reveal h6 {
 	margin: 0 0 40px 0;
 	color: #383D3D;
-	font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;
-	line-height: 0.9em;	
 }
 
 /*********************************************

+ 22 - 9
css/theme/simple.css

@@ -8,21 +8,38 @@
  */
 
 /*********************************************
- * FONT-FACE DEFINITIONS
+ * FONTS
  *********************************************/
 
 @import url(http://fonts.googleapis.com/css?family=News+Cycle:400,700);
 
+.reveal {
+	font-family: 'Lato', Times, 'Times New Roman', serif;
+	font-size: 36px;
+	font-weight: 200;
+	letter-spacing: -0.02em;
+}
+
+.reveal h1, 
+.reveal h2, 
+.reveal h3, 
+.reveal h4, 
+.reveal h5, 
+.reveal h6 {
+	margin: 0 0 20px 0;
+	color: black;
+	font-family: 'News Cycle', Impact, sans-serif;
+	line-height: 0.9em;
+	
+	text-transform: uppercase;
+}
+
 
 /*********************************************
  * GLOBAL STYLES
  *********************************************/
 
 body {
-	font-family: 'Lato', Times, 'Times New Roman', serif;
-	font-size: 36px;
-	font-weight: 200;
-	letter-spacing: -0.02em;
 	color: black !important;
 
 	background: white;
@@ -53,10 +70,6 @@ body {
 .reveal h6 {
 	margin: 0 0 20px 0;
 	color: black;
-	font-family: 'News Cycle', Impact, sans-serif;
-	line-height: 0.9em;
-	
-	text-transform: uppercase;
 }
 
 

+ 19 - 10
css/theme/sky.css

@@ -5,12 +5,30 @@
  */
 
 /*********************************************
- * FONT-FACE DEFINITIONS
+ * FONTS
  *********************************************/
 
 @import url(http://fonts.googleapis.com/css?family=Quicksand:400,700,400italic,700italic);
 @import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700);
 
+.reveal {
+	font-family: 'Open Sans', sans-serif;
+	font-size: 36px;
+	font-weight: 200;
+	letter-spacing: -0.02em;
+}
+
+.reveal h1, 
+.reveal h2, 
+.reveal h3, 
+.reveal h4, 
+.reveal h5, 
+.reveal h6 {
+	font-family: 'Quicksand', sans-serif;
+	line-height: 0.9em;
+	letter-spacing: -0.08em;
+	text-transform: uppercase;
+}
 
 
 /*********************************************
@@ -18,10 +36,6 @@
  *********************************************/
 
 body {
-	font-family: 'Open Sans', sans-serif;
-	font-size: 36px;
-	font-weight: 200;
-	letter-spacing: -0.02em;
 	color: #333;
 
 	background: #f7fbfc;
@@ -60,11 +74,6 @@ body {
 .reveal h6 {
 	margin: 0 0 20px 0;
 	color: #333;
-	font-family: 'Quicksand', sans-serif;
-	line-height: 0.9em;
-	letter-spacing: -0.08em;
-	
-	text-transform: uppercase;
 }
 
 

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio