diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-08-30 00:44:39 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-30 00:44:39 +0000 |
commit | 77fd0a0421864b8af04ceb6474f39cf52fc80b46 (patch) | |
tree | 6742d2808a07a9cba444c63a78375556a4ed2b63 | |
parent | b283185b384da66b08e9daf40cddf5442556f6ad (diff) | |
parent | 48e53bf07a5fde2fa81cc16f4d3218d72ad85673 (diff) | |
download | gitlab-ce-77fd0a0421864b8af04ceb6474f39cf52fc80b46.tar.gz |
Merge branch 'remove-unused-mixins' into 'master'
Remove unused mixins
## What does this MR do?
Remove unused mixins
## Are there points in the code the reviewer needs to double check?
None
## Why was this MR needed?
Reduces unused css
## Screenshots (if relevant)
Before:
```
$git grep 'btn-big' -- '*.scss'
app/assets/stylesheets/framework/mixins.scss:107:@mixin btn-big {
$git grep 'input-big' -- '*.scss'
app/assets/stylesheets/framework/mixins.scss:97:@mixin input-big {
$git grep 'solid-shade' -- '*.scss'
app/assets/stylesheets/framework/mixins.scss:45:@mixin solid-shade {
$git grep 'shade' -- '*.scss'
app/assets/stylesheets/framework/mixins.scss:41:@mixin shade {
app/assets/stylesheets/framework/mixins.scss:45:@mixin solid-shade {
$git grep 'linear-gradient' -- '*.scss'
app/assets/stylesheets/framework/buttons.scss:310: background: linear-gradient(180deg, $white-light 25%, $gray-light 100%);
app/assets/stylesheets/framework/mixins.scss:20:@mixin linear-gradient($from, $to) {
app/assets/stylesheets/framework/mixins.scss:22: background-image: -webkit-linear-gradient($from, $to);
app/assets/stylesheets/framework/mixins.scss:23: background-image: -moz-linear-gradient($from, $to);
app/assets/stylesheets/framework/mixins.scss:24: background-image: -ms-linear-gradient($from, $to);
app/assets/stylesheets/framework/mixins.scss:25: background-image: -o-linear-gradient($from, $to);
app/assets/stylesheets/framework/nav.scss:11: background: -webkit-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/framework/nav.scss:12: background: -o-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/framework/nav.scss:13: background: -moz-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/framework/nav.scss:14: background: linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/pages/diff.scss:167: background-image: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%),
app/assets/stylesheets/pages/diff.scss:168: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%);
$git grep 'border-radius-left' -- '*.scss'
app/assets/stylesheets/framework/mixins.scss:12:@mixin border-radius-left($radius) {
$git grep 'border-radius-right' -- '*.scss'
app/assets/stylesheets/framework/mixins.scss:16:@mixin border-radius-right($radius) {
```
After:
```
$git grep 'btn-big' -- '*.scss'
(nothing)
$git grep 'input-big' -- '*.scss'
(nothing)
$git grep 'solid-shade' -- '*.scss'
(nothing)
$git grep 'shade' -- '*.scss'
(nothing)
$git grep 'linear-gradient' -- '*.scss'
app/assets/stylesheets/framework/buttons.scss:310: background: linear-gradient(180deg, $white-light 25%, $gray-light 100%);
app/assets/stylesheets/framework/nav.scss:11: background: -webkit-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/framework/nav.scss:12: background: -o-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/framework/nav.scss:13: background: -moz-linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/framework/nav.scss:14: background: linear-gradient($gradient-direction, rgba($gradient-color, 0.4), $gradient-color 45%);
app/assets/stylesheets/pages/diff.scss:167: background-image: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%),
app/assets/stylesheets/pages/diff.scss:168: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%);
$git grep 'border-radius-left' -- '*.scss'
(nothing)
$git grep 'border-radius-right' -- '*.scss'
(nothing)
```
## 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 #21559
See merge request !6092
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/mixins.scss | 41 |
2 files changed, 1 insertions, 41 deletions
diff --git a/CHANGELOG b/CHANGELOG index f429ffb5d33..d983265f10e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,7 @@ v 8.12.0 (unreleased) - Remove Gitorious import - Add Sentry logging to API calls - Automatically expand hidden discussions when accessed by a permalink !5585 (Mike Greiling) + - Remove unused mixins (ClemMakesApps) - Fix groups sort dropdown alignment (ClemMakesApps) - Add horizontal scrolling to all sub-navs on mobile viewports (ClemMakesApps) - Fix markdown help references (ClemMakesApps) diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss index d2d60ed7196..9fb3bcb271e 100644 --- a/app/assets/stylesheets/framework/mixins.scss +++ b/app/assets/stylesheets/framework/mixins.scss @@ -9,22 +9,6 @@ border-radius: $radius; } -@mixin border-radius-left($radius) { - @include border-radius($radius 0 0 $radius) -} - -@mixin border-radius-right($radius) { - @include border-radius(0 0 $radius $radius) -} - -@mixin linear-gradient($from, $to) { - background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to)); - background-image: -webkit-linear-gradient($from, $to); - background-image: -moz-linear-gradient($from, $to); - background-image: -ms-linear-gradient($from, $to); - background-image: -o-linear-gradient($from, $to); -} - @mixin transition($transition) { -webkit-transition: $transition; -moz-transition: $transition; @@ -38,14 +22,6 @@ * Mixins with fixed values */ -@mixin shade { - @include box-shadow(0 0 3px #ddd); -} - -@mixin solid-shade { - @include box-shadow(0 0 0 3px #f1f1f1); -} - @mixin str-truncated($max_width: 82%) { display: inline-block; overflow: hidden; @@ -94,23 +70,6 @@ } } -@mixin input-big { - height: 36px; - padding: 5px 10px; - font-size: 16px; - line-height: 24px; - color: #7f8fa4; - background-color: #fff; - border-color: #e7e9ed; -} - -@mixin btn-big { - height: 36px; - padding: 5px 10px; - font-size: 16px; - line-height: 24px; -} - @mixin bulleted-list { > ul { list-style-type: disc; |