Просмотр исходного кода

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

Hakim El Hattab 13 лет назад
Родитель
Сommit
17f3cf4332
5 измененных файлов с 101 добавлено и 41 удалено
  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 {
 @font-face {
@@ -21,16 +21,32 @@
 	font-style: normal;
 	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
  * GLOBAL STYLES
  *********************************************/
  *********************************************/
 
 
 body {
 body {
-	font-family: 'Lato', Times, 'Times New Roman', serif;
-	font-size: 36px;
-	font-weight: 200;
-	letter-spacing: -0.02em;
 	color: #333;
 	color: #333;
 
 
 	background: #f7f3de;
 	background: #f7f3de;
@@ -68,11 +84,6 @@ body {
 .reveal h6 {
 .reveal h6 {
 	margin: 0 0 20px 0;
 	margin: 0 0 20px 0;
 	color: #333;
 	color: #333;
-	font-family: 'League Gothic', Impact, sans-serif;
-	line-height: 0.9em;
-	letter-spacing: 0.02em;
-	
-	text-transform: uppercase;
 }
 }
 
 
 .reveal h1 {
 .reveal h1 {

Разница между файлами не показана из-за своего большого размера
+ 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
  * GLOBAL STYLES
  *********************************************/
  *********************************************/
 
 
 body {
 body {
-	font-family: 'Palatino Linotype', 'Book Antiqua', Palatino, FreeSerif, serif;
-	font-size: 36px;
-	font-weight: 200;
-	letter-spacing: -0.02em;
 	color: black !important;
 	color: black !important;
 
 
 	background: #F0F1EB;
 	background: #F0F1EB;
@@ -51,8 +64,6 @@ body {
 .reveal h6 {
 .reveal h6 {
 	margin: 0 0 40px 0;
 	margin: 0 0 40px 0;
 	color: #383D3D;
 	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);
 @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
  * GLOBAL STYLES
  *********************************************/
  *********************************************/
 
 
 body {
 body {
-	font-family: 'Lato', Times, 'Times New Roman', serif;
-	font-size: 36px;
-	font-weight: 200;
-	letter-spacing: -0.02em;
 	color: black !important;
 	color: black !important;
 
 
 	background: white;
 	background: white;
@@ -53,10 +70,6 @@ body {
 .reveal h6 {
 .reveal h6 {
 	margin: 0 0 20px 0;
 	margin: 0 0 20px 0;
 	color: black;
 	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=Quicksand:400,700,400italic,700italic);
 @import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700);
 @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 {
 body {
-	font-family: 'Open Sans', sans-serif;
-	font-size: 36px;
-	font-weight: 200;
-	letter-spacing: -0.02em;
 	color: #333;
 	color: #333;
 
 
 	background: #f7fbfc;
 	background: #f7fbfc;
@@ -60,11 +74,6 @@ body {
 .reveal h6 {
 .reveal h6 {
 	margin: 0 0 20px 0;
 	margin: 0 0 20px 0;
 	color: #333;
 	color: #333;
-	font-family: 'Quicksand', sans-serif;
-	line-height: 0.9em;
-	letter-spacing: -0.08em;
-	
-	text-transform: uppercase;
 }
 }
 
 
 
 

Некоторые файлы не были показаны из-за большого количества измененных файлов

PANIC: session(release): write data/sessions/8/3/831fc31e92698f29: no space left on device

PANIC

session(release): write data/sessions/8/3/831fc31e92698f29: no space left on device
/my/cache/.heroku/go/go-path/pkg/mod/github.com/go-macaron/session@v1.0.3/session.go:204 (0xb13e07)
/my/cache/.heroku/go/go-path/pkg/mod/gopkg.in/macaron.v1@v1.5.1/context.go:80 (0x967b75)
/my/cache/.heroku/go/go-path/pkg/mod/github.com/go-macaron/inject@v0.0.0-20200308113650-138e5925c53b/inject.go:157 (0x9512ee)
/my/cache/.heroku/go/go-path/pkg/mod/github.com/go-macaron/inject@v0.0.0-20200308113650-138e5925c53b/inject.go:135 (0x951205)
/my/cache/.heroku/go/go-path/pkg/mod/gopkg.in/macaron.v1@v1.5.1/context.go:124 (0x967cc4)
/my/cache/.heroku/go/go-path/pkg/mod/gopkg.in/macaron.v1@v1.5.1/context.go:114 (0x967bf6)
/my/cache/.heroku/go/go-path/pkg/mod/gopkg.in/macaron.v1@v1.5.1/recovery.go:161 (0x15baec4)
/my/cache/.heroku/go/go-path/pkg/mod/gopkg.in/macaron.v1@v1.5.1/logger.go:40 (0x96b257)
/my/cache/.heroku/go/go-path/pkg/mod/github.com/go-macaron/inject@v0.0.0-20200308113650-138e5925c53b/inject.go:157 (0x9512ee)
/my/cache/.heroku/go/go-path/pkg/mod/github.com/go-macaron/inject@v0.0.0-20200308113650-138e5925c53b/inject.go:135 (0x951205)
/my/cache/.heroku/go/go-path/pkg/mod/gopkg.in/macaron.v1@v1.5.1/context.go:124 (0x967cc4)
/my/cache/.heroku/go/go-path/pkg/mod/gopkg.in/macaron.v1@v1.5.1/router.go:187 (0x972959)
/my/cache/.heroku/go/go-path/pkg/mod/gopkg.in/macaron.v1@v1.5.1/router.go:304 (0x973a01)
/my/cache/.heroku/go/go-path/pkg/mod/gopkg.in/macaron.v1@v1.5.1/macaron.go:218 (0x96c572)
/my/cache/.heroku/go/go1.26.3/go/src/net/http/server.go:3311 (0x85a5cd)
/my/cache/.heroku/go/go1.26.3/go/src/net/http/server.go:2073 (0x837f6f)
/my/cache/.heroku/go/go1.26.3/go/src/runtime/asm_amd64.s:1771 (0x493380)