From 67bf7e2697174b6920b99770d254817c2a61d53f Mon Sep 17 00:00:00 2001 From: Csaba Jakosa Date: Sat, 3 Sep 2016 11:00:42 +0200 Subject: [PATCH] GTK 3.20 :: Clean code (#553) * * Clean code. * * Fixed PR code. --- gtk-3.20/scss/apps/_gedit.scss | 6 +++--- gtk-3.20/scss/apps/_gnome-terminal.scss | 6 ------ gtk-3.20/scss/apps/_nemo.scss | 3 +-- gtk-3.20/scss/widgets/_button.scss | 4 ++-- gtk-3.20/scss/widgets/_menu.scss | 7 +++++-- gtk-3.20/scss/widgets/_sidebar.scss | 6 ++++-- gtk-3.20/scss/widgets/_toggle.scss | 8 ++++---- gtk-3.20/scss/widgets/_view.scss | 2 ++ 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gtk-3.20/scss/apps/_gedit.scss b/gtk-3.20/scss/apps/_gedit.scss index 156996b..dab0056 100644 --- a/gtk-3.20/scss/apps/_gedit.scss +++ b/gtk-3.20/scss/apps/_gedit.scss @@ -133,10 +133,10 @@ .gedit-bottom-panel-paned, .gedit-side-panel-paned, paned.titlebar { - margin-right: 0px; - } + margin-right: 0; + } .gedit-bottom-panel-paned notebook { border-top: none; - } + } } diff --git a/gtk-3.20/scss/apps/_gnome-terminal.scss b/gtk-3.20/scss/apps/_gnome-terminal.scss index ee3e4cb..996d69c 100644 --- a/gtk-3.20/scss/apps/_gnome-terminal.scss +++ b/gtk-3.20/scss/apps/_gnome-terminal.scss @@ -33,11 +33,5 @@ &:disabled { background-color: transparent; } } } - - /*GtkNotebook.notebook { - border-right-width: 0; - border-bottom-width: 0; - border-left-width: 0; - }*/ } } diff --git a/gtk-3.20/scss/apps/_nemo.scss b/gtk-3.20/scss/apps/_nemo.scss index b7d2d0b..983cbba 100644 --- a/gtk-3.20/scss/apps/_nemo.scss +++ b/gtk-3.20/scss/apps/_nemo.scss @@ -38,7 +38,7 @@ min-width: 28px; padding: 3px; } - + /* Path Bar */ toolitem stack { margin-left: 15px; @@ -48,7 +48,6 @@ -NemoPathbarButton-border-radius: $roundness; } } - } // END toolbar /* Status Bar */ diff --git a/gtk-3.20/scss/widgets/_button.scss b/gtk-3.20/scss/widgets/_button.scss index d4358e1..3efb373 100644 --- a/gtk-3.20/scss/widgets/_button.scss +++ b/gtk-3.20/scss/widgets/_button.scss @@ -4,7 +4,7 @@ @include exports("button_extends") { // stuff for .needs-attention - $_dot_color: if($variant=='light', $selected_bg_color, lighten($selected_bg_color, .15)); + $_dot_color: if($variant == 'light', $selected_bg_color, lighten($selected_bg_color, .15)); @keyframes needs_attention { from { @@ -19,7 +19,7 @@ %needs_attention { animation: needs_attention 150ms ease-in; $_dot_shadow: _text_shadow_color(); - $_dot_shadow_r: if($variant=='light', .5, .45); + $_dot_shadow_r: if($variant == 'light', .5, .45); background-image: -gtk-gradient(radial, center center, 0, center center, .5, to($_dot_color), to(transparent)), -gtk-gradient(radial, center center, 0, center center, $_dot_shadow_r, to($_dot_shadow), to(transparent)); background-size: 6px 6px, 6px 6px; diff --git a/gtk-3.20/scss/widgets/_menu.scss b/gtk-3.20/scss/widgets/_menu.scss index 0bef14a..4b3d290 100644 --- a/gtk-3.20/scss/widgets/_menu.scss +++ b/gtk-3.20/scss/widgets/_menu.scss @@ -276,9 +276,9 @@ border-radius: $roundness; } - entry { @include entry($menu_bg_color, $menu_fg_color); } + entry { @include entry($menu_bg_color, $menu_fg_color); } - button { @include button($menu_bg_color, $menu_fg_color); } + button { @include button($menu_bg_color, $menu_fg_color); } > list, > .view, > toolbar { border-style: none; @@ -296,7 +296,9 @@ //@extend %undecorated_button; &:hover { background-color: $selected_bg_color; color: $selected_fg_color } + &:active, &:selected { &, arrow { @extend %selected_items; } } + &:checked { color: $fg_color; } // FIXME: temporary workaround @@ -308,6 +310,7 @@ &.flat arrow { &.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } + &.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } } } diff --git a/gtk-3.20/scss/widgets/_sidebar.scss b/gtk-3.20/scss/widgets/_sidebar.scss index 106ade8..54a77bd 100644 --- a/gtk-3.20/scss/widgets/_sidebar.scss +++ b/gtk-3.20/scss/widgets/_sidebar.scss @@ -65,7 +65,7 @@ } } - $_placesidebar_icons_opacity: 0.7; + $_placesidebar_icons_opacity: .7; placessidebar { > viewport.frame { border-style: none; } @@ -73,7 +73,7 @@ row { // Needs overriding of the GtkListBoxRow padding min-height: 36px; - padding: 0px; + padding: 0; // Using margins/padding directly in the SidebarRow // will make the animation of the new bookmark row jump @@ -95,11 +95,13 @@ opacity: $_placesidebar_icons_opacity; // dim the device icons &:dir(ltr) { padding-right: 8px; } + &:dir(rtl) { padding-left: 8px; } } label.sidebar-label { &:dir(ltr) { padding-right: 2px; } + &:dir(rtl) { padding-left: 2px; } } diff --git a/gtk-3.20/scss/widgets/_toggle.scss b/gtk-3.20/scss/widgets/_toggle.scss index 094ab0c..bde09d3 100644 --- a/gtk-3.20/scss/widgets/_toggle.scss +++ b/gtk-3.20/scss/widgets/_toggle.scss @@ -94,17 +94,17 @@ $suffix: if($variant == "dark", "-dark", ""); padding: $spacing - 1; border: none; outline: none; - transition: background-color 0.3s linear; + transition: background-color .3s linear; min-width: 88px; min-height: 24px; background-color: $switch_bg_color; color: $switch_fg_color; - box-shadow: inset 1px -1px 0px rgba(0, 0, 0, 0.06), inset -1px 1px 0px rgba(0, 0, 0, 0.06); + box-shadow: inset 1px -1px 0 alpha($dark_shadow, .06), inset -1px 1px 0 alpha($dark_shadow, .06); slider { background-color: $switch_slider_bg_color; transition: all 0.3s ease-in; - box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.07), 1px 0px 2px 0px rgba(0, 0, 0, 0.07); + box-shadow: 0 1px 2px 0 alpha($dark_shadow, .07), 1px 0 2px 0 alpha($dark_shadow, .07); border-radius: $roundness; } @@ -116,7 +116,7 @@ $suffix: if($variant == "dark", "-dark", ""); slider { background-color: $white; - box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px 0 alpha($dark_shadow, .1); } } diff --git a/gtk-3.20/scss/widgets/_view.scss b/gtk-3.20/scss/widgets/_view.scss index 41abe9a..b5a401c 100644 --- a/gtk-3.20/scss/widgets/_view.scss +++ b/gtk-3.20/scss/widgets/_view.scss @@ -99,6 +99,7 @@ &:selected { &:focus, & { @extend %selected_items; + border-radius: 0; } @@ -113,6 +114,7 @@ &:selected { color: mix($selected_fg_color, $selected_bg_color, .4); + &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, .3); } }