diff options
| author | Thomas Park <thomas@thomaspark.me> | 2012-03-16 00:50:58 -0400 |
|---|---|---|
| committer | Thomas Park <thomas@thomaspark.me> | 2012-03-16 00:50:58 -0400 |
| commit | ccd7f0cad744bc20b0b1f199ec6bde22ddb433e4 (patch) | |
| tree | b3cd7546e8701763616e830dda0e49ea6e21ca24 /journal | |
| parent | a29761ed0762b4d0dd2ba00150416731c6df2240 (diff) | |
web font import now over ssl
performance should be ok with google property.
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 | 24 |
3 files changed, 14 insertions, 14 deletions
diff --git a/journal/bootstrap.css b/journal/bootstrap.css index 0cbbf19e..45bb9dfd 100644 --- a/journal/bootstrap.css +++ b/journal/bootstrap.css @@ -1,4 +1,4 @@ -@import url('http://fonts.googleapis.com/css?family=Open+Sans:400,700'); +@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700'); /*! * Bootstrap v2.0.2 * diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css index 4b27d70a..a459d089 100644 --- a/journal/bootstrap.min.css +++ b/journal/bootstrap.min.css @@ -1,4 +1,4 @@ -@import url('http://fonts.googleapis.com/css?family=Open+Sans:400,700'); +@import url('https://fonts.googleapis.com/css?family=Open+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/journal/bootswatch.less b/journal/bootswatch.less index 77d82ae1..fa6f25de 100755 --- a/journal/bootswatch.less +++ b/journal/bootswatch.less @@ -3,21 +3,10 @@ // Version: 2.0.2 // ----------------------------------------------------- -// SCAFFOLDING -// ----------------------------------------------------- - -a { - text-decoration: underline; -} - -.nav a, .navbar .brand, .subnav a, a.btn { - text-decoration: none; -} - // TYPOGRAPHY // ----------------------------------------------------- -@import url('http://fonts.googleapis.com/css?family=Open+Sans:400,700'); +@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700'); h1, h2, h3, h4, h5, h6, .brand, .navbar, .subnav a, blockquote > p { font-family: 'Open Sans', sans-serif; @@ -28,6 +17,17 @@ h1, h2, h3, h4, h5, h6, .brand { font-weight: 700; } +// SCAFFOLDING +// ----------------------------------------------------- + +a { + text-decoration: underline; +} + +.nav a, .navbar .brand, .subnav a, a.btn { + text-decoration: none; +} + // NAVBAR // ----------------------------------------------------- |