[gnome-themes-standard] all: trivial cleanups

From: Cosimo Cecchi <cosimoc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-themes-standard] all: trivial cleanups
Date: Mon, 30 Apr 2012 17:46:39 +0000 (UTC)
commit 6f9f61f84e4ef94afa987271aa650ba2216fd4ad
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Apr 30 13:09:00 2012 -0400

    all: trivial cleanups
    
    Move some bits around, remove commented selectors and move common colors
    to gtk-main-common.css

 themes/Adwaita/gtk-3.0/gnome-applications.css |    8 ----
 themes/Adwaita/gtk-3.0/gtk-main-common.css    |   35 ++++++++++++++++++
 themes/Adwaita/gtk-3.0/gtk-main-dark.css      |   39 ++------------------
 themes/Adwaita/gtk-3.0/gtk-main.css           |   47 ++-----------------------
 themes/Adwaita/gtk-3.0/gtk-widgets.css        |   32 +++--------------
 5 files changed, 47 insertions(+), 114 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gnome-applications.css b/themes/Adwaita/gtk-3.0/gnome-applications.css
index 713e06d..f86f5f5 100644
--- a/themes/Adwaita/gtk-3.0/gnome-applications.css
+++ b/themes/Adwaita/gtk-3.0/gnome-applications.css
@@ -14,14 +14,6 @@
 /****************
  * Applications *
  ****************/
-ApDocView, /* Abiword */
-EogScrollView, /* Eog */
-CheeseThumbView /* Cheese */
-{
-    background-color: @chrome_bg_color;
-    -EogScrollView-shadow-type: none;
-}
-
 /* gnome-terminal */
 TerminalScreen {
     background-color: @theme_base_color;
diff --git a/themes/Adwaita/gtk-3.0/gtk-main-common.css b/themes/Adwaita/gtk-3.0/gtk-main-common.css
index 3bbe2ea..b86431e 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-common.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-common.css
@@ -37,3 +37,38 @@
 @define-color osd_button_shadow alpha(black, 0.35);
 
 @define-color osd_trough_bg alpha(@osd_button_fg, 0.10);
+
+/*********************
+ * Error/Warning/... *
+ *********************/
+ define-color link_color #4a90d9;
+ define-color warning_color #f57900;
+ define-color error_color #cc0000;
+ define-color success_color #4e9a06;
+
+ define-color info_fg_color black;
+ define-color info_text_shadow alpha(black, 0.1);
+ define-color info_bg_color rgb (252, 252, 189);
+ define-color warning_fg_color black;
+ define-color warning_text_shadow alpha(black, 0.1);
+ define-color warning_bg_color rgb (250, 173, 61);
+ define-color question_fg_color white;
+ define-color question_text_shadow alpha(black, 0.5);
+ define-color question_bg_color rgb (138, 173, 212);
+ define-color error_fg_color white;
+ define-color error_text_shadow alpha(black, 0.5);
+ define-color error_bg_color rgb (237, 54, 54);
+
+/*****************
+ * Fallback Mode *
+ *****************/
+ define-color os_chrome_bg_color black;
+ define-color os_chrome_fg_color #ccc;
+ define-color os_chrome_selected_bg_color #333;
+ define-color os_chrome_selected_fg_color white;
+
+/************
+ * Tooltips *
+ ************/
+ define-color theme_tooltip_bg_color #212526;
+ define-color theme_tooltip_fg_color #ffffff;
diff --git a/themes/Adwaita/gtk-3.0/gtk-main-dark.css b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
index 16159d3..7bf7576 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
@@ -30,9 +30,6 @@
 @define-color menu_combobox_border darker (@theme_selected_bg_color);
 @define-color menu_separator mix (@menu_fg_color, @menu_bg_color, 0.95);
 
- define-color theme_tooltip_bg_color #000000;
- define-color theme_tooltip_fg_color #eeeeee;
-
 @define-color button_gradient_color_a shade (@theme_bg_color, 1.15);
 @define-color button_gradient_color_b @theme_bg_color;
 @define-color button_gradient_color_c shade (@theme_bg_color, 0.8);
@@ -139,40 +136,13 @@
 @define-color treeview_focus_border shade (@theme_selected_bg_color, 1.20);
 
 @define-color scale_fill shade (@insensitive_borders, 0.90);
+ define-color scale_progress_fill #2c85e2;
 @define-color scale_border_a shade (@internal_element_color, 0.90);
 @define-color scale_border_b shade (@internal_element_color, 0.65);
 
-/* FIXME: needs dark colors from here */
- define-color link_color #4a90d9;
- define-color warning_color #f57900;
- define-color error_color #cc0000;
- define-color success_color #4e9a06;
-
- define-color info_fg_color black;
- define-color info_text_shadow alpha(black, 0.1);
- define-color info_bg_color rgb (252, 252, 189);
- define-color warning_fg_color black;
- define-color warning_text_shadow alpha(black, 0.1);
- define-color warning_bg_color rgb (250, 173, 61);
- define-color question_fg_color white;
- define-color question_text_shadow alpha(black, 0.5);
- define-color question_bg_color rgb (138, 173, 212);
- define-color error_fg_color white;
- define-color error_text_shadow alpha(black, 0.5);
- define-color error_bg_color rgb (237, 54, 54);
-
- define-color os_chrome_bg_color black;
- define-color os_chrome_fg_color #ccc;
- define-color os_chrome_selected_bg_color #333;
- define-color os_chrome_selected_fg_color white;
-
- define-color chrome_bg_color #1e1a17;
- define-color chrome_fg_color #fff;
-
- define-color scale_progress_fill #2c85e2;
- define-color scale_progress_border #1864b2;
- define-color scale_progress_border_b #3e90e5;
-
+/******
+ * WM *
+ ******/
 @define-color wm_title @theme_fg_color;
 @define-color wm_unfocused_title @theme_unfocused_fg_color;
 @define-color wm_highlight shade(@theme_bg_color, 1.4);
@@ -201,6 +171,5 @@
 @import url("gtk-widgets-borders-dark.css");
 @import url("gtk-widgets-assets-dark.css");
 @import url("gtk-widgets.css");
-/* @import url("gtk-scrollbar-experiments.css"); */
 @import url("gtk-widgets-dark-overrides.css");
 @import url("gnome-applications.css");
diff --git a/themes/Adwaita/gtk-3.0/gtk-main.css b/themes/Adwaita/gtk-3.0/gtk-main.css
index fb43ef2..d0706cf 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main.css
@@ -1,13 +1,10 @@
 /* Default color scheme */
 @define-color base_color #ffffff;
 @define-color bg_color #ededed;
- define-color tooltip_bg_color #212526;
 @define-color selected_bg_color #4a90d9;
 @define-color text_color #2e3436;
 @define-color fg_color #2e3436;
- define-color tooltip_fg_color #ffffff;
 @define-color selected_fg_color #ffffff;
-/* define-color unfocused_bg_color #f8f8f8;*/
 @define-color unfocused_bg_color @bg_color;
 
 /* Colormap actually used by the theme, to be overridden in other css files */
@@ -15,8 +12,6 @@
 @define-color theme_text_color @text_color;
 @define-color theme_bg_color @bg_color;
 @define-color theme_fg_color @fg_color;
- define-color theme_tooltip_bg_color @tooltip_bg_color;
- define-color theme_tooltip_fg_color @tooltip_fg_color;
 @define-color theme_selected_bg_color @selected_bg_color;
 @define-color theme_selected_fg_color @selected_fg_color;
 
@@ -43,41 +38,15 @@
 @define-color menu_combobox_border #3277bf;
 @define-color menu_separator mix (@menu_fg_color, @menu_bg_color, 0.9);
 
- define-color link_color #4a90d9;
 @define-color frame_color #8a9580;
 @define-color inactive_frame_color #c7ccc1;
- define-color warning_color #f57900;
- define-color error_color #cc0000;
- define-color success_color #4e9a06;
-
- define-color info_fg_color black;
- define-color info_text_shadow alpha(black, 0.1);
- define-color info_bg_color rgb (252, 252, 189);
- define-color warning_fg_color black;
- define-color warning_text_shadow alpha(black, 0.1);
- define-color warning_bg_color rgb (250, 173, 61);
- define-color question_fg_color white;
- define-color question_text_shadow alpha(black, 0.5);
- define-color question_bg_color rgb (138, 173, 212);
- define-color error_fg_color white;
- define-color error_text_shadow alpha(black, 0.5);
- define-color error_bg_color rgb (237, 54, 54);
 
 @define-color keyboard_focus_border_a #a2c9f1;
 @define-color keyboard_focus_border_b #6794cf;
 
-/* @define-color sidebar_bg_color shade (@theme_bg_color, 1.02); */
 @define-color sidebar_bg shade (@theme_bg_color, 1.025);
 @define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
 
- define-color os_chrome_bg_color black;
- define-color os_chrome_fg_color #ccc;
- define-color os_chrome_selected_bg_color #333;
- define-color os_chrome_selected_fg_color white;
-
- define-color chrome_bg_color #1e1a17;
- define-color chrome_fg_color #fff;
-
 @define-color focused_entry_border #579eea;
 @define-color focused_entry_inset alpha (#d7e4f1, 0.50);
 
@@ -145,15 +114,12 @@
 
 @define-color internal_element_color #888a85;
 @define-color internal_element_prelight @theme_text_color;
-/* define-color internal_element_insensitive shade (@internal_element_color, 1.7);*/
 @define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.7);
 
 @define-color scale_fill @insensitive_borders;
 @define-color scale_border_a @internal_element_color;
 @define-color scale_border_b shade (@internal_element_color, 1.25);
 @define-color scale_progress_fill #2c85e2;
- define-color scale_progress_border_a #1864b2;
- define-color scale_progress_border_b #3e90e5;
 
 @define-color highlighted_border #8a8f8a;
 
@@ -164,16 +130,6 @@
 @define-color notebook_tab_gradient_b shade(@theme_bg_color, 0.85);
 @define-color notebook_tab_hilight shade(@theme_bg_color, 1.02);
 
-/* define-color toolbar_gradient_base #aaaa9e;
- define-color toolbar_gradient_step1 #bcbcb4;
- define-color toolbar_gradient_step2 #d9d9d7;
- define-color toolbar_gradient_final #e5e5e2;*/
-
-/* define-color toolbar_gradient_base shade(@toolbar_gradient_step2, 0.9);
- define-color toolbar_gradient_step1 shade(@toolbar_gradient_step2, 0.95);
- define-color toolbar_gradient_step2 #babdb6;
- define-color toolbar_gradient_final shade(@toolbar_gradient_step2, 1.15);*/
-
 @define-color toolbar_gradient_a shade(@borders, 1.15);
 @define-color toolbar_gradient_b shade(@borders, 1.25);
 @define-color toolbar_gradient_c shade(@borders, 1.3);
@@ -195,6 +151,9 @@
 @define-color inset_light_color alpha(white, 0.45);
 @define-color inset_dark_color alpha(black, 0.07);
 
+/******
+ * WM *
+ ******/
 @define-color wm_title @theme_fg_color;
 @define-color wm_unfocused_title @theme_unfocused_fg_color;
 @define-color wm_highlight #ffffff;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 0e3802c..aa45289 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -80,12 +80,6 @@ GtkWindow:backdrop {
     border-color: @insensitive_borders;
 }
 
-/*
-*:active {
-    background-color: shade (@theme_bg_color, 0.915);
-}
-*/
-
 *:backdrop {
     /* I want everything nice and flat in the unfocused window */
     text-shadow: none;
@@ -1479,18 +1473,6 @@ GtkComboBox .button *:hover {
     color: mix(@scrollbar_slider_unfocused, @scrollbar_trough_unfocused, 0.7);
 }
 
-/* FIXME: disable until we have have an extra px padded towards the border. It feels uncentered now.
-.scrollbar.trough.vertical,
-.scrollbar.trough.vertical:backdrop {
-       box-shadow: -1 0 inset alpha(@theme_text_color, 0.05), 1 0 inset alpha(@theme_text_color, 0.1);
-}
-
-.scrollbar.trough.horizontal,
-.scrollbar.trough.horizontal:backdrop {
-   box-shadow: 0 -1 inset alpha(@theme_text_color, 0.05), 0 1 inset alpha(@theme_text_color, 0.1);
-}
-*/
-
 .scrollbar.trough:insensitive {
     background-color: @scrollbar_trough_insensitive;
     border-style: solid;
@@ -1651,10 +1633,14 @@ GtkTreeMenu .menuitem * {
 }
 
 .menu .menuitem:active,
+.menu .menuitem:hover {
+    background-color: @theme_selected_bg_color;
+}
+
+.menu .menuitem:active,
 .menu .menuitem *:active,
 .menu .menuitem:hover,
 .menu .menuitem *:hover {
-    background-color: @theme_selected_bg_color;
     color: @theme_selected_fg_color;
 }
 
@@ -1783,7 +1769,6 @@ GtkCheckButton:selected:focus {
 .toolbar {
     border-style: none;
     border-color: darker (@theme_bg_color);
-/*    border-width: 1 0 1px 0; */
     padding: 4px;
 }
 
@@ -1799,10 +1784,6 @@ GtkCheckButton:selected:focus {
  * Menubar Toolbars *
  ********************/
 .toolbar.menubar {
-    /*background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from(@theme_bg_color),
-                                     to(shade(@theme_bg_color, 0.96)));*/
     border-style: none;
 
     -GtkToolbar-button-relief: normal;
@@ -2113,7 +2094,6 @@ GtkSwitch.slider {
     border-style: solid;
     border-color: mix (@borders, @theme_text_color, 0.4);
 
-    /*box-shadow: 0 -1 inset alpha(@theme_base_color, 0.50);*/
     box-shadow: inset 0 -1px alpha(white, 0.9), inset 0 1px @theme_base_color, inset 0 2px alpha(@borders, 0.15);
 
     padding: 2px 2px 3px 2px;
@@ -2241,8 +2221,6 @@ GtkTreeView:selected:focus {
 column-header.button,
 column-header .button {
     color: @internal_element_color;
-    /* I'd like to have shadows inside any white box, not possible yet */
-    /* box-shadow: 0 1 inset @entry_inset, 0 2 inset alpha(@entry_inset, 0.4); */
 }
 
 column-header.button,
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]