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 | |
parent | dd06cdf0bd11b6c90d5a18520b9053f3922af91f (diff) | |
parent | 02133bf7b428f0d1544fe09c8b41476b318cc8f3 (diff) |
Merge pull request #60 from buzztabapp/gh-pages
Protocol-relative URLs for Google Font @imports
33 files changed, 41 insertions, 41 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; 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 // ----------------------------------------------------- diff --git a/cosmo/bootstrap.css b/cosmo/bootstrap.css index 53862f02..4824589b 100644 --- a/cosmo/bootstrap.css +++ b/cosmo/bootstrap.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); +@import url('//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); /*! * Bootstrap v2.2.2 * diff --git a/cosmo/bootstrap.min.css b/cosmo/bootstrap.min.css index 34d8b87d..189bb086 100644 --- a/cosmo/bootstrap.min.css +++ b/cosmo/bootstrap.min.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); +@import url('//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,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/cosmo/bootswatch.less b/cosmo/bootswatch.less index f5add631..7b5d9735 100644 --- a/cosmo/bootswatch.less +++ b/cosmo/bootswatch.less @@ -6,7 +6,7 @@ // TYPOGRAPHY // ----------------------------------------------------- -@import url('https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); +@import url('//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); body { font-weight: 300; 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, 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 +} diff --git a/readable/bootstrap.css b/readable/bootstrap.css index 1fab5619..bf0888a7 100644 --- a/readable/bootstrap.css +++ b/readable/bootstrap.css @@ -1,4 +1,4 @@ -@import url('http://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic'); +@import url('//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic'); /*! * Bootstrap v2.2.2 * diff --git a/readable/bootstrap.min.css b/readable/bootstrap.min.css index 0baf7cf7..e4e6dc39 100644 --- a/readable/bootstrap.min.css +++ b/readable/bootstrap.min.css @@ -1,4 +1,4 @@ -@import url('http://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic'); +@import url('//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic'); 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/readable/bootswatch.less b/readable/bootswatch.less index 55824d03..2d220dad 100644 --- a/readable/bootswatch.less +++ b/readable/bootswatch.less @@ -6,7 +6,7 @@ // TYPOGRAPHY // ----------------------------------------------------- -@import url('http://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic'); +@import url('//fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic'); // SCAFFOLDING // ----------------------------------------------------- diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css index ebbb2d0f..08393099 100644 --- a/simplex/bootstrap.css +++ b/simplex/bootstrap.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=Josefin+Sans:300,400,700'); +@import url('//fonts.googleapis.com/css?family=Josefin+Sans:300,400,700'); /*! * Bootstrap v2.2.2 * diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css index e5316530..d2289cd6 100644 --- a/simplex/bootstrap.min.css +++ b/simplex/bootstrap.min.css @@ -1,4 +1,4 @@ -@import url('https://fonts.googleapis.com/css?family=Josefin+Sans:300,400,700'); +@import url('//fonts.googleapis.com/css?family=Josefin+Sans:300,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/simplex/bootswatch.less b/simplex/bootswatch.less index c8e42cfe..fef77ddf 100755 --- a/simplex/bootswatch.less +++ b/simplex/bootswatch.less @@ -8,7 +8,7 @@ // TYPOGRAPHY // ----------------------------------------------------- -@import url('https://fonts.googleapis.com/css?family=Josefin+Sans:300,400,700'); +@import url('//fonts.googleapis.com/css?family=Josefin+Sans:300,400,700'); // SCAFFOLDING // ----------------------------------------------------- diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css index 505058bc..f8652809 100644 --- a/spacelab/bootstrap.css +++ b/spacelab/bootstrap.css @@ -1,4 +1,4 @@ -@import url('http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); +@import url('//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); /*! * Bootstrap v2.2.2 * diff --git a/spacelab/bootstrap.min.css b/spacelab/bootstrap.min.css index d9a1487a..e9f5d3eb 100644 --- a/spacelab/bootstrap.min.css +++ b/spacelab/bootstrap.min.css @@ -1,4 +1,4 @@ -@import url('http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); +@import url('//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,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/spacelab/bootswatch.less b/spacelab/bootswatch.less index 67e8b095..62722ce7 100755 --- a/spacelab/bootswatch.less +++ b/spacelab/bootswatch.less @@ -6,7 +6,7 @@ // TYPOGRAPHY // ----------------------------------------------------- -@import url('http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); +@import url('//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); // SCAFFOLDING // ----------------------------------------------------- diff --git a/spruce/bootstrap.css b/spruce/bootstrap.css index 0cf6cea4..9bfa3bb3 100644 --- a/spruce/bootstrap.css +++ b/spruce/bootstrap.css @@ -1,4 +1,4 @@ -@import url(http://fonts.googleapis.com/css?family=Crete+Round); +@import url(//fonts.googleapis.com/css?family=Crete+Round); /*! * Bootstrap v2.2.2 * diff --git a/spruce/bootstrap.min.css b/spruce/bootstrap.min.css index be6fe5a1..98a9780d 100644 --- a/spruce/bootstrap.min.css +++ b/spruce/bootstrap.min.css @@ -1,4 +1,4 @@ -@import url(http://fonts.googleapis.com/css?family=Crete+Round); +@import url(//fonts.googleapis.com/css?family=Crete+Round); 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 1371b41f..101c59cf 100755 --- a/spruce/bootswatch.less +++ b/spruce/bootswatch.less @@ -6,7 +6,7 @@ // TYPOGRAPHY // -------------------------------------------------- -@import url(http://fonts.googleapis.com/css?family=Crete+Round); +@import url(//fonts.googleapis.com/css?family=Crete+Round); h1 > small, h2 > small, diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css index 7c6df4c8..63d83c05 100644 --- a/superhero/bootstrap.css +++ b/superhero/bootstrap.css @@ -1,6 +1,6 @@ -@import url(https://fonts.googleapis.com/css?family=Oswald); +@import url(//fonts.googleapis.com/css?family=Oswald); -@import url(https://fonts.googleapis.com/css?family=Noticia+Text); +@import url(//fonts.googleapis.com/css?family=Noticia+Text); /*! * Bootstrap v2.2.2 * diff --git a/superhero/bootstrap.min.css b/superhero/bootstrap.min.css index 0db7272d..e7d51f9f 100644 --- a/superhero/bootstrap.min.css +++ b/superhero/bootstrap.min.css @@ -1,5 +1,5 @@ -@import url(https://fonts.googleapis.com/css?family=Oswald); -@import url(https://fonts.googleapis.com/css?family=Noticia+Text); +@import url(//fonts.googleapis.com/css?family=Oswald); +@import url(//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 a3be40b3..897ebd1e 100755 --- a/superhero/bootswatch.less +++ b/superhero/bootswatch.less @@ -6,8 +6,8 @@ // TYPOGRAPHY // -------------------------------------------------- -@import url(https://fonts.googleapis.com/css?family=Oswald); -@import url(https://fonts.googleapis.com/css?family=Noticia+Text); +@import url(//fonts.googleapis.com/css?family=Oswald); +@import url(//fonts.googleapis.com/css?family=Noticia+Text); h1 small, h2 small, h3 small, h4 small, h5 small, h6 small, h6 { font-family: @headingsFontFamily; @@ -664,4 +664,4 @@ label { } } } -}
\ No newline at end of file +} diff --git a/united/bootstrap.css b/united/bootstrap.css index 1f679df2..a42e68fb 100644 --- a/united/bootstrap.css +++ b/united/bootstrap.css @@ -1,4 +1,4 @@ -@import url(https://fonts.googleapis.com/css?family=Ubuntu); +@import url(//fonts.googleapis.com/css?family=Ubuntu); /*! * Bootstrap v2.2.2 * diff --git a/united/bootstrap.min.css b/united/bootstrap.min.css index 3101b299..171c9c11 100644 --- a/united/bootstrap.min.css +++ b/united/bootstrap.min.css @@ -1,4 +1,4 @@ -@import url(https://fonts.googleapis.com/css?family=Ubuntu); +@import url(//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 fccfc977..f92d9521 100755 --- a/united/bootswatch.less +++ b/united/bootswatch.less @@ -6,7 +6,7 @@ // TYPOGRAPHY // ----------------------------------------------------- -@import url(https://fonts.googleapis.com/css?family=Ubuntu); +@import url(//fonts.googleapis.com/css?family=Ubuntu); // SCAFFOLDING // ----------------------------------------------------- |