diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-01 19:56:43 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-01 19:56:43 +0000 |
commit | 2c3586d299beb036bc689df3fe699e3085672df4 (patch) | |
tree | 4efedfb52c3b6048f6d3e9589f119afa312c64fd /app | |
parent | 837cbfa44bd53e5036f38fd76efbc5d0b56bd8b1 (diff) | |
parent | 7b09a27e9b27c4f62cfffdc0371a01e5f191980f (diff) | |
download | gitlab-ce-2c3586d299beb036bc689df3fe699e3085672df4.tar.gz |
Merge branch 'remove-transition-prefix' into 'master'
Remove prefixes from transition CSS property
## What does this MR do?
Removes vendor prefixes from the CSS transition property
## Are there points in the code the reviewer needs to double check?
None
## Why was this MR needed?
Reduces unnecessary CSS
## Screenshots (if relevant)
None
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #21614
See merge request !6093
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/selects.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/search.scss | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index 396a37bab6e..62dc2cb3fdc 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -9,14 +9,6 @@ border-radius: $radius; } -@mixin transition($transition) { - -webkit-transition: $transition; - -moz-transition: $transition; - -ms-transition: $transition; - -o-transition: $transition; - transition: $transition; -} - /** * Prefilled mixins * Mixins with fixed values diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index b2e22b60440..c75dacf95d9 100644 --- a/app/assets/stylesheets/framework/selects.scss +++ b/app/assets/stylesheets/framework/selects.scss @@ -151,7 +151,7 @@ background-position: right 0 bottom 6px; border: 1px solid $input-border; @include border-radius($border-radius-default); - @include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s); + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; &:focus { border-color: $input-border-focus; diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index c9d436d72ba..436fb00ba2e 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -80,7 +80,7 @@ .search-icon { @extend .fa-search; - @include transition(color .15s); + transition: color 0.15s; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; @@ -125,7 +125,7 @@ } .location-badge { - @include transition(all .15s); + transition: all 0.15s; background-color: $location-badge-active-bg; color: $white-light; } |