Skip to content

Commit

Permalink
CSS: Fixed the Bootstrap license block
Browse files Browse the repository at this point in the history
  • Loading branch information
LaurentGoderre committed Jul 24, 2015
1 parent 5edde0e commit e74de37
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
9 changes: 9 additions & 0 deletions src/base/_bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,14 @@
$icon-font-path: "#{$wb-core-path}/fonts/";


/* TODO: Remove this block when including bootstrap 3.3.5 */
/*!
* Bootstrap v3.3.1 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
/*!
* GLYPHICONS Halflings for Twitter Bootstrap by GLYPHICONS.com | Licensed under http://www.apache.org/licenses/LICENSE-2.0
*/
@import "../../lib/bootstrap-sass-official/assets/stylesheets/bootstrap";
@import "bootstrap-overrides/base";
3 changes: 0 additions & 3 deletions src/base/_wet-boew.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
* 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
*/
/*
* GLYPHICONS Halflings for Twitter Bootstrap by GLYPHICONS.com | Licensed under http://www.apache.org/licenses/LICENSE-2.0
*/

/*
Global placeholders
Expand Down
3 changes: 0 additions & 3 deletions theme/theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
@import "variables";
@import "defaults";

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

/* WET Core */
Expand Down

0 comments on commit e74de37

Please sign in to comment.