Ubuntu theme

Merge lp:~larsu/ubuntu-themes/literal-colors into lp:ubuntu-themes

  1. literal-colors
  2. Merge into trunk
Proposed by Lars Karlitski
Status: Merged
Approved by: Iain Lane
Approved revision: 425
Merged at revision: 433
Proposed branch: lp:~larsu/ubuntu-themes/literal-colors
Merge into: lp:ubuntu-themes
Diff against target: 107 lines (+24/-12)
4 files modified
Ambiance/gtk-3.0/gtk-main.css (+7/-1)
Ambiance/gtk-3.0/gtk-widgets.css (+5/-5)
Radiance/gtk-3.0/gtk-main.css (+7/-1)
Radiance/gtk-3.0/gtk-widgets.css (+5/-5)
To merge this branch: bzr merge lp:~larsu/ubuntu-themes/literal-colors
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Iain Lane Approve
Review via email: mp+255806@code.launchpad.net

Commit message

Don't use symbolic colors for style

Gtk doesn't expand color variables for style properties right now.

Description of the change

Don't use symbolic colors for style

Gtk doesn't expand color variables for style properties right now.

To post a comment you must log in.
lp:~larsu/ubuntu-themes/literal-colors updated
424. By Lars Karlitski

Don't use symbolic colors for style properties

Gtk doesn't expand color variables for style properties right now.

425. By Lars Karlitski

Add comment explaining why we use literal colors

Revision history for this message
Iain Lane (laney) wrote :

yes, thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:424
http://jenkins.qa.ubuntu.com/job/ubuntu-themes-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-themes-vivid-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-themes-ci/99/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/gtk-3.0/gtk-main.css'
2--- Ambiance/gtk-3.0/gtk-main.css 2015-03-20 16:52:48 +0000
3+++ Ambiance/gtk-3.0/gtk-main.css 2015-04-10 10:46:56 +0000
4@@ -8,7 +8,13 @@
5 @define-color tooltip_bg_color #000000;
6 @define-color tooltip_fg_color #ffffff;
7
8-/* misc colors used by gtk+ */
9+/* misc colors used by gtk+
10+ *
11+ * Gtk doesn't currently expand color variables for style properties. Thus,
12+ * gtk-widgets.css uses literal color names, but includes a comment containing
13+ * the name of the variable. Please remember to change values there as well
14+ * when changing one of the variables below.
15+ */
16 @define-color info_fg_color rgb (181, 171, 156);
17 @define-color info_bg_color rgb (252, 252, 189);
18 @define-color warning_fg_color rgb (173, 120, 41);
19
20=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
21--- Ambiance/gtk-3.0/gtk-widgets.css 2015-03-20 15:43:13 +0000
22+++ Ambiance/gtk-3.0/gtk-widgets.css 2015-04-10 10:46:56 +0000
23@@ -11,8 +11,8 @@
24 -GtkEntry-inner-border: 2;
25 -GtkEntry-progress-border: 0;
26 -GtkExpander-expander-size: 8;
27- -GtkHTML-link-color: @link_color;
28- -GtkIMHtml-hyperlink-color: @link_color;
29+ -GtkHTML-link-color: #f07746; /* @link_color */
30+ -GtkIMHtml-hyperlink-color: #f07746; /* @link_color */
31 -GtkMenu-horizontal-padding: 0;
32 -GtkMenu-vertical-padding: 5px;
33 -GtkMenuBar-internal-padding: 0;
34@@ -34,7 +34,7 @@
35 -GtkScrolledWindow-scrollbars-within-bevel: 1;
36 -GtkSeparatorMenuItem-horizontal-padding: 0;
37 -GtkStatusbar-shadow-type: none;
38- -GtkTextView-error-underline-color: @error_color;
39+ -GtkTextView-error-underline-color: #df382c; /* @error_color doesn't work due to a gtk bug */
40 -GtkToolButton-icon-spacing: 6;
41 -GtkToolItemGroup-expander-size: 11;
42 -GtkToolbar-internal-padding: 0;
43@@ -43,8 +43,8 @@
44 -GtkWidget-separator-width: 2;
45 -GtkWidget-separator-height: 2;
46 -GtkWidget-wide-separators: true;
47- -GtkWidget-link-color: @link_color;
48- -GtkWidget-visited-link-color: @link_color;
49+ -GtkWidget-link-color: #f07746; /* @link_color */
50+ -GtkWidget-visited-link-color: #f07746; /* @link_color */
51 -GtkWindow-resize-grip-width: 0;
52 -GtkWindow-resize-grip-height: 0;
53 -WnckTasklist-fade-overlay-rect: 0;
54
55=== modified file 'Radiance/gtk-3.0/gtk-main.css'
56--- Radiance/gtk-3.0/gtk-main.css 2015-03-20 16:52:48 +0000
57+++ Radiance/gtk-3.0/gtk-main.css 2015-04-10 10:46:56 +0000
58@@ -8,7 +8,13 @@
59 @define-color tooltip_bg_color #000000;
60 @define-color tooltip_fg_color #ffffff;
61
62-/* misc colors used by gtk+ */
63+/* misc colors used by gtk+
64+ *
65+ * Gtk doesn't currently expand color variables for style properties. Thus,
66+ * gtk-widgets.css uses literal color names, but includes a comment containing
67+ * the name of the variable. Please remember to change values there as well
68+ * when changing one of the variables below.
69+ */
70 @define-color info_fg_color rgb (181, 171, 156);
71 @define-color info_bg_color rgb (252, 252, 189);
72 @define-color warning_fg_color rgb (173, 120, 41);
73
74=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
75--- Radiance/gtk-3.0/gtk-widgets.css 2015-03-20 15:43:13 +0000
76+++ Radiance/gtk-3.0/gtk-widgets.css 2015-04-10 10:46:56 +0000
77@@ -11,8 +11,8 @@
78 -GtkEntry-inner-border: 2;
79 -GtkEntry-progress-border: 0;
80 -GtkExpander-expander-size: 8;
81- -GtkHTML-link-color: @link_color;
82- -GtkIMHtml-hyperlink-color: @link_color;
83+ -GtkHTML-link-color: #f07746; /* @link_color */
84+ -GtkIMHtml-hyperlink-color: #f07746; /* @link_color */
85 -GtkMenu-horizontal-padding: 0;
86 -GtkMenu-vertical-padding: 5px;
87 -GtkMenuBar-internal-padding: 0;
88@@ -34,7 +34,7 @@
89 -GtkScrolledWindow-scrollbars-within-bevel: 1;
90 -GtkSeparatorMenuItem-horizontal-padding: 0;
91 -GtkStatusbar-shadow-type: none;
92- -GtkTextView-error-underline-color: @error_color;
93+ -GtkTextView-error-underline-color: #df382c; /* @error_color */
94 -GtkToolButton-icon-spacing: 6;
95 -GtkToolItemGroup-expander-size: 11;
96 -GtkToolbar-internal-padding: 0;
97@@ -42,8 +42,8 @@
98 -GtkTreeView-vertical-separator: 0;
99 -GtkWidget-separator-width: 2;
100 -GtkWidget-separator-height: 2;
101- -GtkWidget-link-color: @link_color;
102- -GtkWidget-visited-link-color: @link_color;
103+ -GtkWidget-link-color: #f07746; /* @link_color */
104+ -GtkWidget-visited-link-color: #f07746; /* @link_color */
105 -GtkWindow-resize-grip-width: 0;
106 -GtkWindow-resize-grip-height: 0;
107 -WnckTasklist-fade-overlay-rect: 0;

Subscribers

People subscribed via source and target branches