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.pull/496/head
Csaba Jakosa
Khurshid Alam
parent
0d05abedfc
commit
bd780f03d4
|
|
@ -3,15 +3,17 @@
|
|||
*************/
|
||||
|
||||
@include exports("nautilus") {
|
||||
.nautilus-desktop * {
|
||||
color: $white;
|
||||
text-shadow: 1px 1px $black;
|
||||
.nautilus-desktop, .nautilus-desktop * {
|
||||
&, &:backdrop {
|
||||
color: $white;
|
||||
text-shadow: 1px 1px $black;
|
||||
|
||||
&:active { color: $fg_color; }
|
||||
&:active { color: $fg_color; }
|
||||
|
||||
&:selected { color: $selected_fg_color; }
|
||||
&:selected { color: $selected_fg_color; }
|
||||
|
||||
&:active, &:hover, &:selected { text-shadow: none; }
|
||||
&:active, &:hover, &:selected { text-shadow: none; }
|
||||
}
|
||||
}
|
||||
|
||||
.nautilus-window {
|
||||
|
|
@ -22,44 +24,25 @@
|
|||
}
|
||||
|
||||
.sidebar {
|
||||
border: none;
|
||||
border: 0;
|
||||
|
||||
frame { border: 0; }
|
||||
}
|
||||
|
||||
paned {
|
||||
border-width: 0 1px 0 0;
|
||||
border-style: solid;
|
||||
|
||||
&, &:hover {
|
||||
border-color: shade($bg_color, ($contrast + .1));
|
||||
background-color: $bg_color;
|
||||
}
|
||||
}
|
||||
|
||||
notebook {
|
||||
background-color: $base_color;
|
||||
border: none;
|
||||
border: 0;
|
||||
|
||||
frame { border: 0; }
|
||||
}
|
||||
|
||||
.searchbar-container {
|
||||
border-bottom: 2px solid $base_color;
|
||||
border-left-width: 0px;
|
||||
margin-top: -1px;
|
||||
|
||||
searchbar {
|
||||
padding-top: $spacing - 3px;
|
||||
padding-bottom: $spacing - 2px;
|
||||
border: none;
|
||||
background-color: $selected_bg_color;
|
||||
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
|
||||
|
||||
.search {
|
||||
border-right-width: 1px;
|
||||
|
||||
+ button {
|
||||
margin-left: 8px;
|
||||
}
|
||||
}
|
||||
border-bottom: 1px solid $borders_color;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,19 +4,15 @@
|
|||
|
||||
@include exports("nemo") {
|
||||
.nemo-desktop, .nemo-desktop * {
|
||||
color: $white;
|
||||
text-shadow: 1px 1px $black;
|
||||
&, &:backdrop {
|
||||
color: $white;
|
||||
text-shadow: 1px 1px $black;
|
||||
|
||||
&:active {
|
||||
color: $fg_color;
|
||||
}
|
||||
&:active { color: $fg_color; }
|
||||
|
||||
&:selected {
|
||||
color: $selected_fg_color;
|
||||
}
|
||||
&:selected { color: $selected_fg_color; }
|
||||
|
||||
&:active, &:hover, &:selected {
|
||||
text-shadow: none;
|
||||
&:active, &:hover, &:selected { text-shadow: none; }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -71,8 +67,7 @@
|
|||
> widget:last-child {
|
||||
button {
|
||||
min-height: 15px;
|
||||
min-width: 22px;
|
||||
margin: 5px;
|
||||
min-width: 20px;
|
||||
}
|
||||
|
||||
button:first-child {
|
||||
|
|
@ -132,24 +127,24 @@
|
|||
}
|
||||
|
||||
/* Nemo Query Editor (File Search Bar) */
|
||||
+ separator + box .primary-toolbar {
|
||||
+ separator + box .primary-toolbar {
|
||||
@include linear-gradient(shade($bg_color, .98)); // Searchbar color (_actionbar.scss)
|
||||
|
||||
padding-top: $spacing - 3px;
|
||||
padding-bottom: $spacing - 4px;
|
||||
border-top: none;
|
||||
background-color: $selected_bg_color;
|
||||
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
|
||||
border-bottom: 1px solid $borders_color;
|
||||
|
||||
button:nth-child(2) {
|
||||
border-right: none;
|
||||
border-top-right-radius: 0px;
|
||||
border-bottom-right-radius: 0px;
|
||||
border-top-right-radius: 0;
|
||||
border-bottom-right-radius: 0;
|
||||
}
|
||||
|
||||
button:nth-child(3) {
|
||||
margin-left: -6px;
|
||||
border-left: none;
|
||||
border-top-left-radius: 0px;
|
||||
border-bottom-left-radius: 0px;
|
||||
border-top-left-radius: 0;
|
||||
border-bottom-left-radius: 0;
|
||||
}
|
||||
|
||||
button.flat {
|
||||
|
|
@ -168,9 +163,7 @@
|
|||
box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength);
|
||||
padding: 5px 6px;
|
||||
}
|
||||
|
||||
} // END Nemo Query Editor
|
||||
|
||||
} // END .sidebar
|
||||
|
||||
notebook {
|
||||
|
|
@ -183,4 +176,3 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,15 +20,14 @@
|
|||
****************/
|
||||
|
||||
@include exports("searchbar") {
|
||||
.search-bar {
|
||||
searchbar,
|
||||
.location-bar {
|
||||
@include linear-gradient(shade($bg_color, .98));
|
||||
|
||||
border-width: 0 0 1px;
|
||||
border-style: solid;
|
||||
border-color: border_normal($bg_color);
|
||||
color: $fg_color;
|
||||
|
||||
.button.close-button { padding: $spacing; }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -60,7 +59,7 @@
|
|||
&.header-bar, &.toolbar {
|
||||
@include toolbar($selected_bg_color, $selected_fg_color);
|
||||
|
||||
.button {
|
||||
button {
|
||||
@include button($selected_bg_color, $selected_fg_color);
|
||||
|
||||
&.suggested-action { @extend .suggested-action.button; }
|
||||
|
|
|
|||
Loading…
Reference in New Issue