[gnome-themes-standard] Widget theme: preliminary borders assets for the dark theme and various tweaks.
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] Widget theme: preliminary borders assets for the dark theme and various tweaks.
- Date: Mon, 19 Dec 2011 11:03:29 +0000 (UTC)
commit 9b1592a2f9cb6b5ea7c0dfe2889fbf291c49b60a
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Mon Dec 19 12:03:09 2011 +0100
Widget theme: preliminary borders assets for the dark theme and various tweaks.
themes/Adwaita/gtk-3.0/borders/Makefile.am | 4 +-
.../borders/generic-border-unfocused-dark.svg | 77 +++++++++++++
...imary-toolbar-generic-border-unfocused-dark.svg | 121 ++++++++++++++++++++
themes/Adwaita/gtk-3.0/gnome-applications.css | 2 +-
themes/Adwaita/gtk-3.0/gtk-dark.css | 15 ++-
.../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css | 39 ++++++-
themes/Adwaita/gtk-3.0/gtk-widgets.css | 6 +-
themes/Adwaita/gtk-3.0/gtk.css | 8 +-
8 files changed, 260 insertions(+), 12 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/borders/Makefile.am b/themes/Adwaita/gtk-3.0/borders/Makefile.am
index ad6b532..ce0e14e 100644
--- a/themes/Adwaita/gtk-3.0/borders/Makefile.am
+++ b/themes/Adwaita/gtk-3.0/borders/Makefile.am
@@ -9,6 +9,7 @@ borders_DATA = \
generic-border.svg \
generic-border-dark.svg \
generic-border-unfocused.svg \
+ generic-border-unfocused-dark.svg \
primary-toolbar-button-border-focused.svg \
primary-toolbar-button-border-focused-dark.svg \
primary-toolbar-button-border.svg \
@@ -17,6 +18,7 @@ borders_DATA = \
primary-toolbar-generic-border-focused-dark.svg \
primary-toolbar-generic-border.svg \
primary-toolbar-generic-border-dark.svg \
- primary-toolbar-generic-border-unfocused.svg
+ primary-toolbar-generic-border-unfocused.svg \
+ primary-toolbar-generic-border-unfocused-dark.svg
EXTRA_DIST = $(borders_DATA)
diff --git a/themes/Adwaita/gtk-3.0/borders/generic-border-unfocused-dark.svg b/themes/Adwaita/gtk-3.0/borders/generic-border-unfocused-dark.svg
new file mode 100644
index 0000000..54287a8
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/borders/generic-border-unfocused-dark.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16px"
+ height="16px"
+ id="svg33222"
+ version="1.1"
+ inkscape:version="0.48.1 r9760"
+ sodipodi:docname="generic-border-unfocused.svg">
+ <defs
+ id="defs33224" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#8e8e8e"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313709"
+ inkscape:cx="17.850819"
+ inkscape:cy="-1.2397353"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1366"
+ inkscape:window-height="710"
+ inkscape:window-x="0"
+ inkscape:window-y="26"
+ inkscape:window-maximized="1"
+ inkscape:snap-nodes="false"
+ inkscape:snap-bbox="true"
+ inkscape:showpageshadow="false"
+ showborder="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2992"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata33227">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <rect
+ ry="2.5"
+ rx="2.5000005"
+ y="0.5"
+ x="0.5"
+ height="13.999999"
+ width="15"
+ id="rect17861"
+ style="color:#000000;fill:none;stroke:#24282a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-dashoffset:0" />
+ </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-unfocused-dark.svg b/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-unfocused-dark.svg
new file mode 100644
index 0000000..324acca
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/borders/primary-toolbar-generic-border-unfocused-dark.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16px"
+ height="16px"
+ id="svg33222"
+ version="1.1"
+ inkscape:version="0.48.1 r9760"
+ sodipodi:docname="primary-toolbar-generic-border-unfocused-dark.svg">
+ <defs
+ id="defs33224">
+ <linearGradient
+ id="linearGradient3837">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3839" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3841" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="matrix(0.84615379,0,0,0.91666667,1.2307694,1.125)"
+ y2="14.003025"
+ x2="7.999999"
+ y1="1.92503"
+ x1="7.999999"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3864"
+ xlink:href="#linearGradient3837"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient3826-9">
+ <stop
+ id="stop3828-2"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:0.059" />
+ <stop
+ id="stop3830-6"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0.251" />
+ </linearGradient>
+ <linearGradient
+ y2="13.462841"
+ x2="8.000001"
+ y1="1.5371597"
+ x1="8.0000019"
+ gradientTransform="matrix(0.86666667,0,0,0.92857148,1.0666667,1.0357141)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3880"
+ xlink:href="#linearGradient3826-9"
+ inkscape:collect="always" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#8e8e8e"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="1"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.627417"
+ inkscape:cx="6.284171"
+ inkscape:cy="9.0507553"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="611"
+ inkscape:window-height="438"
+ inkscape:window-x="751"
+ inkscape:window-y="296"
+ inkscape:window-maximized="0"
+ inkscape:snap-nodes="false"
+ inkscape:snap-bbox="true"
+ inkscape:showpageshadow="false"
+ showborder="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2992"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata33227">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <rect
+ ry="2.5"
+ rx="2.5"
+ y="1.5"
+ x="1.5"
+ height="13"
+ width="13"
+ id="rect17861"
+ style="color:#000000;fill:none;stroke:#24282a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/gnome-applications.css b/themes/Adwaita/gtk-3.0/gnome-applications.css
index 1f6841c..fb613d2 100644
--- a/themes/Adwaita/gtk-3.0/gnome-applications.css
+++ b/themes/Adwaita/gtk-3.0/gnome-applications.css
@@ -137,7 +137,7 @@ NautilusWindow > GtkGrid > .pane-separator:hover {
border-width: 1 1 0 0;
border-style: solid;
border-color: shade (@theme_bg_color, 0.66);
- background-color: shade (@theme_bg_color, 1.02);
+ background-color: @sidebar_bg_color;
color: shade (@theme_bg_color, 0.9);
}
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index 23f5011..7774cbb 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -10,13 +10,14 @@
@define-color placeholder_text_color shade(@theme_text_color, 0.4);
@define-color theme_unfocused_base_color shade(@insensitive_bg_color, 1.05);
- define-color theme_unfocused_text_color @button_border;
- define-color theme_unfocused_fg_color @button_border;
- define-color theme_unfocused_bg_color @theme_bg_color; /* FIXME */
- define-color theme_unfocused_selected_bg_color @theme_selected_bg_color; /* FIXME */
+ define-color theme_unfocused_text_color mix(@theme_unfocused_base_color, @theme_text_color, 0.8);
+ define-color theme_unfocused_fg_color mix(@theme_unfocused_bg_color, @theme_text_color, 0.3);
+ define-color theme_unfocused_bg_color @theme_bg_color;
+ define-color theme_unfocused_selected_bg_color shade (@theme_selected_bg_color, 0.75); /* FIXME */
@define-color theme_unfocused_selected_fg_color @theme_selected_fg_color; /* FIXME */
@define-color unfocused_button_background @theme_unfocused_bg_color;
@define-color unfocused_borders_color @button_border;
+ define-color unfocused_insensitive_borders_color mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5);
@define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5);
@define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5);
@define-color unfocused_toolbar mix(@theme_unfocused_bg_color, @unfocused_borders_color, 0.5);
@@ -24,6 +25,8 @@
@define-color menu_bg_color #555753;
@define-color menu_fg_color @theme_text_color;
+ define-color menu_controls_color #aaa8ac;
+
@define-color menu_combobox_border darker (@theme_selected_bg_color);
@define-color menu_separator mix (@menu_fg_color, @menu_bg_color, 0.95);
@@ -110,11 +113,11 @@
@define-color inset_light_color alpha(white, 0.05);
@define-color inset_dark_color alpha(black, 0.15);
- define-color menu_controls_color #aaa8ac;
-
@define-color keyboard_focus_border_a alpha (@theme_fg_color, 0.30);
@define-color keyboard_focus_border_b alpha (@theme_fg_color, 0.10);
+ define-color sidebar_bg_color shade (@theme_bg_color, 1.02);
+
@define-color trough_bg_color_a #30312f;
@define-color trough_bg_color_b #41433f;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
index 4c2d4c0..5e9d7b5 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
@@ -9,6 +9,7 @@ GtkComboBox.combobox-entry .button:focus,
.button:active:hover,
.button:insensitive,
.trough,
+.trough.highlight,
.trough row,
.trough row:hover,
GtkSwitch.trough,
@@ -48,7 +49,7 @@ GtkSwitch.trough:active {
.primary-toolbar .entry,
.primary-toolbar GtkComboBox.combobox-entry .entry,
.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button:prelight,
+.primary-toolbar GtkComboBox.combobox-entry .button:hover,
.primary-toolbar GtkComboBox.combobox-entry .button:active,
.primary-toolbar GtkComboBox.combobox-entry .button:focus,
.primary-toolbar GtkComboBox.combobox-entry .button:insensitive,
@@ -139,6 +140,17 @@ column-header .button:active:hover {
border-radius: 0;
}
+column-header.button:window-unfocused,
+column-header .button:window-unfocused {
+ border-image: -gtk-gradient (linear,
+ left top, left bottom,
+ from (@unfocused_borders_color),
+ to (@theme_unfocused_base_color)) 0 1 0 0;
+ border-width: 0 1 0 0;
+ border-radius: 0;
+
+}
+
column-header.button:last-child,
column-header:last-child .button,
column-header.button:hover:last-child,
@@ -158,3 +170,28 @@ column-header:last-child .button:active:hover {
border-image: none;
border-width: 0;
}
+/* unfocused window: generic element borders */
+.button:window-unfocused,
+GtkComboBox.combobox-entry .entry:window-unfocused,
+GtkComboBox.combobox-entry .button:window-unfocused,
+GtkComboBox *:window-unfocused,
+.entry:window-unfocused,
+GtkSwitch.trough:window-unfocused,
+.trough:window-unfocused {
+ border-image: url("borders/generic-border-unfocused-dark.svg") 3 3 4 3 / 3 3 4 3 stretch;
+ border-radius: 3;
+ border-width: 1 1 2 1;
+}
+
+/* unfocused window: primary toolbar generic element borders */
+.primary-toolbar .button.raised:window-unfocused,
+.primary-toolbar .raised .button:window-unfocused,
+.primary-toolbar .entry:window-unfocused,
+.inline-toolbar.toolbar .button:window-unfocused {
+ border-image: url("borders/primary-toolbar-generic-border-unfocused-dark.svg") 4 / 4 stretch;
+ border-radius: 3;
+ border-width: 2;
+ border-style: solid;
+ border-color: transparent;
+
+}
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 0655391..b57abd9 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -1609,11 +1609,11 @@ GtkCheckButton:selected:focus {
***********/
.sidebar,
.sidebar .view {
- background-color: shade (@theme_bg_color, 1.02);
+ background-color: @sidebar_bg_color;
}
.sidebar .scrollbar.trough {
- background-color: shade (@theme_bg_color, 1.02);
+ background-color: @sidebar_bg_color;
}
.sidebar .radio,
@@ -1642,6 +1642,8 @@ GtkAssistant .sidebar {
color: mix (@theme_fg_color, @theme_bg_color, 0.40);
background-color: shade (@theme_bg_color, 0.97);
+ /* shall we make it like sidebars in general? */
+
}
/*************
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index 9848d05..7e5af15 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -9,7 +9,6 @@
@define-color selected_fg_color #ffffff;
/* define-color unfocused_bg_color #f8f8f8;*/
@define-color unfocused_bg_color @bg_color;
- define-color placeholder_text_color shade(@text_color, 3.5);
/* Colormap actually used by the theme, to be overridden in other css files */
@define-color theme_base_color @base_color;
@@ -21,6 +20,8 @@
@define-color theme_selected_bg_color @selected_bg_color;
@define-color theme_selected_fg_color @selected_fg_color;
+ define-color placeholder_text_color shade(@text_color, 3.5);
+
@define-color theme_unfocused_base_color shade(@insensitive_bg_color, 1.015); /* I don't want the same color, hope not to hurt usability to much here */
@define-color theme_unfocused_text_color mix(@theme_unfocused_fg_color, @theme_text_color, 0.5); /* Need something darker here to have stuff nicelly readable*/
@define-color theme_unfocused_fg_color #a7aba7;
@@ -36,7 +37,9 @@
@define-color menu_bg_color shade (@theme_bg_color, 1.1);
@define-color menu_fg_color @theme_fg_color;
+
@define-color menu_controls_color shade (@theme_fg_color, 0.9);
+
@define-color menu_combobox_border #3277bf;
@define-color menu_separator mix (@menu_fg_color, @menu_bg_color, 0.9);
@@ -59,6 +62,9 @@
@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_color shade (@theme_bg_color, 1.025);
+
@define-color os_chrome_bg_color black;
@define-color os_chrome_fg_color #ccc;
@define-color os_chrome_selected_bg_color #333;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
