diff --git a/src/main/gnome-shell/gdm3-dark.css b/src/main/gnome-shell/gdm3-dark.css index c1e1761..96038ef 100644 --- a/src/main/gnome-shell/gdm3-dark.css +++ b/src/main/gnome-shell/gdm3-dark.css @@ -193,14 +193,6 @@ stage { margin: 4px 8px; } -.datemenu-displays-section { - padding-bottom: 0; -} - -.datemenu-displays-box { - spacing: 8px; -} - .datemenu-calendar-column { spacing: 8px; border: none; @@ -217,6 +209,14 @@ stage { border-right-width: 0; } +.datemenu-calendar-column .datemenu-displays-section { + padding-bottom: 0; +} + +.datemenu-calendar-column .datemenu-displays-box { + spacing: 8px; +} + .datemenu-today-button { min-height: 48px; border: none; @@ -405,7 +405,6 @@ stage { .weather-button, .events-button, .events-section-title { - min-height: 20px; padding: 12px; margin: 2px 4px; } @@ -439,36 +438,44 @@ stage { font-feature-settings: "tnum"; } -.world-clocks-grid, -.weather-grid { - spacing-rows: 0.4em; - spacing-columns: 0.8em; -} - -.world-clocks-city { +.world-clocks-button .world-clocks-city { color: #999999; font-weight: bold; font-size: 0.9em; } -.world-clocks-time { +.world-clocks-button .world-clocks-time { color: #999999; font-feature-settings: "tnum"; font-size: 1.2em; } -.world-clocks-timezone { +.world-clocks-button .world-clocks-time:ltr { + text-align: right; +} + +.world-clocks-button .world-clocks-time:rtl { + text-align: left; +} + +.world-clocks-button .world-clocks-timezone { color: #999999; font-feature-settings: "tnum"; font-size: 0.9em; } +.world-clocks-grid, +.weather-grid { + spacing-rows: 0.4em; + spacing-columns: 0.8em; +} + .weather-button { margin-bottom: 6px; } .weather-button .weather-box { - spacing: 0.5em; + spacing: 12px; } .weather-button .weather-header-box { diff --git a/src/main/gnome-shell/gdm3-light.css b/src/main/gnome-shell/gdm3-light.css index 03b7b7a..98bcf86 100644 --- a/src/main/gnome-shell/gdm3-light.css +++ b/src/main/gnome-shell/gdm3-light.css @@ -193,14 +193,6 @@ stage { margin: 4px 8px; } -.datemenu-displays-section { - padding-bottom: 0; -} - -.datemenu-displays-box { - spacing: 8px; -} - .datemenu-calendar-column { spacing: 8px; border: none; @@ -217,6 +209,14 @@ stage { border-right-width: 0; } +.datemenu-calendar-column .datemenu-displays-section { + padding-bottom: 0; +} + +.datemenu-calendar-column .datemenu-displays-box { + spacing: 8px; +} + .datemenu-today-button { min-height: 48px; border: none; @@ -405,7 +405,6 @@ stage { .weather-button, .events-button, .events-section-title { - min-height: 20px; padding: 12px; margin: 2px 4px; } @@ -439,36 +438,44 @@ stage { font-feature-settings: "tnum"; } -.world-clocks-grid, -.weather-grid { - spacing-rows: 0.4em; - spacing-columns: 0.8em; -} - -.world-clocks-city { +.world-clocks-button .world-clocks-city { color: #565656; font-weight: bold; font-size: 0.9em; } -.world-clocks-time { +.world-clocks-button .world-clocks-time { color: #565656; font-feature-settings: "tnum"; font-size: 1.2em; } -.world-clocks-timezone { +.world-clocks-button .world-clocks-time:ltr { + text-align: right; +} + +.world-clocks-button .world-clocks-time:rtl { + text-align: left; +} + +.world-clocks-button .world-clocks-timezone { color: #565656; font-feature-settings: "tnum"; font-size: 0.9em; } +.world-clocks-grid, +.weather-grid { + spacing-rows: 0.4em; + spacing-columns: 0.8em; +} + .weather-button { margin-bottom: 6px; } .weather-button .weather-box { - spacing: 0.5em; + spacing: 12px; } .weather-button .weather-header-box { diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css index 3fac18f..8bcc579 100644 --- a/src/main/gnome-shell/gnome-shell-dark-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-alt.css @@ -288,14 +288,6 @@ stage { margin: 4px 8px; } -.datemenu-displays-section { - padding-bottom: 0; -} - -.datemenu-displays-box { - spacing: 8px; -} - .datemenu-calendar-column { spacing: 8px; border: none; @@ -312,6 +304,14 @@ stage { border-right-width: 0; } +.datemenu-calendar-column .datemenu-displays-section { + padding-bottom: 0; +} + +.datemenu-calendar-column .datemenu-displays-box { + spacing: 8px; +} + .datemenu-today-button { min-height: 48px; border: none; @@ -500,7 +500,6 @@ stage { .weather-button, .events-button, .events-section-title { - min-height: 20px; padding: 12px; margin: 2px 4px; } @@ -534,36 +533,44 @@ stage { font-feature-settings: "tnum"; } -.world-clocks-grid, -.weather-grid { - spacing-rows: 0.4em; - spacing-columns: 0.8em; -} - -.world-clocks-city { +.world-clocks-button .world-clocks-city { color: #999999; font-weight: bold; font-size: 0.9em; } -.world-clocks-time { +.world-clocks-button .world-clocks-time { color: #999999; font-feature-settings: "tnum"; font-size: 1.2em; } -.world-clocks-timezone { +.world-clocks-button .world-clocks-time:ltr { + text-align: right; +} + +.world-clocks-button .world-clocks-time:rtl { + text-align: left; +} + +.world-clocks-button .world-clocks-timezone { color: #999999; font-feature-settings: "tnum"; font-size: 0.9em; } +.world-clocks-grid, +.weather-grid { + spacing-rows: 0.4em; + spacing-columns: 0.8em; +} + .weather-button { margin-bottom: 6px; } .weather-button .weather-box { - spacing: 0.5em; + spacing: 12px; } .weather-button .weather-header-box { diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css index 37cf308..94ee532 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css @@ -288,14 +288,6 @@ stage { margin: 4px 8px; } -.datemenu-displays-section { - padding-bottom: 0; -} - -.datemenu-displays-box { - spacing: 8px; -} - .datemenu-calendar-column { spacing: 8px; border: none; @@ -312,6 +304,14 @@ stage { border-right-width: 0; } +.datemenu-calendar-column .datemenu-displays-section { + padding-bottom: 0; +} + +.datemenu-calendar-column .datemenu-displays-box { + spacing: 8px; +} + .datemenu-today-button { min-height: 48px; border: none; @@ -500,7 +500,6 @@ stage { .weather-button, .events-button, .events-section-title { - min-height: 20px; padding: 12px; margin: 2px 4px; } @@ -534,36 +533,44 @@ stage { font-feature-settings: "tnum"; } -.world-clocks-grid, -.weather-grid { - spacing-rows: 0.4em; - spacing-columns: 0.8em; -} - -.world-clocks-city { +.world-clocks-button .world-clocks-city { color: #999999; font-weight: bold; font-size: 0.9em; } -.world-clocks-time { +.world-clocks-button .world-clocks-time { color: #999999; font-feature-settings: "tnum"; font-size: 1.2em; } -.world-clocks-timezone { +.world-clocks-button .world-clocks-time:ltr { + text-align: right; +} + +.world-clocks-button .world-clocks-time:rtl { + text-align: left; +} + +.world-clocks-button .world-clocks-timezone { color: #999999; font-feature-settings: "tnum"; font-size: 0.9em; } +.world-clocks-grid, +.weather-grid { + spacing-rows: 0.4em; + spacing-columns: 0.8em; +} + .weather-button { margin-bottom: 6px; } .weather-button .weather-box { - spacing: 0.5em; + spacing: 12px; } .weather-button .weather-header-box { diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css index 37cf308..94ee532 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid.css @@ -288,14 +288,6 @@ stage { margin: 4px 8px; } -.datemenu-displays-section { - padding-bottom: 0; -} - -.datemenu-displays-box { - spacing: 8px; -} - .datemenu-calendar-column { spacing: 8px; border: none; @@ -312,6 +304,14 @@ stage { border-right-width: 0; } +.datemenu-calendar-column .datemenu-displays-section { + padding-bottom: 0; +} + +.datemenu-calendar-column .datemenu-displays-box { + spacing: 8px; +} + .datemenu-today-button { min-height: 48px; border: none; @@ -500,7 +500,6 @@ stage { .weather-button, .events-button, .events-section-title { - min-height: 20px; padding: 12px; margin: 2px 4px; } @@ -534,36 +533,44 @@ stage { font-feature-settings: "tnum"; } -.world-clocks-grid, -.weather-grid { - spacing-rows: 0.4em; - spacing-columns: 0.8em; -} - -.world-clocks-city { +.world-clocks-button .world-clocks-city { color: #999999; font-weight: bold; font-size: 0.9em; } -.world-clocks-time { +.world-clocks-button .world-clocks-time { color: #999999; font-feature-settings: "tnum"; font-size: 1.2em; } -.world-clocks-timezone { +.world-clocks-button .world-clocks-time:ltr { + text-align: right; +} + +.world-clocks-button .world-clocks-time:rtl { + text-align: left; +} + +.world-clocks-button .world-clocks-timezone { color: #999999; font-feature-settings: "tnum"; font-size: 0.9em; } +.world-clocks-grid, +.weather-grid { + spacing-rows: 0.4em; + spacing-columns: 0.8em; +} + .weather-button { margin-bottom: 6px; } .weather-button .weather-box { - spacing: 0.5em; + spacing: 12px; } .weather-button .weather-header-box { diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css index 3fac18f..8bcc579 100644 --- a/src/main/gnome-shell/gnome-shell-dark.css +++ b/src/main/gnome-shell/gnome-shell-dark.css @@ -288,14 +288,6 @@ stage { margin: 4px 8px; } -.datemenu-displays-section { - padding-bottom: 0; -} - -.datemenu-displays-box { - spacing: 8px; -} - .datemenu-calendar-column { spacing: 8px; border: none; @@ -312,6 +304,14 @@ stage { border-right-width: 0; } +.datemenu-calendar-column .datemenu-displays-section { + padding-bottom: 0; +} + +.datemenu-calendar-column .datemenu-displays-box { + spacing: 8px; +} + .datemenu-today-button { min-height: 48px; border: none; @@ -500,7 +500,6 @@ stage { .weather-button, .events-button, .events-section-title { - min-height: 20px; padding: 12px; margin: 2px 4px; } @@ -534,36 +533,44 @@ stage { font-feature-settings: "tnum"; } -.world-clocks-grid, -.weather-grid { - spacing-rows: 0.4em; - spacing-columns: 0.8em; -} - -.world-clocks-city { +.world-clocks-button .world-clocks-city { color: #999999; font-weight: bold; font-size: 0.9em; } -.world-clocks-time { +.world-clocks-button .world-clocks-time { color: #999999; font-feature-settings: "tnum"; font-size: 1.2em; } -.world-clocks-timezone { +.world-clocks-button .world-clocks-time:ltr { + text-align: right; +} + +.world-clocks-button .world-clocks-time:rtl { + text-align: left; +} + +.world-clocks-button .world-clocks-timezone { color: #999999; font-feature-settings: "tnum"; font-size: 0.9em; } +.world-clocks-grid, +.weather-grid { + spacing-rows: 0.4em; + spacing-columns: 0.8em; +} + .weather-button { margin-bottom: 6px; } .weather-button .weather-box { - spacing: 0.5em; + spacing: 12px; } .weather-button .weather-header-box { diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css index 8d5ad96..2195511 100644 --- a/src/main/gnome-shell/gnome-shell-light-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-alt.css @@ -288,14 +288,6 @@ stage { margin: 4px 8px; } -.datemenu-displays-section { - padding-bottom: 0; -} - -.datemenu-displays-box { - spacing: 8px; -} - .datemenu-calendar-column { spacing: 8px; border: none; @@ -312,6 +304,14 @@ stage { border-right-width: 0; } +.datemenu-calendar-column .datemenu-displays-section { + padding-bottom: 0; +} + +.datemenu-calendar-column .datemenu-displays-box { + spacing: 8px; +} + .datemenu-today-button { min-height: 48px; border: none; @@ -500,7 +500,6 @@ stage { .weather-button, .events-button, .events-section-title { - min-height: 20px; padding: 12px; margin: 2px 4px; } @@ -534,36 +533,44 @@ stage { font-feature-settings: "tnum"; } -.world-clocks-grid, -.weather-grid { - spacing-rows: 0.4em; - spacing-columns: 0.8em; -} - -.world-clocks-city { +.world-clocks-button .world-clocks-city { color: #565656; font-weight: bold; font-size: 0.9em; } -.world-clocks-time { +.world-clocks-button .world-clocks-time { color: #565656; font-feature-settings: "tnum"; font-size: 1.2em; } -.world-clocks-timezone { +.world-clocks-button .world-clocks-time:ltr { + text-align: right; +} + +.world-clocks-button .world-clocks-time:rtl { + text-align: left; +} + +.world-clocks-button .world-clocks-timezone { color: #565656; font-feature-settings: "tnum"; font-size: 0.9em; } +.world-clocks-grid, +.weather-grid { + spacing-rows: 0.4em; + spacing-columns: 0.8em; +} + .weather-button { margin-bottom: 6px; } .weather-button .weather-box { - spacing: 0.5em; + spacing: 12px; } .weather-button .weather-header-box { diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css index b737f41..c0740d3 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css @@ -288,14 +288,6 @@ stage { margin: 4px 8px; } -.datemenu-displays-section { - padding-bottom: 0; -} - -.datemenu-displays-box { - spacing: 8px; -} - .datemenu-calendar-column { spacing: 8px; border: none; @@ -312,6 +304,14 @@ stage { border-right-width: 0; } +.datemenu-calendar-column .datemenu-displays-section { + padding-bottom: 0; +} + +.datemenu-calendar-column .datemenu-displays-box { + spacing: 8px; +} + .datemenu-today-button { min-height: 48px; border: none; @@ -500,7 +500,6 @@ stage { .weather-button, .events-button, .events-section-title { - min-height: 20px; padding: 12px; margin: 2px 4px; } @@ -534,36 +533,44 @@ stage { font-feature-settings: "tnum"; } -.world-clocks-grid, -.weather-grid { - spacing-rows: 0.4em; - spacing-columns: 0.8em; -} - -.world-clocks-city { +.world-clocks-button .world-clocks-city { color: #565656; font-weight: bold; font-size: 0.9em; } -.world-clocks-time { +.world-clocks-button .world-clocks-time { color: #565656; font-feature-settings: "tnum"; font-size: 1.2em; } -.world-clocks-timezone { +.world-clocks-button .world-clocks-time:ltr { + text-align: right; +} + +.world-clocks-button .world-clocks-time:rtl { + text-align: left; +} + +.world-clocks-button .world-clocks-timezone { color: #565656; font-feature-settings: "tnum"; font-size: 0.9em; } +.world-clocks-grid, +.weather-grid { + spacing-rows: 0.4em; + spacing-columns: 0.8em; +} + .weather-button { margin-bottom: 6px; } .weather-button .weather-box { - spacing: 0.5em; + spacing: 12px; } .weather-button .weather-header-box { diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css index b737f41..c0740d3 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid.css +++ b/src/main/gnome-shell/gnome-shell-light-solid.css @@ -288,14 +288,6 @@ stage { margin: 4px 8px; } -.datemenu-displays-section { - padding-bottom: 0; -} - -.datemenu-displays-box { - spacing: 8px; -} - .datemenu-calendar-column { spacing: 8px; border: none; @@ -312,6 +304,14 @@ stage { border-right-width: 0; } +.datemenu-calendar-column .datemenu-displays-section { + padding-bottom: 0; +} + +.datemenu-calendar-column .datemenu-displays-box { + spacing: 8px; +} + .datemenu-today-button { min-height: 48px; border: none; @@ -500,7 +500,6 @@ stage { .weather-button, .events-button, .events-section-title { - min-height: 20px; padding: 12px; margin: 2px 4px; } @@ -534,36 +533,44 @@ stage { font-feature-settings: "tnum"; } -.world-clocks-grid, -.weather-grid { - spacing-rows: 0.4em; - spacing-columns: 0.8em; -} - -.world-clocks-city { +.world-clocks-button .world-clocks-city { color: #565656; font-weight: bold; font-size: 0.9em; } -.world-clocks-time { +.world-clocks-button .world-clocks-time { color: #565656; font-feature-settings: "tnum"; font-size: 1.2em; } -.world-clocks-timezone { +.world-clocks-button .world-clocks-time:ltr { + text-align: right; +} + +.world-clocks-button .world-clocks-time:rtl { + text-align: left; +} + +.world-clocks-button .world-clocks-timezone { color: #565656; font-feature-settings: "tnum"; font-size: 0.9em; } +.world-clocks-grid, +.weather-grid { + spacing-rows: 0.4em; + spacing-columns: 0.8em; +} + .weather-button { margin-bottom: 6px; } .weather-button .weather-box { - spacing: 0.5em; + spacing: 12px; } .weather-button .weather-header-box { diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css index d3de130..9ea9223 100644 --- a/src/main/gnome-shell/gnome-shell-light.css +++ b/src/main/gnome-shell/gnome-shell-light.css @@ -288,14 +288,6 @@ stage { margin: 4px 8px; } -.datemenu-displays-section { - padding-bottom: 0; -} - -.datemenu-displays-box { - spacing: 8px; -} - .datemenu-calendar-column { spacing: 8px; border: none; @@ -312,6 +304,14 @@ stage { border-right-width: 0; } +.datemenu-calendar-column .datemenu-displays-section { + padding-bottom: 0; +} + +.datemenu-calendar-column .datemenu-displays-box { + spacing: 8px; +} + .datemenu-today-button { min-height: 48px; border: none; @@ -500,7 +500,6 @@ stage { .weather-button, .events-button, .events-section-title { - min-height: 20px; padding: 12px; margin: 2px 4px; } @@ -534,36 +533,44 @@ stage { font-feature-settings: "tnum"; } -.world-clocks-grid, -.weather-grid { - spacing-rows: 0.4em; - spacing-columns: 0.8em; -} - -.world-clocks-city { +.world-clocks-button .world-clocks-city { color: #565656; font-weight: bold; font-size: 0.9em; } -.world-clocks-time { +.world-clocks-button .world-clocks-time { color: #565656; font-feature-settings: "tnum"; font-size: 1.2em; } -.world-clocks-timezone { +.world-clocks-button .world-clocks-time:ltr { + text-align: right; +} + +.world-clocks-button .world-clocks-time:rtl { + text-align: left; +} + +.world-clocks-button .world-clocks-timezone { color: #565656; font-feature-settings: "tnum"; font-size: 0.9em; } +.world-clocks-grid, +.weather-grid { + spacing-rows: 0.4em; + spacing-columns: 0.8em; +} + .weather-button { margin-bottom: 6px; } .weather-button .weather-box { - spacing: 0.5em; + spacing: 12px; } .weather-button .weather-header-box { diff --git a/src/sass/gnome-shell/widgets/_calendar.scss b/src/sass/gnome-shell/widgets/_calendar.scss index 2000465..4d4fa59 100644 --- a/src/sass/gnome-shell/widgets/_calendar.scss +++ b/src/sass/gnome-shell/widgets/_calendar.scss @@ -28,15 +28,16 @@ margin: 4px 8px; } -.datemenu-displays-section { padding-bottom: 0; } -.datemenu-displays-box { spacing: 8px; } - .datemenu-calendar-column { spacing: 8px; border: none; padding: 0 $container_padding * 2; + &:ltr { margin-right: $container_padding * 2; border-left-width: 0; } &:rtl { margin-left: $container_padding * 2; border-right-width: 0; } + + .datemenu-displays-section { padding-bottom: 0; } + .datemenu-displays-box { spacing: 8px; } } .datemenu-today-button { @@ -88,6 +89,7 @@ background-image: url("assets/calendar-arrow-left.svg"); &:rtl { background-image: url("assets/calendar-arrow-right.svg"); } } + .calendar-change-month-forward { //arrow foreward padding: 0 2px; background-image: url("assets/calendar-arrow-right.svg"); @@ -110,17 +112,21 @@ border-radius: 1000px; color: $alt_fg_color; font-feature-settings: "tnum"; + &:hover, &:focus { background-color: $divider_color; } + &:active { color: $alt_fg_color; background-color: $track_color; border-color: transparent; //avoid jumparound due to today } + &:selected { color: $fg_color; background-color: $track_color; border-color: transparent; //avoid jumparound due to today } + &.calendar-day-heading { //day of week heading width: $menuitem_size; height: $menuitem_size - 7px; @@ -138,6 +144,7 @@ .calendar-day { //border collapse hack - see calendar.js border-width: 0; } + .calendar-day-top { border-top-width: 0; } .calendar-day-left { border-left-width: 0; } .calendar-nonwork-day { @@ -199,7 +206,6 @@ .events-button, .events-section-title { @extend %popover_bubble; - min-height: $menuitem_size - 4px * 2; padding: 12px; margin: 2px 4px; } @@ -236,36 +242,41 @@ } // World Clock +.world-clocks-button { + .world-clocks-city { + color: $hint_fg_color; + font-weight: bold; + font-size: 0.9em; + } + + .world-clocks-time { + color: $hint_fg_color; + font-feature-settings: "tnum"; + font-size: 1.2em; + + &:ltr { text-align: right; } + &:rtl { text-align: left; } + } + + .world-clocks-timezone { + color: $hint_fg_color; + font-feature-settings: "tnum"; + font-size: 0.9em; + } +} + .world-clocks-grid, .weather-grid { spacing-rows: 0.4em; spacing-columns: 0.8em; } -.world-clocks-city { - color: $hint_fg_color; - font-weight: bold; - font-size: 0.9em; -} - -.world-clocks-time { - color: $hint_fg_color; - font-feature-settings: "tnum"; - font-size: 1.2em; -} - -.world-clocks-timezone { - color: $hint_fg_color; - font-feature-settings: "tnum"; - font-size: 0.9em; -} - // Weather .weather-button { margin-bottom: 6px; .weather-box { - spacing: 0.5em; + spacing: 12px; } .weather-header-box {