diff options
Diffstat (limited to 'app')
4 files changed, 14 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index 69ef116043a..20b7c6d4564 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -232,6 +232,16 @@ label { color: $gray-600; } +.input-xs { + max-width: $input-xs-width; + width: 100%; +} + +.input-sm { + max-width: $input-sm-width; + width: 100%; +} + .input-md { max-width: $input-md-width; width: 100%; diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index faa0a9909d5..857c22f8cd7 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -636,6 +636,8 @@ $gl-field-focus-shadow: rgba(0, 0, 0, 0.075); $gl-field-focus-shadow-error: rgba($red-500, 0.6); $input-short-width: 200px; $input-short-md-width: 280px; +$input-xs-width: 80px; +$input-sm-width: 160px; $input-md-width: 240px; $input-lg-width: 320px; diff --git a/app/views/admin/application_settings/integrations.html.haml b/app/views/admin/application_settings/integrations.html.haml index 310e86b1377..9969f91bbf2 100644 --- a/app/views/admin/application_settings/integrations.html.haml +++ b/app/views/admin/application_settings/integrations.html.haml @@ -2,8 +2,6 @@ - page_title _("Integrations") - @content_class = "limit-container-width" unless fluid_layout -= render_if_exists 'admin/application_settings/elasticsearch_form', expanded: expanded_by_default? - %section.settings.as-plantuml.no-animate#js-plantuml-settings{ class: ('expanded' if expanded_by_default?) } .settings-header %h4 diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index f76268bc29b..2f9ad8a70e6 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -170,6 +170,8 @@ = render_if_exists 'layouts/nav/ee/admin/geo_sidebar' + = render_if_exists 'layouts/nav/sidebar/elasticsearch_link' + = nav_link(controller: :deploy_keys) do = link_to admin_deploy_keys_path do .nav-icon-container |