web font import now over ssl

performance should be ok with google property.

diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
index 1ccf034..5b973e4 100644 (file)
--- 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
index dc96527..238354f 100644 (file)
--- a/amelia/bootstrap.min.css
+++ b/amelia/bootstrap.min.css
@@ -1,5 +1,5 @@
-@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');
 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 1554bf3..572603f 100755 (executable)
--- 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
index 117439e..93b2e00 100644 (file)
--- 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
index c9f8d6f..ff2f8ba 100644 (file)
--- a/cerulean/bootstrap.min.css
+++ b/cerulean/bootstrap.min.css
@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Telex);
+@import url(https://fonts.googleapis.com/css?family=Telex);
 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/cerulean/bootswatch.less b/cerulean/bootswatch.less
index 4f79578..6ac0056 100755 (executable)
--- 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
index 9c46793..81d9dae 100644 (file)
--- 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
index e1b5923..dc44443 100644 (file)
--- a/cyborg/bootstrap.min.css
+++ b/cyborg/bootstrap.min.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');
 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/cyborg/bootswatch.less b/cyborg/bootswatch.less
index 5d0aa9a..c96101e 100755 (executable)
--- 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
index 0cbbf19..45bb9df 100644 (file)
--- 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
index 4b27d70..a459d08 100644 (file)
--- a/journal/bootstrap.min.css
+++ b/journal/bootstrap.min.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');
 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/journal/bootswatch.less b/journal/bootswatch.less
index 77d82ae..fa6f25d 100755 (executable)
--- 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
index 8796220..3709382 100644 (file)
--- 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
index 3c87889..7d1ac4c 100644 (file)
--- a/spruce/bootstrap.min.css
+++ b/spruce/bootstrap.min.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');
 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/spruce/bootswatch.less b/spruce/bootswatch.less
index 6472570..5d2753d 100755 (executable)
--- 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
index 124d8aa..1667629 100644 (file)
--- 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
index 8bb23e7..cb05242 100644 (file)
--- a/superhero/bootstrap.min.css
+++ b/superhero/bootstrap.min.css
@@ -1,5 +1,5 @@
-@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);
 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 39f3ee0..bd84c0c 100755 (executable)
--- 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
index 5561d9e..7d1a0f6 100644 (file)
--- 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
index 0668fc5..c5f47b8 100644 (file)
--- a/united/bootstrap.min.css
+++ b/united/bootstrap.min.css
@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Ubuntu);
+@import url(https://fonts.googleapis.com/css?family=Ubuntu);
 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/united/bootswatch.less b/united/bootswatch.less
index 10344a6..a2d6b7c 100755 (executable)
--- 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
 // -----------------------------------------------------