Restyle Pathbar (#243)

* gtk3: Add .nautilus-path-bar to linked button rules

For some reason, the .linked button rules from _common.scss keep
overriding .nautilus-path-bar button theming in _application.scss.

Work around the issue by adding :not(.nautilus-path-bar) selectors.

* gtk3: Update pathbar theming for nautilus 3.32

* gtk3: Remove nautilus 3.32 path-bar separators

This is more consistent with other path-bars and stack-switchers.
master
David Mohammed 2019-05-16 14:59:05 +01:00 committed by GitHub
parent 99df8d9943
commit a6cf4045f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 8 deletions

View File

@ -67,16 +67,21 @@ terminal-window,
}
// Pathbar for nautilus >=3.30
.nautilus-window .path-bar-box.width-maximized {
border: 1px $header_button_border solid;
.nautilus-window .path-bar-box {
border-radius: 3px;
transition: border $backdrop_transition;
transition: background-color $backdrop_transition;
&:not(:backdrop) {
background-color: $header_button_bg;
&.width-maximized {
border: 1px $header_button_border solid;
transition: border $backdrop_transition;
transition: background-color $backdrop_transition;
&:not(:backdrop) {
background-color: $header_button_bg;
}
}
}
// path-bar buttons for nautilus 3.30
.nautilus-window .path-bar > box > button {
background-color: transparent;
border-color: transparent;
@ -90,6 +95,41 @@ terminal-window,
}
}
// path-bar buttons for nautilus >=3.32
.nautilus-path-bar > button {
margin: 0;
border: 1px $header_button_border solid;
background-color: $header_button_bg;
@extend %linked;
// from .linked:not(.vertical).path-bar > button:hover in _common.scss
&:hover { background-color: lighten($header_button_bg, 15%); }
&:active, &:checked { @include button(header-active); }
.nautilus-window .path-bar-box.width-maximized > & {
border-width: 0;
&:last-child {
border-width: 0px 1px 0px 0px;
}
&:only-child {
border-radius: 3px 0px 0px 3px;
}
&:not(:first-child) {
border-radius: 0;
}
}
// workaround jumpy button labels
& > box > label { padding: 0 1px; }
&:only-child > box > label { padding: 0 2px; }
}
button.nautilus-circular-button.image-button {
@extend button.circular;
}

View File

@ -1211,12 +1211,12 @@ headerbar {
// Linking stuff
// Disconnect linked buttons
.linked:not(.vertical):not(.path-bar):not(.stack-switcher) {
.linked:not(.vertical):not(.path-bar):not(.nautilus-path-bar):not(.stack-switcher) {
button:not(:last-child):not(:only-child) { margin-right: 1px; }
}
// Reset buttons
.linked:not(.vertical):not(.path-bar) > button {
.linked:not(.vertical):not(.path-bar):not(.nautilus-path-bar) > button {
&, &:hover, &:active, &:checked, &:disabled {
border-radius: 3px;
border-style: solid;