Merge remote-tracking branch 'upstream/master'

Update to the latest upstream again
This commit is contained in:
Muhammad Rivan 2021-04-04 18:42:18 +07:00
commit 59e1ce103c
6 changed files with 122 additions and 2 deletions

View file

@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
transition-duration: 300ms;
}
window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
color: #FDFDFD;
}
window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
color: #FDFDFD;
@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
popover > scrolledwindow > viewport > list row,
popover.background > scrolledwindow > viewport > list row {
padding: 6px 12px;
border-radius: 6px;
}
@ -5148,6 +5155,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
border: none;
}
preferencesgroup list list {
margin: 0 0;
padding: 0 0;
box-shadow: none;
background: none;
border: none;
}
.nautilus-canvas-item {
border-radius: 5px;
}
@ -6351,6 +6366,10 @@ notebook.main-notebook webkitwebview {
border-radius: 0 0 12px 12px;
}
window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
border-color: #373737;
}
tabbox {
background-color: #1e1e1e;
box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@ -6361,6 +6380,11 @@ tabbox > tab {
padding: 2px 10px;
min-width: 24px;
min-height: 24px;
border-top: 1px solid rgba(255, 255, 255, 0.12);
}
tabbox > tab:checked {
border-top-color: #373737;
}
tabbox > tab button {

View file

@ -1942,6 +1942,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
transition-duration: 300ms;
}
window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
color: #FDFDFD;
}
window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
color: #FDFDFD;
@ -2442,6 +2448,7 @@ popover.background > scrolledwindow > viewport > list {
popover > scrolledwindow > viewport > list row,
popover.background > scrolledwindow > viewport > list row {
padding: 6px 12px;
border-radius: 6px;
}
@ -5143,6 +5150,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
border: none;
}
preferencesgroup list list {
margin: 0 0;
padding: 0 0;
box-shadow: none;
background: none;
border: none;
}
.nautilus-canvas-item {
border-radius: 5px;
}
@ -6346,6 +6361,10 @@ notebook.main-notebook webkitwebview {
border-radius: 0 0 12px 12px;
}
window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
border-color: #373737;
}
tabbox {
background-color: #1e1e1e;
box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12);
@ -6356,6 +6375,11 @@ tabbox > tab {
padding: 2px 10px;
min-width: 24px;
min-height: 24px;
border-top: 1px solid rgba(255, 255, 255, 0.12);
}
tabbox > tab:checked {
border-top-color: #373737;
}
tabbox > tab button {

View file

@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
transition-duration: 300ms;
}
window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
color: #575757;
}
window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
color: #575757;
@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
popover > scrolledwindow > viewport > list row,
popover.background > scrolledwindow > viewport > list row {
padding: 6px 12px;
border-radius: 6px;
}
@ -5170,6 +5177,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
border: none;
}
preferencesgroup list list {
margin: 0 0;
padding: 0 0;
box-shadow: none;
background: none;
border: none;
}
.nautilus-canvas-item {
border-radius: 5px;
}
@ -6374,6 +6389,10 @@ notebook.main-notebook webkitwebview {
border-radius: 0 0 12px 12px;
}
window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
border-color: #ffffff;
}
tabbox {
background-color: #e6e6e6;
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@ -6384,6 +6403,11 @@ tabbox > tab {
padding: 2px 10px;
min-width: 24px;
min-height: 24px;
border-top: 1px solid rgba(0, 0, 0, 0.12);
}
tabbox > tab:checked {
border-top-color: #ffffff;
}
tabbox > tab button {

View file

@ -1950,6 +1950,12 @@ window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar
transition-duration: 300ms;
}
window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:active:hover,
window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:active:hover, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:active:hover:not(.image-button), .nemo-window .primary-toolbar button:active:hover, headerbar button:active:hover, window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
color: #575757;
}
window.background.csd > headerbar.titlebar.selection-mode > hdyleaflet > headerbar > button:checked,
window.background.csd > headerbar.titlebar.selection-mode > leaflet > headerbar > button:checked, window.org-gnome-gedit > paned.titlebar > headerbar button.flat.toggle.popup:checked:not(.image-button), .nemo-window .primary-toolbar button:checked, headerbar button:checked {
color: #575757;
@ -2450,6 +2456,7 @@ popover.background > scrolledwindow > viewport > list {
popover > scrolledwindow > viewport > list row,
popover.background > scrolledwindow > viewport > list row {
padding: 6px 12px;
border-radius: 6px;
}
@ -5165,6 +5172,14 @@ window.background.csd > box.vertical > box.horizontal > stack > widget > noteboo
border: none;
}
preferencesgroup list list {
margin: 0 0;
padding: 0 0;
box-shadow: none;
background: none;
border: none;
}
.nautilus-canvas-item {
border-radius: 5px;
}
@ -6369,6 +6384,10 @@ notebook.main-notebook webkitwebview {
border-radius: 0 0 12px 12px;
}
window.background.csd > deck > deck > fullscreenbox > flap > box > windowhandle > headerbar.titlebar {
border-color: #ffffff;
}
tabbox {
background-color: #e6e6e6;
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12);
@ -6379,6 +6398,11 @@ tabbox > tab {
padding: 2px 10px;
min-width: 24px;
min-height: 24px;
border-top: 1px solid rgba(0, 0, 0, 0.12);
}
tabbox > tab:checked {
border-top-color: #ffffff;
}
tabbox > tab button {

View file

@ -332,6 +332,14 @@ preferencesgroup { // gnome 40.0 preferences window
@extend %circular_list;
row.activatable { @extend %circular_row; }
list {
margin: 0 0;
padding: 0 0;
box-shadow: none;
background: none;
border: none;
}
}
}
@ -1816,6 +1824,14 @@ notebook.main-notebook {
}
// gnome 40.0
window.background.csd {
> deck > deck > fullscreenbox > flap > box > windowhandle {
> headerbar.titlebar { // Gnome 40.0
border-color: $header_bg;
}
}
}
tabbox {
background-color: darken($header_bg, 10%);
box-shadow: inset 0 -1px $borders_color;
@ -1826,6 +1842,11 @@ tabbox {
padding: 2px 10px;
min-width: 24px;
min-height: 24px;
border-top: 1px solid $borders_color;
&:checked {
border-top-color: $header_bg;
}
button {
min-height: 20px;

View file

@ -1776,7 +1776,7 @@ headerbar, .titlebar {
transition-duration: 300ms;
}
// &:active:hover, &:checked { color: $header_fg; }
&:active:hover, &:checked { color: $header_fg; }
&:checked {
@include button(header-checked);
@ -2207,7 +2207,10 @@ popover.background {
> scrolledwindow > viewport > list {
margin: $container_padding;
row { border-radius: $bt_radius; }
row {
padding: 6px 12px;
border-radius: $bt_radius;
}
}
&, .csd & {