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

yenhoang · Jan 3, 2013 · 3522778 · 3522778
1 parent 91e9617
commit 3522778
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 14 deletions.
diff --git 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
diff --git 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
@@ -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
diff --git 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;