From 252dd7f6df46f70892c2f3038cef0cd976d9adf5 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 27 Oct 2013 14:50:35 +0100 Subject: ContrastHigh: Style .background, not GtkWindow We want to be able to simulate a regular window background by just setting the background style class. --- desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index fe0fd836..58648fe7 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css @@ -50,7 +50,7 @@ background-clip: padding-box; } -GtkWindow { +.background { color: @theme_fg_color; background-color: @theme_base_color; } -- cgit v1.2.1 From 7a8f1ecd95b05d31cc4b8e65f34d50b305834579 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 27 Oct 2013 15:00:08 +0100 Subject: ContrastHigh: improve style for insensitive colors Set a global insensitive color, so that applications that assume it's different from the regular text color don't get black when querying a color from the theme. --- .../ContrastHigh/gtk-3.0/gtk-widgets.css | 26 +++++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index 58648fe7..8b3db27e 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css @@ -63,6 +63,7 @@ GtkClutterOffscreen { *:insensitive { background-color: @theme_button_insensitive_bg; border-color: @theme_button_insensitive_active_bg; + color: @theme_insensitive_color; } *:selected { @@ -250,20 +251,22 @@ GtkLevelBar.vertical { .button:insensitive { background-color: @theme_button_insensitive_bg; - color: @theme_button_insensitive_fg; border-color: @theme_button_insensitive_border; } -GtkComboBox:insensitive { - color: @theme_button_insensitive_fg -} - .button:insensitive:active { background-color: @theme_button_insensitive_active_bg; - color: @theme_button_insensitive_active_fg; border-color: @theme_button_insensitive_active_border; } +.button *:insensitive { + color: @theme_button_insensitive_fg; +} + +.button *:insensitive:active { + color: @theme_button_insensitive_active_fg; +} + .button:hover { background-color: @theme_fg_color; border-color: @theme_fg_color; @@ -275,6 +278,17 @@ GtkComboBox:insensitive { border-color: @theme_fg_color; } +GtkComboBox .separator { + /* always disable separators */ + -GtkWidget-wide-separators: true; + -GtkWidget-horizontal-separator: 0; + -GtkWidget-vertical-separator: 0; +} + +GtkComboBox *:insensitive { + color: @theme_button_insensitive_fg +} + /*********** * Entries * ***********/ -- cgit v1.2.1 From 8d98e347671b051bd0579e17c4b24f06d90792c7 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 27 Oct 2013 15:02:00 +0100 Subject: HighContrastHigh: add style for linked vertical button boxes As seen in gnome-packagekit. --- desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index 8b3db27e..1306c136 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css @@ -675,6 +675,20 @@ GtkComboBox .button { border-width: 2px; } +.linked.vertical .button { + border-width: 0 2px 2px; + border-radius: 0; +} + +.linked.vertical .button:first-child { + border-radius: 3px 3px 0 0; + border-width: 2px; +} + +.linked.vertical .button:last-child { + border-radius: 0 0 3px 3px; +} + /********** * Scales * **********/ -- cgit v1.2.1 From 4407261bafef10973ef2ff3af0a598bbe0f8d7a6 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 27 Oct 2013 15:04:19 +0100 Subject: ContrastHigh: add theming for OSD progressbar As seen in Epiphany and gnome-online-accounts. --- desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index 1306c136..349a01d8 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css @@ -1055,6 +1055,23 @@ GtkIconView.view.cell { background-color: @theme_base_color; } +GtkProgressBar.osd { + -GtkProgressBar-min-horizontal-bar-height: 12px; +} + +GtkProgressBar.osd.trough { + padding: 0; + border-radius: 0; + background-color: transparent; + border-style: none; +} + +GtkProgressBar.osd.progressbar { + background-color: @theme_highlight_color; + border-radius: 0; + border-style: none; +} + /********************** * Fallback Mode Panel **********************/ -- cgit v1.2.1 From 1cef6068461204b139e00b483039a7b47257c2b1 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 27 Oct 2013 15:06:36 +0100 Subject: ContrastHigh: improve styling for floating-bar widgets Add a border and round it according to its position. --- .../ContrastHigh/gtk-3.0/gtk-widgets.css | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index 349a01d8..d1a9cabc 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css @@ -144,6 +144,38 @@ GtkImage:insensitive { .floating-bar { background-color: @theme_insensitive_bg; + border-width: 1px; + border-radius: 3px; + border-style: solid; +} + +.floating-bar.top { + border-top-width: 0; + border-top-right-radius: 0; + border-top-left-radius: 0; +} + +.floating-bar.right { + border-right-width: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +.floating-bar.bottom { + border-bottom-width: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} + +.floating-bar.left { + border-left-width: 0; + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + +.floating-bar .button { + background-color: transparent; + border-style: none; } GtkColorButton.button { -- cgit v1.2.1 From d0b779d71c8e7fa66f800eb713d486013e571487 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 27 Oct 2013 15:12:47 +0100 Subject: ContrastHigh: add support for CSD and headerbars --- .../ContrastHigh/gtk-3.0/gtk-widgets.css | 92 ++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index d1a9cabc..e9f4aa1a 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css @@ -556,6 +556,14 @@ GtkComboBox .button { padding: 1px; } +.toolbar .button.text-button { + padding: 2px 16px; +} + +.toolbar .button.image-button { + padding: 5px; +} + .toolbar .button:insensitive { background-color: @theme_base_color; } @@ -1104,6 +1112,90 @@ GtkProgressBar.osd.progressbar { border-style: none; } +/*************** + * Header bars * + ***************/ +.header-bar { + border-width: 0 0 1px; + border-style: solid; + border-color: @theme_border_color; + + background-color: @theme_base_color; + + padding: 6px 6px 5px 6px; +} + +.header-bar .button.text-button { + padding: 2px 16px; +} + +.header-bar .button.image-button { + padding: 5px; +} + +.header-bar .title { + font: Bold 11; +} + +.header-bar .subtitle { + font: 9; +} + +/******* + * CSD * + *******/ +.titlebar { + background-color: @theme_base_color; + border-radius: 7px 7px 0px 0px; +} + +/* this is the default titlebar that is added by GTK + * when client-side decorations are in use and the application + * did not set a custom titlebar. + */ +.titlebar.default-decoration { + border: none; +} + +.titlebar .title { + font: Bold 11; +} + +.titlebar .titlebutton { + color: @theme_button_fg; + background-color: transparent; + padding: 5px; + + border-color: transparent; +} + +.titlebar .titlebutton:hover { + background-color: @theme_button_bg; + border-color: @theme_button_fg; + color: @theme_button_fg; +} + +.titlebar .titlebutton:active { + background-color: @theme_button_active_bg; + color: @theme_base_color; +} + +.window-frame { + border-color: darker(@theme_bg_color); + border-radius: 7px 7px 0 0; + border-width: 1px; + border-style: solid; + + box-shadow: 0 2px 8px 3px alpha(black, 0.7); + + /* this is used for the resize cursor area */ + margin: 10px; +} + +.window-frame:backdrop { + box-shadow: 0 2px 5px 1px alpha(black, 0.7); +} + /********************** * Fallback Mode Panel **********************/ -- cgit v1.2.1 From 9b4401babb89fdcb78c05f11791b1601b231b1cb Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 27 Oct 2013 16:18:22 +0100 Subject: ContrastHigh: fix Nautilus styling --- .../ContrastHigh/gtk-3.0/gtk-widgets.css | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index e9f4aa1a..4634a8d4 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css @@ -1315,19 +1315,24 @@ TerminalScreen { font: bold; } -NautilusWindow .pane-separator { - border-style: solid; - border-width: 1px; - border-color: @theme_border_color; +NautilusWindow .sidebar .frame { + border-style: none; } -NautilusWindow .sidebar .frame { - border-style: solid; - border-width: 1px 0 0 0; +NautilusNotebook.notebook { + border-right-width: 0; + border-left-width: 0; + border-bottom-width: 0; } -.nautilus-inactive-pane .view { - background-color: @theme_insensitive_bg; +NautilusNotebook .frame { + border-width: 0; +} + +NautilusWindow .pane-separator { + border-width: 0 1px 0 0; + border-style: solid; + border-color: @theme_border_color; } .nautilus-desktop.nautilus-canvas-item { -- cgit v1.2.1 From f556e2ad42d28188676a0eca494f0d40ff4f70d5 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 27 Oct 2013 16:22:42 +0100 Subject: ContrastHigh: fix insensitive menu items --- .../ContrastHigh/gtk-3.0/gtk-widgets.css | 30 ++++++++++------------ 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index 4634a8d4..7eda046f 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css @@ -501,38 +501,34 @@ GtkComboBox .button { /********* * Menus * *********/ +.menu { + border-style: solid; + border-color: @theme_fg_color; + border-width: 1px; + + color: @theme_fg_color; +} + .menuitem { color: @theme_fg_color; + background-color: transparent; } .menuitem:insensitive { color: @theme_button_insensitive_fg; } -.menubar .menuitem { - padding: 3px 5px; -} - -.menubar .menuitem:hover { - background-color: @theme_active_color; +.menuitem:hover { color: @theme_base_color; + background-color: @theme_active_color; } .menu .menuitem { padding: 4px; } -.menu .menuitem:hover { - background-color: @theme_active_color; - color: @theme_base_color; -} - -.menu { - border-style: solid; - border-color: @theme_fg_color; - border-width: 1px; - - color: @theme_fg_color; +.menubar .menuitem { + padding: 3px 5px; } .menuitem.separator { -- cgit v1.2.1 From 9fc5674d665bbdc2c8f142a291517089abcb1d25 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 27 Oct 2013 16:25:55 +0100 Subject: HighContrastHigh: add a style for hovered listbox rows --- desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index 7eda046f..d6f4cc16 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css @@ -286,7 +286,7 @@ GtkLevelBar.vertical { border-color: @theme_button_insensitive_border; } -.button:insensitive:active { +.button:active *:insensitive { background-color: @theme_button_insensitive_active_bg; border-color: @theme_button_insensitive_active_border; } @@ -1051,6 +1051,13 @@ GtkIconView.view.cell { border-radius: 4px; } +/************** + * List boxes * + **************/ +.list-row:hover { + background-color: @theme_button_bg; +} + /******* * OSD * *******/ -- cgit v1.2.1 From d7ab5e94d77e83fc66bc28238c2abb5350d4bd62 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 27 Oct 2013 16:29:43 +0100 Subject: ContrastHigh: don't set a frame on GtkStatusbar --- desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index d6f4cc16..be8f7d36 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css @@ -47,6 +47,8 @@ -GtkWindow-resize-grip-width: 0; -GtkWindow-resize-grip-height: 0; + -GtkStatusbar-shadow-type: none; + background-clip: padding-box; } -- cgit v1.2.1 From f025d9a6870053fade2ca0974b7b2034be81d3a1 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 27 Oct 2013 16:31:48 +0100 Subject: ContrastHigh: add missing selector for image-button classes --- desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index be8f7d36..9ee1ad49 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css @@ -277,6 +277,10 @@ GtkLevelBar.vertical { color: @theme_button_fg; } +.button.image-button { + padding: 5px; +} + .button:active { background-color: @theme_button_active_bg; color: @theme_base_color; -- cgit v1.2.1 From d40ac250fa0785090233d2cc3cedf3bfa0193aab Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 27 Oct 2013 17:42:54 +0100 Subject: ContrastHigh: update metacity-theme-3.xml --- desktop-themes/ContrastHigh/metacity-1/metacity-theme-3.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-themes/ContrastHigh/metacity-1/metacity-theme-3.xml b/desktop-themes/ContrastHigh/metacity-1/metacity-theme-3.xml index dbb15dae..86689ff7 100644 --- a/desktop-themes/ContrastHigh/metacity-1/metacity-theme-3.xml +++ b/desktop-themes/ContrastHigh/metacity-1/metacity-theme-3.xml @@ -5,7 +5,7 @@ GNOME Art Team <art.gnome.org> Â Intel, Â Red Hat, Lapo Calamandrei 2012 - HighContrast GNOME 3 window theme + ContrastHigh MATE window theme -- cgit v1.2.1