minor fixes

This commit is contained in:
Sam Hewitt 2015-04-27 22:25:50 -04:00
parent 6363c103a7
commit 17842bb8c4
8 changed files with 54 additions and 10 deletions

View File

@ -16,7 +16,7 @@
* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/. * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
*/ */
@define-color midori #5CCA10; @define-color midori #16b435;
/********** /**********
* Header * * Header *

View File

@ -24,7 +24,7 @@
@define-color backdrop_unity #5A6367; /* Backdrop Unity window border color */ @define-color backdrop_unity #5A6367; /* Backdrop Unity window border color */
@define-color unity_text #dbdee0; /* Unity window text color */ @define-color unity_text #dbdee0; /* Unity window text color */
@define-color backdrop_unity_text #909598; /* Backdrop Unity window text color */ @define-color backdrop_unity_text #909598; /* Backdrop Unity window text color */
@define-color unity_panel @unity; /* Unity panel color #454D50 */ @define-color unity_panel shade(@unity, 0.8); /* Unity panel color #454D50 */
@define-color backdrop_unity_panel shade(@unity_panel, 1.05); /* Backdrop Unity panel color */ @define-color backdrop_unity_panel shade(@unity_panel, 1.05); /* Backdrop Unity panel color */
@define-color unity_panel_text #dbdee0; /* Unity panel text color */ @define-color unity_panel_text #dbdee0; /* Unity panel text color */
@define-color backdrop_unity_panel_text shade(@unity_panel_text, 0.95); /* Backdrop Unity panel text color */ @define-color backdrop_unity_panel_text shade(@unity_panel_text, 0.95); /* Backdrop Unity panel text color */

View File

@ -22,7 +22,7 @@
/* Insensitive colors */ /* Insensitive colors */
@define-color insensitive_base shade(@base, 0.95); @define-color insensitive_base shade(@base, 0.95);
@define-color insensitive_background alpha(@background, 0.0); @define-color insensitive_background shade(@background, 1.01);
@define-color insensitive_foreground alpha(@foreground, 0.5); @define-color insensitive_foreground alpha(@foreground, 0.5);
@define-color insensitive_border shade(@border, 1.1); @define-color insensitive_border shade(@border, 1.1);
@define-color insensitive_button @insensitive_background; @define-color insensitive_button @insensitive_background;
@ -46,7 +46,7 @@
@define-color backdrop_insensitive_text mix(@backdrop_text, @insensitive_text, 0.5); @define-color backdrop_insensitive_text mix(@backdrop_text, @insensitive_text, 0.5);
/* Backdrop-selected colors */ /* Backdrop-selected colors */
@define-color backdrop_selected_background shade(@backdrop_background, 0.9); @define-color backdrop_selected_background shade(@selection, 0.9);
@define-color backdrop_selection @backdrop_selected_background; @define-color backdrop_selection @backdrop_selected_background;
@define-color backdrop_selected_foreground shade(@selection_foreground, 0.9); @define-color backdrop_selected_foreground shade(@selection_foreground, 0.9);

View File

@ -21,21 +21,19 @@
* Base States * * Base States *
***************/ ***************/
.background { .background {
color: @foreground;
background-image: none;
background-color: @background; background-color: @background;
color: @foreground;
} }
.background-color:backdrop { .background-color:backdrop,
.background-color:active:backdrop {
/* I want everything nice and flat in the backdrop window */ /* I want everything nice and flat in the backdrop window */
background-image: none;
background-color: @backdrop_background; background-color: @backdrop_background;
color: @backdrop_text; color: @backdrop_text;
} }
.background-color:insensitive { .background-color:insensitive {
/* I want everything nice and flat in the backdrop window */ /* I want everything nice and flat in the backdrop window */
background-image: none;
background-color: @insensitive_background; background-color: @insensitive_background;
color: @insensitive_text; color: @insensitive_text;
} }

View File

@ -2,7 +2,7 @@
* expander * * expander *
************/ ************/
.expander { .expander {
border: alpha(@foreground, 0.7); border: @border;
color: alpha(@foreground, 0.7); color: alpha(@foreground, 0.7);
} }

View File

@ -136,6 +136,7 @@
.menuitem .accelerator, .menuitem .accelerator,
.menuitem .accelerator:insensitive { .menuitem .accelerator:insensitive {
background: none; background: none;
color: @insensitive_text;
} }
.menuitem .accelerator:hover, .menuitem .accelerator:hover,
@ -151,6 +152,11 @@
color: @text; color: @text;
} }
/* Menu Text */
.menuitem GtkLabel:insensitive {
color: @insensitive_text;
}
.menu .menuitem GtkLabel, .menu .menuitem GtkLabel,
.popup .menuitem GtkLabel { .popup .menuitem GtkLabel {
padding-left: 6px; padding-left: 6px;

View File

@ -56,6 +56,7 @@
} }
.message-dialog .dialog-action-area .button { .message-dialog .dialog-action-area .button {
border: none;
border-radius: 0; border-radius: 0;
padding: 0; padding: 0;
font: bold; font: bold;
@ -71,64 +72,80 @@
} }
.message-dialog.csd .dialog-action-area .button:hover { .message-dialog.csd .dialog-action-area .button:hover {
border: none;
background-image: none;
background-color: @selection; background-color: @selection;
color: @selection_foreground; color: @selection_foreground;
} }
.message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area .button:active,
.message-dialog.csd .dialog-action-area .button:active:hover { .message-dialog.csd .dialog-action-area .button:active:hover {
border: none;
border-radius: 2px; border-radius: 2px;
background-image: none;
background-color: alpha(#000, 0.2); background-color: alpha(#000, 0.2);
color: @text; color: @text;
} }
.message-dialog.csd .dialog-action-area .button:insensitive { .message-dialog.csd .dialog-action-area .button:insensitive {
border: none;
background-image: none;
background-color: @insensitive_background; background-color: @insensitive_background;
color: @insensitive_text; color: @insensitive_text;
} }
.message-dialog.csd .dialog-action-area .button:backdrop { .message-dialog.csd .dialog-action-area .button:backdrop {
border: none;
background-image: none;
background-color: @backdrop_background; background-color: @backdrop_background;
color: @backdrop_text; color: @backdrop_text;
} }
.message-dialog.csd .dialog-action-area .button:backdrop:insensitive { .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
border: none;
background-image: none;
background-color: mix(@insensitive_background, @backdrop_background, 0.5); background-color: mix(@insensitive_background, @backdrop_background, 0.5);
color: mix(@insensitive_text, @backdrop_text, 0.5); color: mix(@insensitive_text, @backdrop_text, 0.5);
} }
/* Suggested Action Button */ /* Suggested Action Button */
.message-dialog.csd .dialog-action-area .button.suggested-action { .message-dialog.csd .dialog-action-area .button.suggested-action {
background-image: none;
border: 0px solid @suggested_action_button; border: 0px solid @suggested_action_button;
background-color: @suggested_action_button; background-color: @suggested_action_button;
color: @suggested_action_button_foreground; color: @suggested_action_button_foreground;
} }
.message-dialog.csd .dialog-action-area .button.suggested-action:hover { .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
background-image: none;
border: 0px solid shade(@suggested_action_button, 1.2); border: 0px solid shade(@suggested_action_button, 1.2);
background-color: shade(@suggested_action_button, 1.2); background-color: shade(@suggested_action_button, 1.2);
color: @suggested_action_button_foreground; color: @suggested_action_button_foreground;
} }
.message-dialog.csd .dialog-action-area .button.suggested-action:active { .message-dialog.csd .dialog-action-area .button.suggested-action:active {
background-image: none;
border: 0px solid shade(@suggested_action_button, 1.1); border: 0px solid shade(@suggested_action_button, 1.1);
background-color: shade(@suggested_action_button, 1.1); background-color: shade(@suggested_action_button, 1.1);
color: @suggested_action_button_foreground; color: @suggested_action_button_foreground;
} }
.message-dialog.csd .dialog-action-area .button.suggested-action:backdrop { .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
background-image: none;
border: 0px solid @backdrop_border; border: 0px solid @backdrop_border;
background-color: @backdrop_background; background-color: @backdrop_background;
color: @backdrop_text; color: @backdrop_text;
} }
.message-dialog.csd .dialog-action-area .button.suggested-action:insensitive { .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
background-image: none;
border: 0px solid @insensitive_border; border: 0px solid @insensitive_border;
background-color: @insensitive_background; background-color: @insensitive_background;
color: @insensitive_text; color: @insensitive_text;
} }
.message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive { .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
background-image: none;
border: 0px solid mix(@insensitive_border, @backdrop_border, 0.5); border: 0px solid mix(@insensitive_border, @backdrop_border, 0.5);
background-color: mix(@insensitive_background, @backdrop_background, 0.5); background-color: mix(@insensitive_background, @backdrop_background, 0.5);
color: mix(@insensitive_text, @backdrop_text, 0.5); color: mix(@insensitive_text, @backdrop_text, 0.5);
@ -137,36 +154,42 @@
/* Destructive Action Button */ /* Destructive Action Button */
.message-dialog.csd .dialog-action-area .button.destructive-action { .message-dialog.csd .dialog-action-area .button.destructive-action {
background-image: none;
border: 0px solid @destructive_action_button_border; border: 0px solid @destructive_action_button_border;
background-color: @destructive_action_button; background-color: @destructive_action_button;
color: @destructive_action_button_foreground; color: @destructive_action_button_foreground;
} }
.message-dialog.csd .dialog-action-area .button.destructive-action:hover { .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
background-image: none;
border: 0px solid shade(@destructive_action_button_border, 1.1); border: 0px solid shade(@destructive_action_button_border, 1.1);
background-color: shade(@destructive_action_button, 1.1); background-color: shade(@destructive_action_button, 1.1);
color: @destructive_action_button_foreground; color: @destructive_action_button_foreground;
} }
.message-dialog.csd .dialog-action-area .button.destructive-action:active { .message-dialog.csd .dialog-action-area .button.destructive-action:active {
background-image: none;
border: 0px solid @destructive_action_button_border; border: 0px solid @destructive_action_button_border;
background-color: @destructive_action_button; background-color: @destructive_action_button;
color: @destructive_action_button_foreground; color: @destructive_action_button_foreground;
} }
.message-dialog.csd .dialog-action-area .button.destructive-action:backdrop { .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
background-image: none;
border: 0px solid @backdrop_border; border: 0px solid @backdrop_border;
background-color: @backdrop_background; background-color: @backdrop_background;
color: @backdrop_text; color: @backdrop_text;
} }
.message-dialog.csd .dialog-action-area .button.destructive-action:insensitive { .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
background-image: none;
border: 0px solid @insensitive_border; border: 0px solid @insensitive_border;
background-color: @insensitive_background; background-color: @insensitive_background;
color: @insensitive_text; color: @insensitive_text;
} }
.message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive { .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
background-image: none;
border: 0px solid mix(@insensitive_border, @backdrop_border, 0.5); border: 0px solid mix(@insensitive_border, @backdrop_border, 0.5);
background-color: mix(@insensitive_background, @backdrop_background, 0.5); background-color: mix(@insensitive_background, @backdrop_background, 0.5);
color: mix(@insensitive_text, @backdrop_text, 0.5); color: mix(@insensitive_text, @backdrop_text, 0.5);
@ -190,6 +213,7 @@
.message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop,
.message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive,
.message-dialog.csd .dialog-action-area .button.destructive-action:insensitive { .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
background-image: none;
border-left-style: solid; border-left-style: solid;
border-right-style: none; border-right-style: none;
border-bottom-style: none; border-bottom-style: none;

View File

@ -44,6 +44,22 @@
} }
/********
* Misc *
********/
GtkAlignment,
GtkEventBox {
background-color: @background;
color: @text;
}
GtkAlignment:backdrop,
GtkEventBox:backdrop {
background-color: @backdrop_background;
color: @backdrop_text;
}
/******** /********
* View * * View *
********/ ********/