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 /journal | |
parent | dd06cdf0bd11b6c90d5a18520b9053f3922af91f (diff) | |
parent | 02133bf7b428f0d1544fe09c8b41476b318cc8f3 (diff) |
Merge pull request #60 from buzztabapp/gh-pages
Protocol-relative URLs for Google Font @imports
Diffstat (limited to 'journal')
-rw-r--r-- | journal/bootstrap.css | 2 | ||||
-rw-r--r-- | journal/bootstrap.min.css | 2 | ||||
-rwxr-xr-x | journal/bootswatch.less | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/journal/bootstrap.css b/journal/bootstrap.css index d0ddca6d..ba5b2af2 100644 --- a/journal/bootstrap.css +++ b/journal/bootstrap.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=News+Cycle:400,700'); +@import url('//fonts.googleapis.com/css?family=News+Cycle:400,700'); /*! * Bootstrap v2.2.2 * diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css index b76d485e..3f5c3cdd 100644 --- a/journal/bootstrap.min.css +++ b/journal/bootstrap.min.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=News+Cycle:400,700'); +@import url('//fonts.googleapis.com/css?family=News+Cycle: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 39ca9a20..0f6a01b1 100755 --- a/journal/bootswatch.less +++ b/journal/bootswatch.less @@ -6,7 +6,7 @@ // TYPOGRAPHY // ----------------------------------------------------- -@import url('https://fonts.googleapis.com/css?family=News+Cycle:400,700'); +@import url('//fonts.googleapis.com/css?family=News+Cycle:400,700'); h1, h2, h3, h4, h5, h6 { @@ -327,4 +327,4 @@ legend { .nav > li.dropdown.open.active > a:hover { border-color: #e5e5e5; } -}
\ No newline at end of file +} |