diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-23 12:38:37 -0500 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-23 12:38:37 -0500 |
commit | 1956a8a737d9db2813646abaadfd32a40d1f5567 (patch) | |
tree | 9c0c4853b83e2e5f3e19cff4782dd7e3667c326c | |
parent | 923e081bac13d07c23320d42498186d6777639e0 (diff) | |
download | gitlab-ce-1956a8a737d9db2813646abaadfd32a40d1f5567.tar.gz |
Fix admin broadcast color form
-rw-r--r-- | app/assets/javascripts/pages/admin/admin.js | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/admin/admin.js b/app/assets/javascripts/pages/admin/admin.js index ab4a02c82de..ff4d6ab15f9 100644 --- a/app/assets/javascripts/pages/admin/admin.js +++ b/app/assets/javascripts/pages/admin/admin.js @@ -25,7 +25,7 @@ export default function adminInit() { $('body').on('click', '.js-toggle-colors-link', (e) => { e.preventDefault(); - $('.js-toggle-colors-container').toggleClass('hidden'); + $('.js-toggle-colors-container').toggleClass('hide'); }); $('.log-tabs a').on('click', function logTabsClick(e) { diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 3d850523480..0c492e7d4a5 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -46,6 +46,12 @@ a { text-align: right; } +.form-control, +.search form { + // Bootstrap 4 does not have a height + height: 34px; +} + table { // Remove any table border lines border-spacing: 0; |