web font import now over ssl

performance should be ok with google property.
kublaj · Mar 16, 2012 · ccd7f0c · ccd7f0c
1 parent a29761e
commit ccd7f0c
Show file tree

Hide file tree

Showing 21 changed files with 38 additions and 38 deletions.
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
@@ -1,6 +1,6 @@
-@import url('http://fonts.googleapis.com/css?family=Lobster');
+@import url('https://fonts.googleapis.com/css?family=Lobster');
 
-@import url('http://fonts.googleapis.com/css?family=Cabin:400,700');
+@import url('https://fonts.googleapis.com/css?family=Cabin:400,700');
 /*!
  * Bootstrap v2.0.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,8 @@
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-@import url('http://fonts.googleapis.com/css?family=Lobster');
-@import url('http://fonts.googleapis.com/css?family=Cabin:400,700');
+@import url('https://fonts.googleapis.com/css?family=Lobster');
+@import url('https://fonts.googleapis.com/css?family=Cabin:400,700');
 
 .navbar .brand, legend {
 	font-family: @headingsFontFamily;

diff --git a/cerulean/bootstrap.css b/cerulean/bootstrap.css
@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Telex);
+@import url(https://fonts.googleapis.com/css?family=Telex);
 /*!
  * Bootstrap v2.0.2
  *

diff --git a/cerulean/bootstrap.min.css b/cerulean/bootstrap.min.css
diff --git a/cerulean/bootswatch.less b/cerulean/bootswatch.less
@@ -6,7 +6,7 @@
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-@import url(http://fonts.googleapis.com/css?family=Telex);
+@import url(https://fonts.googleapis.com/css?family=Telex);
 
 .navbar, .subnav {
 	font-family: @headingsFontFamily;

diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css
@@ -1,4 +1,4 @@
-@import url('http://fonts.googleapis.com/css?family=Droid+Sans:400,700');
+@import url('https://fonts.googleapis.com/css?family=Droid+Sans:400,700');
 /*!
  * Bootstrap v2.0.2
  *

diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css
diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less
@@ -6,7 +6,7 @@
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-@import url('http://fonts.googleapis.com/css?family=Droid+Sans:400,700');
+@import url('https://fonts.googleapis.com/css?family=Droid+Sans:400,700');
 
 .navbar {
 	font-size: 16px;

diff --git a/journal/bootstrap.css b/journal/bootstrap.css
@@ -1,4 +1,4 @@
-@import url('http://fonts.googleapis.com/css?family=Open+Sans:400,700');
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
 /*!
  * Bootstrap v2.0.2
  *

diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css
diff --git a/journal/bootswatch.less b/journal/bootswatch.less
@@ -3,21 +3,10 @@
 // Version: 2.0.2
 // -----------------------------------------------------
 
-// SCAFFOLDING
-// -----------------------------------------------------
-
-a {
-	text-decoration: underline;
-}
-
-.nav a, .navbar .brand, .subnav a, a.btn {
-	text-decoration: none;
-}
-
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-@import url('http://fonts.googleapis.com/css?family=Open+Sans:400,700');
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
 
 h1, h2, h3, h4, h5, h6, .brand, .navbar, .subnav a, blockquote > p {
 	font-family: 'Open Sans', sans-serif;
@@ -28,6 +17,17 @@ h1, h2, h3, h4, h5, h6, .brand {
 	font-weight: 700;
 }
 
+// SCAFFOLDING
+// -----------------------------------------------------
+
+a {
+	text-decoration: underline;
+}
+
+.nav a, .navbar .brand, .subnav a, a.btn {
+	text-decoration: none;
+}
+
 // NAVBAR
 // -----------------------------------------------------
 

diff --git a/spruce/bootstrap.css b/spruce/bootstrap.css
@@ -1,4 +1,4 @@
-@import url('http://fonts.googleapis.com/css?family=Josefin+Slab:400,700');
+@import url('https://fonts.googleapis.com/css?family=Josefin+Slab:400,700');
 /*!
  * Bootstrap v2.0.2
  *

diff --git a/spruce/bootstrap.min.css b/spruce/bootstrap.min.css
diff --git a/spruce/bootswatch.less b/spruce/bootswatch.less
@@ -6,7 +6,7 @@
 // TYPOGRAPHY
 // --------------------------------------------------
 
-@import url('http://fonts.googleapis.com/css?family=Josefin+Slab:400,700');
+@import url('https://fonts.googleapis.com/css?family=Josefin+Slab:400,700');
 
 .navbar .brand, legend, .btn,
 .navbar .nav > li > a,

diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css
@@ -1,6 +1,6 @@
-@import url(http://fonts.googleapis.com/css?family=Oswald);
+@import url(https://fonts.googleapis.com/css?family=Oswald);
 
-@import url(http://fonts.googleapis.com/css?family=Noticia+Text);
+@import url(https://fonts.googleapis.com/css?family=Noticia+Text);
 /*!
  * Bootstrap v2.0.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,8 @@
 // TYPOGRAPHY
 // --------------------------------------------------
 
-@import url(http://fonts.googleapis.com/css?family=Oswald);
-@import url(http://fonts.googleapis.com/css?family=Noticia+Text);
+@import url(https://fonts.googleapis.com/css?family=Oswald);
+@import url(https://fonts.googleapis.com/css?family=Noticia+Text);
 
 h1, h2, h3, h4, h5, h6, legend, .navbar .brand,
 .navbar .nav > li > a,

diff --git a/united/bootstrap.css b/united/bootstrap.css
@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Ubuntu);
+@import url(https://fonts.googleapis.com/css?family=Ubuntu);
 /*!
  * Bootstrap v2.0.2
  *

diff --git a/united/bootstrap.min.css b/united/bootstrap.min.css
diff --git a/united/bootswatch.less b/united/bootswatch.less
@@ -6,7 +6,7 @@
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-@import url(http://fonts.googleapis.com/css?family=Ubuntu);
+@import url(https://fonts.googleapis.com/css?family=Ubuntu);
 
 // NAVBAR
 // -----------------------------------------------------