fix search bar for nemo and nautilus

(cherry picked from commit antergos/numix-frost@c61955e)
pull/414/head
Dustin Falgout 2016-05-09 05:31:38 -05:00
parent 76a8fc2dee
commit 22a3938038
2 changed files with 140 additions and 136 deletions

View File

@ -41,31 +41,26 @@
border: none; border: none;
frame { border: 0; } frame { border: 0; }
} }
}
NautilusQueryEditor { .searchbar-container {
toolbar { border-bottom: 2px solid $base_color;
padding-top: $spacing - 1px; border-left-width: 0px;
padding-bottom: $spacing - 2px;
border-width: 1px 0 0;
border-style: solid;
border-color: $toolbar_bg_color;
background-color: shade($toolbar_bg_color, .9);
&:nth-child(2) { border-color: border_normal($toolbar_bg_color); } searchbar {
padding-top: $spacing - 3px;
&.search-bar { padding-bottom: $spacing - 2px;
border-top-width: 0; border: none;
border-bottom-width: 0; background-color: $selected_bg_color;
} box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
&, &.search-bar { .search {
&:last-child, &:only-child { border-right-width: 1px;
border-bottom-width: 1px;
border-bottom-color: border_normal($toolbar_bg_color); + button {
margin-left: 8px;
}
} }
} }
} }
} }
} }

View File

@ -21,102 +21,12 @@
} }
} }
.nemo-pathbar {
@include button($toolbar_bg_color, $toolbar_fg_color);
-NemoPathbarButton-border-radius: $roundness;
}
/* This block needs to be moved back into the scope of nemo-window
* as soon as nemo is updated to include the nemo-window style class.
*/
.sidebar .view {
-NemoPlacesTreeView-disk-full-bg-color: shade($bg_color, .8);
-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-max-length: 75px;
&:selected {
-NemoPlacesTreeView-disk-full-bg-color: $selected_fg_color;
-NemoPlacesTreeView-disk-full-fg-color: shade($selected_bg_color, 1.2);
}
}
/* Ridiculously specific selector until Nemo is updated with new style classes */
grid > paned > box > paned > box > notebook {
background-color: $base_color;
}
.nemo-window { .nemo-window {
toolbar { toolbar {
border-width: 0 0 1px; border-width: 0 0 1px;
border-style: solid; border-style: solid;
border-color: border_normal($toolbar_bg_color); border-color: border_normal($toolbar_bg_color);
}
/* Stupid selectors to target statusbar because nemo lacks 3.20 style class */
grid {
> widget:last-child {
button {
min-height: 15px;
min-width: 22px;
margin: 5px;
}
button:first-child {
margin-left: 20px;
}
button:first-child + button {
margin-right: 15px;
}
button:first-child + button + separator + button {
margin-left: 15px;
}
> box > scale {
margin-right: 12px;
}
}
} // END statusbar
.sidebar {
.frame {
border: 0;
}
image {
padding-left: $spacing;
padding-right: $spacing;
}
.places-sidebar {
&, & .view {
background-color: mix($bg_color, $base_color, .5);
}
.view:selected {
&:focus, & {
@extend %selected_items;
}
}
}
}
statusbar {
border: 0;
}
notebook {
border-width: 0;
tabs {
border: 0;
}
}
toolbar {
button { button {
@include button($bg_color, $fg_color); @include button($bg_color, $fg_color);
} }
@ -146,35 +56,134 @@
&.primary-toolbar button { &.primary-toolbar button {
padding: 5px 6px; padding: 5px 6px;
} }
}
} /* Path Bar */
toolitem stack {
margin-left: 15px;
NemoQueryEditor { widget button {
toolbar { @include linked_button($toolbar_bg_color);
padding-top: $spacing - 3px; -NemoPathbarButton-border-radius: $roundness;
padding-bottom: $spacing - 4px;
border-width: 1px 0 0;
border-style: solid;
border-color: $toolbar_bg_color;
background-color: shade($toolbar_bg_color, .9);
&:nth-child(2) {
border-color: border_normal($toolbar_bg_color);
}
&.search-bar {
border-top-width: 0;
border-bottom-width: 0;
}
&, &.search-bar {
&:last-child, &:only-child {
border-bottom-width: 1px;
border-bottom-color: border_normal($toolbar_bg_color);
} }
} }
} // END toolbar
/* Status Bar */
grid {
> widget:last-child {
button {
min-height: 15px;
min-width: 22px;
margin: 5px;
}
button:first-child {
margin-left: 20px;
}
button:first-child + button {
margin-right: 15px;
}
button:first-child + button + separator + button {
margin-left: 15px;
}
> box > scale {
margin-right: 12px;
}
statusbar {
border: 0;
}
}
} // END Status Bar
.sidebar {
.frame {
border: 0;
}
image {
padding-left: $spacing;
padding-right: $spacing;
}
.nemo-places-sidebar {
&, & .view {
background-color: mix($bg_color, $base_color, .5);
}
.view {
-NemoPlacesTreeView-disk-full-bg-color: shade($bg_color, .8);
-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-max-length: 75px;
&:selected {
-NemoPlacesTreeView-disk-full-bg-color: $selected_fg_color;
-NemoPlacesTreeView-disk-full-fg-color: shade($selected_bg_color, 1.2);
&:focus, & {
@extend %selected_items;
}
}
}
}
/* Nemo Query Editor (File Search Bar) */
+ separator + box .primary-toolbar {
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);
button:nth-child(2) {
border-right: none;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
}
button:nth-child(3) {
margin-left: -6px;
border-left: none;
border-top-left-radius: 0px;
border-bottom-left-radius: 0px;
}
button.flat {
$bg: $bg_color;
$fg: $fg_color;
$border_strength: if(lightness($bg) > 50, 0, .1);
$shadow_strength: if(lightness($bg) > 50, 0, .1);
$button_bg: if(hue($bg) == 0deg, shade($bg, 1.2), $bg);
@extend %button;
@include linear-gradient($button_bg);
@include border(rgba(0, 0, 0, .12 + $border_strength));
color: $fg;
box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength);
padding: 5px 6px;
}
} // END Nemo Query Editor
} // END .sidebar
notebook {
background-color: $base_color;
border-width: 0;
tabs {
border: 0;
}
} }
} }
} }