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 /amelia | |
| parent | dd06cdf0bd11b6c90d5a18520b9053f3922af91f (diff) | |
| parent | 02133bf7b428f0d1544fe09c8b41476b318cc8f3 (diff) | |
Merge pull request #60 from buzztabapp/gh-pages
Protocol-relative URLs for Google Font @imports
Diffstat (limited to 'amelia')
| -rw-r--r-- | amelia/bootstrap.css | 4 | ||||
| -rw-r--r-- | amelia/bootstrap.min.css | 4 | ||||
| -rwxr-xr-x | amelia/bootswatch.less | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css index 9231e8be..7cedcb6d 100644 --- a/amelia/bootstrap.css +++ b/amelia/bootstrap.css @@ -1,6 +1,6 @@ -@import url('https://fonts.googleapis.com/css?family=Lobster'); +@import url('//fonts.googleapis.com/css?family=Lobster'); -@import url('https://fonts.googleapis.com/css?family=Cabin:400,700'); +@import url('//fonts.googleapis.com/css?family=Cabin:400,700'); /*! * Bootstrap v2.2.2 * diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css index 47b90f41..eddcdb79 100644 --- a/amelia/bootstrap.min.css +++ b/amelia/bootstrap.min.css @@ -1,5 +1,5 @@ -@import url('https://fonts.googleapis.com/css?family=Lobster'); -@import url('https://fonts.googleapis.com/css?family=Cabin:400,700'); +@import url('//fonts.googleapis.com/css?family=Lobster'); +@import url('//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 a844d2d4..2cf0bec5 100755 --- a/amelia/bootswatch.less +++ b/amelia/bootswatch.less @@ -6,8 +6,8 @@ // TYPOGRAPHY // ----------------------------------------------------- -@import url('https://fonts.googleapis.com/css?family=Lobster'); -@import url('https://fonts.googleapis.com/css?family=Cabin:400,700'); +@import url('//fonts.googleapis.com/css?family=Lobster'); +@import url('//fonts.googleapis.com/css?family=Cabin:400,700'); h6 { color: @textColor; |