Merge pull request #1746 from underparnv/master

Simply combines @import rules in public/laravel/css/style.css

Merge pull request #1746 from underparnv/master
Simply combines @import rules in public/laravel/css/style.css
457d0f17 · Taylor Otwell · 11855500 · eccd8375 · 457d0f17
Commit 457d0f17 authored Mar 28, 2013 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

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

No files found.
--- a/public/laravel/css/style.css
+++ b/public/laravel/css/style.css
-@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; }
 audio, canvas, video { display: inline-block; *display: inline; *zoom: 1; }