Skip to content

Commit

Permalink
Combine the WET core CSS in the theme CSS
Browse files Browse the repository at this point in the history
Partially implements #6809
  • Loading branch information
LaurentGoderre committed Jun 1, 2015
1 parent e8600a9 commit 16a8175
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
5 changes: 2 additions & 3 deletions site/includes/headresources.hbs
@@ -1,12 +1,11 @@
<!--[if gte IE 9 | !IE ]><!--> <!--[if gte IE 9 | !IE ]><!-->
<link href="{{assets}}/assets/favicon.ico" rel="icon" type="image/x-icon" /> <link href="{{assets}}/assets/favicon.ico" rel="icon" type="image/x-icon" />
<link rel="stylesheet" href="{{assets}}/css/wet-boew{{environment.suffix}}.css" />
<!--<![endif]-->
<link rel="stylesheet" href="{{assets}}/css/theme{{environment.suffix}}.css" /> <link rel="stylesheet" href="{{assets}}/css/theme{{environment.suffix}}.css" />
<!--<![endif]-->
{{#if page.css}}{{#each page.css}}<link rel="stylesheet" href="{{this}}{{../environment.suffix}}.css" />{{/each}}{{/if}} {{#if page.css}}{{#each page.css}}<link rel="stylesheet" href="{{this}}{{../environment.suffix}}.css" />{{/each}}{{/if}}
<!--[if lt IE 9]> <!--[if lt IE 9]>
<link href="{{assets}}/assets/favicon.ico" rel="shortcut icon" /> <link href="{{assets}}/assets/favicon.ico" rel="shortcut icon" />
<link rel="stylesheet" href="{{assets}}/css/ie8-wet-boew{{environment.suffix}}.css" /> <link rel="stylesheet" href="{{assets}}/css/ie8-theme{{environment.suffix}}.css" />
<script src="http://ajax.googleapis.com/ajax/libs/jquery/{{environment.jqueryOldIEVersion}}/jquery{{environment.suffix}}.js"></script> <script src="http://ajax.googleapis.com/ajax/libs/jquery/{{environment.jqueryOldIEVersion}}/jquery{{environment.suffix}}.js"></script>
<script src="{{assets}}/js/ie8-wet-boew{{environment.suffix}}.js"></script> <script src="{{assets}}/js/ie8-wet-boew{{environment.suffix}}.js"></script>
<![endif]--> <![endif]-->
Expand Down
7 changes: 7 additions & 0 deletions theme/theme.scss
Expand Up @@ -13,6 +13,13 @@
@import "variables"; @import "variables";
@import "defaults"; @import "defaults";


/* WET Core */
/*
* GLYPHICONS Halflings for Twitter Bootstrap by GLYPHICONS.com | Licensed under http://www.apache.org/licenses/LICENSE-2.0
*/
@import "../src/base/bootstrap";
@import "../src/base/wet-boew";

@import "banner/base"; @import "banner/base";
@import "breadcrumb/base"; @import "breadcrumb/base";
@import "footer/base"; @import "footer/base";
Expand Down
7 changes: 1 addition & 6 deletions theme/wet-boew.scss
Expand Up @@ -2,9 +2,4 @@
* Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW) * Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
* wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html * wet-boew.github.io/wet-boew/License-en.html / wet-boew.github.io/wet-boew/Licence-fr.html
*/ */
/* /* Deprecated */
* GLYPHICONS Halflings for Twitter Bootstrap by GLYPHICONS.com | Licensed under http://www.apache.org/licenses/LICENSE-2.0
*/
@import "variables";
@import "../src/base/bootstrap";
@import "../src/base/wet-boew";

0 comments on commit 16a8175

Please sign in to comment.