Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
@charset "UTF-8";
|
||||
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,300italic,300,600,600italic,700,700italic,800,800italic);
|
||||
@import url(../css/font-awesome.css);
|
||||
html, body, div, span, applet, object, iframe,
|
||||
@@ -48,7 +47,7 @@ a img {
|
||||
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
|
||||
display: block; }
|
||||
|
||||
/*!
|
||||
/*
|
||||
* Bootstrap v3.0.0
|
||||
*
|
||||
* Copyright 2013 Twitter, Inc
|
||||
@@ -57,7 +56,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
|
||||
*
|
||||
* Designed and built with all the love in the world by @mdo and @fat.
|
||||
*/
|
||||
/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
|
||||
/* normalize.css v2.1.0 | MIT License | git.io/normalize */
|
||||
article,
|
||||
aside,
|
||||
details,
|
||||
|
||||
Reference in New Issue
Block a user