Skip to content

Commit

Permalink
Merge pull request gwtbootstrap3#521 from thiagoricciardi/master
Browse files Browse the repository at this point in the history
Upgrade bootstrap to 3.4.0 (from 3.3.7)
  • Loading branch information
sjardine authored Feb 7, 2019
2 parents 7bc9d9b + e5b62ee commit 54bdbd0
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ public interface GwtBootstrap3ClientBundle extends ClientBundle {
@Source("resource/js/jquery-1.12.4.min.cache.js")
TextResource jQuery();

@Source("resource/js/bootstrap-3.3.7.min.cache.js")
@Source("resource/js/bootstrap-3.4.0.min.cache.js")
TextResource bootstrap();
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
<module rename-to="GwtBootstrap3Theme">
<inherits name="org.gwtbootstrap3.GwtBootstrap3"/>

<stylesheet src="css/bootstrap-theme-3.3.7.min.cache.css"/>
<stylesheet src="css/bootstrap-theme-3.4.0.min.cache.css"/>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<module>
<inherits name="org.gwtbootstrap3.client.NoThemeResources"/>

<stylesheet src="css/bootstrap-3.3.7.min.cache.css"/>
<stylesheet src="css/bootstrap-3.4.0.min.cache.css"/>
<stylesheet src="css/font-awesome-4.7.0.min.cache.css"/>
</module>

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

0 comments on commit 54bdbd0

Please sign in to comment.