Skip to content

Commit bb8f2f0

Browse files
committed
Fix styles
1 parent 9ee62a6 commit bb8f2f0

File tree

5 files changed

+12
-252
lines changed

5 files changed

+12
-252
lines changed

data/application.css

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
decoration,
21
window,
32
.titlebar {
43
background: transparent;
@@ -18,19 +17,19 @@ window,
1817
@BLACK_500
1918
);
2019
box-shadow:
21-
inset 0 0 0 1px alpha (#fff, 0.02),
22-
inset 0 1px 0 0 alpha (#fff, 0.07),
23-
inset 0 -1px 0 0 alpha (#fff, 0.01),
24-
0 0 0 1px alpha (#000, 0.7),
25-
0 1px 2px alpha (#000, 0.16),
26-
0 2px 3px alpha (#000, 0.23);
20+
inset 0 0 0 1px alpha(#fff, 0.02),
21+
inset 0 1px 0 0 alpha(#fff, 0.07),
22+
inset 0 -1px 0 0 alpha(#fff, 0.01),
23+
0 0 0 1px alpha(#000, 0.7),
24+
0 1px 2px alpha(#000, 0.16),
25+
0 2px 3px alpha(#000, 0.23);
2726
margin: 3px;
2827
-gtk-icon-size: 24px;
2928
}
3029

3130
.close image {
3231
color: #fff;
33-
-gtk-icon-shadow: 0 1px 1px alpha (#000, 0.6);
32+
-gtk-icon-shadow: 0 1px 1px alpha(#000, 0.6);
3433
}
3534

3635
.notification stack > grid {

data/image-mask.svg

Lines changed: 0 additions & 235 deletions
This file was deleted.

data/notifications.gresource.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<gresources>
33
<gresource prefix="/io/elementary/notifications">
4-
<file alias="application.css" compressed="true">application.css</file>
5-
<file alias="image-mask.svg" compressed="true">image-mask.svg</file>
4+
<file alias="Application.css" compressed="true">application.css</file>
65
</gresource>
76
</gresources>

src/AbstractBubble.vala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public class Notifications.AbstractBubble : Gtk.Window {
5555
transition_type = Gtk.RevealerTransitionType.CROSSFADE,
5656
halign = Gtk.Align.START,
5757
valign = Gtk.Align.START,
58-
child = close_button
58+
child = close_button,
59+
overflow = VISIBLE
5960
};
6061

6162
var overlay = new Gtk.Overlay () {
@@ -122,7 +123,7 @@ public class Notifications.AbstractBubble : Gtk.Window {
122123
timeout_id = 0;
123124
}
124125

125-
show ();
126+
base.present ();
126127

127128
if (timeout != 0) {
128129
timeout_id = Timeout.add (timeout, timeout_expired);

src/Widgets/MaskedImage.vala

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
*/
2020

21-
public class Notifications.MaskedImage : Gtk.Overlay {
21+
public class Notifications.MaskedImage : Granite.Bin {
2222
private const int ICON_SIZE = 48;
2323

2424
public Gdk.Pixbuf pixbuf { get; construct; }
@@ -28,15 +28,11 @@ public class Notifications.MaskedImage : Gtk.Overlay {
2828
}
2929

3030
construct {
31-
var mask = new Gtk.Image.from_resource ("/io/elementary/notifications/image-mask.svg");
32-
mask.pixel_size = ICON_SIZE;
33-
3431
var image = new Gtk.Image ();
3532
image.gicon = mask_pixbuf (pixbuf, scale_factor);
3633
image.pixel_size = ICON_SIZE;
3734

3835
child = image;
39-
add_overlay (mask);
4036
}
4137

4238
private static Gdk.Pixbuf? mask_pixbuf (Gdk.Pixbuf pixbuf, int scale) {

0 commit comments

Comments
 (0)