diff options
Diffstat (limited to 'common/gtk-3.0/3.14')
-rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-dark.css | 33 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-darker.css | 24 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 33 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 24 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/gtk-contained-solid.css | 14 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/gtk-contained.css | 14 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/sass/_common.scss | 9 | ||||
-rw-r--r-- | common/gtk-3.0/3.14/sass/_drawing.scss | 14 |
8 files changed, 64 insertions, 101 deletions
diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index 42b858f..9b150e1 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -163,9 +163,10 @@ GtkFlowBox .grid-child { .entry:focus { background-clip: border-box; color: #D3DAE3; - border-color: #5294E2; + border-color: #2b2e39; background-color: #404552; - background-image: linear-gradient(to bottom, #404552); } + background-image: linear-gradient(to bottom, #404552); + box-shadow: inset 1px 1px #5294E2, inset -1px -1px #5294E2; } .entry:insensitive { color: rgba(211, 218, 227, 0.45); border-color: rgba(43, 46, 57, 0.55); @@ -303,9 +304,7 @@ GtkSearchEntry.entry { background-clip: padding-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8b98b0; - background-color: #8b98b0; - border-color: transparent; + border-color: #2b2e39; background-color: #5294E2; transition-duration: 50ms; } .button:active { @@ -535,9 +534,7 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8b98b0; - background-color: #8b98b0; - border-color: transparent; + border-color: #2b2e39; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { color: rgba(211, 218, 227, 0.45); @@ -784,9 +781,7 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8b98b0; - background-color: #8b98b0; - border-color: transparent; + border-color: #2b2e39; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #D3DAE3; @@ -807,9 +802,7 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8b98b0; - background-color: #8b98b0; - border-color: transparent; + border-color: #2b2e39; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #D3DAE3; @@ -854,12 +847,8 @@ GtkComboBox { -GtkWidget-wide-separators: true; } GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(ltr):focus { - box-shadow: 1px 0 #5294E2; } GtkComboBox.combobox-entry .entry:dir(rtl) { border-left-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl):focus { - box-shadow: -1px 0 #5294E2; } GtkComboBox.combobox-entry .button:dir(ltr) { box-shadow: inset 1px 0 #2b2e39; } GtkComboBox.combobox-entry .button:dir(ltr):insensitive { @@ -2165,6 +2154,10 @@ GtkCalendar { background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #D3DAE3; } + GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive { + color: rgba(211, 218, 227, 0.45); + background-color: transparent; + background-image: none; } GtkCalendar.highlight { color: alpha(currentColor,0.55); } @@ -3548,9 +3541,7 @@ GtkListBox .h4 { #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8b98b0; - background-color: #8b98b0; - border-color: transparent; + border-color: #2b2e39; background-color: #5294E2; } #content_frame .button:insensitive { color: rgba(211, 218, 227, 0.45); diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index 2d2523f..c987323 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -303,9 +303,7 @@ GtkSearchEntry.entry { background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: transparent; + border-color: #5294E2; background-color: #5294E2; transition-duration: 50ms; } .button:active { @@ -535,9 +533,7 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: transparent; + border-color: #5294E2; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { color: rgba(92, 97, 108, 0.55); @@ -784,9 +780,7 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: transparent; + border-color: #5294E2; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #5c616c; @@ -807,9 +801,7 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: transparent; + border-color: #5294E2; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #5c616c; @@ -2165,6 +2157,10 @@ GtkCalendar { background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #5c616c; } + GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive { + color: rgba(92, 97, 108, 0.55); + background-color: transparent; + background-image: none; } GtkCalendar.highlight { color: alpha(currentColor,0.55); } @@ -3548,9 +3544,7 @@ GtkListBox .h4 { #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: transparent; + border-color: #5294E2; background-color: #5294E2; } #content_frame .button:insensitive { color: rgba(92, 97, 108, 0.55); diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index be60037..f0970de 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -163,9 +163,10 @@ GtkFlowBox .grid-child { .entry:focus { background-clip: border-box; color: #D3DAE3; - border-color: #5294E2; + border-color: #2b2e39; background-color: #404552; - background-image: linear-gradient(to bottom, #404552); } + background-image: linear-gradient(to bottom, #404552); + box-shadow: inset 1px 1px #5294E2, inset -1px -1px #5294E2; } .entry:insensitive { color: rgba(211, 218, 227, 0.45); border-color: rgba(43, 46, 57, 0.55); @@ -303,9 +304,7 @@ GtkSearchEntry.entry { background-clip: padding-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8b98b0; - background-color: #8b98b0; - border-color: transparent; + border-color: #2b2e39; background-color: #5294E2; transition-duration: 50ms; } .button:active { @@ -535,9 +534,7 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8b98b0; - background-color: #8b98b0; - border-color: transparent; + border-color: #2b2e39; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { color: rgba(211, 218, 227, 0.45); @@ -784,9 +781,7 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8b98b0; - background-color: #8b98b0; - border-color: transparent; + border-color: #2b2e39; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #D3DAE3; @@ -807,9 +802,7 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8b98b0; - background-color: #8b98b0; - border-color: transparent; + border-color: #2b2e39; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #D3DAE3; @@ -854,12 +847,8 @@ GtkComboBox { -GtkWidget-wide-separators: true; } GtkComboBox.combobox-entry .entry:dir(ltr) { border-right-style: none; } - GtkComboBox.combobox-entry .entry:dir(ltr):focus { - box-shadow: 1px 0 #5294E2; } GtkComboBox.combobox-entry .entry:dir(rtl) { border-left-style: none; } - GtkComboBox.combobox-entry .entry:dir(rtl):focus { - box-shadow: -1px 0 #5294E2; } GtkComboBox.combobox-entry .button:dir(ltr) { box-shadow: inset 1px 0 #2b2e39; } GtkComboBox.combobox-entry .button:dir(ltr):insensitive { @@ -2165,6 +2154,10 @@ GtkCalendar { background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #D3DAE3; } + GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive { + color: rgba(211, 218, 227, 0.45); + background-color: transparent; + background-image: none; } GtkCalendar.highlight { color: alpha(currentColor,0.55); } @@ -3548,9 +3541,7 @@ GtkListBox .h4 { #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8b98b0; - background-color: #8b98b0; - border-color: transparent; + border-color: #2b2e39; background-color: #5294E2; } #content_frame .button:insensitive { color: rgba(211, 218, 227, 0.45); diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index 249859f..1a61ad6 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -303,9 +303,7 @@ GtkSearchEntry.entry { background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: transparent; + border-color: #5294E2; background-color: #5294E2; transition-duration: 50ms; } .button:active { @@ -535,9 +533,7 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: transparent; + border-color: #5294E2; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { color: rgba(92, 97, 108, 0.55); @@ -784,9 +780,7 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: transparent; + border-color: #5294E2; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { color: #5c616c; @@ -807,9 +801,7 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: transparent; + border-color: #5294E2; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { color: #5c616c; @@ -2165,6 +2157,10 @@ GtkCalendar { background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #5c616c; } + GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive { + color: rgba(92, 97, 108, 0.55); + background-color: transparent; + background-image: none; } GtkCalendar.highlight { color: alpha(currentColor,0.55); } @@ -3548,9 +3544,7 @@ GtkListBox .h4 { #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; - border-color: transparent; + border-color: #5294E2; background-color: #5294E2; } #content_frame .button:insensitive { color: rgba(92, 97, 108, 0.55); diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index 2fe72f4..e57fad9 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -303,8 +303,6 @@ GtkSearchEntry.entry { background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; transition-duration: 50ms; } @@ -535,8 +533,6 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { @@ -784,8 +780,6 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { @@ -807,8 +801,6 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { @@ -2165,6 +2157,10 @@ GtkCalendar { background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #5c616c; } + GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive { + color: rgba(92, 97, 108, 0.55); + background-color: transparent; + background-image: none; } GtkCalendar.highlight { color: alpha(currentColor,0.55); } @@ -3548,8 +3544,6 @@ GtkListBox .h4 { #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } #content_frame .button:insensitive { diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index eb43577..14206f1 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -303,8 +303,6 @@ GtkSearchEntry.entry { background-clip: border-box; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; transition-duration: 50ms; } @@ -535,8 +533,6 @@ GtkSearchEntry.entry { .inline-toolbar GtkToolButton > .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } .inline-toolbar GtkToolButton > .button:insensitive { @@ -784,8 +780,6 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover { @@ -807,8 +801,6 @@ GtkSearchEntry.entry { .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover { @@ -2165,6 +2157,10 @@ GtkCalendar { background-image: none; } GtkCalendar.button:hover, GtkCalendar.button:focus:hover { color: #5c616c; } + GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive { + color: rgba(92, 97, 108, 0.55); + background-color: transparent; + background-image: none; } GtkCalendar.highlight { color: alpha(currentColor,0.55); } @@ -3548,8 +3544,6 @@ GtkListBox .h4 { #content_frame .button:active, #content_frame .button:checked { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); - border-color: #8f9aae; - background-color: #8f9aae; border-color: #5294E2; background-color: #5294E2; } #content_frame .button:insensitive { diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index f97c1bc..cbf1fdd 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -932,12 +932,12 @@ GtkComboBox { &:dir(ltr) { border-right-style: none; - &:focus { box-shadow: 1px 0 $selected_bg_color; } + @if $variant=='light' { &:focus { box-shadow: 1px 0 $selected_bg_color; } } } &:dir(rtl) { border-left-style: none; - &:focus { box-shadow: -1px 0 $selected_bg_color; } + @if $variant=='light' { &:focus { box-shadow: -1px 0 $selected_bg_color; } } } } @@ -2329,6 +2329,11 @@ GtkCalendar { &:hover { color: $fg_color; } + &:insensitive { + color: $insensitive_fg_color; + background-color: transparent; + background-image: none; + } } &.highlight { color: gtkalpha(currentColor,0.55); } } diff --git a/common/gtk-3.0/3.14/sass/_drawing.scss b/common/gtk-3.0/3.14/sass/_drawing.scss index 73c4962..2b24642 100644 --- a/common/gtk-3.0/3.14/sass/_drawing.scss +++ b/common/gtk-3.0/3.14/sass/_drawing.scss @@ -37,9 +37,14 @@ // focused entry // color: $text_color; - border-color: $selected_bg_color; + border-color: if($variant=='light', $selected_bg_color, $button_border); background-color: $entry_bg; background-image: linear-gradient(to bottom, $entry_bg); + + @if $variant == 'dark' { + box-shadow: inset 1px 1px $selected_bg_color, + inset -1px -1px $selected_bg_color; + } } @if $t==insensitive { @@ -147,13 +152,8 @@ // color: $selected_fg_color; outline-color: transparentize($selected_fg_color, 0.7); - border-color: saturate(mix($fg_color, $bg_color, 60%), 10%); - background-color: saturate(mix($fg_color, $bg_color, 60%), 10%); - //border-color: if($variant=='light', saturate(mix($fg_color, $bg_color, 60%), 10%), transparent); - //background-color: if($variant=='light', saturate(mix($fg_color, $bg_color, 60%), 10%), darken($button_bg, 10%)); - - border-color: if($darker=='false' and $variant=='light', $selected_bg_color, transparent); + border-color: if($variant=='light', $selected_bg_color, $button_border); background-color: $selected_bg_color; } |