Merge lp:~snwh/egtk/notebook-fix into lp:~elementary-design/egtk/trunk

Proposed by Sam Hewitt
Status: Merged
Approved by: Danielle Foré
Approved revision: 451
Merged at revision: 457
Proposed branch: lp:~snwh/egtk/notebook-fix
Merge into: lp:~elementary-design/egtk/trunk
Diff against target: 70 lines (+19/-13)
1 file modified
gtk-3.0/gtk-widgets.css (+19/-13)
To merge this branch: bzr merge lp:~snwh/egtk/notebook-fix
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+257004@code.launchpad.net

Commit message

Remove a white line from the tabs and soften the colours a bit. Plus removed some duplicate code.

Description of the change

Removes a white line from the tabs and softens the colours a bit. Plus removed some duplicate code.

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk-3.0/gtk-widgets.css'
2--- gtk-3.0/gtk-widgets.css 2015-04-20 18:02:27 +0000
3+++ gtk-3.0/gtk-widgets.css 2015-04-21 20:58:17 +0000
4@@ -1327,19 +1327,19 @@
5 ********************/
6
7 .notebook {
8- border-radius: 2.5px;
9+ border-radius: 0 0 2.5px 2.5px;
10
11 background-clip: border-box;
12 background-color: shade (@titlebar_color, 1.06);
13
14 text-shadow: 0 1px alpha (#fff, 0.4);
15 icon-shadow: 0 1px alpha (#fff, 0.4);
16- border: 1px solid shade (@titlebar_color, 0.60);
17+ border: 1px solid shade (@titlebar_color, 0.70);
18 }
19
20 .notebook.header {
21 border: none;
22- background-color: transparent;
23+ background-color: @bg_color;
24 }
25
26 .dynamic-notebook .notebook.header {
27@@ -1397,13 +1397,26 @@
28
29 .notebook tab {
30 background-image: linear-gradient(to bottom,
31- shade (@titlebar_color, 0.75),
32- shade (@titlebar_color, 0.80)
33+ shade (@titlebar_color, 0.79),
34+ shade (@titlebar_color, 0.76)
35 );
36+ color: shade (@text_color, 1.12);
37
38+ border: 1px solid shade (@titlebar_color, 0.60);
39+ border-bottom-width: 0px;
40 border-radius: 2.5px;
41-
42 padding: 2px 3px 0;
43+
44+}
45+
46+.notebook tab:active {
47+ background-image: linear-gradient(to bottom,
48+ shade (@titlebar_color, 1.12),
49+ shade (@titlebar_color, 1.06)
50+ );
51+ border: 1px solid shade (@titlebar_color, 0.60);
52+ border-bottom-width: 0px;
53+ color: @text_color;
54 }
55
56 .dynamic-notebook .notebook tab {
57@@ -1434,13 +1447,6 @@
58 ) 0 1 0 1;
59 }
60
61-.notebook tab:active {
62- background-image: linear-gradient(to bottom,
63- shade (@titlebar_color, 1.24),
64- shade (@titlebar_color, 1.06)
65- );
66- color: @text_color;
67-}
68
69 .dynamic-notebook .notebook tab:active {
70 background-image: linear-gradient(to bottom,

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: