From 3c620bd1909b6b322237b82ca6ff6201fe82159a Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Thu, 9 Apr 2015 17:03:00 -0400 Subject: [PATCH] Refinement --- Paper/gtk-3.0/apps/calculator.css | 26 ++++++++++++---- Paper/gtk-3.0/apps/settings.css | 4 +-- Paper/gtk-3.0/widgets/header-bar.css | 42 +++++++++++++++++++++----- Paper/gtk-3.0/widgets/titlebar.css | 45 ++++++++++++++++++++++------ Paper/gtk-3.0/widgets/windows.css | 10 +++---- 5 files changed, 98 insertions(+), 29 deletions(-) diff --git a/Paper/gtk-3.0/apps/calculator.css b/Paper/gtk-3.0/apps/calculator.css index 9fed6dd..ab81182 100644 --- a/Paper/gtk-3.0/apps/calculator.css +++ b/Paper/gtk-3.0/apps/calculator.css @@ -39,7 +39,8 @@ MathButtons .button, MathButtons .button GtkImage, MathButtons .button.text-button, MathButtons .button.image-button { - background: none; + background-color: none; + background-image: none; border: none; color: @calculator; font: Bold; @@ -48,7 +49,8 @@ MathButtons .button.image-button { MathButtons GtkComboBox, MathButtons GtkComboBox * { - background: none; + background-color: none; + background-image: none; border: none; color: @calculator; font: Bold; @@ -59,7 +61,19 @@ MathButtons GtkComboBox *:focus, MathButtons .button.text-button:focus, MathButtons .button.image-button:focus, MathButtons .button:focus { - background: none; + background-color: none; + background-image: none; + color: @calculator; + border: none; +} + +MathButtons GtkComboBox:hover, +MathButtons GtkComboBox *:hover, +MathButtons .button.text-button:hover, +MathButtons .button.image-button:hover, +MathButtons .button:hover { + background-color: none; + background-image: none; color: @calculator; border: none; } @@ -74,7 +88,8 @@ MathButtons GtkComboBox *:active:hover, MathButtons .button.text-button:active:hover, MathButtons .button.image-button:active:hover, MathButtons .button:active:hover { - background: none; + background-color: none; + background-image: none; color: @calculator; border: none; } @@ -84,7 +99,8 @@ MathButtons GtkComboBox *:backdrop, MathButtons .button.text-button:backdrop, MathButtons .button.image-button:backdrop, MathButtons .button:backdrop { - background: none; + background-color: none; + background-image: none; color: shade(@calculator, 0.9); border: none; } diff --git a/Paper/gtk-3.0/apps/settings.css b/Paper/gtk-3.0/apps/settings.css index 9ae641c..2bca481 100644 --- a/Paper/gtk-3.0/apps/settings.css +++ b/Paper/gtk-3.0/apps/settings.css @@ -57,7 +57,7 @@ CcShellItemView .button { * Iconview * ************/ -/*CcWindow GtkIconView.view.cell { +CcWindow GtkIconView.view.cell { border: none; } @@ -71,7 +71,7 @@ CcWindow GtkIconView.view.cell:selected, CcWindow GtkIconView.view.cell:selected:focus { border: 1px solid @settings; background-color: @settings; -}*/ +} /************ diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css index 1370a91..71b4620 100644 --- a/Paper/gtk-3.0/widgets/header-bar.css +++ b/Paper/gtk-3.0/widgets/header-bar.css @@ -22,13 +22,14 @@ **************/ .header-bar { - padding-left: 6px; - padding-right: 6px; - border-radius: 0px; - background-image: none; + padding:0; + border: none; + border-radius: 0; background-color: @header; color: @header_text; - box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1); + box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1), + inset 0 -1px 0 0 rgba(0,0,0,0.1), + inset 0 -3px 3px -4px alpha(#000, 0.4); } @@ -140,7 +141,7 @@ } .header-bar .text-button:active { - font: Bold; + font: Bold 11; } /* Checked Button */ @@ -160,7 +161,7 @@ } .header-bar .text-button:checked { - font: Bold; + font: Bold 11; } /* Focus Button */ @@ -253,7 +254,7 @@ } .header-bar .text-button:active:backdrop { - font: Bold; + font: Bold 11; } /* Backdrop:Hover Button */ @@ -333,6 +334,31 @@ -gtk-image-effect: dim; } +/* Button Arrows */ +.header-bar .button GtkArrow, +.header-bar .button GtkArrow:active, +.header-bar .button GtkArrow:focus, +.header-bar .button GtkArrow:hover { + color: @header_text; +} + +.header-bar .button GtkArrow:active:backdrop, +.header-bar .button GtkArrow:backdrop, +.header-bar .button GtkArrow:backdrop:hover { + color: @backdrop_header_text; + -gtk-image-effect: dim; +} + +.header-bar .button GtkArrow:insensitive { + color: @insensitive_header_text; + -gtk-image-effect: dim; +} + +.header-bar .button GtkArrow:insensitive:backdrop { + color: mix(@backdrop_toolbar_text, @insensitive_toolbar_text, 0.5); + -gtk-image-effect: dim; +} + /* Button Labels */ .header-bar .button GtkLabel, .header-bar .button GtkLabel:active, diff --git a/Paper/gtk-3.0/widgets/titlebar.css b/Paper/gtk-3.0/widgets/titlebar.css index 3ac407b..81e3e3f 100644 --- a/Paper/gtk-3.0/widgets/titlebar.css +++ b/Paper/gtk-3.0/widgets/titlebar.css @@ -21,13 +21,14 @@ ******************/ .titlebar { - padding: 0px; - border-width: 0px; - border-radius: 0px; - background-image: none; + padding:0; + border: none; + border-radius: 0; background-color: @header; color: @header_text; - box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1); + box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1), + inset 0 -1px 0 0 rgba(0,0,0,0.1), + inset 0 -3px 3px -4px alpha(#000, 0.4); } .maximized .titlebar { @@ -50,8 +51,8 @@ padding-bottom: 0px; padding-top: 0px; background-color: @header; + background-image: none; color: @header_text; - /*box-shadow: inset 0 -3px 3px -4px alpha(#000, 0.7);*/ } .titlebar .title { @@ -136,7 +137,7 @@ } .titlebar .text-button:active { - font: Bold; + font: Bold 11; } /* Checked Button */ @@ -156,7 +157,7 @@ } .titlebar .text-button:checked { - font: Bold; + font: Bold 11; } /* Focus Button */ @@ -248,7 +249,7 @@ } .titlebar .text-button:active:backdrop { - font: Bold; + font: Bold 11; } /* Backdrop:Hover; Button */ @@ -345,6 +346,32 @@ } +/* Button Arrows */ +.titlebar .button GtkArrow, +.titlebar .button GtkArrow:active, +.titlebar .button GtkArrow:focus, +.titlebar .button GtkArrow:hover { + color: @header_text; +} + +.titlebar .button GtkArrow:active:backdrop, +.titlebar .button GtkArrow:backdrop, +.titlebar .button GtkArrow:backdrop:hover { + color: @backdrop_header_text; + -gtk-image-effect: dim; +} + +.titlebar .button GtkArrow:insensitive { + color: @insensitive_header_text; + -gtk-image-effect: dim; +} + +.titlebar .button GtkArrow:insensitive:backdrop { + color: mix(@backdrop_toolbar_text, @insensitive_toolbar_text, 0.5); + -gtk-image-effect: dim; +} + + /* Button Labels */ .titlebar .button GtkLabel, .titlebar .button GtkLabel:active, diff --git a/Paper/gtk-3.0/widgets/windows.css b/Paper/gtk-3.0/widgets/windows.css index 4301f83..ef77eb8 100644 --- a/Paper/gtk-3.0/widgets/windows.css +++ b/Paper/gtk-3.0/widgets/windows.css @@ -20,16 +20,16 @@ * Window * **********/ -@define-color window_shadow alpha(#000, 0.6); -@define-color backdrop_window_shadow alpha(#000, 0.4); +@define-color window_shadow alpha(#000, 0.4); +@define-color backdrop_window_shadow alpha(#000, 0.2); .window-frame { - border-radius: 0px; - box-shadow: 0 2px 6px 3px @window_shadow; + border:none; + box-shadow: 0 2px 5px 1px @window_shadow; margin: 10px; /* this is used for the resize cursor area */ } .window-frame:backdrop { border-radius: 0px; - box-shadow: 0 2px 5px 1px @backdrop_window_shadow; + box-shadow: 0 2px 3px 0 @backdrop_window_shadow; }