aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/gtk-3.0/3.18/gtk-dark.css3
-rw-r--r--common/gtk-3.0/3.18/gtk-darker.css3
-rw-r--r--common/gtk-3.0/3.18/gtk-solid-dark.css3
-rw-r--r--common/gtk-3.0/3.18/gtk-solid-darker.css3
-rw-r--r--common/gtk-3.0/3.18/gtk-solid.css3
-rw-r--r--common/gtk-3.0/3.18/gtk.css3
-rw-r--r--common/gtk-3.0/3.18/sass/_common.scss2
-rw-r--r--common/gtk-3.0/3.20/gtk-dark.css63
-rw-r--r--common/gtk-3.0/3.20/gtk-darker.css63
-rw-r--r--common/gtk-3.0/3.20/gtk-solid-dark.css63
-rw-r--r--common/gtk-3.0/3.20/gtk-solid-darker.css63
-rw-r--r--common/gtk-3.0/3.20/gtk-solid.css63
-rw-r--r--common/gtk-3.0/3.20/gtk.css63
-rw-r--r--common/gtk-3.0/3.20/sass/_applications.scss50
-rw-r--r--common/gtk-3.0/3.20/sass/_common.scss8
-rw-r--r--common/metacity-1/metacity-theme-1-dark.xml7
-rw-r--r--common/metacity-1/metacity-theme-1.xml8
-rw-r--r--common/metacity-1/metacity-theme-2-dark.xml7
-rw-r--r--common/metacity-1/metacity-theme-2.xml7
19 files changed, 472 insertions, 13 deletions
diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css
index 0556032..c0bc9ed 100644
--- a/common/gtk-3.0/3.18/gtk-dark.css
+++ b/common/gtk-3.0/3.18/gtk-dark.css
@@ -249,6 +249,9 @@ GtkSearchEntry.entry {
border-color: #2b2e39;
background-color: #5294e2;
transition-duration: 50ms; }
+ .button:active:not(:insensitive) .label:insensitive, .button:checked:not(:insensitive) .label:insensitive {
+ color: inherit;
+ opacity: 0.6; }
.button:active {
color: #D3DAE3; }
.button:active:hover, .button:checked {
diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css
index 37915c4..d75228a 100644
--- a/common/gtk-3.0/3.18/gtk-darker.css
+++ b/common/gtk-3.0/3.18/gtk-darker.css
@@ -248,6 +248,9 @@ GtkSearchEntry.entry {
border-color: #5294e2;
background-color: #5294e2;
transition-duration: 50ms; }
+ .button:active:not(:insensitive) .label:insensitive, .button:checked:not(:insensitive) .label:insensitive {
+ color: inherit;
+ opacity: 0.6; }
.button:active {
color: #5c616c; }
.button:active:hover, .button:checked {
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 d9716bd..33ceccc 100644
--- a/common/gtk-3.0/3.18/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-solid-dark.css
@@ -249,6 +249,9 @@ GtkSearchEntry.entry {
border-color: #2b2e39;
background-color: #5294e2;
transition-duration: 50ms; }
+ .button:active:not(:insensitive) .label:insensitive, .button:checked:not(:insensitive) .label:insensitive {
+ color: inherit;
+ opacity: 0.6; }
.button:active {
color: #D3DAE3; }
.button:active:hover, .button:checked {
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 4b77834..bb8d873 100644
--- a/common/gtk-3.0/3.18/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-solid-darker.css
@@ -248,6 +248,9 @@ GtkSearchEntry.entry {
border-color: #5294e2;
background-color: #5294e2;
transition-duration: 50ms; }
+ .button:active:not(:insensitive) .label:insensitive, .button:checked:not(:insensitive) .label:insensitive {
+ color: inherit;
+ opacity: 0.6; }
.button:active {
color: #5c616c; }
.button:active:hover, .button:checked {
diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css
index c7d9f25..7a27856 100644
--- a/common/gtk-3.0/3.18/gtk-solid.css
+++ b/common/gtk-3.0/3.18/gtk-solid.css
@@ -248,6 +248,9 @@ GtkSearchEntry.entry {
border-color: #5294e2;
background-color: #5294e2;
transition-duration: 50ms; }
+ .button:active:not(:insensitive) .label:insensitive, .button:checked:not(:insensitive) .label:insensitive {
+ color: inherit;
+ opacity: 0.6; }
.button:active {
color: #5c616c; }
.button:active:hover, .button:checked {
diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css
index 1e53899..782d1e1 100644
--- a/common/gtk-3.0/3.18/gtk.css
+++ b/common/gtk-3.0/3.18/gtk.css
@@ -248,6 +248,9 @@ GtkSearchEntry.entry {
border-color: #5294e2;
background-color: #5294e2;
transition-duration: 50ms; }
+ .button:active:not(:insensitive) .label:insensitive, .button:checked:not(:insensitive) .label:insensitive {
+ color: inherit;
+ opacity: 0.6; }
.button:active {
color: #5c616c; }
.button:active:hover, .button:checked {
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index d60f175..86ae0b7 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -327,6 +327,8 @@ $_dot_color: $selected_bg_color;
background-clip: if($variant=='light', border-box, padding-box);
@include button(active);
transition-duration: 50ms;
+
+ &:not(:insensitive) .label:insensitive { color: inherit; opacity: 0.6; }
}
//Webkitgtk workaround start
diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 63e3e4b..198b0e6 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -271,6 +271,9 @@ button {
background-color: #5294e2;
background-clip: padding-box;
transition-duration: 50ms; }
+ button:active:not(:disabled) label:disabled, button:checked:not(:disabled) label:disabled {
+ color: inherit;
+ opacity: 0.6; }
button:active {
color: #D3DAE3; }
button:active:hover, button:checked {
@@ -789,6 +792,10 @@ spinbutton:not(.vertical) > button:hover:not(:active),
spinbutton:not(.vertical) > button:hover + button {
box-shadow: inset 1px 0 #2b2e39; }
+spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover),
+spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled {
+ box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); }
+
spinbutton:not(.vertical) > button:first-child:hover:not(:active),
spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active),
spinbutton:not(.vertical) > entry + button:not(:active):hover {
@@ -1271,6 +1278,9 @@ window.csd > .titlebar:not(headerbar):backdrop {
.primary-toolbar spinbutton:not(.vertical) > button:hover:not(:active), headerbar spinbutton:not(.vertical) > button:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > button:hover + button, headerbar spinbutton:not(.vertical) > button:hover + button {
box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
+.primary-toolbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), headerbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), .primary-toolbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled, headerbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled {
+ box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
+
.primary-toolbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), headerbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > entry + button:not(:active):hover, headerbar spinbutton:not(.vertical) > entry + button:not(:active):hover {
box-shadow: none; }
@@ -3330,6 +3340,59 @@ button.documents-favorite:active:hover {
.tr-workarea overshoot {
border-color: transparent; }
+#gf-bubble, #gf-bubble.solid,
+#gf-osd-window,
+#gf-osd-window.solid,
+#gf-input-source-popup,
+#gf-input-source-popup.solid,
+#gf-candidate-popup,
+#gf-candidate-popup.solid {
+ color: #cfd5de;
+ background-color: rgba(53, 57, 69, 0.95);
+ border: 1px solid rgba(35, 38, 46, 0.95);
+ border-radius: 2px; }
+
+#gf-bubble levelbar block.low, #gf-bubble levelbar block.high, #gf-bubble levelbar block.full,
+#gf-osd-window levelbar block.low,
+#gf-osd-window levelbar block.high,
+#gf-osd-window levelbar block.full,
+#gf-input-source-popup levelbar block.low,
+#gf-input-source-popup levelbar block.high,
+#gf-input-source-popup levelbar block.full,
+#gf-candidate-popup levelbar block.low,
+#gf-candidate-popup levelbar block.high,
+#gf-candidate-popup levelbar block.full {
+ background-color: #5294e2;
+ border-color: #5294e2; }
+
+#gf-bubble levelbar block.empty,
+#gf-osd-window levelbar block.empty,
+#gf-input-source-popup levelbar block.empty,
+#gf-candidate-popup levelbar block.empty {
+ background-color: rgba(42, 45, 55, 0.95); }
+
+#gf-bubble levelbar trough,
+#gf-osd-window levelbar trough,
+#gf-input-source-popup levelbar trough,
+#gf-candidate-popup levelbar trough {
+ background: none; }
+
+#gf-input-source {
+ min-height: 32px;
+ min-width: 40px; }
+ #gf-input-source:selected {
+ color: #ffffff;
+ background-color: #5294e2;
+ border-radius: 2px; }
+
+gf-candidate-box label {
+ padding: 3px; }
+
+gf-candidate-box:hover, gf-candidate-box:selected {
+ color: #ffffff;
+ background-color: #5294e2;
+ border-radius: 2px; }
+
.mate-panel-menu-bar, .mate-panel-menu-bar menubar,
panel-toplevel.background,
panel-toplevel.background menubar {
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 8ee4e4e..bc2691f 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -270,6 +270,9 @@ button {
background-color: #5294e2;
background-clip: border-box;
transition-duration: 50ms; }
+ button:active:not(:disabled) label:disabled, button:checked:not(:disabled) label:disabled {
+ color: inherit;
+ opacity: 0.6; }
button:active {
color: #5c616c; }
button:active:hover, button:checked {
@@ -788,6 +791,10 @@ spinbutton:not(.vertical) > button:hover:not(:active),
spinbutton:not(.vertical) > button:hover + button {
box-shadow: inset 1px 0 #cfd6e6; }
+spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover),
+spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled {
+ box-shadow: inset 1px 0 rgba(207, 214, 230, 0.5); }
+
spinbutton:not(.vertical) > button:first-child:hover:not(:active),
spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active),
spinbutton:not(.vertical) > entry + button:not(:active):hover {
@@ -1270,6 +1277,9 @@ window.csd > .titlebar:not(headerbar):backdrop {
.primary-toolbar spinbutton:not(.vertical) > button:hover:not(:active), headerbar spinbutton:not(.vertical) > button:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > button:hover + button, headerbar spinbutton:not(.vertical) > button:hover + button {
box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
+.primary-toolbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), headerbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), .primary-toolbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled, headerbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled {
+ box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
+
.primary-toolbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), headerbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > entry + button:not(:active):hover, headerbar spinbutton:not(.vertical) > entry + button:not(:active):hover {
box-shadow: none; }
@@ -3329,6 +3339,59 @@ button.documents-favorite:active:hover {
.tr-workarea overshoot {
border-color: transparent; }
+#gf-bubble, #gf-bubble.solid,
+#gf-osd-window,
+#gf-osd-window.solid,
+#gf-input-source-popup,
+#gf-input-source-popup.solid,
+#gf-candidate-popup,
+#gf-candidate-popup.solid {
+ color: #cfd5de;
+ background-color: rgba(53, 57, 69, 0.95);
+ border: 1px solid rgba(35, 38, 46, 0.95);
+ border-radius: 2px; }
+
+#gf-bubble levelbar block.low, #gf-bubble levelbar block.high, #gf-bubble levelbar block.full,
+#gf-osd-window levelbar block.low,
+#gf-osd-window levelbar block.high,
+#gf-osd-window levelbar block.full,
+#gf-input-source-popup levelbar block.low,
+#gf-input-source-popup levelbar block.high,
+#gf-input-source-popup levelbar block.full,
+#gf-candidate-popup levelbar block.low,
+#gf-candidate-popup levelbar block.high,
+#gf-candidate-popup levelbar block.full {
+ background-color: #5294e2;
+ border-color: #5294e2; }
+
+#gf-bubble levelbar block.empty,
+#gf-osd-window levelbar block.empty,
+#gf-input-source-popup levelbar block.empty,
+#gf-candidate-popup levelbar block.empty {
+ background-color: rgba(42, 45, 55, 0.95); }
+
+#gf-bubble levelbar trough,
+#gf-osd-window levelbar trough,
+#gf-input-source-popup levelbar trough,
+#gf-candidate-popup levelbar trough {
+ background: none; }
+
+#gf-input-source {
+ min-height: 32px;
+ min-width: 40px; }
+ #gf-input-source:selected {
+ color: #ffffff;
+ background-color: #5294e2;
+ border-radius: 2px; }
+
+gf-candidate-box label {
+ padding: 3px; }
+
+gf-candidate-box:hover, gf-candidate-box:selected {
+ color: #ffffff;
+ background-color: #5294e2;
+ border-radius: 2px; }
+
.mate-panel-menu-bar, .mate-panel-menu-bar menubar,
panel-toplevel.background,
panel-toplevel.background menubar {
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 6cc3be6..bfcc985 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -271,6 +271,9 @@ button {
background-color: #5294e2;
background-clip: padding-box;
transition-duration: 50ms; }
+ button:active:not(:disabled) label:disabled, button:checked:not(:disabled) label:disabled {
+ color: inherit;
+ opacity: 0.6; }
button:active {
color: #D3DAE3; }
button:active:hover, button:checked {
@@ -789,6 +792,10 @@ spinbutton:not(.vertical) > button:hover:not(:active),
spinbutton:not(.vertical) > button:hover + button {
box-shadow: inset 1px 0 #2b2e39; }
+spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover),
+spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled {
+ box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); }
+
spinbutton:not(.vertical) > button:first-child:hover:not(:active),
spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active),
spinbutton:not(.vertical) > entry + button:not(:active):hover {
@@ -1271,6 +1278,9 @@ window.csd > .titlebar:not(headerbar):backdrop {
.primary-toolbar spinbutton:not(.vertical) > button:hover:not(:active), headerbar spinbutton:not(.vertical) > button:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > button:hover + button, headerbar spinbutton:not(.vertical) > button:hover + button {
box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
+.primary-toolbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), headerbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), .primary-toolbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled, headerbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled {
+ box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
+
.primary-toolbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), headerbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > entry + button:not(:active):hover, headerbar spinbutton:not(.vertical) > entry + button:not(:active):hover {
box-shadow: none; }
@@ -3330,6 +3340,59 @@ button.documents-favorite:active:hover {
.tr-workarea overshoot {
border-color: transparent; }
+#gf-bubble, #gf-bubble.solid,
+#gf-osd-window,
+#gf-osd-window.solid,
+#gf-input-source-popup,
+#gf-input-source-popup.solid,
+#gf-candidate-popup,
+#gf-candidate-popup.solid {
+ color: #cfd5de;
+ background-color: #353945;
+ border: 1px solid #23262e;
+ border-radius: 2px; }
+
+#gf-bubble levelbar block.low, #gf-bubble levelbar block.high, #gf-bubble levelbar block.full,
+#gf-osd-window levelbar block.low,
+#gf-osd-window levelbar block.high,
+#gf-osd-window levelbar block.full,
+#gf-input-source-popup levelbar block.low,
+#gf-input-source-popup levelbar block.high,
+#gf-input-source-popup levelbar block.full,
+#gf-candidate-popup levelbar block.low,
+#gf-candidate-popup levelbar block.high,
+#gf-candidate-popup levelbar block.full {
+ background-color: #5294e2;
+ border-color: #5294e2; }
+
+#gf-bubble levelbar block.empty,
+#gf-osd-window levelbar block.empty,
+#gf-input-source-popup levelbar block.empty,
+#gf-candidate-popup levelbar block.empty {
+ background-color: #2a2d37; }
+
+#gf-bubble levelbar trough,
+#gf-osd-window levelbar trough,
+#gf-input-source-popup levelbar trough,
+#gf-candidate-popup levelbar trough {
+ background: none; }
+
+#gf-input-source {
+ min-height: 32px;
+ min-width: 40px; }
+ #gf-input-source:selected {
+ color: #ffffff;
+ background-color: #5294e2;
+ border-radius: 2px; }
+
+gf-candidate-box label {
+ padding: 3px; }
+
+gf-candidate-box:hover, gf-candidate-box:selected {
+ color: #ffffff;
+ background-color: #5294e2;
+ border-radius: 2px; }
+
.mate-panel-menu-bar, .mate-panel-menu-bar menubar,
panel-toplevel.background,
panel-toplevel.background menubar {
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 78ef016..47a287a 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -270,6 +270,9 @@ button {
background-color: #5294e2;
background-clip: border-box;
transition-duration: 50ms; }
+ button:active:not(:disabled) label:disabled, button:checked:not(:disabled) label:disabled {
+ color: inherit;
+ opacity: 0.6; }
button:active {
color: #5c616c; }
button:active:hover, button:checked {
@@ -788,6 +791,10 @@ spinbutton:not(.vertical) > button:hover:not(:active),
spinbutton:not(.vertical) > button:hover + button {
box-shadow: inset 1px 0 #cfd6e6; }
+spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover),
+spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled {
+ box-shadow: inset 1px 0 rgba(207, 214, 230, 0.5); }
+
spinbutton:not(.vertical) > button:first-child:hover:not(:active),
spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active),
spinbutton:not(.vertical) > entry + button:not(:active):hover {
@@ -1270,6 +1277,9 @@ window.csd > .titlebar:not(headerbar):backdrop {
.primary-toolbar spinbutton:not(.vertical) > button:hover:not(:active), headerbar spinbutton:not(.vertical) > button:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > button:hover + button, headerbar spinbutton:not(.vertical) > button:hover + button {
box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
+.primary-toolbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), headerbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), .primary-toolbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled, headerbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled {
+ box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
+
.primary-toolbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), headerbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > entry + button:not(:active):hover, headerbar spinbutton:not(.vertical) > entry + button:not(:active):hover {
box-shadow: none; }
@@ -3329,6 +3339,59 @@ button.documents-favorite:active:hover {
.tr-workarea overshoot {
border-color: transparent; }
+#gf-bubble, #gf-bubble.solid,
+#gf-osd-window,
+#gf-osd-window.solid,
+#gf-input-source-popup,
+#gf-input-source-popup.solid,
+#gf-candidate-popup,
+#gf-candidate-popup.solid {
+ color: #cfd5de;
+ background-color: #353945;
+ border: 1px solid #23262e;
+ border-radius: 2px; }
+
+#gf-bubble levelbar block.low, #gf-bubble levelbar block.high, #gf-bubble levelbar block.full,
+#gf-osd-window levelbar block.low,
+#gf-osd-window levelbar block.high,
+#gf-osd-window levelbar block.full,
+#gf-input-source-popup levelbar block.low,
+#gf-input-source-popup levelbar block.high,
+#gf-input-source-popup levelbar block.full,
+#gf-candidate-popup levelbar block.low,
+#gf-candidate-popup levelbar block.high,
+#gf-candidate-popup levelbar block.full {
+ background-color: #5294e2;
+ border-color: #5294e2; }
+
+#gf-bubble levelbar block.empty,
+#gf-osd-window levelbar block.empty,
+#gf-input-source-popup levelbar block.empty,
+#gf-candidate-popup levelbar block.empty {
+ background-color: #2a2d37; }
+
+#gf-bubble levelbar trough,
+#gf-osd-window levelbar trough,
+#gf-input-source-popup levelbar trough,
+#gf-candidate-popup levelbar trough {
+ background: none; }
+
+#gf-input-source {
+ min-height: 32px;
+ min-width: 40px; }
+ #gf-input-source:selected {
+ color: #ffffff;
+ background-color: #5294e2;
+ border-radius: 2px; }
+
+gf-candidate-box label {
+ padding: 3px; }
+
+gf-candidate-box:hover, gf-candidate-box:selected {
+ color: #ffffff;
+ background-color: #5294e2;
+ border-radius: 2px; }
+
.mate-panel-menu-bar, .mate-panel-menu-bar menubar,
panel-toplevel.background,
panel-toplevel.background menubar {
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index dc7fb6b..30fe0c7 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -270,6 +270,9 @@ button {
background-color: #5294e2;
background-clip: border-box;
transition-duration: 50ms; }
+ button:active:not(:disabled) label:disabled, button:checked:not(:disabled) label:disabled {
+ color: inherit;
+ opacity: 0.6; }
button:active {
color: #5c616c; }
button:active:hover, button:checked {
@@ -788,6 +791,10 @@ spinbutton:not(.vertical) > button:hover:not(:active),
spinbutton:not(.vertical) > button:hover + button {
box-shadow: inset 1px 0 #cfd6e6; }
+spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover),
+spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled {
+ box-shadow: inset 1px 0 rgba(207, 214, 230, 0.5); }
+
spinbutton:not(.vertical) > button:first-child:hover:not(:active),
spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active),
spinbutton:not(.vertical) > entry + button:not(:active):hover {
@@ -1270,6 +1277,9 @@ window.csd > .titlebar:not(headerbar):backdrop {
.primary-toolbar spinbutton:not(.vertical) > button:hover:not(:active), headerbar spinbutton:not(.vertical) > button:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > button:hover + button, headerbar spinbutton:not(.vertical) > button:hover + button {
box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
+.primary-toolbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), headerbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), .primary-toolbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled, headerbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled {
+ box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
+
.primary-toolbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), headerbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > entry + button:not(:active):hover, headerbar spinbutton:not(.vertical) > entry + button:not(:active):hover {
box-shadow: none; }
@@ -3333,6 +3343,59 @@ button.documents-favorite:active:hover {
.tr-workarea overshoot {
border-color: transparent; }
+#gf-bubble, #gf-bubble.solid,
+#gf-osd-window,
+#gf-osd-window.solid,
+#gf-input-source-popup,
+#gf-input-source-popup.solid,
+#gf-candidate-popup,
+#gf-candidate-popup.solid {
+ color: #cfd5de;
+ background-color: #353945;
+ border: 1px solid #23262e;
+ border-radius: 2px; }
+
+#gf-bubble levelbar block.low, #gf-bubble levelbar block.high, #gf-bubble levelbar block.full,
+#gf-osd-window levelbar block.low,
+#gf-osd-window levelbar block.high,
+#gf-osd-window levelbar block.full,
+#gf-input-source-popup levelbar block.low,
+#gf-input-source-popup levelbar block.high,
+#gf-input-source-popup levelbar block.full,
+#gf-candidate-popup levelbar block.low,
+#gf-candidate-popup levelbar block.high,
+#gf-candidate-popup levelbar block.full {
+ background-color: #5294e2;
+ border-color: #5294e2; }
+
+#gf-bubble levelbar block.empty,
+#gf-osd-window levelbar block.empty,
+#gf-input-source-popup levelbar block.empty,
+#gf-candidate-popup levelbar block.empty {
+ background-color: #2a2d37; }
+
+#gf-bubble levelbar trough,
+#gf-osd-window levelbar trough,
+#gf-input-source-popup levelbar trough,
+#gf-candidate-popup levelbar trough {
+ background: none; }
+
+#gf-input-source {
+ min-height: 32px;
+ min-width: 40px; }
+ #gf-input-source:selected {
+ color: #ffffff;
+ background-color: #5294e2;
+ border-radius: 2px; }
+
+gf-candidate-box label {
+ padding: 3px; }
+
+gf-candidate-box:hover, gf-candidate-box:selected {
+ color: #ffffff;
+ background-color: #5294e2;
+ border-radius: 2px; }
+
.mate-panel-menu-bar, .mate-panel-menu-bar menubar,
panel-toplevel.background,
panel-toplevel.background menubar {
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 0cadf30..2140fbd 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -270,6 +270,9 @@ button {
background-color: #5294e2;
background-clip: border-box;
transition-duration: 50ms; }
+ button:active:not(:disabled) label:disabled, button:checked:not(:disabled) label:disabled {
+ color: inherit;
+ opacity: 0.6; }
button:active {
color: #5c616c; }
button:active:hover, button:checked {
@@ -788,6 +791,10 @@ spinbutton:not(.vertical) > button:hover:not(:active),
spinbutton:not(.vertical) > button:hover + button {
box-shadow: inset 1px 0 #cfd6e6; }
+spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover),
+spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled {
+ box-shadow: inset 1px 0 rgba(207, 214, 230, 0.5); }
+
spinbutton:not(.vertical) > button:first-child:hover:not(:active),
spinbutton:not(.vertical) > button.up:dir(rtl):hover:not(:active),
spinbutton:not(.vertical) > entry + button:not(:active):hover {
@@ -1270,6 +1277,9 @@ window.csd > .titlebar:not(headerbar):backdrop {
.primary-toolbar spinbutton:not(.vertical) > button:hover:not(:active), headerbar spinbutton:not(.vertical) > button:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > button:hover + button, headerbar spinbutton:not(.vertical) > button:hover + button {
box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
+.primary-toolbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), headerbar spinbutton:not(.vertical) > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover), .primary-toolbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled, headerbar spinbutton:not(.vertical) > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled {
+ box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
+
.primary-toolbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), headerbar spinbutton:not(.vertical) > button:first-child:hover:not(:active), .primary-toolbar spinbutton:not(.vertical) > entry + button:not(:active):hover, headerbar spinbutton:not(.vertical) > entry + button:not(:active):hover {
box-shadow: none; }
@@ -3333,6 +3343,59 @@ button.documents-favorite:active:hover {
.tr-workarea overshoot {
border-color: transparent; }
+#gf-bubble, #gf-bubble.solid,
+#gf-osd-window,
+#gf-osd-window.solid,
+#gf-input-source-popup,
+#gf-input-source-popup.solid,
+#gf-candidate-popup,
+#gf-candidate-popup.solid {
+ color: #cfd5de;
+ background-color: rgba(53, 57, 69, 0.95);
+ border: 1px solid rgba(35, 38, 46, 0.95);
+ border-radius: 2px; }
+
+#gf-bubble levelbar block.low, #gf-bubble levelbar block.high, #gf-bubble levelbar block.full,
+#gf-osd-window levelbar block.low,
+#gf-osd-window levelbar block.high,
+#gf-osd-window levelbar block.full,
+#gf-input-source-popup levelbar block.low,
+#gf-input-source-popup levelbar block.high,
+#gf-input-source-popup levelbar block.full,
+#gf-candidate-popup levelbar block.low,
+#gf-candidate-popup levelbar block.high,
+#gf-candidate-popup levelbar block.full {
+ background-color: #5294e2;
+ border-color: #5294e2; }
+
+#gf-bubble levelbar block.empty,
+#gf-osd-window levelbar block.empty,
+#gf-input-source-popup levelbar block.empty,
+#gf-candidate-popup levelbar block.empty {
+ background-color: rgba(42, 45, 55, 0.95); }
+
+#gf-bubble levelbar trough,
+#gf-osd-window levelbar trough,
+#gf-input-source-popup levelbar trough,
+#gf-candidate-popup levelbar trough {
+ background: none; }
+
+#gf-input-source {
+ min-height: 32px;
+ min-width: 40px; }
+ #gf-input-source:selected {
+ color: #ffffff;
+ background-color: #5294e2;
+ border-radius: 2px; }
+
+gf-candidate-box label {
+ padding: 3px; }
+
+gf-candidate-box:hover, gf-candidate-box:selected {
+ color: #ffffff;
+ background-color: #5294e2;
+ border-radius: 2px; }
+
.mate-panel-menu-bar, .mate-panel-menu-bar menubar,
panel-toplevel.background,
panel-toplevel.background menubar {
diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index c5882b0..2f4e4cb 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -449,6 +449,56 @@ button.documents-favorite:active:hover {
}
//
+// Gnome Flashback
+//
+#gf-bubble,
+#gf-osd-window,
+#gf-input-source-popup,
+#gf-candidate-popup {
+ &, &.solid {
+ color: lighten($osd_fg_color, 7%);
+ background-color: $osd_bg_color;
+ border: 1px solid darken($osd_bg_color, 8%);
+ border-radius: 2px;
+ }
+
+ levelbar {
+ block {
+ &.low, &.high, &.full {
+ background-color: $selected_bg_color;
+ border-color: $selected_bg_color;
+ }
+ &.empty { background-color: darken($osd_bg_color, 5%); }
+ }
+ trough { background: none; }
+ }
+
+ // FIXME still needs button styling
+}
+
+#gf-input-source {
+ min-height: 32px;
+ min-width: 40px;
+
+ &:selected {
+ color: $selected_fg_color;
+ background-color: $selected_bg_color;
+ border-radius: 2px;
+ }
+}
+
+gf-candidate-box {
+ label { padding: 3px; }
+
+ &:hover,
+ &:selected {
+ color: $selected_fg_color;
+ background-color: $selected_bg_color;
+ border-radius: 2px;
+ }
+}
+
+//
// Mate/Gnome Flashback Panel
//
.mate-panel-menu-bar,
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 9d27a68..847c5c7 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -362,6 +362,8 @@ button {
background-clip: if($variant=='light', border-box, padding-box);
transition-duration: 50ms;
+
+ &:not(:disabled) label:disabled { color: inherit; opacity: 0.6; }
}
//Webkitgtk workaround start
@@ -807,6 +809,9 @@ spinbutton {
> button:hover:not(:active),
> button:hover + button { box-shadow: inset 1px 0 $button_border; }
+ > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover),
+ > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { box-shadow: inset 1px 0 transparentize($button_border, 0.5); }
+
> button:first-child:hover:not(:active),
> button.up:dir(rtl):hover:not(:active),
> entry + button:not(:active):hover { box-shadow: none; }
@@ -1300,6 +1305,9 @@ headerbar {
> button:hover:not(:active),
> button:hover + button { box-shadow: inset 1px 0 $header_button_border; }
+ > button:disabled + button:not(:disabled):not(:active):not(:checked):not(:hover),
+ > button:not(:disabled):not(:active):not(:checked):not(:hover) + button:disabled { box-shadow: inset 1px 0 $header_button_border; }
+
> button:first-child:hover:not(:active),
> entry + button:not(:active):hover { box-shadow: none; }
diff --git a/common/metacity-1/metacity-theme-1-dark.xml b/common/metacity-1/metacity-theme-1-dark.xml
index 2b74362..4cb97be 100644
--- a/common/metacity-1/metacity-theme-1-dark.xml
+++ b/common/metacity-1/metacity-theme-1-dark.xml
@@ -41,9 +41,9 @@
<!-- geometries -->
<frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1">
- <distance name="left_width" value="0" />
- <distance name="right_width" value="0" />
- <distance name="bottom_height" value="0" />
+ <distance name="left_width" value="1" />
+ <distance name="right_width" value="1" />
+ <distance name="bottom_height" value="3" />
<distance name="left_titlebar_edge" value="2"/>
<distance name="right_titlebar_edge" value="2"/>
<distance name="title_vertical_pad" value="3"/>
@@ -58,6 +58,7 @@
<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
<distance name="left_width" value="0" />
<distance name="right_width" value="0" />
+ <distance name="bottom_height" value="0" />
<distance name="left_titlebar_edge" value="0"/>
<distance name="right_titlebar_edge" value="0"/>
<distance name="title_vertical_pad" value="2"/> <!--
diff --git a/common/metacity-1/metacity-theme-1.xml b/common/metacity-1/metacity-theme-1.xml
index 9801dd5..773ce7a 100644
--- a/common/metacity-1/metacity-theme-1.xml
+++ b/common/metacity-1/metacity-theme-1.xml
@@ -41,16 +41,15 @@
<!-- geometries -->
<frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1">
- <distance name="left_width" value="0" />
- <distance name="right_width" value="0" />
- <distance name="bottom_height" value="0" />
+ <distance name="left_width" value="1" />
+ <distance name="right_width" value="1" />
+ <distance name="bottom_height" value="3" />
<distance name="left_titlebar_edge" value="2"/>
<distance name="right_titlebar_edge" value="2"/>
<distance name="title_vertical_pad" value="3"/>
<border name="title_border" left="10" right="10" top="3" bottom="3"/>
<border name="button_border" left="3" right="3" top="0" bottom="0"/>
<aspect_ratio name="button" value="1.0" />
-
</frame_geometry>
<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal">
@@ -59,6 +58,7 @@
<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
<distance name="left_width" value="0" />
<distance name="right_width" value="0" />
+ <distance name="bottom_height" value="0" />
<distance name="left_titlebar_edge" value="0"/>
<distance name="right_titlebar_edge" value="0"/>
<distance name="title_vertical_pad" value="2"/> <!--
diff --git a/common/metacity-1/metacity-theme-2-dark.xml b/common/metacity-1/metacity-theme-2-dark.xml
index 2b74362..4cb97be 100644
--- a/common/metacity-1/metacity-theme-2-dark.xml
+++ b/common/metacity-1/metacity-theme-2-dark.xml
@@ -41,9 +41,9 @@
<!-- geometries -->
<frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1">
- <distance name="left_width" value="0" />
- <distance name="right_width" value="0" />
- <distance name="bottom_height" value="0" />
+ <distance name="left_width" value="1" />
+ <distance name="right_width" value="1" />
+ <distance name="bottom_height" value="3" />
<distance name="left_titlebar_edge" value="2"/>
<distance name="right_titlebar_edge" value="2"/>
<distance name="title_vertical_pad" value="3"/>
@@ -58,6 +58,7 @@
<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
<distance name="left_width" value="0" />
<distance name="right_width" value="0" />
+ <distance name="bottom_height" value="0" />
<distance name="left_titlebar_edge" value="0"/>
<distance name="right_titlebar_edge" value="0"/>
<distance name="title_vertical_pad" value="2"/> <!--
diff --git a/common/metacity-1/metacity-theme-2.xml b/common/metacity-1/metacity-theme-2.xml
index 35b181d..773ce7a 100644
--- a/common/metacity-1/metacity-theme-2.xml
+++ b/common/metacity-1/metacity-theme-2.xml
@@ -41,9 +41,9 @@
<!-- geometries -->
<frame_geometry name="normal" title_scale="medium" rounded_top_left="1" rounded_top_right="1">
- <distance name="left_width" value="0" />
- <distance name="right_width" value="0" />
- <distance name="bottom_height" value="0" />
+ <distance name="left_width" value="1" />
+ <distance name="right_width" value="1" />
+ <distance name="bottom_height" value="3" />
<distance name="left_titlebar_edge" value="2"/>
<distance name="right_titlebar_edge" value="2"/>
<distance name="title_vertical_pad" value="3"/>
@@ -58,6 +58,7 @@
<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
<distance name="left_width" value="0" />
<distance name="right_width" value="0" />
+ <distance name="bottom_height" value="0" />
<distance name="left_titlebar_edge" value="0"/>
<distance name="right_titlebar_edge" value="0"/>
<distance name="title_vertical_pad" value="2"/> <!--