Skip to content

Commit 67bf7e2

Browse files
megaxlots0logs
authored andcommitted
GTK 3.20 :: Clean code (#553)
* * Clean code. * * Fixed PR code.
1 parent c997dd3 commit 67bf7e2

8 files changed

Lines changed: 21 additions & 21 deletions

File tree

gtk-3.20/scss/apps/_gedit.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@
133133
.gedit-bottom-panel-paned,
134134
.gedit-side-panel-paned,
135135
paned.titlebar {
136-
margin-right: 0px;
137-
}
136+
margin-right: 0;
137+
}
138138

139139
.gedit-bottom-panel-paned notebook {
140140
border-top: none;
141-
}
141+
}
142142
}

gtk-3.20/scss/apps/_gnome-terminal.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,5 @@
3333
&:disabled { background-color: transparent; }
3434
}
3535
}
36-
37-
/*GtkNotebook.notebook {
38-
border-right-width: 0;
39-
border-bottom-width: 0;
40-
border-left-width: 0;
41-
}*/
4236
}
4337
}

gtk-3.20/scss/apps/_nemo.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
min-width: 28px;
3939
padding: 3px;
4040
}
41-
41+
4242
/* Path Bar */
4343
toolitem stack {
4444
margin-left: 15px;
@@ -48,7 +48,6 @@
4848
-NemoPathbarButton-border-radius: $roundness;
4949
}
5050
}
51-
5251
} // END toolbar
5352

5453
/* Status Bar */

gtk-3.20/scss/widgets/_button.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
@include exports("button_extends") {
66
// stuff for .needs-attention
7-
$_dot_color: if($variant=='light', $selected_bg_color, lighten($selected_bg_color, .15));
7+
$_dot_color: if($variant == 'light', $selected_bg_color, lighten($selected_bg_color, .15));
88

99
@keyframes needs_attention {
1010
from {
@@ -19,7 +19,7 @@
1919
%needs_attention {
2020
animation: needs_attention 150ms ease-in;
2121
$_dot_shadow: _text_shadow_color();
22-
$_dot_shadow_r: if($variant=='light', .5, .45);
22+
$_dot_shadow_r: if($variant == 'light', .5, .45);
2323
background-image: -gtk-gradient(radial, center center, 0, center center, .5, to($_dot_color), to(transparent)),
2424
-gtk-gradient(radial, center center, 0, center center, $_dot_shadow_r, to($_dot_shadow), to(transparent));
2525
background-size: 6px 6px, 6px 6px;

gtk-3.20/scss/widgets/_menu.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,9 @@
276276
border-radius: $roundness;
277277
}
278278

279-
entry { @include entry($menu_bg_color, $menu_fg_color); }
279+
entry { @include entry($menu_bg_color, $menu_fg_color); }
280280

281-
button { @include button($menu_bg_color, $menu_fg_color); }
281+
button { @include button($menu_bg_color, $menu_fg_color); }
282282

283283
> list, > .view, > toolbar {
284284
border-style: none;
@@ -296,7 +296,9 @@
296296
//@extend %undecorated_button;
297297

298298
&:hover { background-color: $selected_bg_color; color: $selected_fg_color }
299+
299300
&:active, &:selected { &, arrow { @extend %selected_items; } }
301+
300302
&:checked { color: $fg_color; }
301303

302304
// FIXME: temporary workaround
@@ -308,6 +310,7 @@
308310

309311
&.flat arrow {
310312
&.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
313+
311314
&.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
312315
}
313316
}

gtk-3.20/scss/widgets/_sidebar.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@
6565
}
6666
}
6767

68-
$_placesidebar_icons_opacity: 0.7;
68+
$_placesidebar_icons_opacity: .7;
6969

7070
placessidebar {
7171
> viewport.frame { border-style: none; }
7272

7373
row {
7474
// Needs overriding of the GtkListBoxRow padding
7575
min-height: 36px;
76-
padding: 0px;
76+
padding: 0;
7777

7878
// Using margins/padding directly in the SidebarRow
7979
// will make the animation of the new bookmark row jump
@@ -95,11 +95,13 @@
9595
opacity: $_placesidebar_icons_opacity; // dim the device icons
9696

9797
&:dir(ltr) { padding-right: 8px; }
98+
9899
&:dir(rtl) { padding-left: 8px; }
99100
}
100101

101102
label.sidebar-label {
102103
&:dir(ltr) { padding-right: 2px; }
104+
103105
&:dir(rtl) { padding-left: 2px; }
104106
}
105107

gtk-3.20/scss/widgets/_toggle.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,17 @@ $suffix: if($variant == "dark", "-dark", "");
9494
padding: $spacing - 1;
9595
border: none;
9696
outline: none;
97-
transition: background-color 0.3s linear;
97+
transition: background-color .3s linear;
9898
min-width: 88px;
9999
min-height: 24px;
100100
background-color: $switch_bg_color;
101101
color: $switch_fg_color;
102-
box-shadow: inset 1px -1px 0px rgba(0, 0, 0, 0.06), inset -1px 1px 0px rgba(0, 0, 0, 0.06);
102+
box-shadow: inset 1px -1px 0 alpha($dark_shadow, .06), inset -1px 1px 0 alpha($dark_shadow, .06);
103103

104104
slider {
105105
background-color: $switch_slider_bg_color;
106106
transition: all 0.3s ease-in;
107-
box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.07), 1px 0px 2px 0px rgba(0, 0, 0, 0.07);
107+
box-shadow: 0 1px 2px 0 alpha($dark_shadow, .07), 1px 0 2px 0 alpha($dark_shadow, .07);
108108
border-radius: $roundness;
109109
}
110110

@@ -116,7 +116,7 @@ $suffix: if($variant == "dark", "-dark", "");
116116

117117
slider {
118118
background-color: $white;
119-
box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.1);
119+
box-shadow: 0 1px 3px 0 alpha($dark_shadow, .1);
120120
}
121121
}
122122

gtk-3.20/scss/widgets/_view.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
&:selected {
100100
&:focus, & {
101101
@extend %selected_items;
102+
102103
border-radius: 0;
103104
}
104105

@@ -113,6 +114,7 @@
113114

114115
&:selected {
115116
color: mix($selected_fg_color, $selected_bg_color, .4);
117+
116118
&:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, .3); }
117119
}
118120

0 commit comments

Comments
 (0)