diff options
| author | Thomas Park <thomas@thomaspark.me> | 2013-01-03 17:34:24 -0500 |
|---|---|---|
| committer | Thomas Park <thomas@thomaspark.me> | 2013-01-03 17:34:24 -0500 |
| commit | 3522778a9af3902343313a383bc00b291294c822 (patch) | |
| tree | 8e5528f16b8750fca51ca00e503cfe163439d4f3 | |
| parent | 91e961750c6239c859ae148ccd45adab9ecda556 (diff) | |
amelia, superhero: for multiple google web fonts, make single request
| -rw-r--r-- | amelia/bootstrap.css | 4 | ||||
| -rw-r--r-- | amelia/bootstrap.min.css | 3 | ||||
| -rwxr-xr-x | amelia/bootswatch.less | 3 | ||||
| -rw-r--r-- | superhero/bootstrap.css | 4 | ||||
| -rw-r--r-- | superhero/bootstrap.min.css | 3 | ||||
| -rwxr-xr-x | superhero/bootswatch.less | 3 |
6 files changed, 6 insertions, 14 deletions
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css index 7cedcb6d..754203da 100644 --- a/amelia/bootstrap.css +++ b/amelia/bootstrap.css @@ -1,6 +1,4 @@ -@import url('//fonts.googleapis.com/css?family=Lobster'); - -@import url('//fonts.googleapis.com/css?family=Cabin:400,700'); +@import url('//fonts.googleapis.com/css?family=Lobster|Cabin:400,700'); /*! * Bootstrap v2.2.2 * diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css index eddcdb79..e4bccabe 100644 --- a/amelia/bootstrap.min.css +++ b/amelia/bootstrap.min.css @@ -1,5 +1,4 @@ -@import url('//fonts.googleapis.com/css?family=Lobster'); -@import url('//fonts.googleapis.com/css?family=Cabin:400,700'); +@import url('//fonts.googleapis.com/css?family=Lobster|Cabin:400,700'); article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} audio:not([controls]){display:none;} diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less index 2cf0bec5..4e245ab9 100755 --- a/amelia/bootswatch.less +++ b/amelia/bootswatch.less @@ -6,8 +6,7 @@ // TYPOGRAPHY // ----------------------------------------------------- -@import url('//fonts.googleapis.com/css?family=Lobster'); -@import url('//fonts.googleapis.com/css?family=Cabin:400,700'); +@import url('//fonts.googleapis.com/css?family=Lobster|Cabin:400,700'); h6 { color: @textColor; diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css index 63d83c05..68bf950b 100644 --- a/superhero/bootstrap.css +++ b/superhero/bootstrap.css @@ -1,6 +1,4 @@ -@import url(//fonts.googleapis.com/css?family=Oswald); - -@import url(//fonts.googleapis.com/css?family=Noticia+Text); +@import url('//fonts.googleapis.com/css?family=Oswald|Noticia+Text'); /*! * Bootstrap v2.2.2 * diff --git a/superhero/bootstrap.min.css b/superhero/bootstrap.min.css index e7d51f9f..1f2e41b1 100644 --- a/superhero/bootstrap.min.css +++ b/superhero/bootstrap.min.css @@ -1,5 +1,4 @@ -@import url(//fonts.googleapis.com/css?family=Oswald); -@import url(//fonts.googleapis.com/css?family=Noticia+Text); +@import url('//fonts.googleapis.com/css?family=Oswald|Noticia+Text'); article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} audio:not([controls]){display:none;} diff --git a/superhero/bootswatch.less b/superhero/bootswatch.less index 897ebd1e..c6dffca1 100755 --- a/superhero/bootswatch.less +++ b/superhero/bootswatch.less @@ -6,8 +6,7 @@ // TYPOGRAPHY // -------------------------------------------------- -@import url(//fonts.googleapis.com/css?family=Oswald); -@import url(//fonts.googleapis.com/css?family=Noticia+Text); +@import url('//fonts.googleapis.com/css?family=Oswald|Noticia+Text'); h1 small, h2 small, h3 small, h4 small, h5 small, h6 small, h6 { font-family: @headingsFontFamily; |