summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--amelia/bootstrap.css4
-rw-r--r--amelia/bootstrap.min.css4
-rwxr-xr-xamelia/bootswatch.less4
-rw-r--r--cerulean/bootstrap.css2
-rw-r--r--cerulean/bootstrap.min.css2
-rwxr-xr-xcerulean/bootswatch.less2
-rw-r--r--cyborg/bootstrap.css2
-rw-r--r--cyborg/bootstrap.min.css2
-rwxr-xr-xcyborg/bootswatch.less2
-rw-r--r--journal/bootstrap.css2
-rw-r--r--journal/bootstrap.min.css2
-rwxr-xr-xjournal/bootswatch.less24
-rw-r--r--spruce/bootstrap.css2
-rw-r--r--spruce/bootstrap.min.css2
-rwxr-xr-xspruce/bootswatch.less2
-rw-r--r--superhero/bootstrap.css4
-rw-r--r--superhero/bootstrap.min.css4
-rwxr-xr-xsuperhero/bootswatch.less4
-rw-r--r--united/bootstrap.css2
-rw-r--r--united/bootstrap.min.css2
-rwxr-xr-xunited/bootswatch.less2
21 files changed, 38 insertions, 38 deletions
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
index 1ccf034c..5b973e4a 100644
--- 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 dc96527e..238354f3 100644
--- 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 1554bf39..572603fb 100755
--- 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 117439e8..93b2e00a 100644
--- 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 c9f8d6f9..ff2f8ba6 100644
--- 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 4f795780..6ac00564 100755
--- 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 9c467933..81d9dae5 100644
--- 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 e1b59233..dc44443a 100644
--- 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 5d0aa9aa..c96101ef 100755
--- 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 0cbbf19e..45bb9dfd 100644
--- 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 4b27d70a..a459d089 100644
--- 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 77d82ae1..fa6f25de 100755
--- 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 87962201..3709382f 100644
--- 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 3c878890..7d1ac4cf 100644
--- 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 64725709..5d2753d5 100755
--- 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 124d8aa8..1667629f 100644
--- 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 8bb23e7a..cb052423 100644
--- 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 39f3ee0a..bd84c0c6 100755
--- 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 5561d9e8..7d1a0f61 100644
--- 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 0668fc58..c5f47b8b 100644
--- 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 10344a60..a2d6b7c1 100755
--- 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
// -----------------------------------------------------