Skip to content

Commit

Permalink
boostrap: Reset to v2.3.2.
Browse files Browse the repository at this point in the history
We merge bootstrap-responsive.css into bootsrap.css since that is
how bootstrap distributes it from this version onwards.

bootstrap.js has a lot of changes to it which completely breaks
our typeaheads and popovers, so we will have to override these
plugins with our version of these plugins. In future versions
of bootstrap when we use npm, we can just choose not to
import them.
  • Loading branch information
amanagr authored and timabbott committed Aug 31, 2020
1 parent 7fa8edd commit 6a2c732
Show file tree
Hide file tree
Showing 6 changed files with 7,709 additions and 7,964 deletions.
2 changes: 1 addition & 1 deletion docs/THIRDPARTY
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Files: static/third/bootstrap/css/bootstrap-btn.css
Copyright: 2011-2014 Twitter, Inc
License: Expat

Files: static/third/bootstrap/css/bootstrap-responsive.css static/third/bootstrap/css/bootstrap.css
Files: static/third/bootstrap/css/bootstrap.css
Copyright: 2012 Twitter, Inc
License: Apache-2.0
Comment: The software has been modified.
Expand Down
1 change: 0 additions & 1 deletion static/js/bundles/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import "../../third/bootstrap/js/bootstrap.js";
import "../common.js";
import "../../third/bootstrap/css/bootstrap.css";
import "../../third/bootstrap/css/bootstrap-btn.css";
import "../../third/bootstrap/css/bootstrap-responsive.css";
import "simplebar/dist/simplebar.css";
import "font-awesome/css/font-awesome.css";
import "../../assets/icons/zulip-icons.font.js";
Expand Down
Loading

0 comments on commit 6a2c732

Please sign in to comment.