diff options
author | Thomas Park <thomas@thomaspark.me> | 2013-01-03 14:14:48 -0800 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2013-01-03 14:14:48 -0800 |
commit | 2c18d0d1d7b3b82270f45d2a6faaf56efbf9f284 (patch) | |
tree | cf28bc562dda24813aecf543ea88d857b1081bfe /cyborg | |
parent | dd06cdf0bd11b6c90d5a18520b9053f3922af91f (diff) | |
parent | 02133bf7b428f0d1544fe09c8b41476b318cc8f3 (diff) |
Merge pull request #60 from buzztabapp/gh-pages
Protocol-relative URLs for Google Font @imports
Diffstat (limited to 'cyborg')
-rw-r--r-- | cyborg/bootstrap.css | 2 | ||||
-rw-r--r-- | cyborg/bootstrap.min.css | 2 | ||||
-rwxr-xr-x | cyborg/bootswatch.less | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css index 014bacf9..6459cb4c 100644 --- a/cyborg/bootstrap.css +++ b/cyborg/bootstrap.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=Droid+Sans:400,700'); +@import url('//fonts.googleapis.com/css?family=Droid+Sans:400,700'); /*! * Bootstrap v2.2.2 * diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css index 5fe3b995..8f0b8acf 100644 --- a/cyborg/bootstrap.min.css +++ b/cyborg/bootstrap.min.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=Droid+Sans:400,700'); +@import url('//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 faa8a15f..b488c30e 100755 --- a/cyborg/bootswatch.less +++ b/cyborg/bootswatch.less @@ -6,7 +6,7 @@ // TYPOGRAPHY // ----------------------------------------------------- -@import url('https://fonts.googleapis.com/css?family=Droid+Sans:400,700'); +@import url('//fonts.googleapis.com/css?family=Droid+Sans:400,700'); label, input, button, select, textarea, .navbar .search-query:-moz-placeholder, |