Skip to content

Commit 34c2db2

Browse files
inject bootstrap.min.css only on the screen media to prevent some important override
1 parent 2db4a2d commit 34c2db2

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

src/main/java/com/github/gwtbootstrap/client/ui/resources/ResourceInjector.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
/**
2929
* Utility class to inject our resources into modules page. Use it to inject
3030
* JavaScript and CSS files.
31-
*
31+
*
3232
* @since 2.0.4.0
33-
*
33+
*
3434
* @author Carlos Alexandro Becker
3535
*/
3636
public class ResourceInjector {
3737

3838
private static final Configurator ADAPTER = GWT.create(Configurator.class);
39-
39+
4040
private static final InternalResourceInjector INJECTOR = GWT.create(InternalResourceInjector.class);
4141

4242
private static HeadElement head;
@@ -48,15 +48,15 @@ public class ResourceInjector {
4848
* </pre>
4949
*/
5050
public static void configureWithCssFile() {
51-
52-
injectResourceCssAsFile("bootstrap.min.css");
53-
injectResourceCssAsFile("gwt-bootstrap.css");
54-
injectResourceCssAsFile("font-awesome.min.css");
51+
52+
injectResourceCssAsFile("bootstrap.min.css", "screen");
53+
injectResourceCssAsFile("gwt-bootstrap.css", "screen");
54+
injectResourceCssAsFile("font-awesome.min.css", null);
5555

5656
configure();
57-
57+
5858
}
59-
59+
6060
/**
6161
* Injects the required CSS styles and JavaScript files into the document
6262
* header.
@@ -65,7 +65,7 @@ public static void configure() {
6565
INJECTOR.preConfigure();
6666

6767
Resources res = ADAPTER.getResources();
68-
if(isNotLoadedJquery())
68+
if(isNotLoadedJquery())
6969
injectJs(res.jquery());
7070

7171
injectJs(res.bootstrapJs());
@@ -88,10 +88,13 @@ private static void injectCss(TextResource r) {
8888
* Inject public resource css file as a file.
8989
* @param filename inject file name
9090
*/
91-
public static void injectResourceCssAsFile(String filename) {
91+
public static void injectResourceCssAsFile(String filename, String media) {
9292
LinkElement link = Document.get().createLinkElement();
9393
link.setType("text/css");
9494
link.setRel("stylesheet");
95+
if (media != null) {
96+
link.setMedia(media);
97+
}
9598
link.setHref(GWT.getModuleBaseURL() + "css/" + filename);
9699
getHead().appendChild(link);
97100
}

0 commit comments

Comments
 (0)