Bug fixes & refinements.

This commit is contained in:
Sam Hewitt 2014-12-19 15:47:55 -05:00
parent 6e03cb2cdc
commit 5f620a197f
11 changed files with 211 additions and 81 deletions

View File

@ -88,11 +88,13 @@ TerminalWindow .dynamic-notebook tab.right:active {
box-shadow:inset 3px 0 0 0 @terminal;
}
/******************
* GNOME Terminal *
******************/
/**********
* Screen *
**********/
TerminalScreen,
VteTerminal {
-TerminalScreen-background-darkness: 0.95;
background-color: @terminal_background;
color: @terminal_text;
}

View File

@ -17,46 +17,36 @@
*/
* {
padding: 0;
background-clip: padding-box;
-GtkToolButton-icon-spacing: 4;
-GtkTextView-error-underline-color: @error;
-GtkPaned-handle-size: 5;
-GtkCheckButton-indicator-size: 16;
-GtkCheckMenuItem-indicator-size: 12;
-GtkCheckMenuItem-indicator-size: 16;
-GtkScrolledWindow-scrollbar-spacing: 0;
-GtkScrolledWindow-scrollbars-within-bevel: 1;
-GtkToolItemGroup-expander-size: 11;
-GtkExpander-expander-size: 11;
-GtkTreeView-expander-size: 11;
-GtkTreeView-horizontal-separator: 4;
-GtkMenu-horizontal-padding: 0;
-GtkMenu-vertical-padding: 0;
-GtkWidget-link-color: @link;
-GtkWidget-visited-link-color: @link;
-GtkIMHtml-hyperlink-color: @link;
-GtkHTML-link-color: @link;
-WnckTasklist-fade-overlay-rect: 0;
-GtkWidget-focus-padding: 0;
-GtkWidget-focus-line-width: 1;
-GtkWindow-resize-grip-width: 0;
-GtkWindow-resize-grip-height: 0;
-GtkWindow-resize-grip-height: 0;
outline-color: alpha(@foreground, 0.3);
padding: 0;
outline-color: alpha(#000, 0.2);
outline-style: dashed;
outline-offset: 2px;
outline-offset: -3px;
outline-width: 1px;
outline-radius: 2px;
background-color: inherit;
color: inherit;

View File

@ -25,7 +25,7 @@
@define-color base #fff;/* Base color */
@define-color background #fff;/* Background color */
@define-color foreground #3F3F3F;/* Foreground color */
@define-color border #C4C4C4;/* Borders color */
@define-color border #D8D8D8;/* Borders color */
@define-color separator alpha(#000, 0.2);/* Separator color */
@define-color text @foreground;/* Text color */
@define-color panel #576165;/* Panel color */

View File

@ -22,17 +22,20 @@
***************/
.background {
color: @foreground;
background-image: none;
background-color: @background;
}
.background-color:backdrop {
/* I want everything nice and flat in the backdrop window */
background-image: none;
background-color: @backdrop_background;
color: @backdrop_text;
}
.background-color:insensitive {
/* I want everything nice and flat in the backdrop window */
background-image: none;
background-color: @insensitive_background;
color: @insensitive_text;
}
@ -109,4 +112,9 @@ GtkBox:insensitive,
GtkGrid,
GtkGrid:insensitive {
background: none;
}
GtkImage,
GtkLabel {
color: @text;
}

View File

@ -16,8 +16,8 @@
* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
*/
@define-color button_background shade(@base, 0.95);/* Button background color */
@define-color button_border shade(@border, 1.1);/* Button border color */
@define-color button_background shade(@base, 0.98);/* Button background color */
@define-color button_border @border;/* Button border color */
@define-color backdrop_button_background shade(@backdrop_background, 0.9);/* Backdrop button background color */
@define-color backdrop_button_border shade(@button_border, 0.9); /* Backdrop button border color */
@ -32,6 +32,10 @@
padding: 4px 9px;
border: 1px solid @button_border;
background-color: @button_background;
background-image: linear-gradient(to bottom,
@button_background,
shade(@button_background, 0.98)
);
}
.button.flat,
@ -71,6 +75,10 @@ GtkCalendar.button:backdrop:hover,
.button.image-button:focus {
border: 1px solid @selection;
background-color: shade(@selection, 1.1);
background-image: linear-gradient(to bottom,
shade(@selection, 1.1),
shade(shade(@selection, 1.1), 0.98)
);
color: @selection;
}
@ -82,6 +90,10 @@ GtkCalendar.button:backdrop:hover,
.button.image-button:hover {
border: 1px solid shade(@selection, 1.1);
background-color: shade(@selection, 1.2);
background-image: linear-gradient(to bottom,
shade(@selection, 1.2),
shade(shade(@selection, 1.2), 0.98)
);
color: @selected_foreground;
transition: all 100ms cubic-bezier(0.3, 0.5, 0.5, 0.9);
}
@ -103,7 +115,8 @@ GtkCalendar.button:backdrop:hover,
.button.text-button:insensitive,
.button.image-button:insensitive {
border: 1px solid @insensitive_border;
background-color: @insensitive_button;
background-color: @insensitive_background;
background-image: none;
color: @insensitive_text;
}
@ -112,8 +125,12 @@ GtkCalendar.button:backdrop:hover,
.button.default:backdrop,
.button.text-button:backdrop,
.button.image-button:backdrop {
border: 1px solid @backdrop_button_background;
border: 1px solid @backdrop_button_border;
background-color: @backdrop_button_background;
background-image: linear-gradient(to bottom,
@backdrop_button_background,
shade(@backdrop_button_background, 0.98)
);
color: @backdrop_text;
}
/* Backdrop Button */
@ -122,6 +139,10 @@ GtkCalendar.button:backdrop:hover,
.button.text-button:backdrop:hover,
.button.image-button:backdrop:hover {
background-color: shade(@backdrop_button_background, 1.1);
background-image: linear-gradient(to bottom,
shade(@backdrop_button_background, 1.1),
shade(shade(@backdrop_button_background, 1.1), 0.98)
);
color: @backdrop_text;
}
@ -131,7 +152,8 @@ GtkCalendar.button:backdrop:hover,
.button.text-button:insensitive:backdrop,
.button.image-button:insensitive:backdrop {
border: 1px solid @insensitive_border;
background-color: @insensitive_button;
background-color: @insensitive_background;
background-image: none;
color: @insensitive_text;
}

View File

@ -65,8 +65,6 @@ GtkCheckButton:selected:focus {
color: @backdrop_selected_foreground;
}
/*****************
* Radio Buttons *
*****************/
@ -114,4 +112,37 @@ GtkCheckButton:selected:focus {
}
.menu .menuitem.radio:insensitive {
color: @insensitive_text;
}
/* Menuitem Checks & Radios */
.menuitem.check,
.menuitem.radio {
background: none;
background-image: none;
background: none;
box-shadow: none;
}
.menuitem.check,
.menuitem.check:active,
.menuitem.check:active:hover,
.menuitem.check:active:insensitive,
.menuitem.check:hover,
.menuitem.check:inconsistent,
.menuitem.check:inconsistent:hover,
.menuitem.check:inconsistent:insensitive,
.menuitem.check:insensitive,
.menuitem.radio,
.menuitem.radio:active,
.menuitem.radio:active:hover,
.menuitem.radio:active:insensitive,
.menuitem.radio:hover,
.menuitem.radio:inconsistent,
.menuitem.radio:inconsistent:hover ,
.menuitem.radio:inconsistent:insensitive,
.menuitem.radio:insensitive {
background: none;
box-shadow: none;
}

View File

@ -76,7 +76,7 @@
.header-bar .text-button,
.header-bar .image-button {
background-color: transparent;
background: none;
background-image: none;
box-shadow: none;
padding: 13px;
transition: all 300ms cubic-bezier(0.3, 0.5, 0.5, 0.9);
@ -91,6 +91,7 @@
.header-bar .suggested-action .button,
.header-bar .image-button {
background-color: transparent;
background-image: none;
border-radius: 0px;
border: none;
box-shadow: none;
@ -108,6 +109,7 @@
.header-bar .image-button:active {
border-radius: 0px;
background-color: alpha(#000, 0.1);
background-image: none;
border: none;
outline: none;
color: @header_text;
@ -127,6 +129,7 @@
.header-bar .suggested-action .button:checked,
.header-bar .image-button:checked {
border-radius: 0px;
background-image: none;
border: none;
outline: none;
color: @header_text;
@ -147,6 +150,7 @@
.header-bar .image-button:focus {
border-radius: 0px;
background-color: transparent;
background-image: none;
border: none;
outline: none;
color: @header_text;
@ -163,6 +167,7 @@
.header-bar .image-button:hover {
border-radius: 0px;
background-color: alpha(#000, 0.1);
background-image: none;
border: none;
outline: none;
box-shadow: inset 0 -2px 0 0 @header_text;
@ -180,6 +185,7 @@
padding: 13px;
border-radius: 0px;
background-color: transparent;
background-image: none;
border: none;
box-shadow: none;
outline: none;
@ -196,6 +202,7 @@
.header-bar .image-button:active:backdrop {
border-radius: 0px;
background-color: transparent;
background-image: none;
border: none;
outline: none;
color: @backdrop_header_text;
@ -215,6 +222,7 @@
.header-bar .suggested-action .button:backdrop:hover,
.header-bar .image-button:backdrop:hover {
background-color: transparent;
background-image: none;
border-radius: 0px;
border: none;
outline: none;
@ -231,6 +239,7 @@
.header-bar .suggested-action .button:insensitive,
.header-bar .image-button:insensitive {
background-color: transparent;
background-image: none;
border-radius: 0px;
border: none;
box-shadow: none;
@ -248,6 +257,7 @@
.header-bar .image-button:insensitive:backdrop {
border-radius: 0px;
background-color: transparent;
background-image: none;
border: none;
outline: none;
color: @insensitive_header_text;

View File

@ -60,58 +60,92 @@ GtkMenuButton.button:active,
GtkMenuButton.button.raised:active {
color: @foreground;
}
/* Images */
.menu-button .menu .menuitem GtkImage {
.menu-button .menuitem GtkImage,
.menu-button .menu .menuitem GtkImage,
.menu-button .menu .menuitem .menu .menuitem GtkImage {
color: @text;
}
.menu-button .menu .menuitem:active GtkImage,
.menu-button .menu .menuitem .menu .menuitem:active GtkImage,
.menu-button .menu .menuitem:hover GtkImage,
.menu-button .menu .menuitem .menu .menuitem:hover GtkImage,
.menu-button .menu .menuitem:focus GtkImage,
.menu-button .menu .menuitem:hover GtkImage {
.menu-button .menu .menuitem .menu .menuitem:focus GtkImage,
.menu-button .menuitem:active GtkImage,
.menu-button .menuitem:focus GtkImage,
.menu-button .menuitem:hover GtkImage {
color: @selected_foreground;
}
.menu-button .menu .menuitem:backdrop GtkImage,
.menu-button .menu .menuitem .menu .menuitem:backdrop GtkImage,
.menu-button .menu .menuitem:active:backdrop GtkImage,
.menu-button .menu .menuitem .menu .menuitem:active:backdrop GtkImage,
.menu-button .menu .menuitem:backdrop:hover GtkImage,
.menu-button .menu .menuitem:active:backdrop GtkImage {
.menu-button .menu .menuitem .menu .menuitem:backdrop:hover GtkImage,
.menu-button .menuitem:backdrop GtkImage,
.menu-button .menuitem:backdrop:hover GtkImage,
.menu-button .menuitem:active:backdrop GtkImage {
color: @backdrop_text;
-gtk-image-effect: dim;
}
.menu-button .menu .menuitem:insensitive GtkImage {
.menu-button .menu .menuitem:insensitive GtkImage,
.menu-button .menu .menuitem .menu .menuitem:insensitive GtkImage,
.menu-button .menuitem:insensitive GtkImage {
color: @insensitive_text;
-gtk-image-effect: dim;
}
.menu-button .menu .menuitem:insensitive:backdrop GtkImage {
.menu-button .menu .menuitem:insensitive:backdrop GtkImage,
.menu-button .menu .menuitem .menu .menuitem:insensitive:backdrop GtkImage,
.menu-button .menuitem:insensitive:backdrop GtkImage {
color: mix(@backdrop_text, @insensitive_text, 0.5);
-gtk-image-effect: dim;
}
/* Labels */
.menu-button .menuitem GtkLabel,
.menu-button .menu .menuitem GtkLabel,
.menu-button .menu .menuitem * GtkLabel {
.menu-button .menu .menuitem .menu .menuitem GtkLabel,
.menu-button .menu .menuitem .menu .menuitem .menuitem GtkLabel {
color: @text;
}
.menu-button .menu .menuitem:active GtkLabel,
.menu .menu-button .menuitem:active GtkLabel,
.menu-button .menu .menuitem .menu .menuitem:active GtkLabel,
.menu-button .menu .menuitem:hover GtkLabel,
.menu-button .menu .menuitem .menu .menuitem:hover GtkLabel,
.menu-button .menu .menuitem:focus GtkLabel,
.menu-button .menu .menuitem:hover GtkLabel {
.menu-button .menu .menuitem .menu .menuitem:focus GtkLabel,
.menu-button .menuitem:active GtkLabel,
.menu-button .menuitem:focus GtkLabel,
.menu-button .menuitem:hover GtkLabel {
color: @selected_foreground;
}
.menu-button .menu .menuitem:backdrop GtkLabel,
.menu-button .menu .menuitem .menu .menuitem:backdrop GtkLabel,
.menu-button .menu .menuitem:active:backdrop GtkLabel,
.menu-button .menu .menuitem .menu .menuitem:active:backdrop GtkLabel,
.menu-button .menu .menuitem:backdrop:hover GtkLabel,
.menu-button .menu .menuitem:active:backdrop GtkLabel {
.menu-button .menu .menuitem .menu .menuitem:backdrop:hover GtkLabel,
.menu-button .menuitem:backdrop GtkLabel,
.menu-button .menuitem:backdrop:hover GtkLabel,
.menu-button .menuitem:active:backdrop GtkLabel {
color: @backdrop_text;
}
.menu-button .menu .menuitem:insensitive GtkLabel {
.menu-button .menu .menuitem:insensitive GtkLabel,
.menu-button .menu .menuitem .menu .menuitem:insensitive GtkLabel,
.menu-button .menuitem:insensitive GtkLabel {
color: @insensitive_text;
}
.menu-button .menu .menuitem:insensitive:backdrop GtkLabel {
.menu-button .menu .menuitem:insensitive:backdrop GtkLabel,
.menu-button .menu .menuitem .menu .menuitem:insensitive:backdrop GtkLabel,
.menu-button .menuitem:insensitive:backdrop GtkLabel {
color: mix(@backdrop_text, @insensitive_text, 0.5);
}

View File

@ -151,17 +151,40 @@
padding-right: 2px;
}
/* Images * Labels */
.menuitem GtkImage {
/* Something is utterly broken where I've had to do this ugly bit of styling. */
/* Images */
.menuitem GtkImage,
.menu .menuitem GtkImage,
.menu .menuitem .menu .menuitem GtkImage,
.menu .menuitem .menu .menuitem .menu .menuitem GtkImage {
color: @text;
}
.menu .menuitem:active GtkImage,
.menu .menuitem .menu .menuitem:active GtkImage,
.menu .menuitem .menu .menuitem .menu .menuitem:active GtkImage,
.menu .menuitem:hover GtkImage,
.menu .menuitem .menu .menuitem:hover GtkImage,
.menu .menuitem .menu .menuitem .menu .menuitem:hover GtkImage,
.menu .menuitem:focus GtkImage,
.menu .menuitem .menu .menuitem:focus GtkImage,
.menu .menuitem .menu .menuitem .menu .menuitem:focus GtkImage,
.menuitem:active GtkImage,
.menuitem:focus GtkImage,
.menuitem:hover GtkImage {
color: @selected_foreground;
}
.menu .menuitem:backdrop GtkImage,
.menu .menuitem .menu .menuitem:backdrop GtkImage,
.menu .menuitem .menu .menuitem .menu .menuitem:backdrop GtkImage,
.menu .menuitem:active:backdrop GtkImage,
.menu .menuitem .menu .menuitem:active:backdrop GtkImage,
.menu .menuitem .menu .menuitem .menu .menuitem:active:backdrop GtkImage,
.menu .menuitem:backdrop:hover GtkImage,
.menu .menuitem .menu .menuitem:backdrop:hover GtkImage,
.menu .menuitem .menu .menuitem .menu .menuitem:backdrop:hover GtkImage,
.menuitem:backdrop GtkImage,
.menuitem:backdrop:hover GtkImage,
.menuitem:active:backdrop GtkImage {
@ -169,70 +192,70 @@
-gtk-image-effect: dim;
}
.menu .menuitem:insensitive GtkImage,
.menu .menuitem .menu .menuitem:insensitive GtkImage,
.menu .menuitem .menu .menuitem .menu .menuitem:insensitive GtkImage,
.menuitem:insensitive GtkImage {
color: @insensitive_text;
-gtk-image-effect: dim;
}
.menu .menuitem:insensitive:backdrop GtkImage,
.menu .menuitem .menu .menuitem:insensitive:backdrop GtkImage,
.menu .menuitem .menu .menuitem .menu .menuitem:insensitive:backdrop GtkImage,
.menuitem:insensitive:backdrop GtkImage {
color: mix(@backdrop_text, @insensitive_text, 0.5);
-gtk-image-effect: dim;
}
/* Labels */
.menuitem GtkLabel {
.menuitem GtkLabel,
.menu .menuitem GtkLabel,
.menu .menuitem .menu .menuitem GtkLabel,
.menu .menuitem .menu .menuitem .menu .menuitem GtkLabel {
color: @text;
}
.menu .menuitem:active GtkLabel,
.menu .menuitem .menu .menuitem:active GtkLabel,
.menu .menuitem .menu .menuitem .menu .menuitem:active GtkLabel,
.menu .menuitem:hover GtkLabel,
.menu .menuitem .menu .menuitem:hover GtkLabel,
.menu .menuitem .menu .menuitem .menu .menuitem:hover GtkLabel,
.menu .menuitem:focus GtkLabel,
.menu .menuitem .menu .menuitem:focus GtkLabel,
.menu .menuitem .menu .menuitem .menu .menuitem:focus GtkLabel,
.menuitem:active GtkLabel,
.menuitem:focus GtkLabel,
.menuitem:hover GtkLabel {
color: @selected_foreground;
}
.menu .menuitem:backdrop GtkLabel,
.menu .menuitem .menu .menuitem:backdrop GtkLabel,
.menu .menuitem .menu .menuitem .menu .menuitem:backdrop GtkLabel,
.menu .menuitem:active:backdrop GtkLabel,
.menu .menuitem .menu .menuitem:active:backdrop GtkLabel,
.menu .menuitem .menu .menuitem .menu .menuitem:active:backdrop GtkLabel,
.menu .menuitem:backdrop:hover GtkLabel,
.menu .menuitem .menu .menuitem:backdrop:hover GtkLabel,
.menu .menuitem .menu .menuitem .menu .menuitem:backdrop:hover GtkLabel,
.menuitem:backdrop GtkLabel,
.menuitem:backdrop:hover GtkLabel,
.menuitem:active:backdrop GtkLabel {
color: @backdrop_text;
}
.menu .menuitem:insensitive GtkLabel,
.menu .menuitem .menu .menuitem:insensitive GtkLabel,
.menu .menuitem .menu .menuitem .menu .menuitem:insensitive GtkLabel,
.menuitem:insensitive GtkLabel {
color: @insensitive_text;
}
.menu .menuitem:insensitive:backdrop GtkLabel,
.menu .menuitem .menu .menuitem:insensitive:backdrop GtkLabel,
.menu .menuitem .menu .menuitem .menu .menuitem:insensitive:backdrop GtkLabel,
.menuitem:insensitive:backdrop GtkLabel {
color: mix(@backdrop_text, @insensitive_text, 0.5);
}
/* Checks & Radios */
.menuitem.check,
.menuitem.radio {
background: none;
background-image: none;
background: none;
box-shadow: none;
}
.menuitem.check,
.menuitem.check:active,
.menuitem.check:active:hover,
.menuitem.check:active:insensitive,
.menuitem.check:hover,
.menuitem.check:inconsistent,
.menuitem.check:inconsistent:hover,
.menuitem.check:inconsistent:insensitive,
.menuitem.check:insensitive,
.menuitem.radio,
.menuitem.radio:active,
.menuitem.radio:active:hover,
.menuitem.radio:active:insensitive,
.menuitem.radio:hover,
.menuitem.radio:inconsistent,
.menuitem.radio:inconsistent:hover ,
.menuitem.radio:inconsistent:insensitive,
.menuitem.radio:insensitive {
background: none;
box-shadow: none;
}

View File

@ -21,7 +21,8 @@
* Separators *
**************/
.separator {
.separator,
.button .separator {
color: @separator;
}

View File

@ -71,7 +71,7 @@
.titlebar .text-button,
.titlebar .image-button {
background-color: transparent;
background: none;
background-image: none;
padding: 13px;
transition: all 300ms cubic-bezier(0.3, 0.5, 0.5, 0.9);
}
@ -85,6 +85,7 @@
.titlebar .suggested-action .button,
.titlebar .image-button {
background-color: transparent;
background-image: none;
border-radius: 0px;
border: none;
outline: none;
@ -102,6 +103,7 @@
.titlebar .image-button:active {
border-radius: 0px;
background-color: alpha(#000, 0.2);
background-image: none;
border: none;
outline: none;
color: @header_text;
@ -121,6 +123,7 @@
.titlebar .suggested-action .button:checked,
.titlebar .image-button:checked {
border-radius: 0px;
background-image: none;
border: none;
outline: none;
color: @header_text;
@ -157,6 +160,7 @@
.titlebar .image-button:hover {
border-radius: 0px;
background-color: alpha(#000, 0.1);
background-image: none;
border: none;
outline: none;
box-shadow: inset 0 -2px 0 0 @header_text;
@ -174,6 +178,7 @@
padding: 13px;
border-radius: 0px;
background-color: transparent;
background-image: none;
border: none;
outline: none;
color: @backdrop_header_text;
@ -189,6 +194,7 @@
.titlebar .image-button:active:backdrop {
border-radius: 0px;
background-color: transparent;
background-image: none;
border: none;
outline: none;
color: @backdrop_header_text;
@ -208,6 +214,7 @@
.titlebar .suggested-action .button:backdrop:hover,
.titlebar .image-button:backdrop:hover {
background-color: transparent;
background-image: none;
border-radius: 0px;
border: none;
outline: none;
@ -224,6 +231,7 @@
.titlebar .suggested-action .button:insensitive,
.titlebar .image-button:insensitive {
background-color: transparent;
background-image: none;
border-radius: 0px;
border: none;
outline: none;
@ -240,6 +248,7 @@
.titlebar .image-button:insensitive:backdrop {
border-radius: 0px;
background-color: transparent;
background-image: none;
border: none;
outline: none;
color: @insensitive_header_text;