Skip to content

Commit

Permalink
Improve build time and components maintainability using only one core…
Browse files Browse the repository at this point in the history
… CSS instead of per-component CSS ( #496 ).
  • Loading branch information
TheCoder4eu committed Aug 29, 2016
1 parent 3151773 commit d8c285e
Show file tree
Hide file tree
Showing 42 changed files with 109 additions and 299 deletions.
13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-alerts.less

This file was deleted.

13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-badges.less

This file was deleted.

13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-carousel.less

This file was deleted.

41 changes: 32 additions & 9 deletions gradleResources/staticResources/less/bs-core.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@

// Core variables and mixins
@import "variables.less";
@import "mixins.less";

// Extra Variables (override)
@import "extra-variables.less";

@import "mixins.less";

// Reset
// Reset and dependencies
@import "normalize.less";
@import "print.less";

// Load fonts from this directory.
@icon-font-path: "../../fonts/";
@import "glyphicons.less";

// Core CSS
@import "scaffolding.less";
@import "type.less";
Expand All @@ -21,19 +25,38 @@
@import "tables.less";
@import "forms.less";
@import "buttons.less";
@import "button-groups.less";
@import "navs.less";

// Components
@import "component-animations.less";
@import "dropdowns.less";
@import "button-groups.less";
@import "input-groups.less";
@import "navs.less";
@import "navbar.less";
@import "breadcrumbs.less";
@import "pagination.less";
@import "pager.less";
@import "labels.less";
@import "badges.less";
@import "jumbotron.less";
@import "thumbnails.less";
@import "alerts.less";
@import "progress-bars.less";
@import "media.less";
@import "list-group.less";
@import "panels.less";
@import "responsive-embed.less";
@import "wells.less";
@import "close.less";
@import "component-animations.less";
//@import "glyphicons.less";
@import "input-groups.less";

// Components w/ JavaScript
@import "modals.less";
@import "tooltip.less";
@import "popovers.less";
@import "carousel.less";

// Utility classes
@import "utilities.less";
@import "responsive-utilities.less";
@import "responsive-embed.less";

@import "customizations.less";
13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-dropdowns.less

This file was deleted.

13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-icons.less

This file was deleted.

13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-jumbotron.less

This file was deleted.

13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-labels.less

This file was deleted.

13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-list-group.less

This file was deleted.

13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-media.less

This file was deleted.

13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-modals.less

This file was deleted.

27 changes: 0 additions & 27 deletions gradleResources/staticResources/less/bs-panels.less

This file was deleted.

13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-popovers.less

This file was deleted.

13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-progress-bars.less

This file was deleted.

23 changes: 0 additions & 23 deletions gradleResources/staticResources/less/bs-thumbnails.less

This file was deleted.

13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-tooltip.less

This file was deleted.

13 changes: 0 additions & 13 deletions gradleResources/staticResources/less/bs-wells.less

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
// --------------------------------
// This file is part of BootsFaces.
// --------------------------------

// Core variables and mixins
@import "variables.less";
// Extra Variables (override)
@import "extra-variables.less";

@import "mixins.less";
@import "utilities.less";
//BootsFaces Overrides

// NavBar
// Inline forms
//
// Make forms appear inline(-block) by adding the `.form-inline` class. Inline
Expand Down Expand Up @@ -60,5 +51,29 @@
}
}

@import "navbar.less";
// Panels
/* Collapsible panels */
.panel-heading a:after {
font-family:'Glyphicons Halflings';
content:"\e114";
float: right;
color: grey;
}
.panel-heading a.collapsed:after {
content:"\e080";
}
a.panel-title-link {
outline: thin dotted rgba(255, 255, 255, 0.3);
outline-offset: 3px;
}

// Thumbnails
// Responsive image
//
// Keep images from scaling beyond the width of their parents.

.img-responsive {
display: block;
max-width: 100%; // Part 1: Set a maximum relative to the parent
height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public Accordion() {
Tooltip.addResourceFiles();
AddResourcesListener.addThemedCSSResource("core.css");
AddResourcesListener.addThemedCSSResource("bsf.css");
AddResourcesListener.addThemedCSSResource("panels.css");
//!bs-less//AddResourcesListener.addThemedCSSResource("panels.css");
setRendererType(DEFAULT_RENDERER);
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/bootsfaces/component/alert/Alert.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* Copyright 2014-16 by Riccardo Massera (TheCoder4.Eu) and Stephan Rauh (http://www.beyondjava.net).
*
*
* This file is part of BootsFaces.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Expand Down Expand Up @@ -43,7 +43,7 @@ public class Alert extends UIComponentBase implements IHasTooltip, IResponsive {
public Alert() {
Tooltip.addResourceFiles();
AddResourcesListener.addThemedCSSResource("core.css");
AddResourcesListener.addThemedCSSResource("alerts.css");
//!bs-less//AddResourcesListener.addThemedCSSResource("alerts.css");

setRendererType(DEFAULT_RENDERER);
}
Expand Down
Loading

0 comments on commit d8c285e

Please sign in to comment.