amelia, superhero: for multiple google web fonts, make single request

diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
index 7cedcb6..754203d 100644 (file)
--- 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 eddcdb7..e4bccab 100644 (file)
--- 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 2cf0bec..4e245ab 100755 (executable)
--- 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 63d83c0..68bf950 100644 (file)
--- 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 e7d51f9..1f2e41b 100644 (file)
--- 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 897ebd1..c6dffca 100755 (executable)
--- 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;