From 9dbe2610c25618609d3ab0f0b0e420c4c7224d8d Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Tue, 24 May 2016 13:33:27 -0400 Subject: [PATCH] a few bug fixes --- Paper/gtk-3.18/gtk-dark.css | 19 +++++++++++-------- Paper/gtk-3.18/gtk.css | 19 +++++++++++-------- Paper/gtk-3.18/widgets/_entries.scss | 17 ++++++++++------- Paper/gtk-3.18/widgets/_level-bars.scss | 4 +--- 4 files changed, 33 insertions(+), 26 deletions(-) diff --git a/Paper/gtk-3.18/gtk-dark.css b/Paper/gtk-3.18/gtk-dark.css index 3db7efe..8bff082 100644 --- a/Paper/gtk-3.18/gtk-dark.css +++ b/Paper/gtk-3.18/gtk-dark.css @@ -2035,7 +2035,8 @@ GtkFileChooserDialog { box-shadow: none; } .error.spinbutton:not(.vertical), GeditWindow > .error.entry, .entry.error { - color: #d32f2f; + color: white; + background-color: #d32f2f; border-color: #420e0e; } .error.spinbutton:focus:not(.vertical), GeditWindow > .error.entry:focus, .entry.error:focus { @@ -2044,10 +2045,12 @@ GtkFileChooserDialog { .error.spinbutton:selected:focus:not(.vertical), GeditWindow > .error.entry:selected:focus, .error.spinbutton:selected:not(.vertical), GeditWindow > .error.entry:selected, .entry.error:selected:focus, .entry.error:selected { - background-color: #d32f2f; } + background-color: white; + color: #d32f2f; } .warning.spinbutton:not(.vertical), GeditWindow > .warning.entry, .entry.warning { - color: #f9ce1d; + color: white; + background-color: #f9ce1d; border-color: #614e03; } .warning.spinbutton:focus:not(.vertical), GeditWindow > .warning.entry:focus, .entry.warning:focus { @@ -2056,7 +2059,8 @@ GtkFileChooserDialog { .warning.spinbutton:selected:focus:not(.vertical), GeditWindow > .warning.entry:selected:focus, .warning.spinbutton:selected:not(.vertical), GeditWindow > .warning.entry:selected, .entry.warning:selected:focus, .entry.warning:selected { - background-color: #f9ce1d; } + background-color: white; + color: #f9ce1d; } .spinbutton:not(.vertical) .progressbar, GeditWindow > .entry .progressbar, .entry .progressbar { margin: 2px -6px; @@ -2949,15 +2953,14 @@ infobar { GtkLevelBar { -GtkLevelBar-min-block-width: 32px; - -GtkLevelBar-min-block-height: 6px; - border-radius: 2px; } + -GtkLevelBar-min-block-height: 6px; } GtkLevelBar.vertical { -GtkLevelBar-min-block-width: 6px; - -GtkLevelBar-min-block-height: 32px; - border-radius: 2px; } + -GtkLevelBar-min-block-height: 32px; } .level-bar { + border-radius: 2px; padding: 2px; } .level-bar.trough { background-color: transparent; diff --git a/Paper/gtk-3.18/gtk.css b/Paper/gtk-3.18/gtk.css index 296bc65..ee9cac2 100644 --- a/Paper/gtk-3.18/gtk.css +++ b/Paper/gtk-3.18/gtk.css @@ -2044,7 +2044,8 @@ GtkFileChooserDialog { box-shadow: none; } .error.spinbutton:not(.vertical), GeditWindow > .error.entry, .entry.error { - color: #d32f2f; + color: white; + background-color: #d32f2f; border-color: #d32f2f; } .error.spinbutton:focus:not(.vertical), GeditWindow > .error.entry:focus, .entry.error:focus { @@ -2053,10 +2054,12 @@ GtkFileChooserDialog { .error.spinbutton:selected:focus:not(.vertical), GeditWindow > .error.entry:selected:focus, .error.spinbutton:selected:not(.vertical), GeditWindow > .error.entry:selected, .entry.error:selected:focus, .entry.error:selected { - background-color: #d32f2f; } + background-color: white; + color: #d32f2f; } .warning.spinbutton:not(.vertical), GeditWindow > .warning.entry, .entry.warning { - color: #f9ce1d; + color: white; + background-color: #f9ce1d; border-color: #f9ce1d; } .warning.spinbutton:focus:not(.vertical), GeditWindow > .warning.entry:focus, .entry.warning:focus { @@ -2065,7 +2068,8 @@ GtkFileChooserDialog { .warning.spinbutton:selected:focus:not(.vertical), GeditWindow > .warning.entry:selected:focus, .warning.spinbutton:selected:not(.vertical), GeditWindow > .warning.entry:selected, .entry.warning:selected:focus, .entry.warning:selected { - background-color: #f9ce1d; } + background-color: white; + color: #f9ce1d; } .spinbutton:not(.vertical) .progressbar, GeditWindow > .entry .progressbar, .entry .progressbar { margin: 2px -6px; @@ -2958,15 +2962,14 @@ infobar { GtkLevelBar { -GtkLevelBar-min-block-width: 32px; - -GtkLevelBar-min-block-height: 6px; - border-radius: 2px; } + -GtkLevelBar-min-block-height: 6px; } GtkLevelBar.vertical { -GtkLevelBar-min-block-width: 6px; - -GtkLevelBar-min-block-height: 32px; - border-radius: 2px; } + -GtkLevelBar-min-block-height: 32px; } .level-bar { + border-radius: 2px; padding: 2px; } .level-bar.trough { background-color: transparent; diff --git a/Paper/gtk-3.18/widgets/_entries.scss b/Paper/gtk-3.18/widgets/_entries.scss index cb6c849..7c7f34e 100644 --- a/Paper/gtk-3.18/widgets/_entries.scss +++ b/Paper/gtk-3.18/widgets/_entries.scss @@ -46,25 +46,28 @@ &:backdrop { @include entry(backdrop); - transition: $backdrop_transition; } - &:backdrop:insensitive { @include entry(backdrop-insensitive); } &:backdrop:insensitive { @include entry(backdrop-insensitive); } &:selected { &:focus, & { @extend %selected_items; }} - // entry error and warning style - @each $e_type, $e_color in (error, $error_color), - (warning, $warning_color) { + // Error styles + @each $e_type, $e_color in (error, $error_color), (warning, $warning_color) { &.#{$e_type} { - color: $e_color; + color: white; + background-color: $e_color; border-color: entry_focus_border($e_color); &:focus { @include entry(focus, $e_color); } - &:selected { &:focus, & { background-color: $e_color; }} + &:selected { + &:focus, & { + background-color:white; + color: $e_color; + } + } } } diff --git a/Paper/gtk-3.18/widgets/_level-bars.scss b/Paper/gtk-3.18/widgets/_level-bars.scss index 6b49e79..3411d0e 100644 --- a/Paper/gtk-3.18/widgets/_level-bars.scss +++ b/Paper/gtk-3.18/widgets/_level-bars.scss @@ -43,17 +43,15 @@ GtkLevelBar { -GtkLevelBar-min-block-width: 32px; -GtkLevelBar-min-block-height: 6px; - border-radius: 2px; } GtkLevelBar.vertical { -GtkLevelBar-min-block-width: 6px; -GtkLevelBar-min-block-height: 32px; - border-radius: 2px; } .level-bar { - + border-radius: 2px; padding: 2px; // Trough - has no style