diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-06-11 17:18:19 -0500 |
|---|---|---|
| committer | Jose <jvargas@gitlab.com> | 2018-06-13 12:41:13 -0500 |
| commit | 9e63168282d8234f1c9212fb6b514474ba2df9d0 (patch) | |
| tree | 15735278094087ec6580a7d205f5a3594b1af0dd | |
| parent | 91f31ae519b500b5d7db8a4f31bda8482aadae26 (diff) | |
| download | gitlab-ce-9e63168282d8234f1c9212fb6b514474ba2df9d0.tar.gz | |
Fix change template form
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 25 | ||||
| -rw-r--r-- | app/views/projects/_project_templates.html.haml | 3 |
3 files changed, 12 insertions, 20 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 95b842a337c..191a3bb5b59 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -161,6 +161,10 @@ table { } } +.input-group-prepend svg.active { + border: 0 !important; +} + // Polyfill deprecated selectors .hidden { diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index caafda5fb05..ea2c0a86e49 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -514,12 +514,6 @@ } } - svg { - position: absolute; - left: $gl-padding; - top: $gl-padding; - } - .project-fields-form { display: none; @@ -530,25 +524,18 @@ } .template-input-group { - position: relative; - - @include media-breakpoint-up(sm) { - display: flex; - } - - .input-group-prepend, - .input-group-append { + .input-group-prepend { flex: 1; - text-align: left; - padding-left: ($gl-padding * 3); - background-color: $white-light; } - .selected-template { - line-height: 20px; + .input-group-text { + width: 100%; + background-color: $white-light; } .selected-icon { + padding-right: $gl-padding; + svg { display: none; top: 7px; diff --git a/app/views/projects/_project_templates.html.haml b/app/views/projects/_project_templates.html.haml index 1dd434d4c35..d08807b5135 100644 --- a/app/views/projects/_project_templates.html.haml +++ b/app/views/projects/_project_templates.html.haml @@ -21,6 +21,7 @@ - Gitlab::ProjectTemplate.all.each do |template| = custom_icon(template.logo) .selected-template - %button.btn.btn-default.change-template{ type: "button" } Change template + .input-group-append + %button.btn.btn-default.change-template{ type: "button" } Change template = render 'new_project_fields', f: f, project_name_id: "template-project-name" |