From bf25f2ed225a77effb18680895a59420bc86dfef Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Fri, 15 Apr 2016 13:55:44 -0400 Subject: [PATCH] a few fixed --- Paper/gtk-3.0/gtk-dark.css | 27 ++++++++++++++++++++----- Paper/gtk-3.0/gtk.css | 27 ++++++++++++++++++++----- Paper/gtk-3.0/widgets/_entries.scss | 2 +- Paper/gtk-3.0/widgets/_header-bars.scss | 23 ++++++++++++++++++++- 4 files changed, 67 insertions(+), 12 deletions(-) diff --git a/Paper/gtk-3.0/gtk-dark.css b/Paper/gtk-3.0/gtk-dark.css index a0e3d98..c336502 100644 --- a/Paper/gtk-3.0/gtk-dark.css +++ b/Paper/gtk-3.0/gtk-dark.css @@ -2903,7 +2903,7 @@ filechooserbutton:drop(active) { spinbutton:not(.vertical), .entry, entry { - min-height: 32px; + min-height: 24px; padding: 6px; border: 1px solid; border-radius: 3px; @@ -3849,13 +3849,16 @@ headerbar { .header-bar.default-decoration button.titlebutton:backdrop, headerbar.default-decoration .button.titlebutton:backdrop, headerbar.default-decoration button.titlebutton:backdrop { - color: rgba(255, 255, 255, 0.3); } + color: rgba(255, 255, 255, 0.3); + background-color: rgba(255, 255, 255, 0.8); } .titlebar:not(headerbar) .entry, .titlebar:not(headerbar) entry, .header-bar .entry, .header-bar entry, headerbar .entry, headerbar entry { + margin: 6px 0; + min-height: 16px; border-radius: 2px; padding: 4px; border: none; @@ -3966,6 +3969,7 @@ headerbar { border: none; box-shadow: none; text-shadow: none; + -gtk-icon-shadow: none; padding: 10px; color: rgba(255, 255, 255, 0.8); } .titlebar:not(headerbar) .button.text-button, .titlebar:not(headerbar) .button.image-button, .titlebar:not(headerbar) .button.flat, @@ -3984,6 +3988,9 @@ headerbar { headerbar button.text-button, headerbar button.image-button, headerbar button.flat { + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; background-color: transparent; background-image: none; color: rgba(255, 255, 255, 0.8); } @@ -4022,13 +4029,17 @@ headerbar { min-height: 16px; min-width: 16px; padding: 1px; - border-radius: 50%; } + border-radius: 50%; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; } .titlebar:not(headerbar) .button.titlebutton:hover, .titlebar:not(headerbar) button.titlebutton:hover, .header-bar .button.titlebutton:hover, .header-bar button.titlebutton:hover, headerbar .button.titlebutton:hover, headerbar button.titlebutton:hover { + background-color: transparent; color: lighter(rgba(255, 255, 255, 0.8), 10%); } .titlebar:not(headerbar) .button.titlebutton:backdrop, .titlebar:not(headerbar) button.titlebutton:backdrop, @@ -4036,6 +4047,7 @@ headerbar { .header-bar button.titlebutton:backdrop, headerbar .button.titlebutton:backdrop, headerbar button.titlebutton:backdrop { + background-color: transparent; color: rgba(255, 255, 255, 0.3); } .titlebar:not(headerbar) .button.titlebutton:active, .titlebar:not(headerbar) button.titlebutton:active, @@ -4053,7 +4065,8 @@ headerbar { .header-bar button:hover, headerbar .button:hover, headerbar button:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: rgba(0, 0, 0, 0.15); + box-shadow: none; } .titlebar:not(headerbar) .button:active, .titlebar:not(headerbar) .button:checked, .titlebar:not(headerbar) button:active, .titlebar:not(headerbar) button:checked, @@ -4067,6 +4080,8 @@ headerbar { headerbar button:checked { font: bold; border-radius: 0px; + text-shadow: none; + -gtk-icon-shadow: none; box-shadow: inset 0 -2px 0 0 rgba(255, 255, 255, 0.8); background-color: transparent; background-image: none; } @@ -4110,7 +4125,9 @@ headerbar { headerbar .button:insensitive:backdrop, headerbar button:insensitive, headerbar button:insensitive:backdrop { - color: rgba(255, 255, 255, 0.3); } + color: rgba(255, 255, 255, 0.3); + background-color: transparent; + background-image: none; } .titlebar:not(headerbar) .button:insensitive image, .titlebar:not(headerbar) .button:insensitive GtkImage, .titlebar:not(headerbar) .button:insensitive:backdrop image, .titlebar:not(headerbar) .button:insensitive:backdrop GtkImage, diff --git a/Paper/gtk-3.0/gtk.css b/Paper/gtk-3.0/gtk.css index b386361..0166e16 100644 --- a/Paper/gtk-3.0/gtk.css +++ b/Paper/gtk-3.0/gtk.css @@ -2917,7 +2917,7 @@ filechooserbutton:drop(active) { spinbutton:not(.vertical), .entry, entry { - min-height: 32px; + min-height: 24px; padding: 6px; border: 1px solid; border-radius: 3px; @@ -3863,13 +3863,16 @@ headerbar { .header-bar.default-decoration button.titlebutton:backdrop, headerbar.default-decoration .button.titlebutton:backdrop, headerbar.default-decoration button.titlebutton:backdrop { - color: rgba(255, 255, 255, 0.5); } + color: rgba(255, 255, 255, 0.5); + background-color: #ffffff; } .titlebar:not(headerbar) .entry, .titlebar:not(headerbar) entry, .header-bar .entry, .header-bar entry, headerbar .entry, headerbar entry { + margin: 6px 0; + min-height: 16px; border-radius: 2px; padding: 4px; border: none; @@ -3980,6 +3983,7 @@ headerbar { border: none; box-shadow: none; text-shadow: none; + -gtk-icon-shadow: none; padding: 10px; color: #ffffff; } .titlebar:not(headerbar) .button.text-button, .titlebar:not(headerbar) .button.image-button, .titlebar:not(headerbar) .button.flat, @@ -3998,6 +4002,9 @@ headerbar { headerbar button.text-button, headerbar button.image-button, headerbar button.flat { + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; background-color: transparent; background-image: none; color: #ffffff; } @@ -4036,13 +4043,17 @@ headerbar { min-height: 16px; min-width: 16px; padding: 1px; - border-radius: 50%; } + border-radius: 50%; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; } .titlebar:not(headerbar) .button.titlebutton:hover, .titlebar:not(headerbar) button.titlebutton:hover, .header-bar .button.titlebutton:hover, .header-bar button.titlebutton:hover, headerbar .button.titlebutton:hover, headerbar button.titlebutton:hover { + background-color: transparent; color: lighter(#ffffff, 10%); } .titlebar:not(headerbar) .button.titlebutton:backdrop, .titlebar:not(headerbar) button.titlebutton:backdrop, @@ -4050,6 +4061,7 @@ headerbar { .header-bar button.titlebutton:backdrop, headerbar .button.titlebutton:backdrop, headerbar button.titlebutton:backdrop { + background-color: transparent; color: rgba(255, 255, 255, 0.5); } .titlebar:not(headerbar) .button.titlebutton:active, .titlebar:not(headerbar) button.titlebutton:active, @@ -4067,7 +4079,8 @@ headerbar { .header-bar button:hover, headerbar .button:hover, headerbar button:hover { - background-color: rgba(0, 0, 0, 0.15); } + background-color: rgba(0, 0, 0, 0.15); + box-shadow: none; } .titlebar:not(headerbar) .button:active, .titlebar:not(headerbar) .button:checked, .titlebar:not(headerbar) button:active, .titlebar:not(headerbar) button:checked, @@ -4081,6 +4094,8 @@ headerbar { headerbar button:checked { font: bold; border-radius: 0px; + text-shadow: none; + -gtk-icon-shadow: none; box-shadow: inset 0 -2px 0 0 #ffffff; background-color: transparent; background-image: none; } @@ -4124,7 +4139,9 @@ headerbar { headerbar .button:insensitive:backdrop, headerbar button:insensitive, headerbar button:insensitive:backdrop { - color: rgba(255, 255, 255, 0.5); } + color: rgba(255, 255, 255, 0.5); + background-color: transparent; + background-image: none; } .titlebar:not(headerbar) .button:insensitive image, .titlebar:not(headerbar) .button:insensitive GtkImage, .titlebar:not(headerbar) .button:insensitive:backdrop image, .titlebar:not(headerbar) .button:insensitive:backdrop GtkImage, diff --git a/Paper/gtk-3.0/widgets/_entries.scss b/Paper/gtk-3.0/widgets/_entries.scss index ad29118..42d1633 100644 --- a/Paper/gtk-3.0/widgets/_entries.scss +++ b/Paper/gtk-3.0/widgets/_entries.scss @@ -6,7 +6,7 @@ .entry, entry { %entry_basic, & { - min-height: 32px; + min-height: 24px; padding: 6px; border: 1px solid; border-radius: 3px; diff --git a/Paper/gtk-3.0/widgets/_header-bars.scss b/Paper/gtk-3.0/widgets/_header-bars.scss index ec3ac2d..d824287 100644 --- a/Paper/gtk-3.0/widgets/_header-bars.scss +++ b/Paper/gtk-3.0/widgets/_header-bars.scss @@ -117,6 +117,7 @@ headerbar { } &:backdrop { color:$backdrop_headerbar_fg_color; + background-color:$headerbar_fg_color; } } } @@ -125,6 +126,9 @@ headerbar { .entry, entry { + + margin:6px 0; + min-height: 16px; border-radius: 2px; padding: 4px; @@ -197,12 +201,16 @@ headerbar { border: none; box-shadow: none; text-shadow: none; + -gtk-icon-shadow: none; padding: 10px; color: $headerbar_fg_color; &.text-button, &.image-button, &.flat { + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; background-color: transparent; background-image: none; color: $headerbar_fg_color; @@ -223,12 +231,17 @@ headerbar { min-width: 16px; padding: 1px; border-radius:50%; + box-shadow: none; + text-shadow: none; + -gtk-icon-shadow: none; &:hover { + background-color:transparent; color:lighter($headerbar_fg_color, 10%); } &:backdrop { + background-color:transparent; color:$backdrop_headerbar_fg_color; } @@ -240,12 +253,18 @@ headerbar { } } - &:hover { background-color: transparentize(black, 0.85);} + &:hover { + background-color: transparentize(black, 0.85); + box-shadow:none; + } &:active, &:checked { font:bold; border-radius: 0px; + + text-shadow: none; + -gtk-icon-shadow: none; box-shadow: inset 0 -2px 0 0 $headerbar_fg_color; @@ -271,6 +290,8 @@ headerbar { &:insensitive, &:insensitive:backdrop { color: $backdrop_headerbar_fg_color; + background-color: transparent; + background-image: none; image, GtkImage {