diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-12 23:32:55 +0300 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-12 23:32:55 +0300 |
commit | c2cbc155741a2c7f0796c2347e679423ba924e15 (patch) | |
tree | d9166d81f2c09191f40432b2b70d38ea966d2371 /app/assets | |
parent | c552328617202bd1225abd3e84fc7f4a4b79e4fa (diff) |
[skip ci] .input-group-addon to .input-group-prepend, .input-group-append
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/profile/account/components/update_username.vue | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/app/assets/javascripts/profile/account/components/update_username.vue b/app/assets/javascripts/profile/account/components/update_username.vue index e5de3f69b01..a7a2a7235fd 100644 --- a/app/assets/javascripts/profile/account/components/update_username.vue +++ b/app/assets/javascripts/profile/account/components/update_username.vue @@ -86,7 +86,11 @@ Please update your Git repository remotes as soon as possible.`), <div class="form-group"> <label :for="$options.inputId">{{ s__('Profiles|Path') }}</label> <div class="input-group"> - <div class="input-group-addon">{{ rootUrl }}</div> + <div class="input-group-prepend"> + <div class="input-group-text"> + {{ rootUrl }} + </div> + </div> <input :id="$options.inputId" class="form-control" diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index eb635361f3a..e2c28d7a2ff 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -170,11 +170,13 @@ label { max-width: 180px; } - .input-group-addon { + .input-group-prepend, + .input-group-append { background-color: $input-group-addon-bg; } - .input-group-addon:not(:first-child):not(:last-child) { + .input-group-prepend:not(:first-child):not(:last-child), + .input-group-append:not(:first-child):not(:last-child) { border-left: 0; border-right: 0; } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 9edb30835b3..df785b54321 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -46,7 +46,8 @@ } } - .input-group-addon { + .input-group-prepend, + .input-group-append { overflow: hidden; text-overflow: ellipsis; line-height: unset; @@ -524,7 +525,8 @@ a.deploy-project-label { display: flex; } - .input-group-addon { + .input-group-prepend, + .input-group-append { flex: 1; text-align: left; padding-left: ($gl-padding * 3); |