Merge pull request #1746 from underparnv/master

Simply combines @import rules in public/laravel/css/style.css
This commit is contained in:
Taylor Otwell 2013-03-28 14:04:25 -07:00
commit 457d0f174a
1 changed files with 1 additions and 2 deletions

View File

@ -1,5 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Ubuntu); @import url(http://fonts.googleapis.com/css?family=Ubuntu|Droid+Sans);
@import url(http://fonts.googleapis.com/css?family=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; }