From 626474399fc6c6fa2c0f1d3ed7b5b34ab5f18c1d Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 19 Feb 2016 11:06:17 +0100 Subject: [PATCH] fix caret color --- common/gtk-3.0/3.20/gtk-dark.css | 13 +------------ common/gtk-3.0/3.20/gtk-darker.css | 13 +------------ common/gtk-3.0/3.20/gtk-solid-dark.css | 13 +------------ common/gtk-3.0/3.20/gtk-solid-darker.css | 13 +------------ common/gtk-3.0/3.20/gtk-solid.css | 13 +------------ common/gtk-3.0/3.20/gtk.css | 13 +------------ common/gtk-3.0/3.20/sass/_common.scss | 1 + common/gtk-3.0/3.20/sass/_drawing.scss | 4 ---- 8 files changed, 7 insertions(+), 76 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index a70a55c..0064813 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -137,10 +137,10 @@ entry, spinbutton { border: 1px solid; padding-left: 8px; padding-right: 8px; + caret-color: currentColor; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; - caret-color: #D3DAE3; border-color: #2b2e39; background-color: #404552; background-image: linear-gradient(to bottom, #404552); } @@ -156,7 +156,6 @@ entry, spinbutton { padding-left: 5px; } entry.flat, spinbutton.flat, entry.flat:focus, spinbutton.flat:focus { color: #D3DAE3; - caret-color: #D3DAE3; border-color: #2b2e39; background-color: #404552; background-image: linear-gradient(to bottom, #404552); @@ -167,7 +166,6 @@ entry, spinbutton { entry:focus, spinbutton:focus { background-clip: border-box; color: #D3DAE3; - caret-color: #D3DAE3; border-color: #2b2e39; background-color: #404552; background-image: linear-gradient(to bottom, #404552); @@ -1056,7 +1054,6 @@ headerbar { .primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar spinbutton, headerbar spinbutton { color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.37); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } @@ -1066,7 +1063,6 @@ headerbar { opacity: 0.85; } .primary-toolbar entry:focus, headerbar entry:focus, .primary-toolbar spinbutton:focus, headerbar spinbutton:focus, .primary-toolbar spinbutton:focus, headerbar spinbutton:focus { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); background-clip: padding-box; } @@ -1285,7 +1281,6 @@ headerbar { .primary-toolbar combobox.combobox-entry button, headerbar combobox.combobox-entry button { color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.37); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } @@ -1293,7 +1288,6 @@ headerbar { color: inherit; } .primary-toolbar combobox.combobox-entry button:hover, headerbar combobox.combobox-entry button:hover { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } @@ -3093,7 +3087,6 @@ GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr), GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) { padding: 0 10px; color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.37); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } @@ -3104,14 +3097,12 @@ GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) { GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):hover { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):active, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):checked { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):disabled, @@ -3364,7 +3355,6 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { padding-left: 4px; padding-right: 4px; color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.37); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } @@ -3372,7 +3362,6 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:disabled { diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 7bbc39f..efd0522 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -137,10 +137,10 @@ entry, spinbutton { border: 1px solid; padding-left: 8px; padding-right: 8px; + caret-color: currentColor; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; - caret-color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } @@ -156,7 +156,6 @@ entry, spinbutton { padding-left: 5px; } entry.flat, spinbutton.flat, entry.flat:focus, spinbutton.flat:focus { color: #5c616c; - caret-color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); @@ -167,7 +166,6 @@ entry, spinbutton { entry:focus, spinbutton:focus { background-clip: border-box; color: #5c616c; - caret-color: #5c616c; border-color: #5294E2; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } @@ -1055,7 +1053,6 @@ headerbar { .primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar spinbutton, headerbar spinbutton { color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.37); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } @@ -1065,7 +1062,6 @@ headerbar { opacity: 0.85; } .primary-toolbar entry:focus, headerbar entry:focus, .primary-toolbar spinbutton:focus, headerbar spinbutton:focus, .primary-toolbar spinbutton:focus, headerbar spinbutton:focus { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); background-clip: padding-box; } @@ -1284,7 +1280,6 @@ headerbar { .primary-toolbar combobox.combobox-entry button, headerbar combobox.combobox-entry button { color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.37); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } @@ -1292,7 +1287,6 @@ headerbar { color: inherit; } .primary-toolbar combobox.combobox-entry button:hover, headerbar combobox.combobox-entry button:hover { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } @@ -3092,7 +3086,6 @@ GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr), GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) { padding: 0 10px; color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.37); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } @@ -3103,14 +3096,12 @@ GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) { GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):hover { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):active, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):checked { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):disabled, @@ -3363,7 +3354,6 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { padding-left: 4px; padding-right: 4px; color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.37); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37)); background-color: transparent; } @@ -3371,7 +3361,6 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:disabled { 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 044882e..5811788 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -137,10 +137,10 @@ entry, spinbutton { border: 1px solid; padding-left: 8px; padding-right: 8px; + caret-color: currentColor; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #D3DAE3; - caret-color: #D3DAE3; border-color: #2b2e39; background-color: #404552; background-image: linear-gradient(to bottom, #404552); } @@ -156,7 +156,6 @@ entry, spinbutton { padding-left: 5px; } entry.flat, spinbutton.flat, entry.flat:focus, spinbutton.flat:focus { color: #D3DAE3; - caret-color: #D3DAE3; border-color: #2b2e39; background-color: #404552; background-image: linear-gradient(to bottom, #404552); @@ -167,7 +166,6 @@ entry, spinbutton { entry:focus, spinbutton:focus { background-clip: border-box; color: #D3DAE3; - caret-color: #D3DAE3; border-color: #2b2e39; background-color: #404552; background-image: linear-gradient(to bottom, #404552); @@ -1056,7 +1054,6 @@ headerbar { .primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar spinbutton, headerbar spinbutton { color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.4); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } @@ -1066,7 +1063,6 @@ headerbar { opacity: 0.85; } .primary-toolbar entry:focus, headerbar entry:focus, .primary-toolbar spinbutton:focus, headerbar spinbutton:focus, .primary-toolbar spinbutton:focus, headerbar spinbutton:focus { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); background-clip: padding-box; } @@ -1285,7 +1281,6 @@ headerbar { .primary-toolbar combobox.combobox-entry button, headerbar combobox.combobox-entry button { color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.4); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } @@ -1293,7 +1288,6 @@ headerbar { color: inherit; } .primary-toolbar combobox.combobox-entry button:hover, headerbar combobox.combobox-entry button:hover { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } @@ -3093,7 +3087,6 @@ GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr), GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) { padding: 0 10px; color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.4); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } @@ -3104,14 +3097,12 @@ GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) { GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):hover { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):active, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):checked { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):disabled, @@ -3364,7 +3355,6 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { padding-left: 4px; padding-right: 4px; color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.4); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } @@ -3372,7 +3362,6 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:disabled { 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 aa37387..71db1d5 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -137,10 +137,10 @@ entry, spinbutton { border: 1px solid; padding-left: 8px; padding-right: 8px; + caret-color: currentColor; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; - caret-color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } @@ -156,7 +156,6 @@ entry, spinbutton { padding-left: 5px; } entry.flat, spinbutton.flat, entry.flat:focus, spinbutton.flat:focus { color: #5c616c; - caret-color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); @@ -167,7 +166,6 @@ entry, spinbutton { entry:focus, spinbutton:focus { background-clip: border-box; color: #5c616c; - caret-color: #5c616c; border-color: #5294E2; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } @@ -1055,7 +1053,6 @@ headerbar { .primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar spinbutton, headerbar spinbutton { color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.4); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } @@ -1065,7 +1062,6 @@ headerbar { opacity: 0.85; } .primary-toolbar entry:focus, headerbar entry:focus, .primary-toolbar spinbutton:focus, headerbar spinbutton:focus, .primary-toolbar spinbutton:focus, headerbar spinbutton:focus { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); background-clip: padding-box; } @@ -1284,7 +1280,6 @@ headerbar { .primary-toolbar combobox.combobox-entry button, headerbar combobox.combobox-entry button { color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.4); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } @@ -1292,7 +1287,6 @@ headerbar { color: inherit; } .primary-toolbar combobox.combobox-entry button:hover, headerbar combobox.combobox-entry button:hover { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } @@ -3092,7 +3086,6 @@ GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr), GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) { padding: 0 10px; color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.4); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } @@ -3103,14 +3096,12 @@ GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) { GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):hover { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):active, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):checked { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):disabled, @@ -3363,7 +3354,6 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { padding-left: 4px; padding-right: 4px; color: rgba(207, 218, 231, 0.8); - caret-color: rgba(207, 218, 231, 0.8); border-color: rgba(21, 23, 28, 0.4); background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4)); background-color: transparent; } @@ -3371,7 +3361,6 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - caret-color: #ffffff; border-color: transparent; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:disabled { diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 0dcd4ff..8ebb087 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -137,10 +137,10 @@ entry, spinbutton { border: 1px solid; padding-left: 8px; padding-right: 8px; + caret-color: currentColor; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; - caret-color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } @@ -156,7 +156,6 @@ entry, spinbutton { padding-left: 5px; } entry.flat, spinbutton.flat, entry.flat:focus, spinbutton.flat:focus { color: #5c616c; - caret-color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); @@ -167,7 +166,6 @@ entry, spinbutton { entry:focus, spinbutton:focus { background-clip: border-box; color: #5c616c; - caret-color: #5c616c; border-color: #5294E2; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } @@ -1055,7 +1053,6 @@ headerbar { .primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar spinbutton, headerbar spinbutton { color: rgba(82, 93, 118, 0.8); - caret-color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); background-color: transparent; } @@ -1065,7 +1062,6 @@ headerbar { opacity: 0.85; } .primary-toolbar entry:focus, headerbar entry:focus, .primary-toolbar spinbutton:focus, headerbar spinbutton:focus, .primary-toolbar spinbutton:focus, headerbar spinbutton:focus { color: #ffffff; - caret-color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); background-clip: border-box; } @@ -1284,7 +1280,6 @@ headerbar { .primary-toolbar combobox.combobox-entry button, headerbar combobox.combobox-entry button { color: rgba(82, 93, 118, 0.8); - caret-color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); background-color: transparent; } @@ -1292,7 +1287,6 @@ headerbar { color: inherit; } .primary-toolbar combobox.combobox-entry button:hover, headerbar combobox.combobox-entry button:hover { color: #ffffff; - caret-color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } @@ -3096,7 +3090,6 @@ GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr), GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) { padding: 0 10px; color: rgba(82, 93, 118, 0.8); - caret-color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); background-color: transparent; } @@ -3107,14 +3100,12 @@ GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) { GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):hover { color: #ffffff; - caret-color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):active, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):checked { color: #ffffff; - caret-color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):disabled, @@ -3367,7 +3358,6 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { padding-left: 4px; padding-right: 4px; color: rgba(82, 93, 118, 0.8); - caret-color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); background-color: transparent; } @@ -3375,7 +3365,6 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - caret-color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:disabled { diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 38f67f5..d43c65f 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -137,10 +137,10 @@ entry, spinbutton { border: 1px solid; padding-left: 8px; padding-right: 8px; + caret-color: currentColor; border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #5c616c; - caret-color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } @@ -156,7 +156,6 @@ entry, spinbutton { padding-left: 5px; } entry.flat, spinbutton.flat, entry.flat:focus, spinbutton.flat:focus { color: #5c616c; - caret-color: #5c616c; border-color: #cfd6e6; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); @@ -167,7 +166,6 @@ entry, spinbutton { entry:focus, spinbutton:focus { background-clip: border-box; color: #5c616c; - caret-color: #5c616c; border-color: #5294E2; background-color: #ffffff; background-image: linear-gradient(to bottom, #ffffff); } @@ -1055,7 +1053,6 @@ headerbar { .primary-toolbar entry, headerbar entry, .primary-toolbar spinbutton, headerbar spinbutton, .primary-toolbar spinbutton, headerbar spinbutton { color: rgba(82, 93, 118, 0.8); - caret-color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); background-color: transparent; } @@ -1065,7 +1062,6 @@ headerbar { opacity: 0.85; } .primary-toolbar entry:focus, headerbar entry:focus, .primary-toolbar spinbutton:focus, headerbar spinbutton:focus, .primary-toolbar spinbutton:focus, headerbar spinbutton:focus { color: #ffffff; - caret-color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); background-clip: border-box; } @@ -1284,7 +1280,6 @@ headerbar { .primary-toolbar combobox.combobox-entry button, headerbar combobox.combobox-entry button { color: rgba(82, 93, 118, 0.8); - caret-color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); background-color: transparent; } @@ -1292,7 +1287,6 @@ headerbar { color: inherit; } .primary-toolbar combobox.combobox-entry button:hover, headerbar combobox.combobox-entry button:hover { color: #ffffff; - caret-color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); box-shadow: none; } @@ -3096,7 +3090,6 @@ GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr), GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) { padding: 0 10px; color: rgba(82, 93, 118, 0.8); - caret-color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); background-color: transparent; } @@ -3107,14 +3100,12 @@ GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) { GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):hover { color: #ffffff; - caret-color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):active, GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):checked { color: #ffffff; - caret-color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):disabled, @@ -3367,7 +3358,6 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { padding-left: 4px; padding-right: 4px; color: rgba(82, 93, 118, 0.8); - caret-color: rgba(82, 93, 118, 0.8); border-color: rgba(82, 93, 118, 0.1); background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9)); background-color: transparent; } @@ -3375,7 +3365,6 @@ MarlinViewWindow FMListView, MarlinViewWindow FMColumnView { color: inherit; } .marlin-pathbar.pathbar:focus { color: #ffffff; - caret-color: #ffffff; border-color: #5294E2; background-image: linear-gradient(to bottom, #5294E2); } .marlin-pathbar.pathbar:disabled { diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 75cfc1f..c5cac11 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -200,6 +200,7 @@ entry { padding-left: 8px; padding-right: 8px; + caret-color: currentColor; border-radius: 3px; transition: all 200ms $ease-out-quad; diff --git a/common/gtk-3.0/3.20/sass/_drawing.scss b/common/gtk-3.0/3.20/sass/_drawing.scss index bc4a8e2..8ccaea3 100644 --- a/common/gtk-3.0/3.20/sass/_drawing.scss +++ b/common/gtk-3.0/3.20/sass/_drawing.scss @@ -27,7 +27,6 @@ // normal entry // color: $text_color; - caret-color: $text_color; border-color: $entry_border; background-color: $entry_bg; background-image: linear-gradient(to bottom, $entry_bg); @@ -38,7 +37,6 @@ // focused entry // color: $text_color; - caret-color: $text_color; border-color: if($variant=='light', $selected_bg_color, $button_border); background-color: $entry_bg; background-image: linear-gradient(to bottom, $entry_bg); @@ -67,7 +65,6 @@ // color: $header_fg; - caret-color: $header_fg; border-color: $header_entry_border; background-image: linear-gradient(to bottom, $header_entry_bg); background-color: transparent; @@ -80,7 +77,6 @@ // focused header-bar entry // color: $selected_fg_color; - caret-color: $selected_fg_color; border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent); background-image: linear-gradient(to bottom, $selected_bg_color); }