diff --git a/src/_sass/gtk/_common-3.20.scss b/src/_sass/gtk/_common-3.20.scss index 87403be..a525075 100644 --- a/src/_sass/gtk/_common-3.20.scss +++ b/src/_sass/gtk/_common-3.20.scss @@ -3135,7 +3135,7 @@ placessidebar.sidebar { min-height: 32px; margin: -1px 4px -1px 0; // Remove unwanted hard-coded vertical margins with -1px padding: 0; - border-radius: 0 1000px 1000px 0; + border-radius: 0 $circular_radius $circular_radius 0; // Using margins/padding directly in the SidebarRow // will make the animation of the new bookmark row jump diff --git a/src/_sass/gtk/apps/_gnome-3.22.scss b/src/_sass/gtk/apps/_gnome-3.22.scss index beffe71..eee3e35 100644 --- a/src/_sass/gtk/apps/_gnome-3.22.scss +++ b/src/_sass/gtk/apps/_gnome-3.22.scss @@ -39,11 +39,25 @@ border-radius: 0; margin: -8px 0 -8px 0; + &, &:focused, &:hover, &:active { + background-image: none; + box-shadow: none; + animation: none; + } + &, image.sidebar-icon, label.sidebar-label { color: $titlebar-text-secondary; } &:drop(active) { + // border-radius: $window-radius - 6px; + + @if $topbar == 'dark' { + border-radius: $circular_radius 0 0 $circular_radius; + } + + background-color: rgba($drop_target_color, 0.1); + &, image.sidebar-icon, label.sidebar-label { color: $drop_target_color; } @@ -53,17 +67,8 @@ @extend %button-on-dark; } - &:hover, &:active { - background: none; - box-shadow: none; - // animation: none; - } - &:hover { - image.sidebar-icon, - label.sidebar-label { - color: $primary; - } + image.sidebar-icon, label.sidebar-label { color: $primary; } } &:selected { @@ -96,7 +101,11 @@ } } - &:disabled { color: $titlebar-text-disabled; } + &:disabled { + &, image.sidebar-icon, label.sidebar-label { + color: $titlebar-text-secondary-disabled; + } + } image.sidebar-icon { padding-right: 8px; diff --git a/src/gtk/3.0/gtk-compact.css b/src/gtk/3.0/gtk-compact.css index e6573a6..7524760 100644 --- a/src/gtk/3.0/gtk-compact.css +++ b/src/gtk/3.0/gtk-compact.css @@ -3511,7 +3511,7 @@ placessidebar.sidebar row { min-height: 32px; margin: -1px 4px -1px 0; padding: 0; - border-radius: 0 1000px 1000px 0; + border-radius: 0 9999px 9999px 0; } placessidebar.sidebar row > revealer { @@ -4065,21 +4065,26 @@ popover.emoji-completion .emoji:hover { margin: -8px 0 -8px 0; } +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:focused, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:active { + background-image: none; + box-shadow: none; + animation: none; +} + .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable label.sidebar-label { color: rgba(255, 255, 255, 0.7); } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active), .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) label.sidebar-label { - color: #FF7043; +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) { + border-radius: 9999px 0 0 9999px; + background-color: rgba(255, 112, 67, 0.1); } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:active { - background: none; - box-shadow: none; +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active), .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) label.sidebar-label { + color: #FF7043; } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover image.sidebar-icon, -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover label.sidebar-label { +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover label.sidebar-label { color: #1A73E8; } @@ -4111,8 +4116,8 @@ popover.emoji-completion .emoji:hover { margin-left: -32px; } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled { - color: rgba(255, 255, 255, 0.5); +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled label.sidebar-label { + color: rgba(255, 255, 255, 0.3); } .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable image.sidebar-icon { diff --git a/src/gtk/3.0/gtk-dark-compact.css b/src/gtk/3.0/gtk-dark-compact.css index ee80fef..77a98b2 100644 --- a/src/gtk/3.0/gtk-dark-compact.css +++ b/src/gtk/3.0/gtk-dark-compact.css @@ -3511,7 +3511,7 @@ placessidebar.sidebar row { min-height: 32px; margin: -1px 4px -1px 0; padding: 0; - border-radius: 0 1000px 1000px 0; + border-radius: 0 9999px 9999px 0; } placessidebar.sidebar row > revealer { @@ -4065,21 +4065,26 @@ popover.emoji-completion .emoji:hover { margin: -8px 0 -8px 0; } +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:focused, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:active { + background-image: none; + box-shadow: none; + animation: none; +} + .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable label.sidebar-label { color: rgba(255, 255, 255, 0.7); } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active), .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) label.sidebar-label { - color: #FF7043; +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) { + border-radius: 9999px 0 0 9999px; + background-color: rgba(255, 112, 67, 0.1); } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:active { - background: none; - box-shadow: none; +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active), .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) label.sidebar-label { + color: #FF7043; } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover image.sidebar-icon, -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover label.sidebar-label { +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover label.sidebar-label { color: #3281ea; } @@ -4111,8 +4116,8 @@ popover.emoji-completion .emoji:hover { margin-left: -32px; } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled { - color: rgba(255, 255, 255, 0.5); +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled label.sidebar-label { + color: rgba(255, 255, 255, 0.3); } .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable image.sidebar-icon { diff --git a/src/gtk/3.0/gtk-dark.css b/src/gtk/3.0/gtk-dark.css index 8eefadb..4e87e38 100644 --- a/src/gtk/3.0/gtk-dark.css +++ b/src/gtk/3.0/gtk-dark.css @@ -3511,7 +3511,7 @@ placessidebar.sidebar row { min-height: 32px; margin: -1px 4px -1px 0; padding: 0; - border-radius: 0 1000px 1000px 0; + border-radius: 0 9999px 9999px 0; } placessidebar.sidebar row > revealer { @@ -4065,21 +4065,26 @@ popover.emoji-completion .emoji:hover { margin: -8px 0 -8px 0; } +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:focused, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:active { + background-image: none; + box-shadow: none; + animation: none; +} + .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable label.sidebar-label { color: rgba(255, 255, 255, 0.7); } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active), .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) label.sidebar-label { - color: #FF7043; +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) { + border-radius: 9999px 0 0 9999px; + background-color: rgba(255, 112, 67, 0.1); } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:active { - background: none; - box-shadow: none; +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active), .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) label.sidebar-label { + color: #FF7043; } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover image.sidebar-icon, -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover label.sidebar-label { +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover label.sidebar-label { color: #3281ea; } @@ -4111,8 +4116,8 @@ popover.emoji-completion .emoji:hover { margin-left: -32px; } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled { - color: rgba(255, 255, 255, 0.5); +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled label.sidebar-label { + color: rgba(255, 255, 255, 0.3); } .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable image.sidebar-icon { diff --git a/src/gtk/3.0/gtk-light-compact.css b/src/gtk/3.0/gtk-light-compact.css index 9e766e2..bb469ca 100644 --- a/src/gtk/3.0/gtk-light-compact.css +++ b/src/gtk/3.0/gtk-light-compact.css @@ -3511,7 +3511,7 @@ placessidebar.sidebar row { min-height: 32px; margin: -1px 4px -1px 0; padding: 0; - border-radius: 0 1000px 1000px 0; + border-radius: 0 9999px 9999px 0; } placessidebar.sidebar row > revealer { @@ -4065,21 +4065,25 @@ popover.emoji-completion .emoji:hover { margin: -8px 0 -8px 0; } +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:focused, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:active { + background-image: none; + box-shadow: none; + animation: none; +} + .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable label.sidebar-label { color: rgba(0, 0, 0, 0.6); } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active), .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) label.sidebar-label { - color: #FF7043; +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) { + background-color: rgba(255, 112, 67, 0.1); } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:active { - background: none; - box-shadow: none; +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active), .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) label.sidebar-label { + color: #FF7043; } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover image.sidebar-icon, -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover label.sidebar-label { +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover label.sidebar-label { color: #1A73E8; } @@ -4111,8 +4115,8 @@ popover.emoji-completion .emoji:hover { margin-left: -32px; } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled { - color: rgba(0, 0, 0, 0.38); +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled label.sidebar-label { + color: rgba(0, 0, 0, 0.26); } .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable image.sidebar-icon { diff --git a/src/gtk/3.0/gtk-light.css b/src/gtk/3.0/gtk-light.css index fce35f1..9330a1e 100644 --- a/src/gtk/3.0/gtk-light.css +++ b/src/gtk/3.0/gtk-light.css @@ -3511,7 +3511,7 @@ placessidebar.sidebar row { min-height: 32px; margin: -1px 4px -1px 0; padding: 0; - border-radius: 0 1000px 1000px 0; + border-radius: 0 9999px 9999px 0; } placessidebar.sidebar row > revealer { @@ -4065,21 +4065,25 @@ popover.emoji-completion .emoji:hover { margin: -8px 0 -8px 0; } +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:focused, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:active { + background-image: none; + box-shadow: none; + animation: none; +} + .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable label.sidebar-label { color: rgba(0, 0, 0, 0.6); } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active), .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) label.sidebar-label { - color: #FF7043; +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) { + background-color: rgba(255, 112, 67, 0.1); } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:active { - background: none; - box-shadow: none; +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active), .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) label.sidebar-label { + color: #FF7043; } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover image.sidebar-icon, -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover label.sidebar-label { +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover label.sidebar-label { color: #1A73E8; } @@ -4111,8 +4115,8 @@ popover.emoji-completion .emoji:hover { margin-left: -32px; } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled { - color: rgba(0, 0, 0, 0.38); +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled label.sidebar-label { + color: rgba(0, 0, 0, 0.26); } .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable image.sidebar-icon { diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css index 53c414b..3c61424 100644 --- a/src/gtk/3.0/gtk.css +++ b/src/gtk/3.0/gtk.css @@ -3511,7 +3511,7 @@ placessidebar.sidebar row { min-height: 32px; margin: -1px 4px -1px 0; padding: 0; - border-radius: 0 1000px 1000px 0; + border-radius: 0 9999px 9999px 0; } placessidebar.sidebar row > revealer { @@ -4065,21 +4065,26 @@ popover.emoji-completion .emoji:hover { margin: -8px 0 -8px 0; } +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:focused, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:active { + background-image: none; + box-shadow: none; + animation: none; +} + .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable label.sidebar-label { color: rgba(255, 255, 255, 0.7); } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active), .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) label.sidebar-label { - color: #FF7043; +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) { + border-radius: 9999px 0 0 9999px; + background-color: rgba(255, 112, 67, 0.1); } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:active { - background: none; - box-shadow: none; +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active), .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:drop(active) label.sidebar-label { + color: #FF7043; } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover image.sidebar-icon, -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover label.sidebar-label { +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:hover label.sidebar-label { color: #1A73E8; } @@ -4111,8 +4116,8 @@ popover.emoji-completion .emoji:hover { margin-left: -32px; } -.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled { - color: rgba(255, 255, 255, 0.5); +.nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled image.sidebar-icon, .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable:disabled label.sidebar-label { + color: rgba(255, 255, 255, 0.3); } .nautilus-window.csd placessidebar > viewport.frame > list > row.activatable image.sidebar-icon {