From de54c8745417d18f503295b022259cd327f32431 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 11 Apr 2016 19:42:43 +0200 Subject: [PATCH 1/4] improve linked button styling --- common/gtk-3.0/3.18/gtk-dark.css | 42 ++++++++++++--------- common/gtk-3.0/3.18/gtk-darker.css | 46 +++++++++++++---------- common/gtk-3.0/3.18/gtk-solid-dark.css | 42 ++++++++++++--------- common/gtk-3.0/3.18/gtk-solid-darker.css | 46 +++++++++++++---------- common/gtk-3.0/3.18/gtk-solid.css | 48 ++++++++++++++---------- common/gtk-3.0/3.18/gtk.css | 48 ++++++++++++++---------- common/gtk-3.0/3.18/sass/_common.scss | 40 +++++++++++--------- common/gtk-3.0/3.20/gtk-dark.css | 40 ++++++++++++-------- common/gtk-3.0/3.20/gtk-darker.css | 44 +++++++++++++--------- common/gtk-3.0/3.20/gtk-solid-dark.css | 40 ++++++++++++-------- common/gtk-3.0/3.20/gtk-solid-darker.css | 44 +++++++++++++--------- common/gtk-3.0/3.20/gtk-solid.css | 46 ++++++++++++++--------- common/gtk-3.0/3.20/gtk.css | 46 ++++++++++++++--------- common/gtk-3.0/3.20/sass/_common.scss | 27 ++++++++----- 14 files changed, 361 insertions(+), 238 deletions(-) diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index 04f946e..5485ad8 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -494,7 +494,8 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning { border-left-color: rgba(43, 46, 57, 0.3); } -.linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning { +.linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, +.linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error { border-left-color: rgba(43, 46, 57, 0.3); } .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), @@ -527,16 +528,19 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #2b2e39; } -.linked:not(.vertical):not(.path-bar) > .button + .button { +.linked:not(.vertical):not(.path-bar) > button + button { border-left-style: none; } -.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), -.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 1px 0 #2b2e39; } -.linked:not(.vertical):not(.path-bar) > .button:first-child:hover:not(:checked):not(:active), -.linked:not(.vertical):not(.path-bar) > .button:checked + .button:not(:checked):not(:active):hover, -.linked:not(.vertical):not(.path-bar) > .entry + .button:not(:checked):not(:active):hover { +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked:not(.vertical):not(.path-bar) > .button:active + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button:checked + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button.suggested-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button.destructive-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .entry + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .linked:not(.vertical).path-bar > .button + .button { @@ -562,7 +566,8 @@ GtkSearchEntry.entry { .linked.vertical > .entry + .entry.warning { border-top-color: rgba(43, 46, 57, 0.3); } -.linked.vertical > .entry.error + .entry.warning { +.linked.vertical > .entry.error + .entry.warning, +.linked.vertical > .entry.warning + .entry.error { border-top-color: rgba(43, 46, 57, 0.3); } .linked.vertical > .entry + .entry:focus:not(:last-child), @@ -595,16 +600,19 @@ GtkSearchEntry.entry { .linked.vertical > .button:checked + .entry { border-top-color: #2b2e39; } -.linked.vertical > .button + .button { +.linked.vertical > button + button { border-top-style: none; } -.linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child), -.linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 0 1px #2b2e39; } -.linked.vertical > .button:first-child:hover:not(:checked):not(:active), -.linked.vertical > .button:checked + .button:not(:checked):not(:active):hover, -.linked.vertical > .entry + .button:not(:checked):not(:active):hover { +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked.vertical > .button:active + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button:checked + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button.suggested-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button.destructive-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .entry + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .linked:not(.vertical) > .entry, @@ -1035,11 +1043,11 @@ GtkComboBox { border-color: rgba(82, 148, 226, 0.65); background-color: rgba(82, 148, 226, 0.65); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:disabled, .header-bar .linked:not(.vertical):not(.path-bar) > .button:disabled { border-radius: 3px; border-style: solid; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .header-bar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), .header-bar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: none; } .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button, .primary-toolbar .linked:not(.vertical).path-bar > .button, .header-bar .linked:not(.vertical).path-bar > .button { @@ -1078,7 +1086,7 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning { border-left-color: rgba(21, 23, 28, 0); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error { border-left-color: rgba(21, 23, 28, 0); } .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child { diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index 13849cd..a4d6b4a 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -493,8 +493,9 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning { border-left-color: #F27835; } -.linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning { - border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, +.linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error { + border-left-color: #f75d37; } .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child { @@ -526,16 +527,19 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #5294E2; } -.linked:not(.vertical):not(.path-bar) > .button + .button { +.linked:not(.vertical):not(.path-bar) > button + button { border-left-style: none; } -.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), -.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 1px 0 #cfd6e6; } -.linked:not(.vertical):not(.path-bar) > .button:first-child:hover:not(:checked):not(:active), -.linked:not(.vertical):not(.path-bar) > .button:checked + .button:not(:checked):not(:active):hover, -.linked:not(.vertical):not(.path-bar) > .entry + .button:not(:checked):not(:active):hover { +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked:not(.vertical):not(.path-bar) > .button:active + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button:checked + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button.suggested-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button.destructive-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .entry + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .linked:not(.vertical).path-bar > .button + .button { @@ -561,8 +565,9 @@ GtkSearchEntry.entry { .linked.vertical > .entry + .entry.warning { border-top-color: #F27835; } -.linked.vertical > .entry.error + .entry.warning { - border-top-color: #FC4138; } +.linked.vertical > .entry.error + .entry.warning, +.linked.vertical > .entry.warning + .entry.error { + border-top-color: #f75d37; } .linked.vertical > .entry + .entry:focus:not(:last-child), .linked.vertical > .entry + .entry:focus:last-child { @@ -594,16 +599,19 @@ GtkSearchEntry.entry { .linked.vertical > .button:checked + .entry { border-top-color: #5294E2; } -.linked.vertical > .button + .button { +.linked.vertical > button + button { border-top-style: none; } -.linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child), -.linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 0 1px #cfd6e6; } -.linked.vertical > .button:first-child:hover:not(:checked):not(:active), -.linked.vertical > .button:checked + .button:not(:checked):not(:active):hover, -.linked.vertical > .entry + .button:not(:checked):not(:active):hover { +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked.vertical > .button:active + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button:checked + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button.suggested-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button.destructive-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .entry + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .linked:not(.vertical) > .entry, @@ -1038,11 +1046,11 @@ GtkComboBox { border-color: rgba(82, 148, 226, 0.65); background-color: rgba(82, 148, 226, 0.65); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:disabled, .header-bar .linked:not(.vertical):not(.path-bar) > .button:disabled { border-radius: 3px; border-style: solid; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .header-bar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), .header-bar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: none; } .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button, .primary-toolbar .linked:not(.vertical).path-bar > .button, .header-bar .linked:not(.vertical).path-bar > .button { @@ -1081,7 +1089,7 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning { border-left-color: rgba(21, 23, 28, 0); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error { border-left-color: rgba(21, 23, 28, 0); } .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child { diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index f567658..8d0fe4c 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -494,7 +494,8 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning { border-left-color: rgba(43, 46, 57, 0.3); } -.linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning { +.linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, +.linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error { border-left-color: rgba(43, 46, 57, 0.3); } .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), @@ -527,16 +528,19 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #2b2e39; } -.linked:not(.vertical):not(.path-bar) > .button + .button { +.linked:not(.vertical):not(.path-bar) > button + button { border-left-style: none; } -.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), -.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 1px 0 #2b2e39; } -.linked:not(.vertical):not(.path-bar) > .button:first-child:hover:not(:checked):not(:active), -.linked:not(.vertical):not(.path-bar) > .button:checked + .button:not(:checked):not(:active):hover, -.linked:not(.vertical):not(.path-bar) > .entry + .button:not(:checked):not(:active):hover { +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked:not(.vertical):not(.path-bar) > .button:active + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button:checked + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button.suggested-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button.destructive-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .entry + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .linked:not(.vertical).path-bar > .button + .button { @@ -562,7 +566,8 @@ GtkSearchEntry.entry { .linked.vertical > .entry + .entry.warning { border-top-color: rgba(43, 46, 57, 0.3); } -.linked.vertical > .entry.error + .entry.warning { +.linked.vertical > .entry.error + .entry.warning, +.linked.vertical > .entry.warning + .entry.error { border-top-color: rgba(43, 46, 57, 0.3); } .linked.vertical > .entry + .entry:focus:not(:last-child), @@ -595,16 +600,19 @@ GtkSearchEntry.entry { .linked.vertical > .button:checked + .entry { border-top-color: #2b2e39; } -.linked.vertical > .button + .button { +.linked.vertical > button + button { border-top-style: none; } -.linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child), -.linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 0 1px #2b2e39; } -.linked.vertical > .button:first-child:hover:not(:checked):not(:active), -.linked.vertical > .button:checked + .button:not(:checked):not(:active):hover, -.linked.vertical > .entry + .button:not(:checked):not(:active):hover { +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked.vertical > .button:active + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button:checked + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button.suggested-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button.destructive-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .entry + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .linked:not(.vertical) > .entry, @@ -1035,11 +1043,11 @@ GtkComboBox { border-color: rgba(82, 148, 226, 0.65); background-color: rgba(82, 148, 226, 0.65); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:disabled, .header-bar .linked:not(.vertical):not(.path-bar) > .button:disabled { border-radius: 3px; border-style: solid; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .header-bar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), .header-bar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: none; } .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button, .primary-toolbar .linked:not(.vertical).path-bar > .button, .header-bar .linked:not(.vertical).path-bar > .button { @@ -1078,7 +1086,7 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning { border-left-color: rgba(21, 23, 28, 0); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error { border-left-color: rgba(21, 23, 28, 0); } .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child { diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index 8e6a361..deda3b5 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -493,8 +493,9 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning { border-left-color: #F27835; } -.linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning { - border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, +.linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error { + border-left-color: #f75d37; } .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child { @@ -526,16 +527,19 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #5294E2; } -.linked:not(.vertical):not(.path-bar) > .button + .button { +.linked:not(.vertical):not(.path-bar) > button + button { border-left-style: none; } -.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), -.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 1px 0 #cfd6e6; } -.linked:not(.vertical):not(.path-bar) > .button:first-child:hover:not(:checked):not(:active), -.linked:not(.vertical):not(.path-bar) > .button:checked + .button:not(:checked):not(:active):hover, -.linked:not(.vertical):not(.path-bar) > .entry + .button:not(:checked):not(:active):hover { +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked:not(.vertical):not(.path-bar) > .button:active + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button:checked + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button.suggested-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button.destructive-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .entry + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .linked:not(.vertical).path-bar > .button + .button { @@ -561,8 +565,9 @@ GtkSearchEntry.entry { .linked.vertical > .entry + .entry.warning { border-top-color: #F27835; } -.linked.vertical > .entry.error + .entry.warning { - border-top-color: #FC4138; } +.linked.vertical > .entry.error + .entry.warning, +.linked.vertical > .entry.warning + .entry.error { + border-top-color: #f75d37; } .linked.vertical > .entry + .entry:focus:not(:last-child), .linked.vertical > .entry + .entry:focus:last-child { @@ -594,16 +599,19 @@ GtkSearchEntry.entry { .linked.vertical > .button:checked + .entry { border-top-color: #5294E2; } -.linked.vertical > .button + .button { +.linked.vertical > button + button { border-top-style: none; } -.linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child), -.linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 0 1px #cfd6e6; } -.linked.vertical > .button:first-child:hover:not(:checked):not(:active), -.linked.vertical > .button:checked + .button:not(:checked):not(:active):hover, -.linked.vertical > .entry + .button:not(:checked):not(:active):hover { +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked.vertical > .button:active + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button:checked + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button.suggested-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button.destructive-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .entry + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .linked:not(.vertical) > .entry, @@ -1038,11 +1046,11 @@ GtkComboBox { border-color: rgba(82, 148, 226, 0.65); background-color: rgba(82, 148, 226, 0.65); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:disabled, .header-bar .linked:not(.vertical):not(.path-bar) > .button:disabled { border-radius: 3px; border-style: solid; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .header-bar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), .header-bar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: none; } .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button, .primary-toolbar .linked:not(.vertical).path-bar > .button, .header-bar .linked:not(.vertical).path-bar > .button { @@ -1081,7 +1089,7 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning { border-left-color: rgba(21, 23, 28, 0); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error { border-left-color: rgba(21, 23, 28, 0); } .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child { diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 4839dc7..419d032 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -493,8 +493,9 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning { border-left-color: #F27835; } -.linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning { - border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, +.linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error { + border-left-color: #f75d37; } .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child { @@ -526,16 +527,19 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #5294E2; } -.linked:not(.vertical):not(.path-bar) > .button + .button { +.linked:not(.vertical):not(.path-bar) > button + button { border-left-style: none; } -.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), -.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 1px 0 #cfd6e6; } -.linked:not(.vertical):not(.path-bar) > .button:first-child:hover:not(:checked):not(:active), -.linked:not(.vertical):not(.path-bar) > .button:checked + .button:not(:checked):not(:active):hover, -.linked:not(.vertical):not(.path-bar) > .entry + .button:not(:checked):not(:active):hover { +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked:not(.vertical):not(.path-bar) > .button:active + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button:checked + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button.suggested-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button.destructive-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .entry + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .linked:not(.vertical).path-bar > .button + .button { @@ -561,8 +565,9 @@ GtkSearchEntry.entry { .linked.vertical > .entry + .entry.warning { border-top-color: #F27835; } -.linked.vertical > .entry.error + .entry.warning { - border-top-color: #FC4138; } +.linked.vertical > .entry.error + .entry.warning, +.linked.vertical > .entry.warning + .entry.error { + border-top-color: #f75d37; } .linked.vertical > .entry + .entry:focus:not(:last-child), .linked.vertical > .entry + .entry:focus:last-child { @@ -594,16 +599,19 @@ GtkSearchEntry.entry { .linked.vertical > .button:checked + .entry { border-top-color: #5294E2; } -.linked.vertical > .button + .button { +.linked.vertical > button + button { border-top-style: none; } -.linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child), -.linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 0 1px #cfd6e6; } -.linked.vertical > .button:first-child:hover:not(:checked):not(:active), -.linked.vertical > .button:checked + .button:not(:checked):not(:active):hover, -.linked.vertical > .entry + .button:not(:checked):not(:active):hover { +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked.vertical > .button:active + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button:checked + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button.suggested-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button.destructive-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .entry + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .linked:not(.vertical) > .entry, @@ -1038,11 +1046,11 @@ GtkComboBox { border-color: rgba(82, 148, 226, 0.65); background-color: rgba(82, 148, 226, 0.65); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:disabled, .header-bar .linked:not(.vertical):not(.path-bar) > .button:disabled { border-radius: 3px; border-style: solid; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .header-bar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), .header-bar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: none; } .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button, .primary-toolbar .linked:not(.vertical).path-bar > .button, .header-bar .linked:not(.vertical).path-bar > .button { @@ -1081,8 +1089,8 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning { border-left-color: #F27835; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning { - border-left-color: #FC4138; } +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error { + border-left-color: #f75d37; } .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child { border-left-color: #5294E2; } diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index d505ed4..cc92f12 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -493,8 +493,9 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning { border-left-color: #F27835; } -.linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning { - border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, +.linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error { + border-left-color: #f75d37; } .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child { @@ -526,16 +527,19 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #5294E2; } -.linked:not(.vertical):not(.path-bar) > .button + .button { +.linked:not(.vertical):not(.path-bar) > button + button { border-left-style: none; } -.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), -.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 1px 0 #cfd6e6; } -.linked:not(.vertical):not(.path-bar) > .button:first-child:hover:not(:checked):not(:active), -.linked:not(.vertical):not(.path-bar) > .button:checked + .button:not(:checked):not(:active):hover, -.linked:not(.vertical):not(.path-bar) > .entry + .button:not(:checked):not(:active):hover { +.linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked:not(.vertical):not(.path-bar) > .button:active + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button:checked + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button.suggested-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .button.destructive-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > .entry + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .linked:not(.vertical).path-bar > .button + .button { @@ -561,8 +565,9 @@ GtkSearchEntry.entry { .linked.vertical > .entry + .entry.warning { border-top-color: #F27835; } -.linked.vertical > .entry.error + .entry.warning { - border-top-color: #FC4138; } +.linked.vertical > .entry.error + .entry.warning, +.linked.vertical > .entry.warning + .entry.error { + border-top-color: #f75d37; } .linked.vertical > .entry + .entry:focus:not(:last-child), .linked.vertical > .entry + .entry:focus:last-child { @@ -594,16 +599,19 @@ GtkSearchEntry.entry { .linked.vertical > .button:checked + .entry { border-top-color: #5294E2; } -.linked.vertical > .button + .button { +.linked.vertical > button + button { border-top-style: none; } -.linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child), -.linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 0 1px #cfd6e6; } -.linked.vertical > .button:first-child:hover:not(:checked):not(:active), -.linked.vertical > .button:checked + .button:not(:checked):not(:active):hover, -.linked.vertical > .entry + .button:not(:checked):not(:active):hover { +.linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked.vertical > .button:active + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button:checked + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button.suggested-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .button.destructive-action + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > .entry + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .linked:not(.vertical) > .entry, @@ -1038,11 +1046,11 @@ GtkComboBox { border-color: rgba(82, 148, 226, 0.65); background-color: rgba(82, 148, 226, 0.65); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:disabled, .header-bar .linked:not(.vertical):not(.path-bar) > .button:disabled { border-radius: 3px; border-style: solid; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .header-bar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), .header-bar .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: none; } .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button, .primary-toolbar .linked:not(.vertical).path-bar > .button, .header-bar .linked:not(.vertical).path-bar > .button { @@ -1081,8 +1089,8 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry.warning { border-left-color: #F27835; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning { - border-left-color: #FC4138; } +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error + .entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.warning + .entry.error { + border-left-color: #f75d37; } .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.path-bar) > .entry + .entry:focus:last-child { border-left-color: #5294E2; } diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 0fc3a4c..13c483c 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -539,7 +539,8 @@ $_dot_color: $selected_bg_color; > .entry.warning + .entry, > .entry + .entry.warning { border-#{$_border}-color: if($var=='light', $warning_color, transparentize($e_border, $a)); } - > .entry.error + .entry.warning { border-#{$_border}-color: if($var=='light', $error_color, transparentize($e_border, $a));} + > .entry.error + .entry.warning, + > .entry.warning + .entry.error { border-#{$_border}-color: if($var=='light', mix($error_color, $warning_color, 50%), transparentize($e_border, $a));} @each $e_type, $e_color in ('',$selected_bg_color), ('.warning', $warning_color), @@ -557,14 +558,19 @@ $_dot_color: $selected_bg_color; > .button:checked + .entry { border-#{$_border}-color: if($var=='light', $selected_bg_color, $e_border); } } @if $button_rules=='true' { - > .button + .button { border-#{$_border}-style: none; } + $_uncolored_button: '.button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action)'; - > .button:hover:not(:checked):not(:active):not(:only-child), - > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: inset if($vert=='false', 1px 0, 0 1px) $b_border; } + > button + button { border-#{$_border}-style: none; } - > .button:first-child:hover:not(:checked):not(:active), - > .button:checked + .button:not(:checked):not(:active):hover, - > .entry + .button:not(:checked):not(:active):hover { box-shadow: none; } + > #{$_uncolored_button}:hover:not(:only-child), + > #{$_uncolored_button}:hover + #{$_uncolored_button} { box-shadow: inset if($vert=='false', 1px 0, 0 1px) $b_border; } + + > #{$_uncolored_button}:first-child:hover, + > .button:active + #{$_uncolored_button}:hover, + > .button:checked + #{$_uncolored_button}:hover, + > .button.suggested-action + #{$_uncolored_button}:hover, + > .button.destructive-action + #{$_uncolored_button}:hover, + > .entry + #{$_uncolored_button}:hover:not(:only-child) { box-shadow: none; } } } @@ -1159,17 +1165,17 @@ GtkComboBox { // Linking stuff // Reset buttons - .linked:not(.vertical):not(.path-bar) > .button, - .linked:not(.vertical):not(.path-bar) > .button:hover, - .linked:not(.vertical):not(.path-bar) > .button:active, - .linked:not(.vertical):not(.path-bar) > .button:checked, - .linked:not(.vertical):not(.path-bar) > .button:insensitive { - border-radius: 3px; - border-style: solid; + .linked:not(.vertical):not(.path-bar) > .button { + &, &:hover, &:active, &:checked, &:disabled { + border-radius: 3px; + border-style: solid; + } } - .linked:not(.vertical):not(.path-bar), .linked:not(.vertical).path-bar { - > .button:hover:not(:checked):not(:active):not(:only-child), - > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: none; } + .linked:not(.vertical):not(.path-bar) { + $_uncolored_button: '.button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action)'; + + > #{$_uncolored_button}:hover:not(:only-child), + > #{$_uncolored_button}:hover + #{$_uncolored_button} { box-shadow: none; } } // special case for path-bars and stack-switchers diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 62b05ec..a016332 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -527,7 +527,8 @@ button { .linked:not(.vertical):not(.path-bar) > entry + entry.warning { border-left-color: rgba(43, 46, 57, 0.3); } -.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning { +.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, +.linked:not(.vertical):not(.path-bar) > entry.warning + entry.error { border-left-color: rgba(43, 46, 57, 0.3); } .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), @@ -566,19 +567,23 @@ button { .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-left-color: #2b2e39; } +.linked:not(.vertical):not(.path-bar) > button:active + entry, .linked:not(.vertical):not(.path-bar) > button:checked + entry { border-left-color: #2b2e39; } .linked:not(.vertical):not(.path-bar) > button + button { border-left-style: none; } -.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), -.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 1px 0 #2b2e39; } -.linked:not(.vertical):not(.path-bar) > button:first-child:hover:not(:checked):not(:active), -.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):hover, -.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(:only-child):hover { +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked:not(.vertical):not(.path-bar) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button.suggested-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button.destructive-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .linked:not(.vertical).path-bar > button + button { @@ -604,7 +609,8 @@ button { .linked.vertical > entry + entry.warning { border-top-color: rgba(43, 46, 57, 0.3); } -.linked.vertical > entry.error + entry.warning { +.linked.vertical > entry.error + entry.warning, +.linked.vertical > entry.warning + entry.error { border-top-color: rgba(43, 46, 57, 0.3); } .linked.vertical > entry + entry:focus:not(:last-child), @@ -643,19 +649,23 @@ button { .linked.vertical > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #2b2e39; } +.linked.vertical > button:active + entry, .linked.vertical > button:checked + entry { border-top-color: #2b2e39; } .linked.vertical > button + button { border-top-style: none; } -.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child), -.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 0 1px #2b2e39; } -.linked.vertical > button:first-child:hover:not(:checked):not(:active), -.linked.vertical > button:checked + button:not(:checked):not(:active):hover, -.linked.vertical > entry + button:not(:checked):not(:active):not(:only-child):hover { +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked.vertical > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button:checked + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button.suggested-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button.destructive-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > entry + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .linked:not(.vertical) > entry, @@ -1125,7 +1135,7 @@ window.csd > .titlebar:not(headerbar):backdrop { border-radius: 3px; border-style: solid; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), headerbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child), headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: none; } .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button { @@ -1164,7 +1174,7 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning { border-left-color: rgba(21, 23, 28, 0); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error { border-left-color: rgba(21, 23, 28, 0); } .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child { @@ -1191,7 +1201,7 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-left-color: rgba(21, 23, 28, 0.37); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:active + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry { border-left-color: rgba(21, 23, 28, 0.37); } .primary-toolbar button.suggested-action, headerbar button.suggested-action { diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 0f74ebf..71c6979 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -526,8 +526,9 @@ button { .linked:not(.vertical):not(.path-bar) > entry + entry.warning { border-left-color: #F27835; } -.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning { - border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, +.linked:not(.vertical):not(.path-bar) > entry.warning + entry.error { + border-left-color: #f75d37; } .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child { @@ -565,19 +566,23 @@ button { .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > button:active + entry, .linked:not(.vertical):not(.path-bar) > button:checked + entry { border-left-color: #5294E2; } .linked:not(.vertical):not(.path-bar) > button + button { border-left-style: none; } -.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), -.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 1px 0 #cfd6e6; } -.linked:not(.vertical):not(.path-bar) > button:first-child:hover:not(:checked):not(:active), -.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):hover, -.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(:only-child):hover { +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked:not(.vertical):not(.path-bar) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button.suggested-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button.destructive-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .linked:not(.vertical).path-bar > button + button { @@ -603,8 +608,9 @@ button { .linked.vertical > entry + entry.warning { border-top-color: #F27835; } -.linked.vertical > entry.error + entry.warning { - border-top-color: #FC4138; } +.linked.vertical > entry.error + entry.warning, +.linked.vertical > entry.warning + entry.error { + border-top-color: #f75d37; } .linked.vertical > entry + entry:focus:not(:last-child), .linked.vertical > entry + entry:focus:last-child { @@ -642,19 +648,23 @@ button { .linked.vertical > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #FC4138; } +.linked.vertical > button:active + entry, .linked.vertical > button:checked + entry { border-top-color: #5294E2; } .linked.vertical > button + button { border-top-style: none; } -.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child), -.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 0 1px #cfd6e6; } -.linked.vertical > button:first-child:hover:not(:checked):not(:active), -.linked.vertical > button:checked + button:not(:checked):not(:active):hover, -.linked.vertical > entry + button:not(:checked):not(:active):not(:only-child):hover { +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked.vertical > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button:checked + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button.suggested-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button.destructive-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > entry + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .linked:not(.vertical) > entry, @@ -1124,7 +1134,7 @@ window.csd > .titlebar:not(headerbar):backdrop { border-radius: 3px; border-style: solid; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), headerbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child), headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: none; } .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button { @@ -1163,7 +1173,7 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning { border-left-color: rgba(21, 23, 28, 0); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error { border-left-color: rgba(21, 23, 28, 0); } .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child { @@ -1190,7 +1200,7 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-left-color: rgba(21, 23, 28, 0.37); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:active + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry { border-left-color: rgba(21, 23, 28, 0.37); } .primary-toolbar button.suggested-action, headerbar button.suggested-action { diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index e09c664..b00ca95 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -527,7 +527,8 @@ button { .linked:not(.vertical):not(.path-bar) > entry + entry.warning { border-left-color: rgba(43, 46, 57, 0.3); } -.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning { +.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, +.linked:not(.vertical):not(.path-bar) > entry.warning + entry.error { border-left-color: rgba(43, 46, 57, 0.3); } .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), @@ -566,19 +567,23 @@ button { .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-left-color: #2b2e39; } +.linked:not(.vertical):not(.path-bar) > button:active + entry, .linked:not(.vertical):not(.path-bar) > button:checked + entry { border-left-color: #2b2e39; } .linked:not(.vertical):not(.path-bar) > button + button { border-left-style: none; } -.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), -.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 1px 0 #2b2e39; } -.linked:not(.vertical):not(.path-bar) > button:first-child:hover:not(:checked):not(:active), -.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):hover, -.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(:only-child):hover { +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked:not(.vertical):not(.path-bar) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button.suggested-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button.destructive-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .linked:not(.vertical).path-bar > button + button { @@ -604,7 +609,8 @@ button { .linked.vertical > entry + entry.warning { border-top-color: rgba(43, 46, 57, 0.3); } -.linked.vertical > entry.error + entry.warning { +.linked.vertical > entry.error + entry.warning, +.linked.vertical > entry.warning + entry.error { border-top-color: rgba(43, 46, 57, 0.3); } .linked.vertical > entry + entry:focus:not(:last-child), @@ -643,19 +649,23 @@ button { .linked.vertical > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #2b2e39; } +.linked.vertical > button:active + entry, .linked.vertical > button:checked + entry { border-top-color: #2b2e39; } .linked.vertical > button + button { border-top-style: none; } -.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child), -.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 0 1px #2b2e39; } -.linked.vertical > button:first-child:hover:not(:checked):not(:active), -.linked.vertical > button:checked + button:not(:checked):not(:active):hover, -.linked.vertical > entry + button:not(:checked):not(:active):not(:only-child):hover { +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked.vertical > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button:checked + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button.suggested-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button.destructive-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > entry + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .linked:not(.vertical) > entry, @@ -1125,7 +1135,7 @@ window.csd > .titlebar:not(headerbar):backdrop { border-radius: 3px; border-style: solid; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), headerbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child), headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: none; } .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button { @@ -1164,7 +1174,7 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning { border-left-color: rgba(21, 23, 28, 0); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error { border-left-color: rgba(21, 23, 28, 0); } .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child { @@ -1191,7 +1201,7 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-left-color: rgba(21, 23, 28, 0.4); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:active + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry { border-left-color: rgba(21, 23, 28, 0.4); } .primary-toolbar button.suggested-action, headerbar button.suggested-action { diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index 2bb5a22..dd1ef92 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -526,8 +526,9 @@ button { .linked:not(.vertical):not(.path-bar) > entry + entry.warning { border-left-color: #F27835; } -.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning { - border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, +.linked:not(.vertical):not(.path-bar) > entry.warning + entry.error { + border-left-color: #f75d37; } .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child { @@ -565,19 +566,23 @@ button { .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > button:active + entry, .linked:not(.vertical):not(.path-bar) > button:checked + entry { border-left-color: #5294E2; } .linked:not(.vertical):not(.path-bar) > button + button { border-left-style: none; } -.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), -.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 1px 0 #cfd6e6; } -.linked:not(.vertical):not(.path-bar) > button:first-child:hover:not(:checked):not(:active), -.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):hover, -.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(:only-child):hover { +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked:not(.vertical):not(.path-bar) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button.suggested-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button.destructive-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .linked:not(.vertical).path-bar > button + button { @@ -603,8 +608,9 @@ button { .linked.vertical > entry + entry.warning { border-top-color: #F27835; } -.linked.vertical > entry.error + entry.warning { - border-top-color: #FC4138; } +.linked.vertical > entry.error + entry.warning, +.linked.vertical > entry.warning + entry.error { + border-top-color: #f75d37; } .linked.vertical > entry + entry:focus:not(:last-child), .linked.vertical > entry + entry:focus:last-child { @@ -642,19 +648,23 @@ button { .linked.vertical > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #FC4138; } +.linked.vertical > button:active + entry, .linked.vertical > button:checked + entry { border-top-color: #5294E2; } .linked.vertical > button + button { border-top-style: none; } -.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child), -.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 0 1px #cfd6e6; } -.linked.vertical > button:first-child:hover:not(:checked):not(:active), -.linked.vertical > button:checked + button:not(:checked):not(:active):hover, -.linked.vertical > entry + button:not(:checked):not(:active):not(:only-child):hover { +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked.vertical > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button:checked + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button.suggested-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button.destructive-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > entry + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .linked:not(.vertical) > entry, @@ -1124,7 +1134,7 @@ window.csd > .titlebar:not(headerbar):backdrop { border-radius: 3px; border-style: solid; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), headerbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child), headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: none; } .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button { @@ -1163,7 +1173,7 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning { border-left-color: rgba(21, 23, 28, 0); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error { border-left-color: rgba(21, 23, 28, 0); } .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child { @@ -1190,7 +1200,7 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-left-color: rgba(21, 23, 28, 0.4); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:active + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry { border-left-color: rgba(21, 23, 28, 0.4); } .primary-toolbar button.suggested-action, headerbar button.suggested-action { diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index a511a00..cd1b845 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -526,8 +526,9 @@ button { .linked:not(.vertical):not(.path-bar) > entry + entry.warning { border-left-color: #F27835; } -.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning { - border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, +.linked:not(.vertical):not(.path-bar) > entry.warning + entry.error { + border-left-color: #f75d37; } .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child { @@ -565,19 +566,23 @@ button { .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > button:active + entry, .linked:not(.vertical):not(.path-bar) > button:checked + entry { border-left-color: #5294E2; } .linked:not(.vertical):not(.path-bar) > button + button { border-left-style: none; } -.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), -.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 1px 0 #cfd6e6; } -.linked:not(.vertical):not(.path-bar) > button:first-child:hover:not(:checked):not(:active), -.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):hover, -.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(:only-child):hover { +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked:not(.vertical):not(.path-bar) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button.suggested-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button.destructive-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .linked:not(.vertical).path-bar > button + button { @@ -603,8 +608,9 @@ button { .linked.vertical > entry + entry.warning { border-top-color: #F27835; } -.linked.vertical > entry.error + entry.warning { - border-top-color: #FC4138; } +.linked.vertical > entry.error + entry.warning, +.linked.vertical > entry.warning + entry.error { + border-top-color: #f75d37; } .linked.vertical > entry + entry:focus:not(:last-child), .linked.vertical > entry + entry:focus:last-child { @@ -642,19 +648,23 @@ button { .linked.vertical > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #FC4138; } +.linked.vertical > button:active + entry, .linked.vertical > button:checked + entry { border-top-color: #5294E2; } .linked.vertical > button + button { border-top-style: none; } -.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child), -.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 0 1px #cfd6e6; } -.linked.vertical > button:first-child:hover:not(:checked):not(:active), -.linked.vertical > button:checked + button:not(:checked):not(:active):hover, -.linked.vertical > entry + button:not(:checked):not(:active):not(:only-child):hover { +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked.vertical > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button:checked + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button.suggested-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button.destructive-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > entry + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .linked:not(.vertical) > entry, @@ -1124,7 +1134,7 @@ window.csd > .titlebar:not(headerbar):backdrop { border-radius: 3px; border-style: solid; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), headerbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child), headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: none; } .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button { @@ -1163,8 +1173,8 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning { border-left-color: #F27835; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning { - border-left-color: #FC4138; } +.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error { + border-left-color: #f75d37; } .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child { border-left-color: #5294E2; } @@ -1190,7 +1200,7 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-left-color: #FC4138; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:active + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry { border-left-color: #5294E2; } .primary-toolbar button.suggested-action, headerbar button.suggested-action { diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 6999c14..b2c9656 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -526,8 +526,9 @@ button { .linked:not(.vertical):not(.path-bar) > entry + entry.warning { border-left-color: #F27835; } -.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning { - border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, +.linked:not(.vertical):not(.path-bar) > entry.warning + entry.error { + border-left-color: #f75d37; } .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child { @@ -565,19 +566,23 @@ button { .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > button:active + entry, .linked:not(.vertical):not(.path-bar) > button:checked + entry { border-left-color: #5294E2; } .linked:not(.vertical):not(.path-bar) > button + button { border-left-style: none; } -.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), -.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 1px 0 #cfd6e6; } -.linked:not(.vertical):not(.path-bar) > button:first-child:hover:not(:checked):not(:active), -.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):hover, -.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(:only-child):hover { +.linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked:not(.vertical):not(.path-bar) > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button.suggested-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > button.destructive-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } .linked:not(.vertical).path-bar > button + button { @@ -603,8 +608,9 @@ button { .linked.vertical > entry + entry.warning { border-top-color: #F27835; } -.linked.vertical > entry.error + entry.warning { - border-top-color: #FC4138; } +.linked.vertical > entry.error + entry.warning, +.linked.vertical > entry.warning + entry.error { + border-top-color: #f75d37; } .linked.vertical > entry + entry:focus:not(:last-child), .linked.vertical > entry + entry:focus:last-child { @@ -642,19 +648,23 @@ button { .linked.vertical > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-top-color: #FC4138; } +.linked.vertical > button:active + entry, .linked.vertical > button:checked + entry { border-top-color: #5294E2; } .linked.vertical > button + button { border-top-style: none; } -.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child), -.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: inset 0 1px #cfd6e6; } -.linked.vertical > button:first-child:hover:not(:checked):not(:active), -.linked.vertical > button:checked + button:not(:checked):not(:active):hover, -.linked.vertical > entry + button:not(:checked):not(:active):not(:only-child):hover { +.linked.vertical > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):first-child:hover, +.linked.vertical > button:active + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button:checked + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button.suggested-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > button.destructive-action + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover, +.linked.vertical > entry + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child) { box-shadow: none; } toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .linked:not(.vertical) > entry, @@ -1124,7 +1134,7 @@ window.csd > .titlebar:not(headerbar):backdrop { border-radius: 3px; border-style: solid; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), headerbar .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child), headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child), .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active), headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action), headerbar .linked:not(.vertical):not(.path-bar) > button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover + button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action) { box-shadow: none; } .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button { @@ -1163,8 +1173,8 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning { border-left-color: #F27835; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning { - border-left-color: #FC4138; } +.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry.error { + border-left-color: #f75d37; } .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child { border-left-color: #5294E2; } @@ -1190,7 +1200,7 @@ window.csd > .titlebar:not(headerbar):backdrop { .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > box > button.combo { border-left-color: #FC4138; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:active + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:active + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry { border-left-color: #5294E2; } .primary-toolbar button.suggested-action, headerbar button.suggested-action { diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index aa0286b..b163e62 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -622,7 +622,8 @@ toolbar.inline-toolbar toolbutton { > entry.warning + entry, > entry + entry.warning { border-#{$_border}-color: if($var=='light', $warning_color, transparentize($e_border, $a)); } - > entry.error + entry.warning { border-#{$_border}-color: if($var=='light', $error_color, transparentize($e_border, $a));} + > entry.error + entry.warning, + > entry.warning + entry.error { border-#{$_border}-color: if($var=='light', mix($error_color, $warning_color, 50%), transparentize($e_border, $a));} @each $e_type, $e_color in (':focus',$selected_bg_color), (':drop(active)', $drop_target_color), @@ -638,17 +639,23 @@ toolbar.inline-toolbar toolbutton { + combobox > box > button.combo { border-#{$_border}-color: if($var=='light', $e_color, $e_border); } } } + > button:active + entry, > button:checked + entry { border-#{$_border}-color: if($var=='light', $selected_bg_color, $e_border); } } @if $button_rules=='true' { + $_uncolored_button: 'button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action)'; + > button + button { border-#{$_border}-style: none; } - > button:hover:not(:checked):not(:active):not(:only-child), - > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { box-shadow: inset if($vert=='false', 1px 0, 0 1px) $b_border; } + > #{$_uncolored_button}:hover:not(:only-child), + > #{$_uncolored_button}:hover + #{$_uncolored_button} { box-shadow: inset if($vert=='false', 1px 0, 0 1px) $b_border; } - > button:first-child:hover:not(:checked):not(:active), - > button:checked + button:not(:checked):not(:active):hover, - > entry + button:not(:checked):not(:active):not(:only-child):hover { box-shadow: none; } + > #{$_uncolored_button}:first-child:hover, + > button:active + #{$_uncolored_button}:hover, + > button:checked + #{$_uncolored_button}:hover, + > button.suggested-action + #{$_uncolored_button}:hover, + > button.destructive-action + #{$_uncolored_button}:hover, + > entry + #{$_uncolored_button}:hover:not(:only-child) { box-shadow: none; } } } @@ -1223,9 +1230,11 @@ headerbar { border-style: solid; } } - .linked:not(.vertical):not(.path-bar), .linked:not(.vertical).path-bar { - > button:hover:not(:checked):not(:active):not(:only-child), - > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { box-shadow: none; } + .linked:not(.vertical):not(.path-bar) { + $_uncolored_button: 'button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action)'; + + > #{$_uncolored_button}:hover:not(:only-child), + > #{$_uncolored_button}:hover + #{$_uncolored_button} { box-shadow: none; } } // special case for path-bars and stack-switchers From bdcb2151db5d5090c4a085364458cbadadeb0428 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 14 Apr 2016 13:55:52 +0200 Subject: [PATCH 2/4] fix a typo --- common/gtk-3.0/3.14/gtk-dark.css | 2 +- common/gtk-3.0/3.14/gtk-darker.css | 2 +- common/gtk-3.0/3.14/gtk-solid-dark.css | 2 +- common/gtk-3.0/3.14/gtk-solid-darker.css | 2 +- common/gtk-3.0/3.14/gtk-solid.css | 2 +- common/gtk-3.0/3.14/gtk.css | 2 +- common/gtk-3.0/3.14/sass/_common.scss | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index 3ac3ad0..d66c8cd 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -2337,7 +2337,7 @@ GtkVolumeButton.button { background-color: transparent; background-image: none; background-color: rgba(47, 52, 63, 0); - border-width: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); color: transparent; background-position: center; background-repeat: no-repeat; } diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index 569bef9..bd6c52e 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -2340,7 +2340,7 @@ GtkVolumeButton.button { background-color: transparent; background-image: none; background-color: rgba(47, 52, 63, 0); - border-width: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); color: transparent; background-position: center; background-repeat: no-repeat; } diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index 7311f15..005fa7e 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -2337,7 +2337,7 @@ GtkVolumeButton.button { background-color: transparent; background-image: none; background-color: rgba(47, 52, 63, 0); - border-width: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); color: transparent; background-position: center; background-repeat: no-repeat; } diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index 0674eee..f25dd32 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -2340,7 +2340,7 @@ GtkVolumeButton.button { background-color: transparent; background-image: none; background-color: rgba(47, 52, 63, 0); - border-width: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); color: transparent; background-position: center; background-repeat: no-repeat; } diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index 6ecb869..fb5dd35 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -2340,7 +2340,7 @@ GtkVolumeButton.button { background-color: transparent; background-image: none; background-color: rgba(231, 232, 235, 0); - border-width: rgba(231, 232, 235, 0); + border-color: rgba(231, 232, 235, 0); color: transparent; background-position: center; background-repeat: no-repeat; } diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index ee8dc74..d0f2631 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -2340,7 +2340,7 @@ GtkVolumeButton.button { background-color: transparent; background-image: none; background-color: rgba(231, 232, 235, 0); - border-width: rgba(231, 232, 235, 0); + border-color: rgba(231, 232, 235, 0); color: transparent; background-position: center; background-repeat: no-repeat; } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index bcff9b9..e8e7e2b 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -2697,7 +2697,7 @@ GtkVolumeButton.button { padding: 8px; } @include button(undecorated); background-color: transparentize($header_bg, 1); - border-width: transparentize($header_bg, 1); + border-color: transparentize($header_bg, 1); color: transparent; background-position: center; From 2cf6296376f8115ae37826a3e2374fec6ecd2cf6 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 14 Apr 2016 14:22:35 +0200 Subject: [PATCH 3/4] 3.14: fix fallback menu button transition --- common/gtk-3.0/3.14/gtk-dark.css | 6 +++--- common/gtk-3.0/3.14/gtk-darker.css | 6 +++--- common/gtk-3.0/3.14/gtk-solid-dark.css | 6 +++--- common/gtk-3.0/3.14/gtk-solid-darker.css | 6 +++--- common/gtk-3.0/3.14/gtk-solid.css | 6 +++--- common/gtk-3.0/3.14/gtk.css | 6 +++--- common/gtk-3.0/3.14/sass/_common.scss | 6 +++++- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css index d66c8cd..185e859 100644 --- a/common/gtk-3.0/3.14/gtk-dark.css +++ b/common/gtk-3.0/3.14/gtk-dark.css @@ -2607,9 +2607,9 @@ GtkVolumeButton.button { .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:active:hover, .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop, .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop:hover { - border-color: transparent; - background-color: transparent; - background-image: none; } + background-image: none; + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .header-bar .left GtkMenuButton.button.titlebutton:first-child:hover, .header-bar .left GtkMenuButton.button.titlebutton:first-child:backdrop:hover, .header-bar .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:hover, .header-bar .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop:hover, diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css index bd6c52e..99a0992 100644 --- a/common/gtk-3.0/3.14/gtk-darker.css +++ b/common/gtk-3.0/3.14/gtk-darker.css @@ -2610,9 +2610,9 @@ GtkVolumeButton.button { .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:active:hover, .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop, .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop:hover { - border-color: transparent; - background-color: transparent; - background-image: none; } + background-image: none; + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .header-bar .left GtkMenuButton.button.titlebutton:first-child:hover, .header-bar .left GtkMenuButton.button.titlebutton:first-child:backdrop:hover, .header-bar .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:hover, .header-bar .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop:hover, diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css index 005fa7e..7282ea1 100644 --- a/common/gtk-3.0/3.14/gtk-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-solid-dark.css @@ -2607,9 +2607,9 @@ GtkVolumeButton.button { .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:active:hover, .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop, .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop:hover { - border-color: transparent; - background-color: transparent; - background-image: none; } + background-image: none; + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .header-bar .left GtkMenuButton.button.titlebutton:first-child:hover, .header-bar .left GtkMenuButton.button.titlebutton:first-child:backdrop:hover, .header-bar .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:hover, .header-bar .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop:hover, diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css index f25dd32..1841e8e 100644 --- a/common/gtk-3.0/3.14/gtk-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-solid-darker.css @@ -2610,9 +2610,9 @@ GtkVolumeButton.button { .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:active:hover, .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop, .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop:hover { - border-color: transparent; - background-color: transparent; - background-image: none; } + background-image: none; + background-color: rgba(47, 52, 63, 0); + border-color: rgba(47, 52, 63, 0); } .header-bar .left GtkMenuButton.button.titlebutton:first-child:hover, .header-bar .left GtkMenuButton.button.titlebutton:first-child:backdrop:hover, .header-bar .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:hover, .header-bar .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop:hover, diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css index fb5dd35..5a47258 100644 --- a/common/gtk-3.0/3.14/gtk-solid.css +++ b/common/gtk-3.0/3.14/gtk-solid.css @@ -2610,9 +2610,9 @@ GtkVolumeButton.button { .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:active:hover, .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop, .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop:hover { - border-color: transparent; - background-color: transparent; - background-image: none; } + background-image: none; + background-color: rgba(231, 232, 235, 0); + border-color: rgba(231, 232, 235, 0); } .header-bar .left GtkMenuButton.button.titlebutton:first-child:hover, .header-bar .left GtkMenuButton.button.titlebutton:first-child:backdrop:hover, .header-bar .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:hover, .header-bar .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop:hover, diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css index d0f2631..18a4ed5 100644 --- a/common/gtk-3.0/3.14/gtk.css +++ b/common/gtk-3.0/3.14/gtk.css @@ -2610,9 +2610,9 @@ GtkVolumeButton.button { .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:active:hover, .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop, .titlebar.selection-mode .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop:hover { - border-color: transparent; - background-color: transparent; - background-image: none; } + background-image: none; + background-color: rgba(231, 232, 235, 0); + border-color: rgba(231, 232, 235, 0); } .header-bar .left GtkMenuButton.button.titlebutton:first-child:hover, .header-bar .left GtkMenuButton.button.titlebutton:first-child:backdrop:hover, .header-bar .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:hover, .header-bar .left:dir(rtl) GtkMenuButton.button.titlebutton:last-child:backdrop:hover, diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index e8e7e2b..a38742e 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -2757,7 +2757,11 @@ GtkVolumeButton.button { padding: 8px; } color: $header_fg; &, &:hover, &:active:hover, - &:backdrop, &:backdrop:hover { @include button(undecorated); } + &:backdrop, &:backdrop:hover { + background-image: none; + background-color: transparentize($header_bg, 1); + border-color: transparentize($header_bg, 1); + } &:hover, &:backdrop:hover { @include button(header-hover); } &:active:hover, &:checked { @include button(header-active); } From 474cc2879f6cd7951ba36640828a161a1f731eb4 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 14 Apr 2016 15:37:03 +0200 Subject: [PATCH 4/4] fix more typos --- common/gtk-3.0/3.18/gtk-dark.css | 10 ++++++---- common/gtk-3.0/3.18/gtk-darker.css | 10 ++++++---- common/gtk-3.0/3.18/gtk-solid-dark.css | 10 ++++++---- common/gtk-3.0/3.18/gtk-solid-darker.css | 10 ++++++---- common/gtk-3.0/3.18/gtk-solid.css | 10 ++++++---- common/gtk-3.0/3.18/gtk.css | 10 ++++++---- common/gtk-3.0/3.18/sass/_common.scss | 5 +++-- 7 files changed, 39 insertions(+), 26 deletions(-) diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css index 5485ad8..5243ab0 100644 --- a/common/gtk-3.0/3.18/gtk-dark.css +++ b/common/gtk-3.0/3.18/gtk-dark.css @@ -525,10 +525,11 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #2b2e39; } +.linked:not(.vertical):not(.path-bar) > .button:active + .entry, .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #2b2e39; } -.linked:not(.vertical):not(.path-bar) > button + button { +.linked:not(.vertical):not(.path-bar) > .button + .button { border-left-style: none; } .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), @@ -597,10 +598,11 @@ GtkSearchEntry.entry { .linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: #2b2e39; } +.linked.vertical > .button:active + .entry, .linked.vertical > .button:checked + .entry { border-top-color: #2b2e39; } -.linked.vertical > button + button { +.linked.vertical > .button + .button { border-top-style: none; } .linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), @@ -1043,7 +1045,7 @@ GtkComboBox { border-color: rgba(82, 148, 226, 0.65); background-color: rgba(82, 148, 226, 0.65); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:disabled, .header-bar .linked:not(.vertical):not(.path-bar) > .button:disabled { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive { border-radius: 3px; border-style: solid; } @@ -1107,7 +1109,7 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .button, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: rgba(21, 23, 28, 0.37); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: rgba(21, 23, 28, 0.37); } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css index a4d6b4a..d268c83 100644 --- a/common/gtk-3.0/3.18/gtk-darker.css +++ b/common/gtk-3.0/3.18/gtk-darker.css @@ -524,10 +524,11 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > .button:active + .entry, .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #5294E2; } -.linked:not(.vertical):not(.path-bar) > button + button { +.linked:not(.vertical):not(.path-bar) > .button + .button { border-left-style: none; } .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), @@ -596,10 +597,11 @@ GtkSearchEntry.entry { .linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: #FC4138; } +.linked.vertical > .button:active + .entry, .linked.vertical > .button:checked + .entry { border-top-color: #5294E2; } -.linked.vertical > button + button { +.linked.vertical > .button + .button { border-top-style: none; } .linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), @@ -1046,7 +1048,7 @@ GtkComboBox { border-color: rgba(82, 148, 226, 0.65); background-color: rgba(82, 148, 226, 0.65); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:disabled, .header-bar .linked:not(.vertical):not(.path-bar) > .button:disabled { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive { border-radius: 3px; border-style: solid; } @@ -1110,7 +1112,7 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .button, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: rgba(21, 23, 28, 0.37); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: rgba(21, 23, 28, 0.37); } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css index 8d0fe4c..49e663b 100644 --- a/common/gtk-3.0/3.18/gtk-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-solid-dark.css @@ -525,10 +525,11 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #2b2e39; } +.linked:not(.vertical):not(.path-bar) > .button:active + .entry, .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #2b2e39; } -.linked:not(.vertical):not(.path-bar) > button + button { +.linked:not(.vertical):not(.path-bar) > .button + .button { border-left-style: none; } .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), @@ -597,10 +598,11 @@ GtkSearchEntry.entry { .linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: #2b2e39; } +.linked.vertical > .button:active + .entry, .linked.vertical > .button:checked + .entry { border-top-color: #2b2e39; } -.linked.vertical > button + button { +.linked.vertical > .button + .button { border-top-style: none; } .linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), @@ -1043,7 +1045,7 @@ GtkComboBox { border-color: rgba(82, 148, 226, 0.65); background-color: rgba(82, 148, 226, 0.65); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:disabled, .header-bar .linked:not(.vertical):not(.path-bar) > .button:disabled { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive { border-radius: 3px; border-style: solid; } @@ -1107,7 +1109,7 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .button, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: rgba(21, 23, 28, 0.4); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: rgba(21, 23, 28, 0.4); } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css index deda3b5..637a535 100644 --- a/common/gtk-3.0/3.18/gtk-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-solid-darker.css @@ -524,10 +524,11 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > .button:active + .entry, .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #5294E2; } -.linked:not(.vertical):not(.path-bar) > button + button { +.linked:not(.vertical):not(.path-bar) > .button + .button { border-left-style: none; } .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), @@ -596,10 +597,11 @@ GtkSearchEntry.entry { .linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: #FC4138; } +.linked.vertical > .button:active + .entry, .linked.vertical > .button:checked + .entry { border-top-color: #5294E2; } -.linked.vertical > button + button { +.linked.vertical > .button + .button { border-top-style: none; } .linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), @@ -1046,7 +1048,7 @@ GtkComboBox { border-color: rgba(82, 148, 226, 0.65); background-color: rgba(82, 148, 226, 0.65); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:disabled, .header-bar .linked:not(.vertical):not(.path-bar) > .button:disabled { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive { border-radius: 3px; border-style: solid; } @@ -1110,7 +1112,7 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .button, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: rgba(21, 23, 28, 0.4); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: rgba(21, 23, 28, 0.4); } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css index 419d032..8c7ab2a 100644 --- a/common/gtk-3.0/3.18/gtk-solid.css +++ b/common/gtk-3.0/3.18/gtk-solid.css @@ -524,10 +524,11 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > .button:active + .entry, .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #5294E2; } -.linked:not(.vertical):not(.path-bar) > button + button { +.linked:not(.vertical):not(.path-bar) > .button + .button { border-left-style: none; } .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), @@ -596,10 +597,11 @@ GtkSearchEntry.entry { .linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: #FC4138; } +.linked.vertical > .button:active + .entry, .linked.vertical > .button:checked + .entry { border-top-color: #5294E2; } -.linked.vertical > button + button { +.linked.vertical > .button + .button { border-top-style: none; } .linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), @@ -1046,7 +1048,7 @@ GtkComboBox { border-color: rgba(82, 148, 226, 0.65); background-color: rgba(82, 148, 226, 0.65); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:disabled, .header-bar .linked:not(.vertical):not(.path-bar) > .button:disabled { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive { border-radius: 3px; border-style: solid; } @@ -1110,7 +1112,7 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .button, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #FC4138; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #5294E2; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css index cc92f12..7329fcb 100644 --- a/common/gtk-3.0/3.18/gtk.css +++ b/common/gtk-3.0/3.18/gtk.css @@ -524,10 +524,11 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #FC4138; } +.linked:not(.vertical):not(.path-bar) > .button:active + .entry, .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #5294E2; } -.linked:not(.vertical):not(.path-bar) > button + button { +.linked:not(.vertical):not(.path-bar) > .button + .button { border-left-style: none; } .linked:not(.vertical):not(.path-bar) > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), @@ -596,10 +597,11 @@ GtkSearchEntry.entry { .linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: #FC4138; } +.linked.vertical > .button:active + .entry, .linked.vertical > .button:checked + .entry { border-top-color: #5294E2; } -.linked.vertical > button + button { +.linked.vertical > .button + .button { border-top-style: none; } .linked.vertical > .button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action):hover:not(:only-child), @@ -1046,7 +1048,7 @@ GtkComboBox { border-color: rgba(82, 148, 226, 0.65); background-color: rgba(82, 148, 226, 0.65); } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:disabled, .header-bar .linked:not(.vertical):not(.path-bar) > .button:disabled { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button, .header-bar .linked:not(.vertical):not(.path-bar) > .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover, .header-bar .linked:not(.vertical):not(.path-bar) > .button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive { border-radius: 3px; border-style: solid; } @@ -1110,7 +1112,7 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .button, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + .button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.path-bar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #FC4138; } -.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { +.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:active + .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry, .header-bar .linked:not(.vertical):not(.path-bar) > .button:checked + .entry { border-left-color: #5294E2; } .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 13c483c..69af281 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -555,12 +555,13 @@ $_dot_color: $selected_bg_color; + GtkComboBoxText > .the-button-in-the-combobox { border-#{$_border}-color: if($var=='light', $e_color, $e_border); } } } + > .button:active + .entry, > .button:checked + .entry { border-#{$_border}-color: if($var=='light', $selected_bg_color, $e_border); } } @if $button_rules=='true' { $_uncolored_button: '.button:not(:checked):not(:active):not(.suggested-action):not(.destructive-action)'; - > button + button { border-#{$_border}-style: none; } + > .button + .button { border-#{$_border}-style: none; } > #{$_uncolored_button}:hover:not(:only-child), > #{$_uncolored_button}:hover + #{$_uncolored_button} { box-shadow: inset if($vert=='false', 1px 0, 0 1px) $b_border; } @@ -1166,7 +1167,7 @@ GtkComboBox { // Reset buttons .linked:not(.vertical):not(.path-bar) > .button { - &, &:hover, &:active, &:checked, &:disabled { + &, &:hover, &:active, &:checked, &:insensitive { border-radius: 3px; border-style: solid; }