From 317b74a657186bc9326138a85da23a9e9a9c8858 Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Mon, 23 Feb 2015 17:22:06 -0500 Subject: [PATCH] Fixed some bugs; tweaked some things. --- Paper/gtk-3.0/apps/gedit.css | 33 ++++-- Paper/gtk-3.0/apps/pantheon.css | 74 +------------ Paper/gtk-3.0/granite-widgets.css | 41 ++++++- Paper/gtk-3.0/gtk-common.css | 2 +- Paper/gtk-3.0/gtk-widgets-assets-dark.css | 3 +- Paper/gtk-3.0/gtk-widgets.css | 5 +- Paper/gtk-3.0/widgets/buttons.css | 9 +- Paper/gtk-3.0/widgets/check-radio.css | 3 +- .../gtk-3.0/widgets/composited-indicator.css | 102 ++++++++++++++++++ 9 files changed, 184 insertions(+), 88 deletions(-) create mode 100644 Paper/gtk-3.0/widgets/composited-indicator.css diff --git a/Paper/gtk-3.0/apps/gedit.css b/Paper/gtk-3.0/apps/gedit.css index aaa9ad2..b332195 100644 --- a/Paper/gtk-3.0/apps/gedit.css +++ b/Paper/gtk-3.0/apps/gedit.css @@ -82,13 +82,10 @@ GeditWindow .dynamic-notebook tab.right:active { ************/ -GeditWindow .pane-separator, -GeditWindow .pane-separator:hover { - border-width: 0 1px 1px 1px; - border-style: solid; - border-color: shade(@background, 0.8); - background-color: shade(@background, 1.02); - color: shade(@background, 0.8); +GeditWindow .gedit-headerbar-paned, +GeditWindow .titlebar .pane-separator, +GeditWindow .header-bar .pane-separator { + background-color: @gedit; } GeditPanel.title GtkLabel { @@ -170,3 +167,25 @@ GeditFileBrowserWidget .primary-toolbar.toolbar { background-color: @background; background-image: none; } + +GeditWindow .pane-separator { + background: url("../assets/pane-separator-grip.svg"); + background-repeat: no-repeat; + background-position: center; +} + +GeditWindow .pane-separator:hover { + background: url("../assets/pane-separator-grip-prelight.svg"); + background-repeat: no-repeat; + background-position: center; +} + +GeditWindow .pane-separator.vertical { + background: url("../assets/pane-separator-grip-vertical.svg"); +} + +GeditWindow .pane-separator.vertical:hover { + background: url("../assets/pane-separator-grip-vertical-prelight.svg"); + background-repeat: no-repeat; + background-position: center; +} \ No newline at end of file diff --git a/Paper/gtk-3.0/apps/pantheon.css b/Paper/gtk-3.0/apps/pantheon.css index c968911..42574d7 100644 --- a/Paper/gtk-3.0/apps/pantheon.css +++ b/Paper/gtk-3.0/apps/pantheon.css @@ -54,7 +54,8 @@ BirdieWidgetsTweetList * { border-width: 0; border-radius: 9px; color: white; - background-color: alpha(@panel, 0.98); + border: 1px solid @panel; + background-color: alpha(@panel, 0.9); } .gala-notification .title, .gala-notification .label { @@ -228,77 +229,6 @@ NoiseWidgetsTileView { color: @foreground; } -/********* - * Panel * - ********/ - -.panel { - background: none; - color: white; - font-weight: bold; -} - -.panel .menu { - border:none; -} -.panel .menu .menuitem { - font-weight: normal; -} - -.panel-shadow { - background-image: none; - background: none; -} - -.panel-app-button { - -GtkMenuItem-horizontal-padding: 6px; -} - -.composited-indicator { - background: none; - color: #fff; - padding: 0 2px; -} - -.composited-indicator.menuitem:active, -.composited-indicator.menuitem:prelight { - border-style: none; - background-image: none; - box-shadow: none; -} - -.panel .window-frame.menu.csd, -.panel .window-frame.popup.csd { - box-shadow: none; -} - -.panel .menu .window-frame.menu.csd, -.panel .menu .window-frame.popup.csd { - box-shadow: 0 0 0 1px alpha (#000, 0.20), - 0 10px 20px alpha (#000, 0.19), - 0 6px 6px alpha (#000, 0.23); -} - -.composited-indicator { - background-color: transparent; - color: #fff; -} - -.composited-indicator > GtkWidget > GtkWidget:first-child { - padding: 0 2px; -} - -.panel-app-button > GtkWidget > GtkWidget:first-child { - padding: 0 2px 0 4px; -} - -.composited-indicator.menuitem:active, -.composited-indicator.menuitem:prelight { - border-style: none; - background-image: none; - box-shadow: none; -} - /********* * Tweet * ********/ diff --git a/Paper/gtk-3.0/granite-widgets.css b/Paper/gtk-3.0/granite-widgets.css index b9ef53b..387dbfc 100644 --- a/Paper/gtk-3.0/granite-widgets.css +++ b/Paper/gtk-3.0/granite-widgets.css @@ -88,4 +88,43 @@ GraniteWidgetsWelcome GtkLabel { GraniteWidgetsWelcome .h1, GraniteWidgetsWelcome .h3 { color: alpha(@foreground, 0.8); -} \ No newline at end of file +} + +/********* + * Panel * + ********/ + +.panel { + background-color: @panel; + color: #fff; + font-weight: bold; +} + +.panel-shadow { + background-image: none; + background-color: transparent; +} + +.panel .menu { + box-shadow: none; +} + +.panel .menu .spinner { + opacity: 1; +} + +.panel .menu .menuitem { + font-weight: normal; +} + +.panel .window-frame.menu.csd, +.panel .window-frame.popup.csd { + box-shadow: none; +} + +.panel .menu .window-frame.menu.csd, +.panel .menu .window-frame.popup.csd { + box-shadow: 0 0 0 1px alpha (#000, 0.20), + 0 10px 20px alpha (#000, 0.19), + 0 6px 6px alpha (#000, 0.23); +} diff --git a/Paper/gtk-3.0/gtk-common.css b/Paper/gtk-3.0/gtk-common.css index eea28db..c94ecc4 100644 --- a/Paper/gtk-3.0/gtk-common.css +++ b/Paper/gtk-3.0/gtk-common.css @@ -64,7 +64,7 @@ /* Selected color */ @define-color selected_background @selection; @define-color selected_border shade(@selection, 0.8); -@define-color selected_foreground shade(@selection, 2.2); +@define-color selected_foreground #fff; @define-color selection_foreground @selected_foreground; /**************** diff --git a/Paper/gtk-3.0/gtk-widgets-assets-dark.css b/Paper/gtk-3.0/gtk-widgets-assets-dark.css index 20307de..4fbe1d5 100644 --- a/Paper/gtk-3.0/gtk-widgets-assets-dark.css +++ b/Paper/gtk-3.0/gtk-widgets-assets-dark.css @@ -276,7 +276,8 @@ /******************* * Pane separators * *******************/ -.pane-separator { +.pane-separator, +.pane-separator:backdrop { background: url("assets/pane-separator-grip.svg"); background-repeat: no-repeat; background-position: center; diff --git a/Paper/gtk-3.0/gtk-widgets.css b/Paper/gtk-3.0/gtk-widgets.css index 016bdfb..1c557ef 100644 --- a/Paper/gtk-3.0/gtk-widgets.css +++ b/Paper/gtk-3.0/gtk-widgets.css @@ -57,6 +57,7 @@ @import url("widgets/color-chooser.css"); @import url("widgets/column-header.css"); @import url("widgets/combobox.css"); +@import url("widgets/composited-indicator.css"); @import url("widgets/cursor-handles.css"); @import url("widgets/destructive-action-buttons.css"); @import url("widgets/dialogs.css"); @@ -69,13 +70,13 @@ @import url("widgets/inline-toolbars.css"); @import url("widgets/labels.css"); @import url("widgets/levelbars.css"); -@import url("widgets/links.css"); @import url("widgets/linked-buttons.css"); +@import url("widgets/links.css"); @import url("widgets/list-rows.css"); @import url("widgets/menu-button.css"); -@import url("widgets/message-dialogs.css"); @import url("widgets/menubars.css"); @import url("widgets/menus.css"); +@import url("widgets/message-dialogs.css"); @import url("widgets/miscellaneous.css"); @import url("widgets/notebook.css"); @import url("widgets/osd.css"); diff --git a/Paper/gtk-3.0/widgets/buttons.css b/Paper/gtk-3.0/widgets/buttons.css index 270f0e8..bdb3272 100644 --- a/Paper/gtk-3.0/widgets/buttons.css +++ b/Paper/gtk-3.0/widgets/buttons.css @@ -228,10 +228,15 @@ GtkCalendar.button:backdrop:hover, color: @text; } +.text-button:focus GtkLabel { + /*color: shade(@text, 2.0);*/ + color: @text; +} + .text-button:active GtkLabel, -.text-button:focus GtkLabel, .text-button:hover GtkLabel { - color: shade(@text, 2.0); + color: alpha(#000, 0.5); + /*color: @text;*/ } .text-button:backdrop GtkLabel, diff --git a/Paper/gtk-3.0/widgets/check-radio.css b/Paper/gtk-3.0/widgets/check-radio.css index d76177e..0f2ac79 100644 --- a/Paper/gtk-3.0/widgets/check-radio.css +++ b/Paper/gtk-3.0/widgets/check-radio.css @@ -145,5 +145,4 @@ GtkCheckButton:selected:focus { .menuitem.radio:insensitive { background: none; box-shadow: none; -} - +} \ No newline at end of file diff --git a/Paper/gtk-3.0/widgets/composited-indicator.css b/Paper/gtk-3.0/widgets/composited-indicator.css new file mode 100644 index 0000000..01d187e --- /dev/null +++ b/Paper/gtk-3.0/widgets/composited-indicator.css @@ -0,0 +1,102 @@ +/* Copyright 2014 Sam Hewitt. +* +* This file is part of the Paper GTK theme. +* +* The Paper GTK theme is free software: you can redistribute it +* and/or modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* +* The Paper GTK theme is distributed in the hope that it will be +* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +* Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/. +*/ + +/*********************** +* Composited Indicator * +************************/ + +.composited-indicator { + background-color: transparent; + color: #fff; +} + +.composited-indicator > GtkWidget > GtkWidget:first-child { + padding: 0 2px; +} + +.panel-app-button > GtkWidget > GtkWidget:first-child { + padding: 0 2px 0 4px; +} + +.composited-indicator.menuitem:active, +.composited-indicator.menuitem:prelight { + border-style: none; + background-image: none; + box-shadow: none; +} + + +/* Images */ +.composited-indicator.menuitem:focus GtkImage, +.composited-indicator.menuitem GtkImage { + color: @text; +} + +.composited-indicator.menuitem:active GtkImage { + color: @selection_foreground; +} + +.composited-indicator.menuitem:hover GtkImage, +.composited-indicator.menuitembutton:hover GtkImage { + color: shade(@text, 2.0); +} + +.composited-indicator.menuitem:backdrop GtkImage, +.composited-indicator.menuitem:backdrop:hover GtkImage, +.composited-indicator.menuitem:active:backdrop GtkImage { + color: @backdrop_text; + -gtk-image-effect: dim; +} + +.composited-indicator.menuitem:insensitive GtkImage { + color: @insensitive_text; + -gtk-image-effect: dim; +} + +.composited-indicator.menuitem:insensitive:backdrop GtkImage { + color: mix(@backdrop_text, @insensitive_text, 0.5); + -gtk-image-effect: dim; +} + +/* Labels */ +.composited-indicator.menuitem:focus GtkLabel, +.composited-indicator.menuitem GtkLabel { + color: @text; +} + +.composited-indicator.menuitem:active GtkLabel { + color: @selection_foreground; +} + +.composited-indicator.menuitem:hover GtkLabel { + color: shade(@text, 2.0); +} + +.composited-indicator.menuitem:backdrop GtkLabel, +.composited-indicator.menuitem:backdrop:hover GtkLabel, +.composited-indicator.menuitem:active:backdrop GtkLabel { + color: @backdrop_text; +} + +.composited-indicator.menuitem:insensitive GtkLabel { + color: @insensitive_text; +} + +.composited-indicator.menuitem:insensitive:backdrop GtkLabel { + color: mix(@backdrop_text, @insensitive_text, 0.5); +} \ No newline at end of file