From 2cf816b68a6b52ca8a4066eb983d96996dec0991 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Tue, 8 Dec 2020 17:33:16 +0800 Subject: [PATCH] update --- src/_sass/gtk/_common-3.20.scss | 124 ++++++------------- src/_sass/gtk/apps/_gnome-3.22.scss | 34 ++--- src/gnome-shell/gnome-shell-compact.css | 35 +++++- src/gnome-shell/gnome-shell-dark-compact.css | 41 +++++- src/gnome-shell/gnome-shell-dark.css | 41 +++++- src/gnome-shell/gnome-shell.css | 35 +++++- src/gnome-shell/sass/_common.scss | 50 ++++++-- src/gtk/3.0/gtk-compact.css | 119 ++++++------------ src/gtk/3.0/gtk-dark-compact.css | 119 ++++++------------ src/gtk/3.0/gtk-dark.css | 119 ++++++------------ src/gtk/3.0/gtk-light-compact.css | 119 ++++++------------ src/gtk/3.0/gtk-light.css | 119 ++++++------------ src/gtk/3.0/gtk.css | 119 ++++++------------ 13 files changed, 445 insertions(+), 629 deletions(-) diff --git a/src/_sass/gtk/_common-3.20.scss b/src/_sass/gtk/_common-3.20.scss index 5638b20..6568f2d 100644 --- a/src/_sass/gtk/_common-3.20.scss +++ b/src/_sass/gtk/_common-3.20.scss @@ -501,16 +501,12 @@ button { @extend %linked; // &:focus { box-shadow: none; } - - &.image-button:not(.text-button) { @extend %linked-image-button; } } .linked.vertical > & { @extend %linked-vertical; // &:focus { box-shadow: none; } - - &.image-button:not(.text-button) { @extend %linked-vertical-image-button; } } .linked:not(.vertical) > &.flat, @@ -657,30 +653,8 @@ button { // } %linked { - &:not(:first-child) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - } - - &:not(:last-child) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } -} - -%linked-vertical { - &:not(:first-child) { - border-top-left-radius: 0; - border-top-right-radius: 0; - } - - &:not(:last-child) { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - } -} + border-radius: 0; -%linked-image-button { &:first-child { border-top-left-radius: $corner-radius; border-bottom-left-radius: $corner-radius; @@ -692,11 +666,13 @@ button { } &:only-child { - border-radius: $circular-radius; + border-radius: $corner-radius; } } -%linked-vertical-image-button { +%linked-vertical { + border-radius: 0; + &:first-child { border-top-left-radius: $corner-radius; border-top-right-radius: $corner-radius; @@ -708,7 +684,7 @@ button { } &:only-child { - border-radius: $circular-radius; + border-radius: $corner-radius; } } @@ -945,7 +921,7 @@ combobox { min-width: 16px; margin: ($medium-size - $small-size) / 2; padding: ($small-size - 16px) / 2; - border-radius: $circular-radius; + border-radius: $corner-radius; } } @@ -1088,58 +1064,39 @@ searchbar > revealer > box { * Header bars * ***************/ - %titlebar-button { - @extend %button-flat; - color: $titlebar-text-secondary; - - .linked:not(.vertical) > & { - border-radius: $circular-radius; - - &:not(:first-child), &:not(:last-child) { - border-top-left-radius: $circular-radius; - border-bottom-left-radius: $circular-radius; - border-top-right-radius: $circular-radius; - border-bottom-right-radius: $circular-radius; - } - - &.image-button:not(.text-button) { - &:first-child { - border-top-left-radius: $circular-radius; - border-bottom-left-radius: $circular-radius; - } +%titlebar-button { + @extend %button-flat; + color: $titlebar-text-secondary; - &:last-child { - border-top-right-radius: $circular-radius; - border-bottom-right-radius: $circular-radius; - } - } - } + .linked:not(.vertical) > & { + border-radius: $circular-radius; + } - &:focus, &:hover, &:active, &:checked { color: $titlebar-text; } + &:focus, &:hover, &:active, &:checked { color: $titlebar-text; } - &:disabled { color: $titlebar-text-secondary-disabled; } + &:disabled { color: $titlebar-text-secondary-disabled; } - &:checked { - &:disabled { - background-color: transparent; - color: $titlebar-text-disabled; - } - } + &:checked { + &:disabled { + background-color: transparent; + color: $titlebar-text-disabled; + } + } - &:backdrop { - color: $titlebar-text-disabled; + &:backdrop { + color: $titlebar-text-disabled; - &:focus, &:hover, &:active { color: $titlebar-text-secondary; } + &:focus, &:hover, &:active { color: $titlebar-text-secondary; } - &:disabled { color: $titlebar-text-secondary-disabled; } + &:disabled { color: $titlebar-text-secondary-disabled; } - &:checked { - color: $titlebar-text-secondary; + &:checked { + color: $titlebar-text-secondary; - &:disabled { color: $titlebar-text-secondary-disabled; } - } - } - } + &:disabled { color: $titlebar-text-secondary-disabled; } + } + } +} %titlebar-entry { background-color: $titlebar-fill; @@ -1770,6 +1727,12 @@ notebook { border-radius: $corner-radius; } + &.frame frame { + &, border, list { border-radius: $corner-radius + 1px; } + + row.activatable { @extend %circular_row; } + } + &:focus tab:checked { box-shadow: none; } @@ -2963,14 +2926,8 @@ messagedialog { // Message Dialog styling button { @extend %button-flat; - border-radius: $circular-radius; - &:not(:first-child), &:not(:last-child) { - border-top-left-radius: $circular-radius; - border-bottom-left-radius: $circular-radius; - border-top-right-radius: $circular-radius; - border-bottom-right-radius: $circular-radius; - } + &, &:first-child, &:last-child { border-radius: $circular-radius; } &:not(:last-child) { margin-right: $container-padding; } @@ -3665,12 +3622,13 @@ stackswitcher { padding: 0; margin: $container-padding 0; - &.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button { + &.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action) { margin: 0 0; - min-width: 120px - 8px * 2; border-radius: $circular-radius; background-color: transparent; + &.text-button { min-width: 100px; } + &:focus { box-shadow: inset 0 0 0 2px $overlay-focus; } &:active { diff --git a/src/_sass/gtk/apps/_gnome-3.22.scss b/src/_sass/gtk/apps/_gnome-3.22.scss index 5e8629b..a9536d5 100644 --- a/src/_sass/gtk/apps/_gnome-3.22.scss +++ b/src/_sass/gtk/apps/_gnome-3.22.scss @@ -656,20 +656,6 @@ list { } } -row#Focus, -row#ClickMethod, -row#StaticWorkspaceTweak, // for 3.26.0 -row#dynamic-workspaces, -row#PrimaryWorkspaceTweak, // for 3.26.0 -row#workspaces-only-on-primary { - padding: 0; - // border: 1px solid $frame; - - // row:not(:last-child) { border-bottom: 1px solid $divider; } - - &.tweak > list { margin-top: -3px; } -} - // Add more spaces between title and list row#Focus, row#ClickMethod, @@ -777,7 +763,7 @@ dialog.background.csd { } %circular_list { - border-radius: $corner-radius; + border-radius: $corner-radius + 1px; box-shadow: none; border: 1px solid $frame; } @@ -823,16 +809,18 @@ hdyleaflet, leaflet { row.activatable { @extend %circular_row; } } - > box.vertical list:not(.view) { - row.activatable { - margin-right: 4px; - border-radius: 0 1000px 1000px 0; + > box.vertical > scrolledwindow > viewport.frame { + list:not(.view):not(.tweak-group) { + row.activatable { + margin-right: 4px; + border-radius: 0 $circular-radius $circular-radius 0; - &:selected { - background-color: $overlay-checked; - color: $primary; + &:selected { + background-color: $overlay-checked; + color: $primary; - image, label { color: $primary; } + image, label { color: $primary; } + } } } } diff --git a/src/gnome-shell/gnome-shell-compact.css b/src/gnome-shell/gnome-shell-compact.css index a001b99..199db25 100644 --- a/src/gnome-shell/gnome-shell-compact.css +++ b/src/gnome-shell/gnome-shell-compact.css @@ -492,20 +492,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .modal-dialog-linked-button:first-child { margin-left: 6px; margin-right: 0; - border-radius: 100px 0px 0px 100px; + border-radius: 9999px 0px 0px 9999px; } .modal-dialog-linked-button:last-child { margin-left: 0; margin-right: 6px; border-right-width: 0px; - border-radius: 0px 100px 100px 0; + border-radius: 0px 9999px 9999px 0; } .modal-dialog-linked-button:first-child:last-child { margin: 0 6px 6px 6px; border-right-width: 0px; - border-radius: 100px; + border-radius: 9999px; } .show-processes-dialog-subject, @@ -691,6 +691,35 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-bottom: 24px; } +.prompt-dialog .modal-dialog-linked-button:first-child { + color: #FF5252; +} + +.prompt-dialog .modal-dialog-linked-button:first-child:active { + color: white; + background-color: #FF5252; +} + +.prompt-dialog .modal-dialog-linked-button:last-child { + color: white; + background-color: #4586D8; +} + +.prompt-dialog .modal-dialog-linked-button:last-child:hover { + color: white; + background-color: #6b9fe0; +} + +.prompt-dialog .modal-dialog-linked-button:last-child:active { + color: white; + background-color: #3078d4; +} + +.prompt-dialog .modal-dialog-linked-button:last-child:insensitive { + color: rgba(69, 134, 216, 0.5); + background-color: rgba(69, 134, 216, 0.15); +} + .prompt-dialog .message-dialog-main-layout { spacing: 24px; padding: 10px; diff --git a/src/gnome-shell/gnome-shell-dark-compact.css b/src/gnome-shell/gnome-shell-dark-compact.css index 45b3cf7..f7d0784 100644 --- a/src/gnome-shell/gnome-shell-dark-compact.css +++ b/src/gnome-shell/gnome-shell-dark-compact.css @@ -405,7 +405,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 24px; color: rgba(255, 255, 255, 0.9); background-color: #202020; - border: 2px solid rgba(255, 255, 255, 0.12); + border: 2px solid rgba(255, 255, 255, 0.15); box-shadow: 0 0 transparent; } @@ -492,20 +492,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .modal-dialog-linked-button:first-child { margin-left: 6px; margin-right: 0; - border-radius: 100px 0px 0px 100px; + border-radius: 9999px 0px 0px 9999px; } .modal-dialog-linked-button:last-child { margin-left: 0; margin-right: 6px; border-right-width: 0px; - border-radius: 0px 100px 100px 0; + border-radius: 0px 9999px 9999px 0; } .modal-dialog-linked-button:first-child:last-child { margin: 0 6px 6px 6px; border-right-width: 0px; - border-radius: 100px; + border-radius: 9999px; } .show-processes-dialog-subject, @@ -538,7 +538,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { /* End Session Dialog */ .end-session-dialog { width: 30em; - border: 2px solid rgba(255, 255, 255, 0.12); + border: 2px solid rgba(255, 255, 255, 0.15); } .end-session-dialog .modal-dialog-linked-button:last-child { @@ -684,13 +684,42 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { /* Password or Authentication Dialog */ .prompt-dialog { width: 28em; - border: 2px solid rgba(255, 255, 255, 0.12); + border: 2px solid rgba(255, 255, 255, 0.15); } .prompt-dialog .modal-dialog-content-box { margin-bottom: 24px; } +.prompt-dialog .modal-dialog-linked-button:first-child { + color: #FF5252; +} + +.prompt-dialog .modal-dialog-linked-button:first-child:active { + color: white; + background-color: #FF5252; +} + +.prompt-dialog .modal-dialog-linked-button:last-child { + color: white; + background-color: #4586D8; +} + +.prompt-dialog .modal-dialog-linked-button:last-child:hover { + color: white; + background-color: #6b9fe0; +} + +.prompt-dialog .modal-dialog-linked-button:last-child:active { + color: white; + background-color: #3078d4; +} + +.prompt-dialog .modal-dialog-linked-button:last-child:insensitive { + color: rgba(69, 134, 216, 0.5); + background-color: rgba(69, 134, 216, 0.15); +} + .prompt-dialog .message-dialog-main-layout { spacing: 24px; padding: 10px; diff --git a/src/gnome-shell/gnome-shell-dark.css b/src/gnome-shell/gnome-shell-dark.css index b580f8d..1cd23ee 100644 --- a/src/gnome-shell/gnome-shell-dark.css +++ b/src/gnome-shell/gnome-shell-dark.css @@ -405,7 +405,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 24px; color: rgba(255, 255, 255, 0.9); background-color: #202020; - border: 2px solid rgba(255, 255, 255, 0.12); + border: 2px solid rgba(255, 255, 255, 0.15); box-shadow: 0 0 transparent; } @@ -492,20 +492,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .modal-dialog-linked-button:first-child { margin-left: 6px; margin-right: 0; - border-radius: 100px 0px 0px 100px; + border-radius: 9999px 0px 0px 9999px; } .modal-dialog-linked-button:last-child { margin-left: 0; margin-right: 6px; border-right-width: 0px; - border-radius: 0px 100px 100px 0; + border-radius: 0px 9999px 9999px 0; } .modal-dialog-linked-button:first-child:last-child { margin: 0 6px 6px 6px; border-right-width: 0px; - border-radius: 100px; + border-radius: 9999px; } .show-processes-dialog-subject, @@ -538,7 +538,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { /* End Session Dialog */ .end-session-dialog { width: 30em; - border: 2px solid rgba(255, 255, 255, 0.12); + border: 2px solid rgba(255, 255, 255, 0.15); } .end-session-dialog .modal-dialog-linked-button:last-child { @@ -684,13 +684,42 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { /* Password or Authentication Dialog */ .prompt-dialog { width: 28em; - border: 2px solid rgba(255, 255, 255, 0.12); + border: 2px solid rgba(255, 255, 255, 0.15); } .prompt-dialog .modal-dialog-content-box { margin-bottom: 24px; } +.prompt-dialog .modal-dialog-linked-button:first-child { + color: #FF5252; +} + +.prompt-dialog .modal-dialog-linked-button:first-child:active { + color: white; + background-color: #FF5252; +} + +.prompt-dialog .modal-dialog-linked-button:last-child { + color: white; + background-color: #4586D8; +} + +.prompt-dialog .modal-dialog-linked-button:last-child:hover { + color: white; + background-color: #6b9fe0; +} + +.prompt-dialog .modal-dialog-linked-button:last-child:active { + color: white; + background-color: #3078d4; +} + +.prompt-dialog .modal-dialog-linked-button:last-child:insensitive { + color: rgba(69, 134, 216, 0.5); + background-color: rgba(69, 134, 216, 0.15); +} + .prompt-dialog .message-dialog-main-layout { spacing: 24px; padding: 10px; diff --git a/src/gnome-shell/gnome-shell.css b/src/gnome-shell/gnome-shell.css index 7e1676e..010e0d0 100644 --- a/src/gnome-shell/gnome-shell.css +++ b/src/gnome-shell/gnome-shell.css @@ -492,20 +492,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .modal-dialog-linked-button:first-child { margin-left: 6px; margin-right: 0; - border-radius: 100px 0px 0px 100px; + border-radius: 9999px 0px 0px 9999px; } .modal-dialog-linked-button:last-child { margin-left: 0; margin-right: 6px; border-right-width: 0px; - border-radius: 0px 100px 100px 0; + border-radius: 0px 9999px 9999px 0; } .modal-dialog-linked-button:first-child:last-child { margin: 0 6px 6px 6px; border-right-width: 0px; - border-radius: 100px; + border-radius: 9999px; } .show-processes-dialog-subject, @@ -691,6 +691,35 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-bottom: 24px; } +.prompt-dialog .modal-dialog-linked-button:first-child { + color: #FF5252; +} + +.prompt-dialog .modal-dialog-linked-button:first-child:active { + color: white; + background-color: #FF5252; +} + +.prompt-dialog .modal-dialog-linked-button:last-child { + color: white; + background-color: #4586D8; +} + +.prompt-dialog .modal-dialog-linked-button:last-child:hover { + color: white; + background-color: #6b9fe0; +} + +.prompt-dialog .modal-dialog-linked-button:last-child:active { + color: white; + background-color: #3078d4; +} + +.prompt-dialog .modal-dialog-linked-button:last-child:insensitive { + color: rgba(69, 134, 216, 0.5); + background-color: rgba(69, 134, 216, 0.15); +} + .prompt-dialog .message-dialog-main-layout { spacing: 24px; padding: 10px; diff --git a/src/gnome-shell/sass/_common.scss b/src/gnome-shell/sass/_common.scss index 4ce4a18..a73695a 100644 --- a/src/gnome-shell/sass/_common.scss +++ b/src/gnome-shell/sass/_common.scss @@ -317,28 +317,33 @@ $slider_color: if($variant == 'light', $accent_color, white); .headline { @include font(title); } -$mdborder_color: if($variant == 'light', transparent, rgba($white, 0.12)); +$mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15)); .modal-dialog { - border-radius: $bt_radius*2; + border-radius: $bt_radius * 2; color: $fg_color; background-color: $base_color; border: 2px solid $mdborder_color; box-shadow: $shadow_0; + .modal-dialog-content-box { margin: 32px 40px; spacing: 32px; max-width: 28em; } + .run-dialog-entry { width: 20em; margin-bottom: 6px; } + .run-dialog-error-box { padding-top: 16px; spacing: 6px; } + .run-dialog-button-box { margin: 3px; padding-top: 1em; } + .run-dialog-label { font-size: 1em; font-weight: normal; @@ -347,8 +352,6 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.12)); } } -$mdbt_radius: 100px; - .modal-dialog-linked-button { min-height: 40px; padding: 0 16px; @@ -356,6 +359,7 @@ $mdbt_radius: 100px; margin-bottom: 6px; @include font(button); @include button(normal); + &:hover { @include button(hover); } &:active { @include button(active); } &:insensitive { @include button(insensitive); } @@ -364,18 +368,20 @@ $mdbt_radius: 100px; &:first-child { margin-left: 6px; margin-right: 0; - border-radius: $mdbt_radius 0px 0px $mdbt_radius; + border-radius: $circular_radius 0px 0px $circular_radius; } + &:last-child { margin-left: 0; margin-right: 6px; border-right-width: 0px; - border-radius: 0px $mdbt_radius $mdbt_radius 0; + border-radius: 0px $circular_radius $circular_radius 0; } + &:first-child:last-child { margin: 0 6px 6px 6px; border-right-width: 0px; - border-radius: $mdbt_radius; + border-radius: $circular_radius; } } @@ -415,6 +421,7 @@ $mdbt_radius: 100px; color: white; background-color: lighten($destructive_color, 9%); } + &:active { color: white; background-color: darken($destructive_color, 5%); @@ -535,6 +542,35 @@ $mdbt_radius: 100px; margin-bottom: 24px; } + .modal-dialog-linked-button:first-child { + color: $destructive_color; + + &:active { + color: white; + background-color: $destructive_color; + } + } + + .modal-dialog-linked-button:last-child { + color: white; + background-color: $suggested_color; + + &:hover { + color: white; + background-color: lighten($suggested_color, 9%); + } + + &:active { + color: white; + background-color: darken($suggested_color, 5%); + } + + &:insensitive { + color: rgba($suggested_color, 0.5); + background-color: rgba($suggested_color, 0.15); + } + } + .message-dialog-main-layout { spacing: 24px; padding: 10px; } .message-dialog-content { spacing: 16px; } .message-dialog-title { @include font(title); color: $fg_color; } diff --git a/src/gtk/3.0/gtk-compact.css b/src/gtk/3.0/gtk-compact.css index 9f5efe9..4345e6f 100644 --- a/src/gtk/3.0/gtk-compact.css +++ b/src/gtk/3.0/gtk-compact.css @@ -951,52 +951,40 @@ stacksidebar.sidebar row.needs-attention > label:dir(rtl), .stack-switcher > but background-position: left 3px; } -.linked:not(.vertical) > spinbutton.vertical:not(:first-child), .linked:not(.vertical) > spinbutton:not(:first-child):not(.vertical), .linked:not(.vertical) > entry:not(:first-child), .linked:not(.vertical) > button:not(:first-child) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} - -.linked:not(.vertical) > spinbutton.vertical:not(:last-child), .linked:not(.vertical) > spinbutton:not(:last-child):not(.vertical), .linked:not(.vertical) > entry:not(:last-child), .linked:not(.vertical) > button:not(:last-child) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.linked.vertical > spinbutton.vertical:not(:first-child), .linked.vertical > spinbutton:not(:first-child):not(.vertical), .linked.vertical > entry:not(:first-child), .linked.vertical > button:not(:first-child) { - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -.linked.vertical > spinbutton.vertical:not(:last-child), .linked.vertical > spinbutton:not(:last-child):not(.vertical), .linked.vertical > entry:not(:last-child), .linked.vertical > button:not(:last-child) { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; +.linked:not(.vertical) > spinbutton.vertical, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .linked:not(.vertical) > button { + border-radius: 0; } -.linked:not(.vertical) > button.image-button:first-child:not(.text-button) { +.linked:not(.vertical) > spinbutton.vertical:first-child, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > button:first-child { border-top-left-radius: 12px; border-bottom-left-radius: 12px; } -.linked:not(.vertical) > button.image-button:last-child:not(.text-button) { +.linked:not(.vertical) > spinbutton.vertical:last-child, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > button:last-child { border-top-right-radius: 12px; border-bottom-right-radius: 12px; } -.linked:not(.vertical) > button.image-button:only-child:not(.text-button) { - border-radius: 9999px; +.linked:not(.vertical) > spinbutton.vertical:only-child, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > button:only-child { + border-radius: 12px; +} + +.linked.vertical > spinbutton.vertical, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button { + border-radius: 0; } -.linked.vertical > button.image-button:first-child:not(.text-button) { +.linked.vertical > spinbutton.vertical:first-child, .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; } -.linked.vertical > button.image-button:last-child:not(.text-button) { +.linked.vertical > spinbutton.vertical:last-child, .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child { border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; } -.linked.vertical > button.image-button:only-child:not(.text-button) { - border-radius: 9999px; +.linked.vertical > spinbutton.vertical:only-child, .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child { + border-radius: 12px; } /* menu buttons */ @@ -1194,7 +1182,7 @@ combobox > .linked:not(.vertical) > button:not(:only-child) { min-width: 16px; margin: 4px; padding: 4px; - border-radius: 9999px; + border-radius: 12px; } .linked:not(.vertical) > combobox:not(:first-child) > box > button.combo { @@ -1352,23 +1340,6 @@ searchbar > revealer > box { border-radius: 9999px; } -.nemo-window .primary-toolbar .linked:not(.vertical) > button:not(:first-child):not(.text-button), headerbar .linked:not(.vertical) > button:not(:first-child):not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar .linked:not(.vertical) > button:not(:last-child):not(.text-button), headerbar .linked:not(.vertical) > button:not(:last-child):not(.suggested-action):not(.destructive-action) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - -.nemo-window .primary-toolbar .linked:not(.vertical) > button.image-button:not(.text-button):first-child, headerbar .linked:not(.vertical) > button.image-button:not(.text-button):first-child:not(.suggested-action):not(.destructive-action) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; -} - -.nemo-window .primary-toolbar .linked:not(.vertical) > button.image-button:not(.text-button):last-child, headerbar .linked:not(.vertical) > button.image-button:not(.text-button):last-child:not(.suggested-action):not(.destructive-action) { - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - .nemo-window .primary-toolbar button:focus:not(.text-button), headerbar button:focus:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:hover:not(.text-button), headerbar button:hover:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:active:not(.text-button), headerbar button:active:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:checked:not(.text-button), headerbar button:checked:not(.suggested-action):not(.destructive-action) { color: white; } @@ -2085,6 +2056,10 @@ notebook, notebook.frame { border-radius: 12px; } +notebook.frame frame, notebook.frame frame border, notebook.frame frame list { + border-radius: 13px; +} + notebook:focus tab:checked { box-shadow: none; } @@ -3398,17 +3373,10 @@ messagedialog.csd .dialog-action-box { margin-top: -4px; } -messagedialog.csd .dialog-action-box button { +messagedialog.csd .dialog-action-box button, messagedialog.csd .dialog-action-box button:first-child, messagedialog.csd .dialog-action-box button:last-child { border-radius: 9999px; } -messagedialog.csd .dialog-action-box button:not(:first-child), messagedialog.csd .dialog-action-box button:not(:last-child) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - messagedialog.csd .dialog-action-box button:not(:last-child) { margin-right: 4px; } @@ -3993,23 +3961,26 @@ stackswitcher { margin: 4px 0; } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action) { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action) { margin: 0 0; - min-width: 104px; border-radius: 9999px; background-color: transparent; } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):focus { +stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action) { + min-width: 100px; +} + +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):focus { box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08); } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):active { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):active { box-shadow: inset 0 0 0 9999px alpha(#1A73E8, 0.08); background-image: radial-gradient(circle, alpha(#1A73E8, 0.08) 10%, transparent 0%); } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):checked { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):checked { background-color: #1A73E8; color: white; } @@ -4658,24 +4629,6 @@ frame.gedit-map-frame > border:dir(rtl) { background-image: none; } -row#Focus, -row#ClickMethod, -row#StaticWorkspaceTweak, -row#dynamic-workspaces, -row#PrimaryWorkspaceTweak, -row#workspaces-only-on-primary { - padding: 0; -} - -row#Focus.tweak > list, -row#ClickMethod.tweak > list, -row#StaticWorkspaceTweak.tweak > list, -row#dynamic-workspaces.tweak > list, -row#PrimaryWorkspaceTweak.tweak > list, -row#workspaces-only-on-primary.tweak > list { - margin-top: -3px; -} - row#Focus, row#ClickMethod, row#PrimaryWorkspaceTweak, @@ -4773,26 +4726,26 @@ dialog.background.csd > box.vertical.dialog-vbox > notebook > stack > box.horizo hdyleaflet list.frame, leaflet list.frame, hdyleaflet frame.view, leaflet frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), .tweak-group-startup, list.tweak-group list, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame { - border-radius: 12px; + border-radius: 13px; box-shadow: none; border: 1px solid rgba(0, 0, 0, 0.08); } -hdyleaflet list.frame row.activatable:first-child, leaflet list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, .tweak-group-startup row.activatable:first-child, list.tweak-group list row.activatable:first-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, +hdyleaflet list.frame row.activatable:first-child, leaflet list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, notebook.frame frame row.activatable:first-child, .tweak-group-startup row.activatable:first-child, list.tweak-group list row.activatable:first-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; } -hdyleaflet list.frame row.activatable:last-child, leaflet list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, .tweak-group-startup row.activatable:last-child, list.tweak-group list row.activatable:last-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, +hdyleaflet list.frame row.activatable:last-child, leaflet list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, notebook.frame frame row.activatable:last-child, .tweak-group-startup row.activatable:last-child, list.tweak-group list row.activatable:last-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child { border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; } -hdyleaflet list.frame row.activatable:only-child, leaflet list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, .tweak-group-startup row.activatable:only-child, list.tweak-group list row.activatable:only-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, +hdyleaflet list.frame row.activatable:only-child, leaflet list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, notebook.frame frame row.activatable:only-child, .tweak-group-startup row.activatable:only-child, list.tweak-group list row.activatable:only-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child { border-radius: 12px; @@ -4806,17 +4759,17 @@ hdyleaflet frame.view list, leaflet frame.view list { background: none; } -hdyleaflet > box.vertical list:not(.view) row.activatable, leaflet > box.vertical list:not(.view) row.activatable { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable { margin-right: 4px; - border-radius: 0 1000px 1000px 0; + border-radius: 0 9999px 9999px 0; } -hdyleaflet > box.vertical list:not(.view) row.activatable:selected, leaflet > box.vertical list:not(.view) row.activatable:selected { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected { background-color: alpha(currentColor, 0.1); color: #1A73E8; } -hdyleaflet > box.vertical list:not(.view) row.activatable:selected image, hdyleaflet > box.vertical list:not(.view) row.activatable:selected label, leaflet > box.vertical list:not(.view) row.activatable:selected image, leaflet > box.vertical list:not(.view) row.activatable:selected label { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected image, hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected label, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected image, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected label { color: #1A73E8; } diff --git a/src/gtk/3.0/gtk-dark-compact.css b/src/gtk/3.0/gtk-dark-compact.css index afe2613..66659a6 100644 --- a/src/gtk/3.0/gtk-dark-compact.css +++ b/src/gtk/3.0/gtk-dark-compact.css @@ -951,52 +951,40 @@ stacksidebar.sidebar row.needs-attention > label:dir(rtl), .stack-switcher > but background-position: left 3px; } -.linked:not(.vertical) > spinbutton.vertical:not(:first-child), .linked:not(.vertical) > spinbutton:not(:first-child):not(.vertical), .linked:not(.vertical) > entry:not(:first-child), .linked:not(.vertical) > button:not(:first-child) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} - -.linked:not(.vertical) > spinbutton.vertical:not(:last-child), .linked:not(.vertical) > spinbutton:not(:last-child):not(.vertical), .linked:not(.vertical) > entry:not(:last-child), .linked:not(.vertical) > button:not(:last-child) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.linked.vertical > spinbutton.vertical:not(:first-child), .linked.vertical > spinbutton:not(:first-child):not(.vertical), .linked.vertical > entry:not(:first-child), .linked.vertical > button:not(:first-child) { - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -.linked.vertical > spinbutton.vertical:not(:last-child), .linked.vertical > spinbutton:not(:last-child):not(.vertical), .linked.vertical > entry:not(:last-child), .linked.vertical > button:not(:last-child) { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; +.linked:not(.vertical) > spinbutton.vertical, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .linked:not(.vertical) > button { + border-radius: 0; } -.linked:not(.vertical) > button.image-button:first-child:not(.text-button) { +.linked:not(.vertical) > spinbutton.vertical:first-child, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > button:first-child { border-top-left-radius: 12px; border-bottom-left-radius: 12px; } -.linked:not(.vertical) > button.image-button:last-child:not(.text-button) { +.linked:not(.vertical) > spinbutton.vertical:last-child, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > button:last-child { border-top-right-radius: 12px; border-bottom-right-radius: 12px; } -.linked:not(.vertical) > button.image-button:only-child:not(.text-button) { - border-radius: 9999px; +.linked:not(.vertical) > spinbutton.vertical:only-child, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > button:only-child { + border-radius: 12px; +} + +.linked.vertical > spinbutton.vertical, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button { + border-radius: 0; } -.linked.vertical > button.image-button:first-child:not(.text-button) { +.linked.vertical > spinbutton.vertical:first-child, .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; } -.linked.vertical > button.image-button:last-child:not(.text-button) { +.linked.vertical > spinbutton.vertical:last-child, .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child { border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; } -.linked.vertical > button.image-button:only-child:not(.text-button) { - border-radius: 9999px; +.linked.vertical > spinbutton.vertical:only-child, .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child { + border-radius: 12px; } /* menu buttons */ @@ -1194,7 +1182,7 @@ combobox > .linked:not(.vertical) > button:not(:only-child) { min-width: 16px; margin: 4px; padding: 4px; - border-radius: 9999px; + border-radius: 12px; } .linked:not(.vertical) > combobox:not(:first-child) > box > button.combo { @@ -1352,23 +1340,6 @@ searchbar > revealer > box { border-radius: 9999px; } -.nemo-window .primary-toolbar .linked:not(.vertical) > button:not(:first-child):not(.text-button), headerbar .linked:not(.vertical) > button:not(:first-child):not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar .linked:not(.vertical) > button:not(:last-child):not(.text-button), headerbar .linked:not(.vertical) > button:not(:last-child):not(.suggested-action):not(.destructive-action) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - -.nemo-window .primary-toolbar .linked:not(.vertical) > button.image-button:not(.text-button):first-child, headerbar .linked:not(.vertical) > button.image-button:not(.text-button):first-child:not(.suggested-action):not(.destructive-action) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; -} - -.nemo-window .primary-toolbar .linked:not(.vertical) > button.image-button:not(.text-button):last-child, headerbar .linked:not(.vertical) > button.image-button:not(.text-button):last-child:not(.suggested-action):not(.destructive-action) { - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - .nemo-window .primary-toolbar button:focus:not(.text-button), headerbar button:focus:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:hover:not(.text-button), headerbar button:hover:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:active:not(.text-button), headerbar button:active:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:checked:not(.text-button), headerbar button:checked:not(.suggested-action):not(.destructive-action) { color: white; } @@ -2085,6 +2056,10 @@ notebook, notebook.frame { border-radius: 12px; } +notebook.frame frame, notebook.frame frame border, notebook.frame frame list { + border-radius: 13px; +} + notebook:focus tab:checked { box-shadow: none; } @@ -3398,17 +3373,10 @@ messagedialog.csd .dialog-action-box { margin-top: -4px; } -messagedialog.csd .dialog-action-box button { +messagedialog.csd .dialog-action-box button, messagedialog.csd .dialog-action-box button:first-child, messagedialog.csd .dialog-action-box button:last-child { border-radius: 9999px; } -messagedialog.csd .dialog-action-box button:not(:first-child), messagedialog.csd .dialog-action-box button:not(:last-child) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - messagedialog.csd .dialog-action-box button:not(:last-child) { margin-right: 4px; } @@ -3993,23 +3961,26 @@ stackswitcher { margin: 4px 0; } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action) { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action) { margin: 0 0; - min-width: 104px; border-radius: 9999px; background-color: transparent; } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):focus { +stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action) { + min-width: 100px; +} + +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):focus { box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08); } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):active { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):active { box-shadow: inset 0 0 0 9999px alpha(#3281ea, 0.08); background-image: radial-gradient(circle, alpha(#3281ea, 0.08) 10%, transparent 0%); } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):checked { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):checked { background-color: #3281ea; color: white; } @@ -4658,24 +4629,6 @@ frame.gedit-map-frame > border:dir(rtl) { background-image: none; } -row#Focus, -row#ClickMethod, -row#StaticWorkspaceTweak, -row#dynamic-workspaces, -row#PrimaryWorkspaceTweak, -row#workspaces-only-on-primary { - padding: 0; -} - -row#Focus.tweak > list, -row#ClickMethod.tweak > list, -row#StaticWorkspaceTweak.tweak > list, -row#dynamic-workspaces.tweak > list, -row#PrimaryWorkspaceTweak.tweak > list, -row#workspaces-only-on-primary.tweak > list { - margin-top: -3px; -} - row#Focus, row#ClickMethod, row#PrimaryWorkspaceTweak, @@ -4773,26 +4726,26 @@ dialog.background.csd > box.vertical.dialog-vbox > notebook > stack > box.horizo hdyleaflet list.frame, leaflet list.frame, hdyleaflet frame.view, leaflet frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), .tweak-group-startup, list.tweak-group list, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame { - border-radius: 12px; + border-radius: 13px; box-shadow: none; border: 1px solid rgba(0, 0, 0, 0.16); } -hdyleaflet list.frame row.activatable:first-child, leaflet list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, .tweak-group-startup row.activatable:first-child, list.tweak-group list row.activatable:first-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, +hdyleaflet list.frame row.activatable:first-child, leaflet list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, notebook.frame frame row.activatable:first-child, .tweak-group-startup row.activatable:first-child, list.tweak-group list row.activatable:first-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; } -hdyleaflet list.frame row.activatable:last-child, leaflet list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, .tweak-group-startup row.activatable:last-child, list.tweak-group list row.activatable:last-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, +hdyleaflet list.frame row.activatable:last-child, leaflet list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, notebook.frame frame row.activatable:last-child, .tweak-group-startup row.activatable:last-child, list.tweak-group list row.activatable:last-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child { border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; } -hdyleaflet list.frame row.activatable:only-child, leaflet list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, .tweak-group-startup row.activatable:only-child, list.tweak-group list row.activatable:only-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, +hdyleaflet list.frame row.activatable:only-child, leaflet list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, notebook.frame frame row.activatable:only-child, .tweak-group-startup row.activatable:only-child, list.tweak-group list row.activatable:only-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child { border-radius: 12px; @@ -4806,17 +4759,17 @@ hdyleaflet frame.view list, leaflet frame.view list { background: none; } -hdyleaflet > box.vertical list:not(.view) row.activatable, leaflet > box.vertical list:not(.view) row.activatable { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable { margin-right: 4px; - border-radius: 0 1000px 1000px 0; + border-radius: 0 9999px 9999px 0; } -hdyleaflet > box.vertical list:not(.view) row.activatable:selected, leaflet > box.vertical list:not(.view) row.activatable:selected { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected { background-color: alpha(currentColor, 0.1); color: #3281ea; } -hdyleaflet > box.vertical list:not(.view) row.activatable:selected image, hdyleaflet > box.vertical list:not(.view) row.activatable:selected label, leaflet > box.vertical list:not(.view) row.activatable:selected image, leaflet > box.vertical list:not(.view) row.activatable:selected label { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected image, hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected label, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected image, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected label { color: #3281ea; } diff --git a/src/gtk/3.0/gtk-dark.css b/src/gtk/3.0/gtk-dark.css index b3465ea..dbc7276 100644 --- a/src/gtk/3.0/gtk-dark.css +++ b/src/gtk/3.0/gtk-dark.css @@ -951,52 +951,40 @@ stacksidebar.sidebar row.needs-attention > label:dir(rtl), .stack-switcher > but background-position: left 3px; } -.linked:not(.vertical) > spinbutton.vertical:not(:first-child), .linked:not(.vertical) > spinbutton:not(:first-child):not(.vertical), .linked:not(.vertical) > entry:not(:first-child), .linked:not(.vertical) > button:not(:first-child) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} - -.linked:not(.vertical) > spinbutton.vertical:not(:last-child), .linked:not(.vertical) > spinbutton:not(:last-child):not(.vertical), .linked:not(.vertical) > entry:not(:last-child), .linked:not(.vertical) > button:not(:last-child) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.linked.vertical > spinbutton.vertical:not(:first-child), .linked.vertical > spinbutton:not(:first-child):not(.vertical), .linked.vertical > entry:not(:first-child), .linked.vertical > button:not(:first-child) { - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -.linked.vertical > spinbutton.vertical:not(:last-child), .linked.vertical > spinbutton:not(:last-child):not(.vertical), .linked.vertical > entry:not(:last-child), .linked.vertical > button:not(:last-child) { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; +.linked:not(.vertical) > spinbutton.vertical, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .linked:not(.vertical) > button { + border-radius: 0; } -.linked:not(.vertical) > button.image-button:first-child:not(.text-button) { +.linked:not(.vertical) > spinbutton.vertical:first-child, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > button:first-child { border-top-left-radius: 12px; border-bottom-left-radius: 12px; } -.linked:not(.vertical) > button.image-button:last-child:not(.text-button) { +.linked:not(.vertical) > spinbutton.vertical:last-child, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > button:last-child { border-top-right-radius: 12px; border-bottom-right-radius: 12px; } -.linked:not(.vertical) > button.image-button:only-child:not(.text-button) { - border-radius: 9999px; +.linked:not(.vertical) > spinbutton.vertical:only-child, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > button:only-child { + border-radius: 12px; +} + +.linked.vertical > spinbutton.vertical, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button { + border-radius: 0; } -.linked.vertical > button.image-button:first-child:not(.text-button) { +.linked.vertical > spinbutton.vertical:first-child, .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; } -.linked.vertical > button.image-button:last-child:not(.text-button) { +.linked.vertical > spinbutton.vertical:last-child, .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child { border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; } -.linked.vertical > button.image-button:only-child:not(.text-button) { - border-radius: 9999px; +.linked.vertical > spinbutton.vertical:only-child, .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child { + border-radius: 12px; } /* menu buttons */ @@ -1194,7 +1182,7 @@ combobox > .linked:not(.vertical) > button:not(:only-child) { min-width: 16px; margin: 6px; padding: 4px; - border-radius: 9999px; + border-radius: 12px; } .linked:not(.vertical) > combobox:not(:first-child) > box > button.combo { @@ -1352,23 +1340,6 @@ searchbar > revealer > box { border-radius: 9999px; } -.nemo-window .primary-toolbar .linked:not(.vertical) > button:not(:first-child):not(.text-button), headerbar .linked:not(.vertical) > button:not(:first-child):not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar .linked:not(.vertical) > button:not(:last-child):not(.text-button), headerbar .linked:not(.vertical) > button:not(:last-child):not(.suggested-action):not(.destructive-action) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - -.nemo-window .primary-toolbar .linked:not(.vertical) > button.image-button:not(.text-button):first-child, headerbar .linked:not(.vertical) > button.image-button:not(.text-button):first-child:not(.suggested-action):not(.destructive-action) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; -} - -.nemo-window .primary-toolbar .linked:not(.vertical) > button.image-button:not(.text-button):last-child, headerbar .linked:not(.vertical) > button.image-button:not(.text-button):last-child:not(.suggested-action):not(.destructive-action) { - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - .nemo-window .primary-toolbar button:focus:not(.text-button), headerbar button:focus:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:hover:not(.text-button), headerbar button:hover:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:active:not(.text-button), headerbar button:active:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:checked:not(.text-button), headerbar button:checked:not(.suggested-action):not(.destructive-action) { color: white; } @@ -2085,6 +2056,10 @@ notebook, notebook.frame { border-radius: 12px; } +notebook.frame frame, notebook.frame frame border, notebook.frame frame list { + border-radius: 13px; +} + notebook:focus tab:checked { box-shadow: none; } @@ -3398,17 +3373,10 @@ messagedialog.csd .dialog-action-box { margin-top: -6px; } -messagedialog.csd .dialog-action-box button { +messagedialog.csd .dialog-action-box button, messagedialog.csd .dialog-action-box button:first-child, messagedialog.csd .dialog-action-box button:last-child { border-radius: 9999px; } -messagedialog.csd .dialog-action-box button:not(:first-child), messagedialog.csd .dialog-action-box button:not(:last-child) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - messagedialog.csd .dialog-action-box button:not(:last-child) { margin-right: 6px; } @@ -3993,23 +3961,26 @@ stackswitcher { margin: 6px 0; } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action) { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action) { margin: 0 0; - min-width: 104px; border-radius: 9999px; background-color: transparent; } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):focus { +stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action) { + min-width: 100px; +} + +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):focus { box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08); } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):active { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):active { box-shadow: inset 0 0 0 9999px alpha(#3281ea, 0.08); background-image: radial-gradient(circle, alpha(#3281ea, 0.08) 10%, transparent 0%); } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):checked { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):checked { background-color: #3281ea; color: white; } @@ -4658,24 +4629,6 @@ frame.gedit-map-frame > border:dir(rtl) { background-image: none; } -row#Focus, -row#ClickMethod, -row#StaticWorkspaceTweak, -row#dynamic-workspaces, -row#PrimaryWorkspaceTweak, -row#workspaces-only-on-primary { - padding: 0; -} - -row#Focus.tweak > list, -row#ClickMethod.tweak > list, -row#StaticWorkspaceTweak.tweak > list, -row#dynamic-workspaces.tweak > list, -row#PrimaryWorkspaceTweak.tweak > list, -row#workspaces-only-on-primary.tweak > list { - margin-top: -3px; -} - row#Focus, row#ClickMethod, row#PrimaryWorkspaceTweak, @@ -4773,26 +4726,26 @@ dialog.background.csd > box.vertical.dialog-vbox > notebook > stack > box.horizo hdyleaflet list.frame, leaflet list.frame, hdyleaflet frame.view, leaflet frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), .tweak-group-startup, list.tweak-group list, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame { - border-radius: 12px; + border-radius: 13px; box-shadow: none; border: 1px solid rgba(0, 0, 0, 0.16); } -hdyleaflet list.frame row.activatable:first-child, leaflet list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, .tweak-group-startup row.activatable:first-child, list.tweak-group list row.activatable:first-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, +hdyleaflet list.frame row.activatable:first-child, leaflet list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, notebook.frame frame row.activatable:first-child, .tweak-group-startup row.activatable:first-child, list.tweak-group list row.activatable:first-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; } -hdyleaflet list.frame row.activatable:last-child, leaflet list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, .tweak-group-startup row.activatable:last-child, list.tweak-group list row.activatable:last-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, +hdyleaflet list.frame row.activatable:last-child, leaflet list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, notebook.frame frame row.activatable:last-child, .tweak-group-startup row.activatable:last-child, list.tweak-group list row.activatable:last-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child { border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; } -hdyleaflet list.frame row.activatable:only-child, leaflet list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, .tweak-group-startup row.activatable:only-child, list.tweak-group list row.activatable:only-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, +hdyleaflet list.frame row.activatable:only-child, leaflet list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, notebook.frame frame row.activatable:only-child, .tweak-group-startup row.activatable:only-child, list.tweak-group list row.activatable:only-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child { border-radius: 12px; @@ -4806,17 +4759,17 @@ hdyleaflet frame.view list, leaflet frame.view list { background: none; } -hdyleaflet > box.vertical list:not(.view) row.activatable, leaflet > box.vertical list:not(.view) row.activatable { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable { margin-right: 4px; - border-radius: 0 1000px 1000px 0; + border-radius: 0 9999px 9999px 0; } -hdyleaflet > box.vertical list:not(.view) row.activatable:selected, leaflet > box.vertical list:not(.view) row.activatable:selected { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected { background-color: alpha(currentColor, 0.1); color: #3281ea; } -hdyleaflet > box.vertical list:not(.view) row.activatable:selected image, hdyleaflet > box.vertical list:not(.view) row.activatable:selected label, leaflet > box.vertical list:not(.view) row.activatable:selected image, leaflet > box.vertical list:not(.view) row.activatable:selected label { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected image, hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected label, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected image, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected label { color: #3281ea; } diff --git a/src/gtk/3.0/gtk-light-compact.css b/src/gtk/3.0/gtk-light-compact.css index 58d7a0a..282e905 100644 --- a/src/gtk/3.0/gtk-light-compact.css +++ b/src/gtk/3.0/gtk-light-compact.css @@ -951,52 +951,40 @@ stacksidebar.sidebar row.needs-attention > label:dir(rtl), .stack-switcher > but background-position: left 3px; } -.linked:not(.vertical) > spinbutton.vertical:not(:first-child), .linked:not(.vertical) > spinbutton:not(:first-child):not(.vertical), .linked:not(.vertical) > entry:not(:first-child), .linked:not(.vertical) > button:not(:first-child) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} - -.linked:not(.vertical) > spinbutton.vertical:not(:last-child), .linked:not(.vertical) > spinbutton:not(:last-child):not(.vertical), .linked:not(.vertical) > entry:not(:last-child), .linked:not(.vertical) > button:not(:last-child) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.linked.vertical > spinbutton.vertical:not(:first-child), .linked.vertical > spinbutton:not(:first-child):not(.vertical), .linked.vertical > entry:not(:first-child), .linked.vertical > button:not(:first-child) { - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -.linked.vertical > spinbutton.vertical:not(:last-child), .linked.vertical > spinbutton:not(:last-child):not(.vertical), .linked.vertical > entry:not(:last-child), .linked.vertical > button:not(:last-child) { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; +.linked:not(.vertical) > spinbutton.vertical, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .linked:not(.vertical) > button { + border-radius: 0; } -.linked:not(.vertical) > button.image-button:first-child:not(.text-button) { +.linked:not(.vertical) > spinbutton.vertical:first-child, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > button:first-child { border-top-left-radius: 12px; border-bottom-left-radius: 12px; } -.linked:not(.vertical) > button.image-button:last-child:not(.text-button) { +.linked:not(.vertical) > spinbutton.vertical:last-child, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > button:last-child { border-top-right-radius: 12px; border-bottom-right-radius: 12px; } -.linked:not(.vertical) > button.image-button:only-child:not(.text-button) { - border-radius: 9999px; +.linked:not(.vertical) > spinbutton.vertical:only-child, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > button:only-child { + border-radius: 12px; +} + +.linked.vertical > spinbutton.vertical, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button { + border-radius: 0; } -.linked.vertical > button.image-button:first-child:not(.text-button) { +.linked.vertical > spinbutton.vertical:first-child, .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; } -.linked.vertical > button.image-button:last-child:not(.text-button) { +.linked.vertical > spinbutton.vertical:last-child, .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child { border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; } -.linked.vertical > button.image-button:only-child:not(.text-button) { - border-radius: 9999px; +.linked.vertical > spinbutton.vertical:only-child, .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child { + border-radius: 12px; } /* menu buttons */ @@ -1194,7 +1182,7 @@ combobox > .linked:not(.vertical) > button:not(:only-child) { min-width: 16px; margin: 4px; padding: 4px; - border-radius: 9999px; + border-radius: 12px; } .linked:not(.vertical) > combobox:not(:first-child) > box > button.combo { @@ -1352,23 +1340,6 @@ searchbar > revealer > box { border-radius: 9999px; } -.nemo-window .primary-toolbar .linked:not(.vertical) > button:not(:first-child):not(.text-button), headerbar .linked:not(.vertical) > button:not(:first-child):not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar .linked:not(.vertical) > button:not(:last-child):not(.text-button), headerbar .linked:not(.vertical) > button:not(:last-child):not(.suggested-action):not(.destructive-action) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - -.nemo-window .primary-toolbar .linked:not(.vertical) > button.image-button:not(.text-button):first-child, headerbar .linked:not(.vertical) > button.image-button:not(.text-button):first-child:not(.suggested-action):not(.destructive-action) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; -} - -.nemo-window .primary-toolbar .linked:not(.vertical) > button.image-button:not(.text-button):last-child, headerbar .linked:not(.vertical) > button.image-button:not(.text-button):last-child:not(.suggested-action):not(.destructive-action) { - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - .nemo-window .primary-toolbar button:focus:not(.text-button), headerbar button:focus:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:hover:not(.text-button), headerbar button:hover:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:active:not(.text-button), headerbar button:active:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:checked:not(.text-button), headerbar button:checked:not(.suggested-action):not(.destructive-action) { color: rgba(0, 0, 0, 0.87); } @@ -2085,6 +2056,10 @@ notebook, notebook.frame { border-radius: 12px; } +notebook.frame frame, notebook.frame frame border, notebook.frame frame list { + border-radius: 13px; +} + notebook:focus tab:checked { box-shadow: none; } @@ -3398,17 +3373,10 @@ messagedialog.csd .dialog-action-box { margin-top: -4px; } -messagedialog.csd .dialog-action-box button { +messagedialog.csd .dialog-action-box button, messagedialog.csd .dialog-action-box button:first-child, messagedialog.csd .dialog-action-box button:last-child { border-radius: 9999px; } -messagedialog.csd .dialog-action-box button:not(:first-child), messagedialog.csd .dialog-action-box button:not(:last-child) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - messagedialog.csd .dialog-action-box button:not(:last-child) { margin-right: 4px; } @@ -3993,23 +3961,26 @@ stackswitcher { margin: 4px 0; } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action) { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action) { margin: 0 0; - min-width: 104px; border-radius: 9999px; background-color: transparent; } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):focus { +stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action) { + min-width: 100px; +} + +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):focus { box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08); } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):active { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):active { box-shadow: inset 0 0 0 9999px alpha(#1A73E8, 0.08); background-image: radial-gradient(circle, alpha(#1A73E8, 0.08) 10%, transparent 0%); } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):checked { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):checked { background-color: #1A73E8; color: white; } @@ -4657,24 +4628,6 @@ frame.gedit-map-frame > border:dir(rtl) { background-image: none; } -row#Focus, -row#ClickMethod, -row#StaticWorkspaceTweak, -row#dynamic-workspaces, -row#PrimaryWorkspaceTweak, -row#workspaces-only-on-primary { - padding: 0; -} - -row#Focus.tweak > list, -row#ClickMethod.tweak > list, -row#StaticWorkspaceTweak.tweak > list, -row#dynamic-workspaces.tweak > list, -row#PrimaryWorkspaceTweak.tweak > list, -row#workspaces-only-on-primary.tweak > list { - margin-top: -3px; -} - row#Focus, row#ClickMethod, row#PrimaryWorkspaceTweak, @@ -4772,26 +4725,26 @@ dialog.background.csd > box.vertical.dialog-vbox > notebook > stack > box.horizo hdyleaflet list.frame, leaflet list.frame, hdyleaflet frame.view, leaflet frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), .tweak-group-startup, list.tweak-group list, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame { - border-radius: 12px; + border-radius: 13px; box-shadow: none; border: 1px solid rgba(0, 0, 0, 0.08); } -hdyleaflet list.frame row.activatable:first-child, leaflet list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, .tweak-group-startup row.activatable:first-child, list.tweak-group list row.activatable:first-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, +hdyleaflet list.frame row.activatable:first-child, leaflet list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, notebook.frame frame row.activatable:first-child, .tweak-group-startup row.activatable:first-child, list.tweak-group list row.activatable:first-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; } -hdyleaflet list.frame row.activatable:last-child, leaflet list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, .tweak-group-startup row.activatable:last-child, list.tweak-group list row.activatable:last-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, +hdyleaflet list.frame row.activatable:last-child, leaflet list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, notebook.frame frame row.activatable:last-child, .tweak-group-startup row.activatable:last-child, list.tweak-group list row.activatable:last-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child { border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; } -hdyleaflet list.frame row.activatable:only-child, leaflet list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, .tweak-group-startup row.activatable:only-child, list.tweak-group list row.activatable:only-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, +hdyleaflet list.frame row.activatable:only-child, leaflet list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, notebook.frame frame row.activatable:only-child, .tweak-group-startup row.activatable:only-child, list.tweak-group list row.activatable:only-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child { border-radius: 12px; @@ -4805,17 +4758,17 @@ hdyleaflet frame.view list, leaflet frame.view list { background: none; } -hdyleaflet > box.vertical list:not(.view) row.activatable, leaflet > box.vertical list:not(.view) row.activatable { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable { margin-right: 4px; - border-radius: 0 1000px 1000px 0; + border-radius: 0 9999px 9999px 0; } -hdyleaflet > box.vertical list:not(.view) row.activatable:selected, leaflet > box.vertical list:not(.view) row.activatable:selected { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected { background-color: alpha(currentColor, 0.1); color: #1A73E8; } -hdyleaflet > box.vertical list:not(.view) row.activatable:selected image, hdyleaflet > box.vertical list:not(.view) row.activatable:selected label, leaflet > box.vertical list:not(.view) row.activatable:selected image, leaflet > box.vertical list:not(.view) row.activatable:selected label { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected image, hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected label, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected image, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected label { color: #1A73E8; } diff --git a/src/gtk/3.0/gtk-light.css b/src/gtk/3.0/gtk-light.css index 0f0dd45..fc3d304 100644 --- a/src/gtk/3.0/gtk-light.css +++ b/src/gtk/3.0/gtk-light.css @@ -951,52 +951,40 @@ stacksidebar.sidebar row.needs-attention > label:dir(rtl), .stack-switcher > but background-position: left 3px; } -.linked:not(.vertical) > spinbutton.vertical:not(:first-child), .linked:not(.vertical) > spinbutton:not(:first-child):not(.vertical), .linked:not(.vertical) > entry:not(:first-child), .linked:not(.vertical) > button:not(:first-child) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} - -.linked:not(.vertical) > spinbutton.vertical:not(:last-child), .linked:not(.vertical) > spinbutton:not(:last-child):not(.vertical), .linked:not(.vertical) > entry:not(:last-child), .linked:not(.vertical) > button:not(:last-child) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.linked.vertical > spinbutton.vertical:not(:first-child), .linked.vertical > spinbutton:not(:first-child):not(.vertical), .linked.vertical > entry:not(:first-child), .linked.vertical > button:not(:first-child) { - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -.linked.vertical > spinbutton.vertical:not(:last-child), .linked.vertical > spinbutton:not(:last-child):not(.vertical), .linked.vertical > entry:not(:last-child), .linked.vertical > button:not(:last-child) { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; +.linked:not(.vertical) > spinbutton.vertical, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .linked:not(.vertical) > button { + border-radius: 0; } -.linked:not(.vertical) > button.image-button:first-child:not(.text-button) { +.linked:not(.vertical) > spinbutton.vertical:first-child, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > button:first-child { border-top-left-radius: 12px; border-bottom-left-radius: 12px; } -.linked:not(.vertical) > button.image-button:last-child:not(.text-button) { +.linked:not(.vertical) > spinbutton.vertical:last-child, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > button:last-child { border-top-right-radius: 12px; border-bottom-right-radius: 12px; } -.linked:not(.vertical) > button.image-button:only-child:not(.text-button) { - border-radius: 9999px; +.linked:not(.vertical) > spinbutton.vertical:only-child, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > button:only-child { + border-radius: 12px; +} + +.linked.vertical > spinbutton.vertical, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button { + border-radius: 0; } -.linked.vertical > button.image-button:first-child:not(.text-button) { +.linked.vertical > spinbutton.vertical:first-child, .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; } -.linked.vertical > button.image-button:last-child:not(.text-button) { +.linked.vertical > spinbutton.vertical:last-child, .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child { border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; } -.linked.vertical > button.image-button:only-child:not(.text-button) { - border-radius: 9999px; +.linked.vertical > spinbutton.vertical:only-child, .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child { + border-radius: 12px; } /* menu buttons */ @@ -1194,7 +1182,7 @@ combobox > .linked:not(.vertical) > button:not(:only-child) { min-width: 16px; margin: 6px; padding: 4px; - border-radius: 9999px; + border-radius: 12px; } .linked:not(.vertical) > combobox:not(:first-child) > box > button.combo { @@ -1352,23 +1340,6 @@ searchbar > revealer > box { border-radius: 9999px; } -.nemo-window .primary-toolbar .linked:not(.vertical) > button:not(:first-child):not(.text-button), headerbar .linked:not(.vertical) > button:not(:first-child):not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar .linked:not(.vertical) > button:not(:last-child):not(.text-button), headerbar .linked:not(.vertical) > button:not(:last-child):not(.suggested-action):not(.destructive-action) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - -.nemo-window .primary-toolbar .linked:not(.vertical) > button.image-button:not(.text-button):first-child, headerbar .linked:not(.vertical) > button.image-button:not(.text-button):first-child:not(.suggested-action):not(.destructive-action) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; -} - -.nemo-window .primary-toolbar .linked:not(.vertical) > button.image-button:not(.text-button):last-child, headerbar .linked:not(.vertical) > button.image-button:not(.text-button):last-child:not(.suggested-action):not(.destructive-action) { - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - .nemo-window .primary-toolbar button:focus:not(.text-button), headerbar button:focus:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:hover:not(.text-button), headerbar button:hover:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:active:not(.text-button), headerbar button:active:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:checked:not(.text-button), headerbar button:checked:not(.suggested-action):not(.destructive-action) { color: rgba(0, 0, 0, 0.87); } @@ -2085,6 +2056,10 @@ notebook, notebook.frame { border-radius: 12px; } +notebook.frame frame, notebook.frame frame border, notebook.frame frame list { + border-radius: 13px; +} + notebook:focus tab:checked { box-shadow: none; } @@ -3398,17 +3373,10 @@ messagedialog.csd .dialog-action-box { margin-top: -6px; } -messagedialog.csd .dialog-action-box button { +messagedialog.csd .dialog-action-box button, messagedialog.csd .dialog-action-box button:first-child, messagedialog.csd .dialog-action-box button:last-child { border-radius: 9999px; } -messagedialog.csd .dialog-action-box button:not(:first-child), messagedialog.csd .dialog-action-box button:not(:last-child) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - messagedialog.csd .dialog-action-box button:not(:last-child) { margin-right: 6px; } @@ -3993,23 +3961,26 @@ stackswitcher { margin: 6px 0; } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action) { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action) { margin: 0 0; - min-width: 104px; border-radius: 9999px; background-color: transparent; } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):focus { +stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action) { + min-width: 100px; +} + +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):focus { box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08); } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):active { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):active { box-shadow: inset 0 0 0 9999px alpha(#1A73E8, 0.08); background-image: radial-gradient(circle, alpha(#1A73E8, 0.08) 10%, transparent 0%); } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):checked { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):checked { background-color: #1A73E8; color: white; } @@ -4657,24 +4628,6 @@ frame.gedit-map-frame > border:dir(rtl) { background-image: none; } -row#Focus, -row#ClickMethod, -row#StaticWorkspaceTweak, -row#dynamic-workspaces, -row#PrimaryWorkspaceTweak, -row#workspaces-only-on-primary { - padding: 0; -} - -row#Focus.tweak > list, -row#ClickMethod.tweak > list, -row#StaticWorkspaceTweak.tweak > list, -row#dynamic-workspaces.tweak > list, -row#PrimaryWorkspaceTweak.tweak > list, -row#workspaces-only-on-primary.tweak > list { - margin-top: -3px; -} - row#Focus, row#ClickMethod, row#PrimaryWorkspaceTweak, @@ -4772,26 +4725,26 @@ dialog.background.csd > box.vertical.dialog-vbox > notebook > stack > box.horizo hdyleaflet list.frame, leaflet list.frame, hdyleaflet frame.view, leaflet frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), .tweak-group-startup, list.tweak-group list, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame { - border-radius: 12px; + border-radius: 13px; box-shadow: none; border: 1px solid rgba(0, 0, 0, 0.08); } -hdyleaflet list.frame row.activatable:first-child, leaflet list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, .tweak-group-startup row.activatable:first-child, list.tweak-group list row.activatable:first-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, +hdyleaflet list.frame row.activatable:first-child, leaflet list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, notebook.frame frame row.activatable:first-child, .tweak-group-startup row.activatable:first-child, list.tweak-group list row.activatable:first-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; } -hdyleaflet list.frame row.activatable:last-child, leaflet list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, .tweak-group-startup row.activatable:last-child, list.tweak-group list row.activatable:last-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, +hdyleaflet list.frame row.activatable:last-child, leaflet list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, notebook.frame frame row.activatable:last-child, .tweak-group-startup row.activatable:last-child, list.tweak-group list row.activatable:last-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child { border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; } -hdyleaflet list.frame row.activatable:only-child, leaflet list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, .tweak-group-startup row.activatable:only-child, list.tweak-group list row.activatable:only-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, +hdyleaflet list.frame row.activatable:only-child, leaflet list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, notebook.frame frame row.activatable:only-child, .tweak-group-startup row.activatable:only-child, list.tweak-group list row.activatable:only-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child { border-radius: 12px; @@ -4805,17 +4758,17 @@ hdyleaflet frame.view list, leaflet frame.view list { background: none; } -hdyleaflet > box.vertical list:not(.view) row.activatable, leaflet > box.vertical list:not(.view) row.activatable { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable { margin-right: 4px; - border-radius: 0 1000px 1000px 0; + border-radius: 0 9999px 9999px 0; } -hdyleaflet > box.vertical list:not(.view) row.activatable:selected, leaflet > box.vertical list:not(.view) row.activatable:selected { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected { background-color: alpha(currentColor, 0.1); color: #1A73E8; } -hdyleaflet > box.vertical list:not(.view) row.activatable:selected image, hdyleaflet > box.vertical list:not(.view) row.activatable:selected label, leaflet > box.vertical list:not(.view) row.activatable:selected image, leaflet > box.vertical list:not(.view) row.activatable:selected label { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected image, hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected label, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected image, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected label { color: #1A73E8; } diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css index 5b96faf..4826bdc 100644 --- a/src/gtk/3.0/gtk.css +++ b/src/gtk/3.0/gtk.css @@ -951,52 +951,40 @@ stacksidebar.sidebar row.needs-attention > label:dir(rtl), .stack-switcher > but background-position: left 3px; } -.linked:not(.vertical) > spinbutton.vertical:not(:first-child), .linked:not(.vertical) > spinbutton:not(:first-child):not(.vertical), .linked:not(.vertical) > entry:not(:first-child), .linked:not(.vertical) > button:not(:first-child) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} - -.linked:not(.vertical) > spinbutton.vertical:not(:last-child), .linked:not(.vertical) > spinbutton:not(:last-child):not(.vertical), .linked:not(.vertical) > entry:not(:last-child), .linked:not(.vertical) > button:not(:last-child) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.linked.vertical > spinbutton.vertical:not(:first-child), .linked.vertical > spinbutton:not(:first-child):not(.vertical), .linked.vertical > entry:not(:first-child), .linked.vertical > button:not(:first-child) { - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -.linked.vertical > spinbutton.vertical:not(:last-child), .linked.vertical > spinbutton:not(:last-child):not(.vertical), .linked.vertical > entry:not(:last-child), .linked.vertical > button:not(:last-child) { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; +.linked:not(.vertical) > spinbutton.vertical, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .linked:not(.vertical) > button { + border-radius: 0; } -.linked:not(.vertical) > button.image-button:first-child:not(.text-button) { +.linked:not(.vertical) > spinbutton.vertical:first-child, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > button:first-child { border-top-left-radius: 12px; border-bottom-left-radius: 12px; } -.linked:not(.vertical) > button.image-button:last-child:not(.text-button) { +.linked:not(.vertical) > spinbutton.vertical:last-child, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > button:last-child { border-top-right-radius: 12px; border-bottom-right-radius: 12px; } -.linked:not(.vertical) > button.image-button:only-child:not(.text-button) { - border-radius: 9999px; +.linked:not(.vertical) > spinbutton.vertical:only-child, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > button:only-child { + border-radius: 12px; +} + +.linked.vertical > spinbutton.vertical, .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button { + border-radius: 0; } -.linked.vertical > button.image-button:first-child:not(.text-button) { +.linked.vertical > spinbutton.vertical:first-child, .linked.vertical > spinbutton:first-child:not(.vertical), .linked.vertical > entry:first-child, .linked.vertical > button:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; } -.linked.vertical > button.image-button:last-child:not(.text-button) { +.linked.vertical > spinbutton.vertical:last-child, .linked.vertical > spinbutton:last-child:not(.vertical), .linked.vertical > entry:last-child, .linked.vertical > button:last-child { border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; } -.linked.vertical > button.image-button:only-child:not(.text-button) { - border-radius: 9999px; +.linked.vertical > spinbutton.vertical:only-child, .linked.vertical > spinbutton:only-child:not(.vertical), .linked.vertical > entry:only-child, .linked.vertical > button:only-child { + border-radius: 12px; } /* menu buttons */ @@ -1194,7 +1182,7 @@ combobox > .linked:not(.vertical) > button:not(:only-child) { min-width: 16px; margin: 6px; padding: 4px; - border-radius: 9999px; + border-radius: 12px; } .linked:not(.vertical) > combobox:not(:first-child) > box > button.combo { @@ -1352,23 +1340,6 @@ searchbar > revealer > box { border-radius: 9999px; } -.nemo-window .primary-toolbar .linked:not(.vertical) > button:not(:first-child):not(.text-button), headerbar .linked:not(.vertical) > button:not(:first-child):not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar .linked:not(.vertical) > button:not(:last-child):not(.text-button), headerbar .linked:not(.vertical) > button:not(:last-child):not(.suggested-action):not(.destructive-action) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - -.nemo-window .primary-toolbar .linked:not(.vertical) > button.image-button:not(.text-button):first-child, headerbar .linked:not(.vertical) > button.image-button:not(.text-button):first-child:not(.suggested-action):not(.destructive-action) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; -} - -.nemo-window .primary-toolbar .linked:not(.vertical) > button.image-button:not(.text-button):last-child, headerbar .linked:not(.vertical) > button.image-button:not(.text-button):last-child:not(.suggested-action):not(.destructive-action) { - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - .nemo-window .primary-toolbar button:focus:not(.text-button), headerbar button:focus:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:hover:not(.text-button), headerbar button:hover:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:active:not(.text-button), headerbar button:active:not(.suggested-action):not(.destructive-action), .nemo-window .primary-toolbar button:checked:not(.text-button), headerbar button:checked:not(.suggested-action):not(.destructive-action) { color: white; } @@ -2085,6 +2056,10 @@ notebook, notebook.frame { border-radius: 12px; } +notebook.frame frame, notebook.frame frame border, notebook.frame frame list { + border-radius: 13px; +} + notebook:focus tab:checked { box-shadow: none; } @@ -3398,17 +3373,10 @@ messagedialog.csd .dialog-action-box { margin-top: -6px; } -messagedialog.csd .dialog-action-box button { +messagedialog.csd .dialog-action-box button, messagedialog.csd .dialog-action-box button:first-child, messagedialog.csd .dialog-action-box button:last-child { border-radius: 9999px; } -messagedialog.csd .dialog-action-box button:not(:first-child), messagedialog.csd .dialog-action-box button:not(:last-child) { - border-top-left-radius: 9999px; - border-bottom-left-radius: 9999px; - border-top-right-radius: 9999px; - border-bottom-right-radius: 9999px; -} - messagedialog.csd .dialog-action-box button:not(:last-child) { margin-right: 6px; } @@ -3993,23 +3961,26 @@ stackswitcher { margin: 6px 0; } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action) { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action) { margin: 0 0; - min-width: 104px; border-radius: 9999px; background-color: transparent; } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):focus { +stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action) { + min-width: 100px; +} + +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):focus { box-shadow: inset 0 0 0 2px alpha(currentColor, 0.08); } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):active { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):active { box-shadow: inset 0 0 0 9999px alpha(#1A73E8, 0.08); background-image: radial-gradient(circle, alpha(#1A73E8, 0.08) 10%, transparent 0%); } -stackswitcher.linked:not(.vertical) > button.text-button:not(.suggested-action):not(.destructive-action):checked { +stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action):checked { background-color: #1A73E8; color: white; } @@ -4658,24 +4629,6 @@ frame.gedit-map-frame > border:dir(rtl) { background-image: none; } -row#Focus, -row#ClickMethod, -row#StaticWorkspaceTweak, -row#dynamic-workspaces, -row#PrimaryWorkspaceTweak, -row#workspaces-only-on-primary { - padding: 0; -} - -row#Focus.tweak > list, -row#ClickMethod.tweak > list, -row#StaticWorkspaceTweak.tweak > list, -row#dynamic-workspaces.tweak > list, -row#PrimaryWorkspaceTweak.tweak > list, -row#workspaces-only-on-primary.tweak > list { - margin-top: -3px; -} - row#Focus, row#ClickMethod, row#PrimaryWorkspaceTweak, @@ -4773,26 +4726,26 @@ dialog.background.csd > box.vertical.dialog-vbox > notebook > stack > box.horizo hdyleaflet list.frame, leaflet list.frame, hdyleaflet frame.view, leaflet frame.view, hdyleaflet frame:not(.view) list:not(.contacts-contact-list), leaflet frame:not(.view) list:not(.contacts-contact-list), .tweak-group-startup, list.tweak-group list, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame { - border-radius: 12px; + border-radius: 13px; box-shadow: none; border: 1px solid rgba(0, 0, 0, 0.08); } -hdyleaflet list.frame row.activatable:first-child, leaflet list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, .tweak-group-startup row.activatable:first-child, list.tweak-group list row.activatable:first-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, +hdyleaflet list.frame row.activatable:first-child, leaflet list.frame row.activatable:first-child, hdyleaflet frame.view list row.activatable:first-child, leaflet frame.view list row.activatable:first-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:first-child, notebook.frame frame row.activatable:first-child, .tweak-group-startup row.activatable:first-child, list.tweak-group list row.activatable:first-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; } -hdyleaflet list.frame row.activatable:last-child, leaflet list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, .tweak-group-startup row.activatable:last-child, list.tweak-group list row.activatable:last-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, +hdyleaflet list.frame row.activatable:last-child, leaflet list.frame row.activatable:last-child, hdyleaflet frame.view list row.activatable:last-child, leaflet frame.view list row.activatable:last-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:last-child, notebook.frame frame row.activatable:last-child, .tweak-group-startup row.activatable:last-child, list.tweak-group list row.activatable:last-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:last-child { border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; } -hdyleaflet list.frame row.activatable:only-child, leaflet list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, .tweak-group-startup row.activatable:only-child, list.tweak-group list row.activatable:only-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, +hdyleaflet list.frame row.activatable:only-child, leaflet list.frame row.activatable:only-child, hdyleaflet frame.view list row.activatable:only-child, leaflet frame.view list row.activatable:only-child, hdyleaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, leaflet frame:not(.view) list:not(.contacts-contact-list) row.activatable:only-child, notebook.frame frame row.activatable:only-child, .tweak-group-startup row.activatable:only-child, list.tweak-group list row.activatable:only-child, window.background.csd > leaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, window.background.csd > hdyleaflet > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child, window.background.csd > box.horizontal > stack.background > widget > scrolledwindow > viewport.frame > hdycolumn > box.vertical > list.frame > row.activatable:only-child { border-radius: 12px; @@ -4806,17 +4759,17 @@ hdyleaflet frame.view list, leaflet frame.view list { background: none; } -hdyleaflet > box.vertical list:not(.view) row.activatable, leaflet > box.vertical list:not(.view) row.activatable { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable { margin-right: 4px; - border-radius: 0 1000px 1000px 0; + border-radius: 0 9999px 9999px 0; } -hdyleaflet > box.vertical list:not(.view) row.activatable:selected, leaflet > box.vertical list:not(.view) row.activatable:selected { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected { background-color: alpha(currentColor, 0.1); color: #1A73E8; } -hdyleaflet > box.vertical list:not(.view) row.activatable:selected image, hdyleaflet > box.vertical list:not(.view) row.activatable:selected label, leaflet > box.vertical list:not(.view) row.activatable:selected image, leaflet > box.vertical list:not(.view) row.activatable:selected label { +hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected image, hdyleaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected label, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected image, leaflet > box.vertical > scrolledwindow > viewport.frame list:not(.view):not(.tweak-group) row.activatable:selected label { color: #1A73E8; }