Skip to content

Commit

Permalink
Fixed issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@vinceliuice
vinceliuice committed Apr 18, 2024
1 parent be8b0af commit 74e2684
Show file tree
Hide file tree
Showing 6 changed files with 154 additions and 127 deletions.
16 changes: 8 additions & 8 deletions src/_sass/gnome-shell/widgets/_message-list-46.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
// message bubbles
.message {
border-radius: $material-radius;
text-shadow: none;
padding: 0;
margin: 0;
box-shadow: $shell-shadow-z2;
Expand All @@ -74,13 +73,14 @@
&:hover, &:focus, &:active { background-color: $base; }

.popup-menu & {
@extend .events-button;
border: 1px solid transparent;
border-left: none;
padding: 0;
margin: 0;
box-shadow: none;
margin: $margin-size;
background-color: if($variant == 'light', rgba(black, 0.04), rgba(white, 0.03));
color: $text-secondary;

&:hover, &:focus { background-color: $secondary-fill; }
&:active { background-color: $track; }
}

// subtract side padding to accommodate the close button's border
Expand Down Expand Up @@ -130,7 +130,7 @@
@extend .icon-button;
color: $text;
background-color: $fill;
padding: 4px;
padding: $margin-size;

&:hover { background-color: $divider; }
&:active,
Expand All @@ -139,7 +139,7 @@
}

.message-expand-button {
padding: $space-size;
padding: $margin-size;

&:ltr { margin-right: $space-size; }
&:rtl { margin-left: $space-size; }
Expand Down Expand Up @@ -195,7 +195,7 @@

/* Media Controls */
.message-media-control {
margin: 4px !important;
margin: $margin-size $space-size / 2 !important;
padding: 0 $space-size * 2 !important;
border-radius: $circular-radius;
color: $text-secondary;
Expand Down
25 changes: 16 additions & 9 deletions src/_sass/gnome-shell/widgets/_notifications-46.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,29 @@ $notification_banner_width: 34em;
font-size: 1em;
margin: $space-size;
border-radius: $popup-radius;
border-left: none;
border-bottom: none;
}

.notification-buttons-bin {
spacing: 0;
background-color: transparent;
padding: 0;
spacing: 0;
margin: 0;
}

.notification-button {
min-height: 40px;
padding: 0 16px;
padding: $space-size / 2 16px;
background-color: transparent;
color: $text-secondary;
font-weight: 500;
border-top: 1px solid $border !important;
border: none;
border-top: 1px solid $border;

.popup-menu & {
padding: 0 16px;
}

&:first-child:ltr {
border-radius: 0 0 0 $popup-radius;
Expand Down Expand Up @@ -52,22 +61,20 @@ $notification_banner_width: 34em;
&:focus {
background-color: transparent;
color: $text-secondary;
box-shadow: inset 0 0 0 2px $secondary-fill !important;
outline: none !important;
box-shadow: inset 0 0 0 2px $secondary-fill;
}

&:hover {
background-color: $secondary-fill;
color: $text;
box-shadow: none !important;
outline: none !important;
box-shadow: none;
}

&:active, &:checked { background-color: $track; color: $text; }

&:insensitive {
background-color: transparent !important;
color: $text-secondary-disabled !important;
background-color: transparent;
color: $text-secondary-disabled;
}

.popup-menu & {
Expand Down
61 changes: 33 additions & 28 deletions src/gnome-shell/shell-46-0/gnome-shell-Compact.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.world-clocks-button,
.weather-button,
.events-button {
.events-button,
.popup-menu .message {
padding: 4px 8px;
border-radius: 10px;
border: none;
Expand All @@ -1143,14 +1144,17 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
.weather-button:hover,
.weather-button:focus,
.events-button:hover,
.events-button:focus {
.popup-menu .message:hover,
.events-button:focus,
.popup-menu .message:focus {
color: rgba(0, 0, 0, 0.87);
background-color: rgba(0, 0, 0, 0.08);
}

.world-clocks-button:active,
.weather-button:active,
.events-button:active {
.events-button:active,
.popup-menu .message:active {
color: rgba(0, 0, 0, 0.87);
background-color: rgba(0, 0, 0, 0.26);
}
Expand Down Expand Up @@ -1180,17 +1184,17 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
font-size: 0.9em;
}

.events-button .events-box {
.events-button .events-box, .popup-menu .message .events-box {
spacing: 6px;
}

.events-button .events-list {
.events-button .events-list, .popup-menu .message .events-list {
color: rgba(0, 0, 0, 0.6);
spacing: 12px;
text-shadow: none;
}

.events-button .event-time {
.events-button .event-time, .popup-menu .message .event-time {
color: rgba(0, 0, 0, 0.26);
font-feature-settings: "tnum";
}
Expand Down Expand Up @@ -1325,7 +1329,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

.message {
border-radius: 10px;
text-shadow: none;
padding: 0;
margin: 0;
box-shadow: 0 3px 3px rgba(0, 0, 0, 0.32);
Expand All @@ -1338,20 +1341,15 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
}

.popup-menu .message {
border: 1px solid transparent;
border-left: none;
padding: 0;
margin: 0;
box-shadow: none;
margin: 2px;
background-color: rgba(0, 0, 0, 0.04);
color: rgba(0, 0, 0, 0.6);
}

.popup-menu .message:hover, .popup-menu .message:focus {
background-color: rgba(0, 0, 0, 0.08);
}

.popup-menu .message:active {
background-color: rgba(0, 0, 0, 0.26);
}

.message:ltr {
padding-right: -2px;
}
Expand Down Expand Up @@ -1400,7 +1398,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
.message .message-header .message-close-button {
color: rgba(0, 0, 0, 0.87);
background-color: rgba(0, 0, 0, 0.04);
padding: 4px;
padding: 2px;
}

.message .message-header .message-expand-button:hover,
Expand All @@ -1420,7 +1418,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
}

.message .message-header .message-expand-button {
padding: 4px;
padding: 2px;
}

.message .message-header .message-expand-button:ltr {
Expand Down Expand Up @@ -1477,7 +1475,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {

/* Media Controls */
.message-media-control {
margin: 4px !important;
margin: 2px 2px !important;
padding: 0 8px !important;
border-radius: 9999px;
color: rgba(0, 0, 0, 0.6);
Expand Down Expand Up @@ -1951,20 +1949,29 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
font-size: 1em;
margin: 4px;
border-radius: 16px;
border-left: none;
border-bottom: none;
}

.notification-buttons-bin {
spacing: 0;
background-color: transparent;
padding: 0;
spacing: 0;
margin: 0;
}

.notification-button {
min-height: 40px;
padding: 0 16px;
padding: 2px 16px;
background-color: transparent;
color: rgba(0, 0, 0, 0.6);
font-weight: 500;
border-top: 1px solid rgba(0, 0, 0, 0.12) !important;
border: none;
border-top: 1px solid rgba(0, 0, 0, 0.12);
}

.popup-menu .notification-button {
padding: 0 16px;
}

.notification-button:first-child:ltr {
Expand Down Expand Up @@ -1994,15 +2001,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
.notification-button:focus {
background-color: transparent;
color: rgba(0, 0, 0, 0.6);
box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.08) !important;
outline: none !important;
box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.08);
}

.notification-button:hover {
background-color: rgba(0, 0, 0, 0.08);
color: rgba(0, 0, 0, 0.87);
box-shadow: none !important;
outline: none !important;
box-shadow: none;
}

.notification-button:active, .notification-button:checked {
Expand All @@ -2011,8 +2016,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
}

.notification-button:insensitive {
background-color: transparent !important;
color: rgba(0, 0, 0, 0.26) !important;
background-color: transparent;
color: rgba(0, 0, 0, 0.26);
}

.popup-menu .notification-button:first-child:ltr {
Expand Down
Loading

0 comments on commit 74e2684

Please sign in to comment.