Merge lp:~willcooke/ubuntu-themes/ubuntu-themes-calendar-focus into lp:ubuntu-themes

Proposed by Will Cooke
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 470
Merged at revision: 473
Proposed branch: lp:~willcooke/ubuntu-themes/ubuntu-themes-calendar-focus
Merge into: lp:ubuntu-themes
Diff against target: 62 lines (+35/-0)
4 files modified
Ambiance/gtk-3.0/apps/calendar.css (+16/-0)
Ambiance/gtk-3.0/gtk-main.css (+1/-0)
Radiance/gtk-3.0/apps/calendar.css (+17/-0)
Radiance/gtk-3.0/gtk-main.css (+1/-0)
To merge this branch: bzr merge lp:~willcooke/ubuntu-themes/ubuntu-themes-calendar-focus
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+290859@code.launchpad.net

Commit message

Adds these fixes for Calendar:

* Work around for white corners
* Fix for border around selected day. LP #1551744
* Fix for selected items in pop-down lists. LP #1558659

Description of the change

Adds these fixes for Calendar:

* Work around for white corners
* Fix for border around selected day. LP #1551744
* Fix for selected items in pop-down lists. LP #1558659

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

That's better, the white corners still seem to be there though and the outline is a bit outside of the day rectangle (that's not the case with adwaita) but that's minor ... giving +1 since it's still a nice improvement, we can sort out the remaining issue before landing or later with another one

review: Approve
471. By Will Cooke

Add an outline-offset of -4px to bring the selected day border inside the cell.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Ambiance/gtk-3.0/apps/calendar.css'
2--- Ambiance/gtk-3.0/apps/calendar.css 1970-01-01 00:00:00 +0000
3+++ Ambiance/gtk-3.0/apps/calendar.css 2016-04-14 21:54:53 +0000
4@@ -0,0 +1,16 @@
5+/* Hide the white corners. Calendar sets a background colour for the whole window. */
6+GcalWindow { background-color: transparent; }
7+
8+/* Make the calendar focus ring appear around the selected day */
9+.calendar-view {
10+ outline-style: dashed;
11+ outline-color: @selected_bg_color;
12+ outline-width: 2px;
13+ outline-radius: 8px;
14+ outline-offset: -4px;
15+}
16+
17+/* Give pop-down lists the same selected bg colour as other menus. Fixes lp# 1558659 */
18+.calendar-list :hover {
19+ background-color: @selected_bg_color;
20+}
21
22=== modified file 'Ambiance/gtk-3.0/gtk-main.css'
23--- Ambiance/gtk-3.0/gtk-main.css 2015-09-10 13:27:10 +0000
24+++ Ambiance/gtk-3.0/gtk-main.css 2016-04-14 21:54:53 +0000
25@@ -66,4 +66,5 @@
26 @import url("apps/unity-greeter.css");
27 @import url("apps/glade.css");
28 @import url("apps/software-center.css");
29+@import url("apps/calendar.css");
30 @import url("public-colors.css");
31
32=== added file 'Radiance/gtk-3.0/apps/calendar.css'
33--- Radiance/gtk-3.0/apps/calendar.css 1970-01-01 00:00:00 +0000
34+++ Radiance/gtk-3.0/apps/calendar.css 2016-04-14 21:54:53 +0000
35@@ -0,0 +1,17 @@
36+/* Hide the white corners. Calendar sets a background colour for the whole window. */
37+GcalWindow { background-color: transparent; }
38+
39+/* Make the calendar focus ring appear around the selected day */
40+.calendar-view {
41+ outline-style: dashed;
42+ outline-color: @selected_bg_color;
43+ outline-width: 2px;
44+ outline-radius: 8px;
45+ outline-offset: -4px;
46+}
47+
48+/* Give pop-down lists the same selected bg colour as other menus. Fixes lp# 1558659 */
49+.calendar-list :hover {
50+ background-color: @selected_bg_color;
51+}
52+
53
54=== modified file 'Radiance/gtk-3.0/gtk-main.css'
55--- Radiance/gtk-3.0/gtk-main.css 2015-09-10 13:27:10 +0000
56+++ Radiance/gtk-3.0/gtk-main.css 2016-04-14 21:54:53 +0000
57@@ -68,4 +68,5 @@
58 @import url("apps/gnome-system-log.css");
59 @import url("apps/glade.css");
60 @import url("apps/software-center.css");
61+@import url("apps/calendar.css");
62 @import url("public-colors.css");

Subscribers

People subscribed via source and target branches