diff options
Diffstat (limited to 'amelia')
| -rw-r--r-- | amelia/bootstrap.css | 4 | ||||
| -rw-r--r-- | amelia/bootstrap.min.css | 3 | ||||
| -rwxr-xr-x | amelia/bootswatch.less | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css index 7cedcb6d..754203da 100644 --- a/amelia/bootstrap.css +++ b/amelia/bootstrap.css @@ -1,6 +1,4 @@ -@import url('//fonts.googleapis.com/css?family=Lobster'); - -@import url('//fonts.googleapis.com/css?family=Cabin:400,700'); +@import url('//fonts.googleapis.com/css?family=Lobster|Cabin:400,700'); /*! * Bootstrap v2.2.2 * diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css index eddcdb79..e4bccabe 100644 --- a/amelia/bootstrap.min.css +++ b/amelia/bootstrap.min.css @@ -1,5 +1,4 @@ -@import url('//fonts.googleapis.com/css?family=Lobster'); -@import url('//fonts.googleapis.com/css?family=Cabin:400,700'); +@import url('//fonts.googleapis.com/css?family=Lobster|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 2cf0bec5..4e245ab9 100755 --- a/amelia/bootswatch.less +++ b/amelia/bootswatch.less @@ -6,8 +6,7 @@ // TYPOGRAPHY // ----------------------------------------------------- -@import url('//fonts.googleapis.com/css?family=Lobster'); -@import url('//fonts.googleapis.com/css?family=Cabin:400,700'); +@import url('//fonts.googleapis.com/css?family=Lobster|Cabin:400,700'); h6 { color: @textColor; |