diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2019-04-01 17:36:11 +0300 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2019-04-01 17:36:11 +0300 |
| commit | 04bb35a4b562fd57b14c55645bb1848a50cdef56 (patch) | |
| tree | 1bd1ac2af6a5c088ac2529cdbccceeca402d3ebe /app/assets/stylesheets/bootstrap_migration.scss | |
| parent | ade207e575ab846f6d354aaccc1382a6e512dd0d (diff) | |
| parent | b8118a65d595040bfce2d83d5e38dd63ebfedb58 (diff) | |
| download | gitlab-ce-id-split-self-approval-restrictions.tar.gz | |
Merge branch 'master' into id-split-self-approval-restrictionsid-split-self-approval-restrictions
Diffstat (limited to 'app/assets/stylesheets/bootstrap_migration.scss')
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index c8357f7751c..93377b8dd91 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -343,16 +343,6 @@ input[type=color].form-control { } } -// Bootstrap 3 compatibility because bootstrap_form Gem is not updated yet -.input-group-btn:first-child { - @extend .input-group-prepend; -} - -// Bootstrap 3 compatibility because bootstrap_form Gem is not updated yet -.input-group-btn:last-child { - @extend .input-group-append; -} - /* Bootstrap 4.1.2 introduced a new default vertical alignment which breaks our icons, so we need to reset the vertical alignment to the default value. See: |