From e6d9055657ba65d657814e2ea59fe5ccef08e384 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 20 Sep 2015 16:46:14 +0200 Subject: refactor error and warning entries --- common/gtk-3.0/3.18/gtk-contained.css | 157 ++++++++++++++++++++++++++++++---- 1 file changed, 139 insertions(+), 18 deletions(-) (limited to 'common/gtk-3.0/3.18/gtk-contained.css') diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css index 053164c..e47ec44 100644 --- a/common/gtk-3.0/3.18/gtk-contained.css +++ b/common/gtk-3.0/3.18/gtk-contained.css @@ -183,32 +183,30 @@ GtkTextView { background-image: none; background-color: transparent; box-shadow: none; } - .entry.error { - color: white; - border-color: #FC4138; - background-image: linear-gradient(to bottom, #fd6760); } - .entry.error:focus { - background-image: linear-gradient(to bottom, #FC4138); - color: white; } - .entry.error:selected, .entry.error:selected:focus { - background-color: white; - color: #FC4138; } .entry.warning { - color: white; + color: #ffffff; border-color: #F27835; - background-image: linear-gradient(to bottom, #f5935d); } + background-image: linear-gradient(to bottom, #f7ae86); } .entry.warning:focus { + color: #ffffff; background-image: linear-gradient(to bottom, #F27835); - color: white; } + box-shadow: none; } .entry.warning:selected, .entry.warning:selected:focus { - background-color: white; + background-color: #ffffff; color: #F27835; } + .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, #fd8d88); } + .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); + box-shadow: none; } + .entry.error:selected, .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .entry.image { color: #7d8189; } - .entry.image:hover { - color: #5c616c; } - .entry.image:active { - color: #5294E2; } .osd .entry { color: #BAC3CF; border-color: rgba(26, 28, 34, 0.35); @@ -520,10 +518,29 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(207, 214, 230, 0.3); } +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: #FC4138; } + +.linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: #5294E2; } +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .entry + .button, .linked:not(.vertical):not(.pathbar) > .entry + .button:hover, .linked:not(.vertical):not(.pathbar) > .entry + .button:active, @@ -537,6 +554,18 @@ GtkSearchEntry.entry { .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #5294E2; } +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #F27835; } + +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #FC4138; } + .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active):not(:only-child), .linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: -1px 0 #cfd6e6; } @@ -565,10 +594,29 @@ GtkSearchEntry.entry { .linked.vertical > .entry + .entry { border-top-color: rgba(207, 214, 230, 0.3); } +.linked.vertical > .entry.error + .entry, +.linked.vertical > .entry + .entry.error { + border-top-color: #FC4138; } + +.linked.vertical > .entry.warning + .entry, +.linked.vertical > .entry + .entry.warning { + border-top-color: #F27835; } + +.linked.vertical > .entry.error + .entry.warning { + border-top-color: #FC4138; } + .linked.vertical > .entry + .entry:focus:not(:last-child), .linked.vertical > .entry + .entry:focus:last-child { border-top-color: #5294E2; } +.linked.vertical > .entry + .entry.warning:focus:not(:last-child), +.linked.vertical > .entry + .entry.warning:focus:last-child { + border-top-color: #F27835; } + +.linked.vertical > .entry + .entry.error:focus:not(:last-child), +.linked.vertical > .entry + .entry.error:focus:last-child { + border-top-color: #FC4138; } + .linked.vertical > .entry + .button, .linked.vertical > .entry + .button:hover, .linked.vertical > .entry + .button:active, @@ -582,6 +630,18 @@ GtkSearchEntry.entry { .linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: #5294E2; } +.linked.vertical > .entry.warning:focus:not(:only-child) + .entry, +.linked.vertical > .entry.warning:focus:not(:only-child) + .button, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #F27835; } + +.linked.vertical > .entry.error:focus:not(:only-child) + .entry, +.linked.vertical > .entry.error:focus:not(:only-child) + .button, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.linked.vertical > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-top-color: #FC4138; } + .linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child), .linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: 0 -1px #cfd6e6; } @@ -1087,6 +1147,26 @@ GtkComboBox { border-color: #5294E2; background-image: none; background-color: transparent; } + .primary-toolbar .entry.warning, .header-bar .entry.warning { + color: #ffffff; + border-color: #F27835; + background-image: linear-gradient(to bottom, rgba(238, 162, 121, 0.98)); } + .primary-toolbar .entry.warning:focus, .header-bar .entry.warning:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #F27835); } + .primary-toolbar .entry.warning:selected, .header-bar .entry.warning:selected, .primary-toolbar .entry.warning:selected:focus, .header-bar .entry.warning:selected:focus { + background-color: #ffffff; + color: #F27835; } + .primary-toolbar .entry.error, .header-bar .entry.error { + color: #ffffff; + border-color: #FC4138; + background-image: linear-gradient(to bottom, rgba(244, 128, 123, 0.98)); } + .primary-toolbar .entry.error:focus, .header-bar .entry.error:focus { + color: #ffffff; + background-image: linear-gradient(to bottom, #FC4138); } + .primary-toolbar .entry.error:selected, .header-bar .entry.error:selected, .primary-toolbar .entry.error:selected:focus, .header-bar .entry.error:selected:focus { + background-color: #ffffff; + color: #FC4138; } .primary-toolbar .button, .header-bar .button { color: rgba(82, 93, 118, 0.8); @@ -1182,11 +1262,34 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry { border-left-color: rgba(82, 93, 118, 0); } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error { + border-left-color: #FC4138; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error + .entry.warning { + border-left-color: #FC4138; } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child { border-left-color: #5294E2; } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.warning:focus:last-child { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:not(:last-child), +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry.error:focus:last-child { + border-left-color: #FC4138; } + .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button, @@ -1196,6 +1299,24 @@ GtkComboBox { .primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color: #5294E2; } +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.warning:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #F27835; } + +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .entry, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + .button, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox, +.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry.error:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { + border-left-color: #FC4138; } + .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action { background-clip: border-box; color: #ffffff; -- cgit v1.2.3