mirror of
https://github.com/imarkoff/Marble-shell-theme.git
synced 2025-10-13 14:43:26 -07:00
Datemenu spacing improvements, modal/script/notif buttons fixes
- Now "spacing" property is responsible for spacings in datemenu, not components with margins. Looks the same on 47 and 43; - Fixed styles mismatch on older GNOME versions; - Fixed notification buttons on older GNOME versions; - Fixed some buttons in login/unlock dialogs on older GNOME versions; - Fixed an issue where generate_file moved specific GNOME version assets to marble folder instead of copying them to temp folder;
This commit is contained in:
@@ -3,16 +3,20 @@
|
||||
/* overall menu */
|
||||
#calendarArea {
|
||||
padding: 0;
|
||||
spacing: 9px;
|
||||
}
|
||||
|
||||
/* Calendar menu side column */
|
||||
.datemenu-calendar-column { spacing: 0px; }
|
||||
/* set padding here instead of #calendarArea for GNOME older than 46 */
|
||||
.datemenu-popover { padding: 9px; }
|
||||
|
||||
/* let's bring back issue #1 */
|
||||
.datemenu-calendar-column:ltr { margin-left: 0; }
|
||||
.datemenu-calendar-column:rtl { margin-right: 0; }
|
||||
/* padding property for older gnome versions */
|
||||
.datemenu-calendar-column:ltr { margin-left: 0; padding-left: 0; }
|
||||
.datemenu-calendar-column:rtl { margin-right: 0; padding-right: 0; }
|
||||
|
||||
.datemenu-calendar-column .datemenu-displays-box { spacing: 0px; }
|
||||
.datemenu-calendar-column, /* Calendar menu side column */
|
||||
.datemenu-calendar-column .datemenu-displays-box { /* widgets below calendar */
|
||||
spacing: 9px;
|
||||
}
|
||||
|
||||
|
||||
/* today header button */
|
||||
@@ -20,6 +24,7 @@
|
||||
color: TEXT-SECONDARY-COLOR;
|
||||
background-color: none;
|
||||
border-radius: 12px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.datemenu-today-button:hover {
|
||||
@@ -51,7 +56,9 @@
|
||||
border-radius: 14px;
|
||||
background-color: SECTION-COLOR;
|
||||
box-shadow: inset 0 0 0 1px BORDER-SHADOW !important;
|
||||
border: 0;
|
||||
padding: 5px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* month header */
|
||||
@@ -168,6 +175,8 @@
|
||||
background-color: SECTION-COLOR;
|
||||
color: TEXT-SECONDARY-COLOR;
|
||||
border-radius: 14px;
|
||||
margin: 0;
|
||||
border: 0;
|
||||
box-shadow: inset 0 0 0 1px BORDER-SHADOW;
|
||||
transition-duration: 125ms;
|
||||
}
|
||||
|
@@ -65,42 +65,44 @@
|
||||
|
||||
|
||||
/* login buttons */
|
||||
.login-dialog-button.cancel-button,
|
||||
.login-dialog-button.switch-user-button,
|
||||
.login-dialog-button.login-dialog-session-list-button {
|
||||
.cancel-button,
|
||||
.switch-user-button,
|
||||
.login-dialog-session-list-button {
|
||||
background-color: ACCENT-DISABLED-COLOR;
|
||||
color: TEXT-PRIMARY-COLOR;
|
||||
padding: 12px;
|
||||
min-height: 16px;
|
||||
box-shadow: inset 0 0 0 1px BORDER-SHADOW;
|
||||
border-radius: 99px;
|
||||
transition-duration: 100ms;
|
||||
}
|
||||
|
||||
.login-dialog-button.cancel-button:hover,
|
||||
.login-dialog-button.switch-user-button:hover,
|
||||
.login-dialog-button.login-dialog-session-list-button:hover {
|
||||
.cancel-button:hover,
|
||||
.switch-user-button:hover,
|
||||
.login-dialog-session-list-button:hover {
|
||||
background-color: ACCENT-DISABLED_HOVER;
|
||||
}
|
||||
|
||||
.login-dialog-button.cancel-button:focus,
|
||||
.login-dialog-button.switch-user-button:focus,
|
||||
.login-dialog-button.login-dialog-session-list-button:focus {
|
||||
.cancel-button:focus,
|
||||
.switch-user-button:focus,
|
||||
.login-dialog-session-list-button:focus {
|
||||
background-color: ACCENT-DISABLED_HOVER;
|
||||
box-shadow: inset 0 0 0 2px ACCENT-SECONDARY-COLOR !important;
|
||||
}
|
||||
|
||||
.login-dialog-button.cancel-button:focus:active,
|
||||
.login-dialog-button.switch-user-button:focus:active,
|
||||
.login-dialog-button.login-dialog-session-list-button:focus:active,
|
||||
.login-dialog-button.cancel-button:focus:hover,
|
||||
.login-dialog-button.switch-user-button:focus:hover,
|
||||
.login-dialog-button.login-dialog-session-list-button:focus:hover {
|
||||
.cancel-button:focus:active,
|
||||
.switch-user-button:focus:active,
|
||||
.login-dialog-session-list-button:focus:active,
|
||||
.cancel-button:focus:hover,
|
||||
.switch-user-button:focus:hover,
|
||||
.login-dialog-session-list-button:focus:hover {
|
||||
background-color: ACCENT-DISABLED_HOVER;
|
||||
box-shadow: inset 0 0 0 1px ACCENT-SECONDARY-COLOR !important;
|
||||
}
|
||||
|
||||
.login-dialog-button.cancel-button:active,
|
||||
.login-dialog-button.switch-user-button:active,
|
||||
.login-dialog-button.login-dialog-session-list-button:active {
|
||||
.cancel-button:active,
|
||||
.switch-user-button:active,
|
||||
.login-dialog-session-list-button:active {
|
||||
background-color: ACCENT-DISABLED_HOVER;
|
||||
}
|
||||
|
||||
|
@@ -7,8 +7,8 @@
|
||||
}
|
||||
|
||||
/* dnd and clear button */
|
||||
.message-list-controls:ltr { padding: auto 0 auto auto; }
|
||||
.message-list-controls:rtl { padding: auto auto auto 0; }
|
||||
.message-list-controls:ltr { padding: auto 0 0 6px; }
|
||||
.message-list-controls:rtl { padding: auto 6px 0 0; }
|
||||
|
||||
/* "No Notifications" text */
|
||||
.message-list-placeholder {
|
||||
@@ -16,9 +16,9 @@
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
/* remove right margin in message list section (datemenu) */
|
||||
.message-list-sections:ltr { margin-right: 0; }
|
||||
.message-list-sections:rtl { margin-left: 0; }
|
||||
/* remove right margin in message list section (datemenu) (a.k.a scrollbar) */
|
||||
.message-list:ltr, .message-list-sections:ltr { margin-right: 0; }
|
||||
.message-list:rtl, .message-list-sections:rtl { margin-left: 0; }
|
||||
|
||||
|
||||
/* popup messages */
|
||||
@@ -36,13 +36,17 @@
|
||||
}
|
||||
|
||||
/* Box layout for messages. I know looks weird but i can't find a better way to do it */
|
||||
.message-list > StBoxLayout > StScrollView > StViewport { spacing: 8px; } /* gap between player and messages box */
|
||||
.message-list > StBoxLayout > StScrollView > StViewport > StBoxLayout > StBoxLayout { spacing: 8px; } /* gap between messages */
|
||||
.message-list > StBoxLayout > StScrollView > StViewport, /* gap between player and messages box */
|
||||
.message-list > StBoxLayout > StScrollView > StViewport > StBoxLayout > StBoxLayout { /* gap between messages */
|
||||
spacing: 9px;
|
||||
}
|
||||
|
||||
/* messages in menus */
|
||||
.message-list .message, .popup-menu-content .message {
|
||||
background-color: SECTION-COLOR;
|
||||
box-shadow: inset 0 0 0 1px BORDER-SHADOW;
|
||||
border: 0;
|
||||
margin: 0; /* fix margins for GNOME older than 46 */
|
||||
border-radius: 13px;
|
||||
transition-duration: 100ms;
|
||||
}
|
||||
@@ -70,8 +74,13 @@
|
||||
.message .message-header .message-header-content .message-source-title,
|
||||
.message .message-header .message-header-content .event-time {
|
||||
color: TEXT-SECONDARY-COLOR;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
/* that's much better than adding "margin: $base_padding * 0.5;" to .message-close-button */
|
||||
.message-close-button { margin: 0; }
|
||||
.message-header:ltr > :last-child { margin-right: 2px; }
|
||||
.messahe-header:rtl > :first-child { margin-left: 2px; }
|
||||
|
||||
/* close button, expand button (46+) */
|
||||
.message-close-button,
|
||||
|
@@ -28,6 +28,7 @@
|
||||
/* password entry */
|
||||
.prompt-dialog-password-entry {
|
||||
background-color: SECTION-COLOR;
|
||||
padding: 8px !important;
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +45,7 @@
|
||||
|
||||
.modal-dialog-linked-button,
|
||||
.modal-dialog-button-box .modal-dialog-button {
|
||||
padding: 9px 0;
|
||||
padding: 9px 0 !important;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
|
@@ -1,33 +1,33 @@
|
||||
/* if first button: margin-right: 12px/2 */
|
||||
/* if first button: margin-right: 8px/2 */
|
||||
.modal-dialog-linked-button:ltr:first-child,
|
||||
.notification-button:ltr:first-child,
|
||||
.hotplug-notification-item:ltr:first-child,
|
||||
.modal-dialog-linked-button:rtl:last-child,
|
||||
.notification-button:rtl:last-child,
|
||||
.hotplug-notification-item:rtl:last-child {
|
||||
margin: 0 6px 0 0 !important;
|
||||
margin: 0 4px 8px 8px !important;
|
||||
}
|
||||
|
||||
/* if last button: margin-left: 12px/2 */
|
||||
/* if last button: margin-left: 8px/2 */
|
||||
.modal-dialog-linked-button:ltr:last-child,
|
||||
.notification-button:ltr:last-child,
|
||||
.hotplug-notification-item:ltr:last-child,
|
||||
.modal-dialog-linked-button:rtl:first-child,
|
||||
.notification-button:rtl:first-child,
|
||||
.hotplug-notification-item:rtl:first-child {
|
||||
margin: 0 0 0 6px !important;
|
||||
margin: 0 8px 8px 4px !important;
|
||||
}
|
||||
|
||||
/* if only button: normal margin */
|
||||
.modal-dialog-linked-button:first-child:last-child,
|
||||
.notification-button:first-child:last-child,
|
||||
.hotplug-notification-item:first-child:last-child {
|
||||
margin: 0 !important;
|
||||
margin: 0 8px 8px 8px !important;
|
||||
}
|
||||
|
||||
/* else: margin-right/left: 12px/2 */
|
||||
/* else: margin-right/left: 8px/2 */
|
||||
.modal-dialog-linked-button,
|
||||
.notification-button,
|
||||
.hotplug-notification-item {
|
||||
margin: 0 6px !important;
|
||||
margin: 0 4px 8px 4px !important;
|
||||
}
|
Reference in New Issue
Block a user