diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-08-24 10:19:43 +0000 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-08-24 16:53:08 +0000 |
| commit | 783dce29886a1dc4bbd632ab5fc59703fd59b89b (patch) | |
| tree | d3e0c1096e427d8e8e3138f1795055113a0cae8e | |
| parent | d245ac39135113ad29f05a5906fae248dca6c218 (diff) | |
| download | gitlab-ce-45116-dropdowns-flexbox.tar.gz | |
Add IE11 specific stylesheet for dropdown fix45116-dropdowns-flexbox
| -rw-r--r-- | app/assets/stylesheets/ie.scss | 8 | ||||
| -rw-r--r-- | app/views/layouts/_head.html.haml | 3 | ||||
| -rw-r--r-- | config/application.rb | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/app/assets/stylesheets/ie.scss b/app/assets/stylesheets/ie.scss new file mode 100644 index 00000000000..721bb580bb5 --- /dev/null +++ b/app/assets/stylesheets/ie.scss @@ -0,0 +1,8 @@ +@import 'framework/variables'; + +.show.dropdown { + .dropdown-menu, + .dropdown-menu-nav { + height: $dropdown-max-height; + } +} diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index ac5916d129c..1fcc605ae6a 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -37,6 +37,9 @@ = stylesheet_link_tag "test", media: "all" if Rails.env.test? = stylesheet_link_tag 'performance_bar' if performance_bar_enabled? + - if browser.ie? + = stylesheet_link_tag 'ie' + = Gon::Base.render_data - if content_for?(:library_javascripts) diff --git a/config/application.rb b/config/application.rb index 76a2c47a750..fbcec588c1a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -141,6 +141,7 @@ module Gitlab config.assets.precompile << "locale/**/app.js" config.assets.precompile << "emoji_sprites.css" config.assets.precompile << "errors.css" + config.assets.precompile << "ie.css" # Import gitlab-svgs directly from vendored directory config.assets.paths << "#{config.root}/node_modules/@gitlab-org/gitlab-svgs/dist" |