From 6d54958daca80ebb7dff6f3a69f1f0a53d5f1bcb Mon Sep 17 00:00:00 2001 From: Csaba Jakosa Date: Mon, 31 Oct 2016 18:58:14 +0100 Subject: [PATCH] [GTK-3.20] Code Cleanup * * Clean code. * * Bluetooth code padding clean. --- src/gtk-3.20/scss/apps/_budgie.scss | 33 ++++++++++++----------- src/gtk-3.20/scss/apps/_nemo.scss | 2 +- src/gtk-3.20/scss/widgets/_grid.scss | 2 +- src/gtk-3.20/scss/widgets/_misc.scss | 6 ++--- src/gtk-3.20/scss/widgets/_overshoot.scss | 1 + src/gtk-3.20/scss/widgets/_progress.scss | 4 +-- src/gtk-3.20/scss/widgets/_toggle.scss | 2 +- src/gtk-3.20/scss/widgets/_view.scss | 2 +- 8 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/gtk-3.20/scss/apps/_budgie.scss b/src/gtk-3.20/scss/apps/_budgie.scss index dc2b02e..3b5ed0a 100644 --- a/src/gtk-3.20/scss/apps/_budgie.scss +++ b/src/gtk-3.20/scss/apps/_budgie.scss @@ -1,24 +1,27 @@ /****************** ! Budgie Desktop * *******************/ -.budgie-container { - background-color: transparent; -} -.raven { - background-color: transparentize($bg_color, .07); - - .raven-header { - background-color: $bg_color; - border: solid $borders_color; - border-width: 1px 0; +@include exports("budgie-desktop") { + .budgie-container { + background-color: transparent; } - .raven-background { + .raven { background-color: transparentize($bg_color, .07); + + .raven-header { + background-color: $bg_color; + border: solid $borders_color; + border-width: 1px 0; + } + + .raven-background { + background-color: transparentize($bg_color, .07); + } + } + + .raven-mpris { + background-color: transparentize($bg_color, .3); } } - -.raven-mpris { - background-color: transparentize($bg_color, .3); -} diff --git a/src/gtk-3.20/scss/apps/_nemo.scss b/src/gtk-3.20/scss/apps/_nemo.scss index 9dc2d78..3028cdd 100644 --- a/src/gtk-3.20/scss/apps/_nemo.scss +++ b/src/gtk-3.20/scss/apps/_nemo.scss @@ -108,7 +108,7 @@ -NemoPlacesTreeView-disk-full-fg-color: $selected_bg_color; -NemoPlacesTreeView-disk-full-bar-width: 2px; -NemoPlacesTreeView-disk-full-bar-radius: 1px; - -NemoPlacesTreeView-disk-full-bottom-padding: 0px; + -NemoPlacesTreeView-disk-full-bottom-padding: 0; -NemoPlacesTreeView-disk-full-max-length: 75px; &:selected { diff --git a/src/gtk-3.20/scss/widgets/_grid.scss b/src/gtk-3.20/scss/widgets/_grid.scss index 3cc0958..7a16dca 100644 --- a/src/gtk-3.20/scss/widgets/_grid.scss +++ b/src/gtk-3.20/scss/widgets/_grid.scss @@ -17,7 +17,7 @@ } row { - transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + transition: all 150ms cubic-bezier(.25, .46, .45, .94); &:hover { transition: none; } diff --git a/src/gtk-3.20/scss/widgets/_misc.scss b/src/gtk-3.20/scss/widgets/_misc.scss index 6c15920..f6fb37c 100644 --- a/src/gtk-3.20/scss/widgets/_misc.scss +++ b/src/gtk-3.20/scss/widgets/_misc.scss @@ -165,7 +165,7 @@ border-top-left-radius: 0; } - .button { + button { border: 0; background-color: transparent; background-image: none; @@ -235,8 +235,8 @@ entry.entry.pin-entry { font-style: normal; font-size: 50px; - padding-left: 25px; - padding-right: 25px; + padding-left: $spacing * 5; + padding-right: $spacing * 5; } label.pin-label { diff --git a/src/gtk-3.20/scss/widgets/_overshoot.scss b/src/gtk-3.20/scss/widgets/_overshoot.scss index 0131ef6..f55aaed 100644 --- a/src/gtk-3.20/scss/widgets/_overshoot.scss +++ b/src/gtk-3.20/scss/widgets/_overshoot.scss @@ -75,6 +75,7 @@ $_bg_pos: $position center; } + // Disable /*background-image: linear-gradient(to $_gradient_dir, // this is the dashed line $_undershoot_color_light 50%, $_undershoot_color_dark 50%);*/ diff --git a/src/gtk-3.20/scss/widgets/_progress.scss b/src/gtk-3.20/scss/widgets/_progress.scss index 2c7817c..b3c9f12 100644 --- a/src/gtk-3.20/scss/widgets/_progress.scss +++ b/src/gtk-3.20/scss/widgets/_progress.scss @@ -92,7 +92,7 @@ border: 1px solid alpha(border_normal($bg_color), .5); border-radius: $roundness; - padding: 2px; //make discrete block appear inside levelbar + padding: 2px; // make discrete block appear inside levelbar } &.horizontal.discrete block { @@ -125,7 +125,7 @@ } &.full { - background-color: shade($selected_bg_color, 0.8); + background-color: shade($selected_bg_color, .8); border-color: transparent; } diff --git a/src/gtk-3.20/scss/widgets/_toggle.scss b/src/gtk-3.20/scss/widgets/_toggle.scss index e779904..ce98652 100644 --- a/src/gtk-3.20/scss/widgets/_toggle.scss +++ b/src/gtk-3.20/scss/widgets/_toggle.scss @@ -105,7 +105,7 @@ $suffix: if($variant == "dark", "-dark", ""); @include exports("switch") { switch { border-radius: $roundness; - padding: $spacing - 1; + padding: $spacing - 1px; border: none; outline: none; transition: background-color .3s linear; diff --git a/src/gtk-3.20/scss/widgets/_view.scss b/src/gtk-3.20/scss/widgets/_view.scss index f70e9c2..9ee6115 100644 --- a/src/gtk-3.20/scss/widgets/_view.scss +++ b/src/gtk-3.20/scss/widgets/_view.scss @@ -179,7 +179,7 @@ background-color: $selected_bg_color; //background-image: linear-gradient(to bottom, $selected_bg_color, darken($selected_bg_color, .1)); box-shadow: inset 0 1px if($variant == 'light', transparentize($white, .7), transparentize($white, .85)), - 0 1px if($variant == 'light', transparentize($black, .8), transparentize($black, .9)); + 0 1px if($variant == 'light', transparentize($black, .8), transparentize($black, .9)); &:selected { &:focus, & {