isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

theme: Make %notification_bubble a mixin

Browse Source 
And simplify .datemenu-today-button styling by using it.

This allows removing duplicate code for flat notification_bubble
styling.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/957
This commit is contained in:
nana-4 2020-01-25 12:15:54 +09:00 committed by Florian Müllner
parent 9d91b586d8
commit 1263f84c3f
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/theme/gnome-shell-sass/_common.scss
View File

@ -155,14 +155,17 @@ stage {
// notification styling // notification styling
%notification_bubble { @mixin notification_bubble($flat: false) {
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
border-radius:$base_border_radius + 2px; border-radius: $base_border_radius + 2px;
padding: 0;
margin: $base_margin; margin: $base_margin;
@if $flat {
@include button(undecorated);
} @else {
@include button(normal); @include button(normal);
}
&:focus { &:focus {
@include button(focus); @include button(focus);

16
data/theme/gnome-shell-sass/widgets/_calendar.scss
View File

@ -21,17 +21,8 @@
// today button (the date) // today button (the date)
.datemenu-today-button { .datemenu-today-button {
@include notification_bubble($flat: true);
padding: $base_padding * 1.5; padding: $base_padding * 1.5;
margin: $base_margin;
border: 1px solid transparent;
border-radius: $base_border_radius + 2px;
&:hover { @include button(hover);}
&:focus { @include button(focus);}
&:active {
@include button(active);
}
// weekday label // weekday label
.day-label { .day-label {
@ -48,8 +39,7 @@
// calendar // calendar
.calendar { .calendar {
@extend %notification_bubble; @include notification_bubble;
margin: $base_margin;
margin-bottom: $base_padding + $base_margin; margin-bottom: $base_padding + $base_margin;
padding: $base_padding; padding: $base_padding;
@ -67,7 +57,7 @@
// world clocks and weather // world clocks and weather
.world-clocks-button, .world-clocks-button,
.weather-button { .weather-button {
@extend %notification_bubble; @include notification_bubble;
padding: $base_padding; padding: $base_padding;
} }
} }

2
data/theme/gnome-shell-sass/widgets/_message-list.scss
View File

@ -32,7 +32,7 @@
// message bubbles // message bubbles
.message { .message {
@extend %notification_bubble; @include notification_bubble;
// title // title
.message-title { .message-title {