Update and fixed bugs

This commit is contained in:
vinceliuice 2018-02-13 12:38:51 +08:00
parent 63b12537c1
commit 66404fb981
6 changed files with 66 additions and 34 deletions

View File

@ -590,7 +590,7 @@ StScrollBar {
-arrow-rise: 0;
-arrow-box-shadow: none;
margin: 2px 6px 6px;
background-color: rgba(36, 36, 36, 0.9);
background-color: rgba(36, 36, 36, 0.95);
border-radius: 8px;
box-shadow: 0 3px 3px rgba(0, 0, 0, 0.24), 0 3px 3px rgba(0, 0, 0, 0.345); }

View File

@ -590,7 +590,7 @@ StScrollBar {
-arrow-rise: 0;
-arrow-box-shadow: none;
margin: 2px 6px 6px;
background-color: rgba(255, 255, 255, 0.9);
background-color: rgba(255, 255, 255, 0.95);
border-radius: 8px;
box-shadow: 0 3px 3px rgba(0, 0, 0, 0.24), 0 3px 3px rgba(0, 0, 0, 0.345); }

View File

@ -631,7 +631,7 @@ $slider_color: if($variant == 'light', white, white);
-arrow-rise: 0;
-arrow-box-shadow: none; //dreaming. bug #689995
margin: 2px 6px 6px;
background-color: rgba($base_color, 0.9);
background-color: rgba($base_color, 0.95);
border-radius: $bt_radius;
box-shadow: $shadow_2;
}

View File

@ -1083,7 +1083,7 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop, w
opacity: 0.6; }
headerbar entry, .nemo-window .primary-toolbar entry {
min-height: 26px;
min-height: 22px;
border: none;
color: rgba(225, 219, 219, 0.8);
background-color: rgba(119, 119, 119, 0.55);
@ -1208,10 +1208,20 @@ headerbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(
margin-right: 1px; }
headerbar .linked:not(.vertical):not(.path-bar) > button, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button, headerbar .linked:not(.vertical):not(.path-bar) > button:hover, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover, headerbar .linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active, headerbar .linked:not(.vertical):not(.path-bar) > button:checked, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked, headerbar .linked:not(.vertical):not(.path-bar) > button:disabled, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:disabled {
border-radius: 5px; }
headerbar .linked:not(.vertical):not(.path-bar) > entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:hover, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:hover, headerbar .linked:not(.vertical):not(.path-bar) > entry:active, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:active, headerbar .linked:not(.vertical):not(.path-bar) > entry:checked, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:checked, headerbar .linked:not(.vertical):not(.path-bar) > entry:disabled, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:disabled {
headerbar .linked:not(.vertical):not(.path-bar) > entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:disabled, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:disabled {
border-radius: 5px;
margin-right: 4px;
margin-left: 3px; }
headerbar .linked:not(.vertical):not(.path-bar) > button:active + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active + entry,
headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry,
.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry {
border-left-color: rgba(255, 255, 255, 0.12); }
headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry,
headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo,
.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
border-left-color: rgba(255, 255, 255, 0.12); }
headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
@ -1272,10 +1282,6 @@ headerbar .linked:not(.vertical).path-bar > button,
opacity: 0.7;
box-shadow: none;
background-image: none; }
headerbar .linked:not(.vertical):not(.path-bar) > button:active + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active + entry,
headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry,
.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry {
border-left-color: rgba(255, 255, 255, 0.12); }
headerbar button.suggested-action, .nemo-window .primary-toolbar button.suggested-action {
background-clip: border-box;
color: white;

View File

@ -139,7 +139,7 @@ spinner {
opacity: 0.5; }
entry {
min-height: 22px;
min-height: 20px;
border: 1px solid;
padding: 2px 8px;
caret-color: currentColor;
@ -1086,7 +1086,7 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop, w
opacity: 0.6; }
headerbar entry, .nemo-window .primary-toolbar entry {
min-height: 24px;
min-height: 20px;
color: rgba(40, 32, 32, 0.8);
background-color: white;
background-image: linear-gradient(0deg, #f1f1f1 0%, #fdfdfd 95%, #fefefe 100%); }
@ -1209,10 +1209,23 @@ headerbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(
headerbar .linked:not(.vertical):not(.path-bar) > button, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button, headerbar .linked:not(.vertical):not(.path-bar) > button:hover, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover, headerbar .linked:not(.vertical):not(.path-bar) > button:active, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active, headerbar .linked:not(.vertical):not(.path-bar) > button:checked, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked, headerbar .linked:not(.vertical):not(.path-bar) > button:disabled, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:disabled {
border-radius: 5px;
border: 1px solid rgba(0, 0, 0, 0.11); }
headerbar .linked:not(.vertical):not(.path-bar) > entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:hover, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:hover, headerbar .linked:not(.vertical):not(.path-bar) > entry:active, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:active, headerbar .linked:not(.vertical):not(.path-bar) > entry:checked, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:checked, headerbar .linked:not(.vertical):not(.path-bar) > entry:disabled, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:disabled {
headerbar .linked:not(.vertical):not(.path-bar) > entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:disabled, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:disabled {
border-radius: 5px;
margin-right: 4px;
margin-left: 3px; }
margin-left: 3px;
border: 1px solid rgba(0, 0, 0, 0.11); }
headerbar .linked:not(.vertical):not(.path-bar) > entry:focus, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus {
border: 1px solid #74aaff; }
headerbar .linked:not(.vertical):not(.path-bar) > button:active + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active + entry,
headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry,
.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry {
border-left-color: rgba(0, 0, 0, 0.11); }
headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry,
headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo,
.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > box > button.combo {
border-left-color: rgba(0, 0, 0, 0.11); }
headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child),
headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action),
@ -1272,10 +1285,6 @@ headerbar .linked:not(.vertical).path-bar > button,
opacity: 0.7;
box-shadow: none;
background-image: none; }
headerbar .linked:not(.vertical):not(.path-bar) > button:active + entry, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active + entry,
headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry,
.nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry {
border-left-color: rgba(0, 0, 0, 0.11); }
headerbar button.suggested-action, .nemo-window .primary-toolbar button.suggested-action {
background-clip: border-box;
color: white;

View File

@ -202,7 +202,7 @@ spinner {
// Text Entries
//
entry {
min-height: 22px;
min-height: if($variant =='light', 20px, 22px);
border: 1px solid;
padding: 2px 8px;
@ -1253,7 +1253,7 @@ headerbar {
// Headerbar Entries
entry {
min-height: if($variant =='light', 24px, 26px);
min-height: if($variant =='light', 20px, 22px);
@include entry(header-normal);
&:backdrop { opacity: 0.85; }
@ -1377,19 +1377,40 @@ headerbar {
// Reset buttons
.linked:not(.vertical):not(.path-bar) > button {
&, &:hover, &:active, &:checked, &:disabled {
&, &:hover, &:active, &:checked, &:disabled {
border-radius: $bt_radius;
@if $variant == 'light' { border: 1px solid $borders_color; }
// label { padding-left: 3px; padding-right: 6px; }
// image { padding-left: 6px; padding-right: 3px; }
}
}
// Reset entrys
.linked:not(.vertical):not(.path-bar) > entry {
&, &:hover, &:active, &:checked, &:disabled {
&, &:disabled {
border-radius: $bt_radius;
margin-right: 4px;
margin-left: 3px;
@if $variant == 'light' { border: 1px solid $borders_color; }
}
&:focus { @if $variant == 'light' { border: 1px solid $entry_highlight; } }
}
// use linking rules for entries only
.linked:not(.vertical):not(.path-bar) {
// @include linking_rules( $a:0.5,
// $var:if($variant=='light' and $darker=='false', 'light', 'dark'),
// $button_rules:'false',
// $e_border:$header_entry_border,
// $b_border:$header_button_border );
// Reset headerbar linked rules
> button:active + entry,
> button:checked + entry { border-left-color: $borders_color; }
> entry:focus:not(:only-child) {
+ entry,
+ button,
+ combobox > box > button.combo { border-left-color: $borders_color; }
}
}
@ -1420,17 +1441,6 @@ headerbar {
// @include pathbar_linking_rules($sep_color: $button_border);
}
// use linking rules for entries only
.linked:not(.vertical):not(.path-bar) {
// @include linking_rules( $a:0.5,
// $var:if($variant=='light' and $darker=='false', 'light', 'dark'),
// $button_rules:'false',
// $e_border:$header_entry_border,
// $b_border:$header_button_border );
> button:active + entry,
> button:checked + entry { border-left-color: $borders_color; }
}
// Headerbar Suggested and Destructive Action buttons
@each $b_type, $b_color, $b_fg in (suggested-action, $suggested_color, $suggested_fg_color),
(destructive-action, $destructive_color, $destructive_fg_color) {
@ -1929,6 +1939,13 @@ popover.background {
&.osd { @extend %osd; }
}
// &.menu button:not(only-child),
// button.model:not(only-child) {
// min-height: 24px;
// padding: 0;
// margin: 0;
// }
}
//touch selection handlebars for the Popover.osd above