Browse Source

Merge pull request #1746 from underparnv/master

Simply combines @import rules in public/laravel/css/style.css
Taylor Otwell 12 years ago
parent
commit
457d0f174a
1 changed files with 1 additions and 2 deletions
  1. 1 2
      public/laravel/css/style.css

+ 1 - 2
public/laravel/css/style.css

@@ -1,5 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Ubuntu);
-@import url(http://fonts.googleapis.com/css?family=Droid+Sans);
+@import url(http://fonts.googleapis.com/css?family=Ubuntu|Droid+Sans);
 
 
 article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; }
 article, aside, details, figcaption, figure, footer, header, hgroup, nav, section { display: block; }
 audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; }
 audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; }