diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css index 3e43828..6e29ddc 100644 --- a/common/gnome-shell/3.18/gnome-shell-dark.css +++ b/common/gnome-shell/3.18/gnome-shell-dark.css @@ -988,16 +988,21 @@ StScrollBar { font-size: 1em; } .message-media-control { - padding: 6px; } + padding: 6px; + color: rgba(211, 218, 227, 0.45); } .message-media-control:last-child:ltr { padding-right: 18px; } .message-media-control:last-child:rtl { padding-left: 18px; } + .message-media-control:hover { + color: #D3DAE3; } + .message-media-control:active { + color: #5294E2; } .media-message-cover-icon { icon-size: 32px; } .media-message-cover-icon.fallback { - color: #4e5467; + color: rgba(211, 218, 227, 0.45); background-color: #383C4A; border-radius: 2px; icon-size: 16px; diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css index 9660c38..80f818c 100644 --- a/common/gnome-shell/3.18/gnome-shell.css +++ b/common/gnome-shell/3.18/gnome-shell.css @@ -988,16 +988,21 @@ StScrollBar { font-size: 1em; } .message-media-control { - padding: 6px; } + padding: 6px; + color: rgba(92, 97, 108, 0.55); } .message-media-control:last-child:ltr { padding-right: 18px; } .message-media-control:last-child:rtl { padding-left: 18px; } + .message-media-control:hover { + color: #5c616c; } + .message-media-control:active { + color: #5294E2; } .media-message-cover-icon { icon-size: 32px; } .media-message-cover-icon.fallback { - color: white; + color: rgba(92, 97, 108, 0.55); background-color: #F5F6F7; border-radius: 2px; icon-size: 16px; diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss index 9351847..6094af9 100644 --- a/common/gnome-shell/3.18/sass/_common.scss +++ b/common/gnome-shell/3.18/sass/_common.scss @@ -1289,15 +1289,20 @@ StScrollBar { .message-media-control { padding: 6px; + color: $insensitive_fg_color; &:last-child:ltr { padding-right: 18px; } &:last-child:rtl { padding-left: 18px; } + + &:hover { color: $fg_color; } + &:active { color: $selected_bg_color; } } .media-message-cover-icon { icon-size: 32px; + &.fallback { - color: lighten($bg_color,10%); + color: $insensitive_fg_color; background-color: $bg_color; border-radius: 2px; icon-size: 16px; diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 1b9f4c0..5a7242a 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -704,9 +704,6 @@ modelbutton.flat { modelbutton.flat radio:first-child { margin-right: 8px; } -modelbutton.flat arrow { - background: none; } - modelbutton.flat arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } @@ -1376,15 +1373,15 @@ treeview.view { color: #ffffff; } treeview.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } - treeview.view.progressbar { + treeview.view.progressbar, treeview.view.progressbar:focus { color: #ffffff; border-radius: 3px; background-image: linear-gradient(to bottom, #5294E2); } - treeview.view.progressbar:selected { + treeview.view.progressbar:selected, treeview.view.progressbar:selected:focus, treeview.view.progressbar:focus:selected, treeview.view.progressbar:focus:selected:focus { color: #5294E2; box-shadow: none; background-image: linear-gradient(to bottom, #ffffff); } - treeview.view.trough, treeview.view.trough:selected { + treeview.view.trough, treeview.view.trough:selected, treeview.view.trough:selected:focus { color: #D3DAE3; background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; @@ -2869,24 +2866,30 @@ headerbar button.titlebutton, textview text:selected, iconview text:selected:focus, textview text:selected:focus, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, -textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected, +textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow, modelbutton.flat:active, -modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { +modelbutton.flat:active arrow, +modelbutton.flat:selected, +modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { background-color: #5294E2; } row:selected label, label:selected, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected, textview text:selected, iconview text:selected:focus, textview text:selected:focus, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, - textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected, + textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow, modelbutton.flat:active, - modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { + modelbutton.flat:active arrow, + modelbutton.flat:selected, + modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } row:selected label:disabled, label:disabled:selected, .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, - textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, entry selection:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:disabled:selected, + textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, entry selection:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:active arrow:disabled, menuitem.button.flat:disabled:selected, menuitem.button.flat:selected arrow:disabled, modelbutton.flat:disabled:active, - modelbutton.flat:disabled:selected, treeview.view:disabled:selected:focus, row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:active:hover { + modelbutton.flat:active arrow:disabled, + modelbutton.flat:disabled:selected, + modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:active:hover { color: #a9caf1; } .gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked { diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 91dad7f..3f331a2 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -703,9 +703,6 @@ modelbutton.flat { modelbutton.flat radio:first-child { margin-right: 8px; } -modelbutton.flat arrow { - background: none; } - modelbutton.flat arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } @@ -1375,15 +1372,15 @@ treeview.view { color: #ffffff; } treeview.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } - treeview.view.progressbar { + treeview.view.progressbar, treeview.view.progressbar:focus { color: #ffffff; border-radius: 3px; background-image: linear-gradient(to bottom, #5294E2); } - treeview.view.progressbar:selected { + treeview.view.progressbar:selected, treeview.view.progressbar:selected:focus, treeview.view.progressbar:focus:selected, treeview.view.progressbar:focus:selected:focus { color: #5294E2; box-shadow: none; background-image: linear-gradient(to bottom, #ffffff); } - treeview.view.trough, treeview.view.trough:selected { + treeview.view.trough, treeview.view.trough:selected, treeview.view.trough:selected:focus { color: #5c616c; background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; @@ -2868,24 +2865,30 @@ headerbar button.titlebutton, textview text:selected, iconview text:selected:focus, textview text:selected:focus, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, -textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected, +textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow, modelbutton.flat:active, -modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { +modelbutton.flat:active arrow, +modelbutton.flat:selected, +modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { background-color: #5294E2; } row:selected label, label:selected, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected, textview text:selected, iconview text:selected:focus, textview text:selected:focus, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, - textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected, + textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow, modelbutton.flat:active, - modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { + modelbutton.flat:active arrow, + modelbutton.flat:selected, + modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } row:selected label:disabled, label:disabled:selected, .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, - textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, entry selection:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:disabled:selected, + textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, entry selection:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:active arrow:disabled, menuitem.button.flat:disabled:selected, menuitem.button.flat:selected arrow:disabled, modelbutton.flat:disabled:active, - modelbutton.flat:disabled:selected, treeview.view:disabled:selected:focus, row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:active:hover { + modelbutton.flat:active arrow:disabled, + modelbutton.flat:disabled:selected, + modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:active:hover { color: #a9caf1; } .gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked { 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 c107aba..374b9e5 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -704,9 +704,6 @@ modelbutton.flat { modelbutton.flat radio:first-child { margin-right: 8px; } -modelbutton.flat arrow { - background: none; } - modelbutton.flat arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } @@ -1376,15 +1373,15 @@ treeview.view { color: #ffffff; } treeview.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } - treeview.view.progressbar { + treeview.view.progressbar, treeview.view.progressbar:focus { color: #ffffff; border-radius: 3px; background-image: linear-gradient(to bottom, #5294E2); } - treeview.view.progressbar:selected { + treeview.view.progressbar:selected, treeview.view.progressbar:selected:focus, treeview.view.progressbar:focus:selected, treeview.view.progressbar:focus:selected:focus { color: #5294E2; box-shadow: none; background-image: linear-gradient(to bottom, #ffffff); } - treeview.view.trough, treeview.view.trough:selected { + treeview.view.trough, treeview.view.trough:selected, treeview.view.trough:selected:focus { color: #D3DAE3; background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; @@ -2869,24 +2866,30 @@ headerbar button.titlebutton, textview text:selected, iconview text:selected:focus, textview text:selected:focus, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, -textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected, +textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow, modelbutton.flat:active, -modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { +modelbutton.flat:active arrow, +modelbutton.flat:selected, +modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { background-color: #5294E2; } row:selected label, label:selected, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected, textview text:selected, iconview text:selected:focus, textview text:selected:focus, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, - textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected, + textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow, modelbutton.flat:active, - modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { + modelbutton.flat:active arrow, + modelbutton.flat:selected, + modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } row:selected label:disabled, label:disabled:selected, .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, - textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, entry selection:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:disabled:selected, + textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, entry selection:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:active arrow:disabled, menuitem.button.flat:disabled:selected, menuitem.button.flat:selected arrow:disabled, modelbutton.flat:disabled:active, - modelbutton.flat:disabled:selected, treeview.view:disabled:selected:focus, row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:active:hover { + modelbutton.flat:active arrow:disabled, + modelbutton.flat:disabled:selected, + modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:active:hover { color: #a9caf1; } .gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked { 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 895cf06..fb3ffe7 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -703,9 +703,6 @@ modelbutton.flat { modelbutton.flat radio:first-child { margin-right: 8px; } -modelbutton.flat arrow { - background: none; } - modelbutton.flat arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } @@ -1375,15 +1372,15 @@ treeview.view { color: #ffffff; } treeview.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } - treeview.view.progressbar { + treeview.view.progressbar, treeview.view.progressbar:focus { color: #ffffff; border-radius: 3px; background-image: linear-gradient(to bottom, #5294E2); } - treeview.view.progressbar:selected { + treeview.view.progressbar:selected, treeview.view.progressbar:selected:focus, treeview.view.progressbar:focus:selected, treeview.view.progressbar:focus:selected:focus { color: #5294E2; box-shadow: none; background-image: linear-gradient(to bottom, #ffffff); } - treeview.view.trough, treeview.view.trough:selected { + treeview.view.trough, treeview.view.trough:selected, treeview.view.trough:selected:focus { color: #5c616c; background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; @@ -2868,24 +2865,30 @@ headerbar button.titlebutton, textview text:selected, iconview text:selected:focus, textview text:selected:focus, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, -textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected, +textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow, modelbutton.flat:active, -modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { +modelbutton.flat:active arrow, +modelbutton.flat:selected, +modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { background-color: #5294E2; } row:selected label, label:selected, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected, textview text:selected, iconview text:selected:focus, textview text:selected:focus, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, - textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected, + textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow, modelbutton.flat:active, - modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { + modelbutton.flat:active arrow, + modelbutton.flat:selected, + modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } row:selected label:disabled, label:disabled:selected, .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, - textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, entry selection:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:disabled:selected, + textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, entry selection:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:active arrow:disabled, menuitem.button.flat:disabled:selected, menuitem.button.flat:selected arrow:disabled, modelbutton.flat:disabled:active, - modelbutton.flat:disabled:selected, treeview.view:disabled:selected:focus, row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:active:hover { + modelbutton.flat:active arrow:disabled, + modelbutton.flat:disabled:selected, + modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:active:hover { color: #a9caf1; } .gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked { diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 77ea2b5..5bd9188 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -703,9 +703,6 @@ modelbutton.flat { modelbutton.flat radio:first-child { margin-right: 8px; } -modelbutton.flat arrow { - background: none; } - modelbutton.flat arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } @@ -1379,15 +1376,15 @@ treeview.view { color: #ffffff; } treeview.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } - treeview.view.progressbar { + treeview.view.progressbar, treeview.view.progressbar:focus { color: #ffffff; border-radius: 3px; background-image: linear-gradient(to bottom, #5294E2); } - treeview.view.progressbar:selected { + treeview.view.progressbar:selected, treeview.view.progressbar:selected:focus, treeview.view.progressbar:focus:selected, treeview.view.progressbar:focus:selected:focus { color: #5294E2; box-shadow: none; background-image: linear-gradient(to bottom, #ffffff); } - treeview.view.trough, treeview.view.trough:selected { + treeview.view.trough, treeview.view.trough:selected, treeview.view.trough:selected:focus { color: #5c616c; background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; @@ -2872,24 +2869,30 @@ headerbar button.titlebutton, textview text:selected, iconview text:selected:focus, textview text:selected:focus, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, -textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected, +textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow, modelbutton.flat:active, -modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { +modelbutton.flat:active arrow, +modelbutton.flat:selected, +modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { background-color: #5294E2; } row:selected label, label:selected, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected, textview text:selected, iconview text:selected:focus, textview text:selected:focus, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, - textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected, + textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow, modelbutton.flat:active, - modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { + modelbutton.flat:active arrow, + modelbutton.flat:selected, + modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } row:selected label:disabled, label:disabled:selected, .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, - textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, entry selection:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:disabled:selected, + textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, entry selection:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:active arrow:disabled, menuitem.button.flat:disabled:selected, menuitem.button.flat:selected arrow:disabled, modelbutton.flat:disabled:active, - modelbutton.flat:disabled:selected, treeview.view:disabled:selected:focus, row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:active:hover { + modelbutton.flat:active arrow:disabled, + modelbutton.flat:disabled:selected, + modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:active:hover { color: #a9caf1; } .gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked { diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 50287f6..cdddd33 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -703,9 +703,6 @@ modelbutton.flat { modelbutton.flat radio:first-child { margin-right: 8px; } -modelbutton.flat arrow { - background: none; } - modelbutton.flat arrow.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } @@ -1379,15 +1376,15 @@ treeview.view { color: #ffffff; } treeview.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } - treeview.view.progressbar { + treeview.view.progressbar, treeview.view.progressbar:focus { color: #ffffff; border-radius: 3px; background-image: linear-gradient(to bottom, #5294E2); } - treeview.view.progressbar:selected { + treeview.view.progressbar:selected, treeview.view.progressbar:selected:focus, treeview.view.progressbar:focus:selected, treeview.view.progressbar:focus:selected:focus { color: #5294E2; box-shadow: none; background-image: linear-gradient(to bottom, #ffffff); } - treeview.view.trough, treeview.view.trough:selected { + treeview.view.trough, treeview.view.trough:selected, treeview.view.trough:selected:focus { color: #5c616c; background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; @@ -2872,24 +2869,30 @@ headerbar button.titlebutton, textview text:selected, iconview text:selected:focus, textview text:selected:focus, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, -textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected, +textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow, modelbutton.flat:active, -modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { +modelbutton.flat:active arrow, +modelbutton.flat:selected, +modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { background-color: #5294E2; } row:selected label, label:selected, .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected, textview text:selected, iconview text:selected:focus, textview text:selected:focus, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text selection:focus, - textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:selected, + textview text selection, flowbox flowboxchild:selected, entry selection:focus, entry selection, menuitem.button.flat:active, menuitem.button.flat:active arrow, menuitem.button.flat:selected, menuitem.button.flat:selected arrow, modelbutton.flat:active, - modelbutton.flat:selected, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { + modelbutton.flat:active arrow, + modelbutton.flat:selected, + modelbutton.flat:selected arrow, treeview.view:selected, treeview.view:selected:focus, row:selected, .nautilus-window placessidebar.sidebar row.has-open-popup:selected, .nautilus-window placessidebar.sidebar row:selected, .nautilus-window placessidebar.sidebar row:selected:hover, .nautilus-window placessidebar.sidebar row:active:hover { color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } row:selected label:disabled, label:disabled:selected, .view:disabled:selected, iconview:disabled:selected, iconview:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, - textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, entry selection:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:disabled:selected, + textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, entry selection:disabled, menuitem.button.flat:disabled:active, menuitem.button.flat:active arrow:disabled, menuitem.button.flat:disabled:selected, menuitem.button.flat:selected arrow:disabled, modelbutton.flat:disabled:active, - modelbutton.flat:disabled:selected, treeview.view:disabled:selected:focus, row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:active:hover { + modelbutton.flat:active arrow:disabled, + modelbutton.flat:disabled:selected, + modelbutton.flat:selected arrow:disabled, treeview.view:disabled:selected:focus, row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:selected, .nautilus-window placessidebar.sidebar row:disabled:active:hover { color: #a9caf1; } .gedit-bottom-panel-paned notebook > header.top > tabs > tab:checked { diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index ac425ad..98d8bf5 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -695,7 +695,7 @@ modelbutton.flat { @extend %undecorated_button; &:hover { background-color: if($variant=='light', mix($fg_color,$bg_color,5%), mix($fg_color,$bg_color,10%)); } - &:active, &:selected { @extend %selected_items; } + &:active, &:selected { &, arrow { @extend %selected_items; } } &:checked { color: $fg_color; } // FIXME: temporary workaround @@ -707,8 +707,6 @@ modelbutton.flat { } modelbutton.flat arrow { - & { background: none; } - &.left { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); } &.right { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } } @@ -1444,18 +1442,18 @@ treeview.view { &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } } - &.progressbar { // progress bar in treeviews + &.progressbar, &.progressbar:focus { // progress bar in treeviews color: $selected_fg_color; border-radius: 3px; background-image: linear-gradient(to bottom, $selected_bg_color); - &:selected { + &:selected, &:selected:focus { color: $selected_bg_color; box-shadow: none; background-image: linear-gradient(to bottom, $selected_fg_color); } } - &.trough, &.trough:selected { // progress bar trough in treeviews + &.trough, &.trough:selected, &.trough:selected:focus { // progress bar trough in treeviews color: $fg_color; background-image: linear-gradient(to bottom, $button_border); border-radius: 3px;