Skip to content

Commit bd780f0

Browse files
megaxkhurshid-alam
authored andcommitted
GTK 3.20 :: Optimized Nemo and Nautilus design and update searchbar code (#482)
* * Optimized Nemo and Nautilus design. Update searchbar code. * * Fixed Nautilus backdrop text color change.
1 parent 0d05abe commit bd780f0

3 files changed

Lines changed: 32 additions & 58 deletions

File tree

gtk-3.20/scss/apps/_nautilus.scss

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
*************/
44

55
@include exports("nautilus") {
6-
.nautilus-desktop * {
7-
color: $white;
8-
text-shadow: 1px 1px $black;
6+
.nautilus-desktop, .nautilus-desktop * {
7+
&, &:backdrop {
8+
color: $white;
9+
text-shadow: 1px 1px $black;
910

10-
&:active { color: $fg_color; }
11+
&:active { color: $fg_color; }
1112

12-
&:selected { color: $selected_fg_color; }
13+
&:selected { color: $selected_fg_color; }
1314

14-
&:active, &:hover, &:selected { text-shadow: none; }
15+
&:active, &:hover, &:selected { text-shadow: none; }
16+
}
1517
}
1618

1719
.nautilus-window {
@@ -22,44 +24,25 @@
2224
}
2325

2426
.sidebar {
25-
border: none;
26-
frame { border: 0; }
27-
}
28-
29-
paned {
30-
border-width: 0 1px 0 0;
31-
border-style: solid;
27+
border: 0;
3228

33-
&, &:hover {
34-
border-color: shade($bg_color, ($contrast + .1));
35-
background-color: $bg_color;
36-
}
29+
frame { border: 0; }
3730
}
3831

3932
notebook {
4033
background-color: $base_color;
41-
border: none;
34+
border: 0;
35+
4236
frame { border: 0; }
4337
}
4438

4539
.searchbar-container {
46-
border-bottom: 2px solid $base_color;
47-
border-left-width: 0px;
40+
margin-top: -1px;
4841

4942
searchbar {
5043
padding-top: $spacing - 3px;
5144
padding-bottom: $spacing - 2px;
52-
border: none;
53-
background-color: $selected_bg_color;
54-
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
55-
56-
.search {
57-
border-right-width: 1px;
58-
59-
+ button {
60-
margin-left: 8px;
61-
}
62-
}
45+
border-bottom: 1px solid $borders_color;
6346
}
6447
}
6548
}

gtk-3.20/scss/apps/_nemo.scss

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,15 @@
44

55
@include exports("nemo") {
66
.nemo-desktop, .nemo-desktop * {
7-
color: $white;
8-
text-shadow: 1px 1px $black;
7+
&, &:backdrop {
8+
color: $white;
9+
text-shadow: 1px 1px $black;
910

10-
&:active {
11-
color: $fg_color;
12-
}
11+
&:active { color: $fg_color; }
1312

14-
&:selected {
15-
color: $selected_fg_color;
16-
}
13+
&:selected { color: $selected_fg_color; }
1714

18-
&:active, &:hover, &:selected {
19-
text-shadow: none;
15+
&:active, &:hover, &:selected { text-shadow: none; }
2016
}
2117
}
2218

@@ -71,8 +67,7 @@
7167
> widget:last-child {
7268
button {
7369
min-height: 15px;
74-
min-width: 22px;
75-
margin: 5px;
70+
min-width: 20px;
7671
}
7772

7873
button:first-child {
@@ -132,24 +127,24 @@
132127
}
133128

134129
/* Nemo Query Editor (File Search Bar) */
135-
+ separator + box .primary-toolbar {
130+
+ separator + box .primary-toolbar {
131+
@include linear-gradient(shade($bg_color, .98)); // Searchbar color (_actionbar.scss)
132+
136133
padding-top: $spacing - 3px;
137134
padding-bottom: $spacing - 4px;
138-
border-top: none;
139-
background-color: $selected_bg_color;
140-
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
135+
border-bottom: 1px solid $borders_color;
141136

142137
button:nth-child(2) {
143138
border-right: none;
144-
border-top-right-radius: 0px;
145-
border-bottom-right-radius: 0px;
139+
border-top-right-radius: 0;
140+
border-bottom-right-radius: 0;
146141
}
147142

148143
button:nth-child(3) {
149144
margin-left: -6px;
150145
border-left: none;
151-
border-top-left-radius: 0px;
152-
border-bottom-left-radius: 0px;
146+
border-top-left-radius: 0;
147+
border-bottom-left-radius: 0;
153148
}
154149

155150
button.flat {
@@ -168,9 +163,7 @@
168163
box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength);
169164
padding: 5px 6px;
170165
}
171-
172166
} // END Nemo Query Editor
173-
174167
} // END .sidebar
175168

176169
notebook {
@@ -183,4 +176,3 @@
183176
}
184177
}
185178
}
186-

gtk-3.20/scss/widgets/_actionbar.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@
2020
****************/
2121

2222
@include exports("searchbar") {
23-
.search-bar {
23+
searchbar,
24+
.location-bar {
2425
@include linear-gradient(shade($bg_color, .98));
2526

2627
border-width: 0 0 1px;
2728
border-style: solid;
2829
border-color: border_normal($bg_color);
2930
color: $fg_color;
30-
31-
.button.close-button { padding: $spacing; }
3231
}
3332
}
3433

@@ -60,7 +59,7 @@
6059
&.header-bar, &.toolbar {
6160
@include toolbar($selected_bg_color, $selected_fg_color);
6261

63-
.button {
62+
button {
6463
@include button($selected_bg_color, $selected_fg_color);
6564

6665
&.suggested-action { @extend .suggested-action.button; }

0 commit comments

Comments
 (0)