summaryrefslogtreecommitdiff
path: root/cerulean
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2013-01-03 14:14:48 -0800
committerThomas Park <thomas@thomaspark.me>2013-01-03 14:14:48 -0800
commit2c18d0d1d7b3b82270f45d2a6faaf56efbf9f284 (patch)
treecf28bc562dda24813aecf543ea88d857b1081bfe /cerulean
parentdd06cdf0bd11b6c90d5a18520b9053f3922af91f (diff)
parent02133bf7b428f0d1544fe09c8b41476b318cc8f3 (diff)
Merge pull request #60 from buzztabapp/gh-pages
Protocol-relative URLs for Google Font @imports
Diffstat (limited to 'cerulean')
-rw-r--r--cerulean/bootstrap.css2
-rw-r--r--cerulean/bootstrap.min.css2
-rwxr-xr-xcerulean/bootswatch.less2
3 files changed, 3 insertions, 3 deletions
diff --git a/cerulean/bootstrap.css b/cerulean/bootstrap.css
index 8d620e7f..285c05a8 100644
--- a/cerulean/bootstrap.css
+++ b/cerulean/bootstrap.css
@@ -1,4 +1,4 @@
-@import url(https://fonts.googleapis.com/css?family=Telex);
+@import url(//fonts.googleapis.com/css?family=Telex);
/*!
* Bootstrap v2.2.2
*
diff --git a/cerulean/bootstrap.min.css b/cerulean/bootstrap.min.css
index e67de38b..5dc0c959 100644
--- a/cerulean/bootstrap.min.css
+++ b/cerulean/bootstrap.min.css
@@ -1,4 +1,4 @@
-@import url(https://fonts.googleapis.com/css?family=Telex);
+@import url(//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 3ffe93e7..3c353e98 100755
--- a/cerulean/bootswatch.less
+++ b/cerulean/bootswatch.less
@@ -6,7 +6,7 @@
// TYPOGRAPHY
// -----------------------------------------------------
-@import url(https://fonts.googleapis.com/css?family=Telex);
+@import url(//fonts.googleapis.com/css?family=Telex);
// SCAFFOLDING
// -----------------------------------------------------