Merge lp:~3v1n0/ubuntu-themes/popover-tip-fix into lp:ubuntu-themes

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 610
Merged at revision: 610
Proposed branch: lp:~3v1n0/ubuntu-themes/popover-tip-fix
Merge into: lp:ubuntu-themes
Diff against target: 62 lines (+8/-6)
2 files modified
Ambiance/gtk-3.20/gtk-widgets.css (+4/-3)
Radiance/gtk-3.20/gtk-widgets.css (+4/-3)
To merge this branch: bzr merge lp:~3v1n0/ubuntu-themes/popover-tip-fix
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Review via email: mp+341916@code.launchpad.net

Commit message

Ambiance, Radiance: Remove the gap between the popover and tip, add border

Margin value is now matching Adwaita.

To post a comment you must log in.
610. By Marco Trevisan (Treviño)

Ambiance, Radiance: add slight border around popovers

Revision history for this message
Daniel van Vugt (vanvugt) wrote :
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Per above.

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Although ideally if we start to use something that's the same as Adwaita then we should be able to just delete it from Ambiance/Radiance, and we'll get the Adwaita definition.

I'm not sure that would work here, but it's a suggestion to keep in mind in future.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

> I'm not sure that would work here, but it's a suggestion to keep in mind in
> future.

Yes, sure, but in this case the value was defined somewhere else inside our theme.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Ambiance/gtk-3.20/gtk-widgets.css'
--- Ambiance/gtk-3.20/gtk-widgets.css 2018-03-22 08:26:49 +0000
+++ Ambiance/gtk-3.20/gtk-widgets.css 2018-03-22 16:38:44 +0000
@@ -2560,7 +2560,7 @@
2560/* FIXME: we can't reuse the default shadow definition as increasing marging2560/* FIXME: we can't reuse the default shadow definition as increasing marging
2561 * would break the tip2561 * would break the tip
2562 */2562 */
2563 margin: 13px;2563 margin: 4px;
2564 box-shadow: 1px 3px 6px @inactive_shadow_color;2564 box-shadow: 1px 3px 6px @inactive_shadow_color;
2565}2565}
25662566
@@ -3426,7 +3426,8 @@
3426 shade (@bg_color, 0.93),3426 shade (@bg_color, 0.93),
3427 shade (@bg_color, 0.98));3427 shade (@bg_color, 0.98));
3428 border-radius: 5px;3428 border-radius: 5px;
3429 border: none;3429 border: 1px solid shade (@bg_color, 0.85);
3430 border-image: none;
3430 padding: 2px;3431 padding: 2px;
3431}3432}
34323433
@@ -3434,7 +3435,7 @@
3434 background-image: none;3435 background-image: none;
3435 background-color: shade (@bg_color, 0.95);3436 background-color: shade (@bg_color, 0.95);
3436 border-radius: 5px;3437 border-radius: 5px;
3437 border: none;3438 border-color: shade (@bg_color, 0.88);
3438 padding: 2px;3439 padding: 2px;
3439}3440}
34403441
34413442
=== modified file 'Radiance/gtk-3.20/gtk-widgets.css'
--- Radiance/gtk-3.20/gtk-widgets.css 2018-03-22 08:26:49 +0000
+++ Radiance/gtk-3.20/gtk-widgets.css 2018-03-22 16:38:44 +0000
@@ -2556,7 +2556,7 @@
2556/* FIXME: we can't reuse the default shadow definition as increasing marging2556/* FIXME: we can't reuse the default shadow definition as increasing marging
2557 * would break the tip2557 * would break the tip
2558 */2558 */
2559 margin: 13px;2559 margin: 4px;
2560 box-shadow: 1px 3px 6px @inactive_shadow_color;2560 box-shadow: 1px 3px 6px @inactive_shadow_color;
2561}2561}
25622562
@@ -3423,7 +3423,8 @@
3423 shade (@bg_color, 0.93),3423 shade (@bg_color, 0.93),
3424 shade (@bg_color, 0.98));3424 shade (@bg_color, 0.98));
3425 border-radius: 5px;3425 border-radius: 5px;
3426 border: none;3426 border: 1px solid shade (@bg_color, 0.85);
3427 border-image: none;
3427 padding: 2px;3428 padding: 2px;
3428}3429}
34293430
@@ -3431,7 +3432,7 @@
3431 background-image: none;3432 background-image: none;
3432 background-color: shade (@bg_color, 0.95);3433 background-color: shade (@bg_color, 0.95);
3433 border-radius: 5px;3434 border-radius: 5px;
3434 border: none;3435 border-color: shade (@bg_color, 0.88);
3435 padding: 2px;3436 padding: 2px;
3436}3437}
34373438

Subscribers

People subscribed via source and target branches