diff --git a/src/_sass/cinnamon/_common.scss b/src/_sass/cinnamon/_common.scss index 7bb207ff..f47e394b 100644 --- a/src/_sass/cinnamon/_common.scss +++ b/src/_sass/cinnamon/_common.scss @@ -7,7 +7,7 @@ $asset_path: assets; $font-size: 9; stage { - @include fontsize($font-size); + // @include fontsize($font-size); color: $text; } @@ -265,32 +265,43 @@ StScrollBar { // Popovers/Menus // -$menu_bg: if($variant=='light', rgba($base, 0.95), rgba($background, 0.95)); -$sub_menu_bg: if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05)); -$menu_item_radius: $corner-radius; - .menu, .popup-menu, %menu { - padding: $space-size / 2; - color: $text; - background-color: $menu_bg; - border-radius: $window-radius; - margin: $space-size; - box-shadow: 0 5px 12px rgba(black, 0.35); + padding: 0; + margin: 0; + box-shadow: none; + border: none; + background: none; &-arrow { icon-size: 16px; } + .popup-menu-content { + padding: $space-size 0; + color: $text; + background-color: $menu; + border-radius: $menu-radius; + margin: $space-size; + box-shadow: 0 5px 12px rgba(black, 0.35); + } + .popup-sub-menu { - border-radius: $menu_item_radius; + border-radius: 0; + padding: $space-size 0; + margin: 0 $space-size; background-gradient-direction: none; box-shadow: none; - background-color: $sub_menu_bg; - color: on($menu_bg, secondary); + background-color: $fill; + color: on($menu, secondary); + + .popup-menu-item { + margin: 0; + border-radius: 0; - .popup-menu-item:active { - background-color: on($menu_bg, divider); - color: on($menu_bg); + &:active { + background-color: on($menu, divider); + color: on($menu); + } } StScrollBar { @@ -299,12 +310,11 @@ $menu_item_radius: $corner-radius; } } - .popup-menu-content { padding: $space-size / 2; } - .popup-menu-item { - padding: $space-size $space-size*2; - spacing: $space-size*2; - border-radius: $menu_item_radius; + padding: $space-size $space-size * 2; + spacing: $space-size * 2; + border-radius: $corner-radius; + margin: 0 $space-size; &:hover, &:active { color: $text; @@ -342,8 +352,6 @@ $menu_item_radius: $corner-radius; padding: $space-size * 2; } -// .popup-image-menu-item {} - .popup-combobox-item { spacing: 1em; } .popup-separator-menu-item { @@ -661,12 +669,39 @@ $menu_item_radius: $corner-radius; // // Calendar // + +.calendar-main-box { + margin: 0 $space-size; +} + .calendar { - padding: .4em 1.75em; + padding: $space-size $space-size * 2; spacing-rows: 0px; spacing-columns: 0px; } +.calendar-today-home-button, +.calendar-today-home-button-enabled { + margin: $space-size 0; + padding: $space-size; + @extend %flat_button; +} + +.calendar-today-day-label { + font-size: 1.75em; + color: $text-secondary; + font-weight: bold; + text-align: center; + padding-bottom: .1em; +} + +.calendar-today-date-label { + font-size: 1.1em; + color: $text-disabled; + font-weight: bold; + text-align: center; +} + .calendar-month-label { color: $text; font-weight: bold; @@ -704,6 +739,18 @@ $menu_item_radius: $corner-radius; } } +.calendar-day-event-dot-box { + margin-top: 1.75em; + max-rows: 1; +} + +.calendar-day-event-dot { + margin: 1px; + border-radius: 2px; + width: 4px; + height: 4px; +} + .datemenu-date-label { padding: .4em 1.75em; font-weight: normal; @@ -720,6 +767,18 @@ $menu_item_radius: $corner-radius; padding: 0; margin: 2px; border-radius: $circular-radius; + + &:hover { + background-color: $fill; + } + + &:active { + background-color: $divider; + } + + &:selected { + background-color: $divider; + } } .calendar-day-heading { @@ -749,7 +808,8 @@ $menu_item_radius: $corner-radius; .calendar-today, .calendar-today:active, .calendar-today:focus, -.calendar-today:hover { +.calendar-today:hover, +.calendar-today:selected { font-weight: bold; color: on($primary); background-color: $primary; @@ -776,18 +836,143 @@ $menu_item_radius: $corner-radius; } } +.calendar-events-main-box { + height: 300px; + margin: $space-size + 2px 0.8em 0 0; + padding: $space-size + 2px; + min-width: 350px; + border: none; + border-radius: $corner-radius; + background-gradient-direction: vertical; + background-gradient-start: $fill; + background-gradient-end: $fill; + color: $text-secondary; +} + +.calendar-events-no-events-button { + margin: $space-size 0; + padding: $space-size; + border-radius: $corner-radius; + + &:hover { + background-gradient-direction: vertical; + background-gradient-start: $fill; + background-gradient-end: $fill; + box-shadow: none; + } +} + +.calendar-events-no-events-icon { + color: $text-disabled; +} + +.calendar-events-no-events-label { + font-size: 1.1em; + color: $text-disabled; + font-weight: bold; + text-align: center; + margin-top: $space-size * 1.5; +} + +.calendar-events-date-label { + padding: $space-size / 2 0 $space-size * 2 $space-size / 2; + font-size: 1.1em; + color: $text-secondary; + font-weight: bold; + text-align: center; +} + +.calendar-events-event-container { + padding: 2px; +} + +.calendar-events-main-box .separator { + -margin-horizontal: 1em; + -gradient-height: 1px; + -gradient-start: $border; + -gradient-end: $border; +} + +.calendar-event-button { + margin: $space-size 0 $space-size 0; + border-radius: $corner-radius; + + &:hover { + background-gradient-direction: vertical; + background-gradient-start: $fill; + background-gradient-end: $fill; + box-shadow: none; + } +} + +.calendar-event-color-strip { + width: 4px; + border-radius: 4px 0 0 4px; +} + +.calendar-event-row-content { + margin: $space-size; +} + +.calendar-event-time-past { + color: $text-secondary-disabled; + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present { + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present:all-day { + color: rgba($success, 0.6); +} + +.calendar-event-time-future { + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-countdown { + color: $text-disabled; + font-weight: bold; + text-align: right; + margin-bottom: .6em; +} + +.calendar-event-countdown:soon { + color: white; +} + +.calendar-event-countdown:imminent { + color: rgba($warning, 0.6); +} + +.calendar-event-countdown:current { + color: rgba($success, 0.6); +} + +.calendar-event-summary { + color: $text-disabled; + text-align: left; + width: 200px; +} + // // Notifications // #notification { border-radius: $window-radius; - padding: $space-size*2; - spacing-rows: $space-size*1.5; - spacing-columns: $space-size*1.5; - margin-from-right-edge-of-screen: $space-size*3; + padding: $space-size * 2; + spacing-rows: $space-size * 1.5; + spacing-columns: $space-size * 1.5; + margin-from-right-edge-of-screen: $space-size * 3; width: 28em; color: $text; - background-color: rgba($base, 0.8); + background-color: $menu; box-shadow: 0 5px 12px rgba(black, 0.35); margin: 7px 12px 17px 12px; @@ -865,7 +1050,7 @@ $menu_item_radius: $corner-radius; .switcher-list { color: $text; - background-color: $menu_bg; + background-color: $menu; border: none; border-radius: $corner-radius; padding: 20px; @@ -1150,7 +1335,7 @@ $menu_item_radius: $corner-radius; .menu { &-favorites-box { margin: auto; - margin-bottom: $space-size; + margin-bottom: $space-size * 1.5; padding: $space-size; transition-duration: 300; background-color: rgba($text, 0.05); @@ -1159,7 +1344,7 @@ $menu_item_radius: $corner-radius; } &-favorites-button { - padding: $space-size*1.5; + padding: $space-size * 1.5; border: none; border-radius: $corner-radius; @@ -1208,7 +1393,7 @@ $menu_item_radius: $corner-radius; StScrollView.menu-application-button { // extracted submenu container padding: $space-size/2 0; border-radius: $corner-radius; - background-color: $sub_menu_bg; + background-color: $fill; color: $text-secondary; .popup-menu-item { @@ -1223,7 +1408,7 @@ $menu_item_radius: $corner-radius; &:active { border-image: none; // image independent - background-color: on($menu_bg, divider); + background-color: on($menu, divider); color: $text; } @@ -1261,15 +1446,9 @@ $menu_item_radius: $corner-radius; // Name and description of the currently hovered item in the menu // This appears on the bottom right hand corner of the menu &-selected-app-box { - padding-right: 30px; - padding-left: 28px; + padding: 10px 30px; text-align: right; height: 30px; - - &:rtl { - padding-top: 10px; - height: 30px; - } } &-selected-app-title { font-weight: bold; } @@ -1287,10 +1466,6 @@ $menu_item_radius: $corner-radius; caret-color: $text; @extend %entry; - - &:focus { - box-shadow: inset 0 0 0 2px $entry-highlight; - } } .menu-search-entry-icon { @@ -1480,6 +1655,11 @@ $menu_item_radius: $corner-radius; &-thumbnail-menu { padding: $space-size; + color: $text; + background-color: $menu; + border-radius: $menu-radius; + margin: $space-size; + box-shadow: 0 5px 12px rgba(black, 0.35); .item-box { padding: $space-size; @@ -1644,7 +1824,7 @@ $menu_item_radius: $corner-radius; padding: 0 0; margin-top: 6px; border-radius: $corner-radius; - background-color: $sub_menu_bg; + background-color: $fill; color: $text; > StBoxLayout:first-child { @@ -1656,8 +1836,8 @@ $menu_item_radius: $corner-radius; height: 24px; border-radius: $circular-radius; - &:hover { background-color: on($menu_bg, divider); } - &:active { background-color: on($menu_bg, track); } + &:hover { background-color: on($menu, divider); } + &:active { background-color: on($menu, track); } StIcon { icon-size: 16px; } } diff --git a/src/cinnamon/cinnamon-Dark-compact.css b/src/cinnamon/cinnamon-Dark-compact.css index c187c3c0..8f0a2afd 100644 --- a/src/cinnamon/cinnamon-Dark-compact.css +++ b/src/cinnamon/cinnamon-Dark-compact.css @@ -1,5 +1,4 @@ stage { - font-size: 9pt; color: white; } @@ -46,25 +45,29 @@ stage { border-radius: 2px; } -.notification-button, .notification-icon-button, .menu #notification .notification-button, .menu #notification .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, #notification .notification-button, #notification .notification-icon-button { +.notification-button, .notification-icon-button, .menu #notification .notification-button, .menu #notification .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, #notification .notification-button, #notification .notification-icon-button, .calendar-today-home-button, +.calendar-today-home-button-enabled { border-radius: 2px; color: rgba(255, 255, 255, 0.7); background-color: transparent; } -.notification-button:hover, .notification-icon-button:hover, #notification .notification-button:hover, #notification .notification-icon-button:hover { +.notification-button:hover, .notification-icon-button:hover, #notification .notification-button:hover, #notification .notification-icon-button:hover, .calendar-today-home-button:hover, +.calendar-today-home-button-enabled:hover { color: white; background-color: rgba(255, 255, 255, 0.12); border-radius: 2px; } -.notification-button:active, .notification-icon-button:active, #notification .notification-button:active, #notification .notification-icon-button:active { +.notification-button:active, .notification-icon-button:active, #notification .notification-button:active, #notification .notification-icon-button:active, .calendar-today-home-button:active, +.calendar-today-home-button-enabled:active { color: white; background-color: rgba(255, 255, 255, 0.3); border-radius: 2px; } -.notification-button:insensitive, .notification-icon-button:insensitive, #notification .notification-button:insensitive, #notification .notification-icon-button:insensitive { +.notification-button:insensitive, .notification-icon-button:insensitive, #notification .notification-button:insensitive, #notification .notification-icon-button:insensitive, .calendar-today-home-button:insensitive, +.calendar-today-home-button-enabled:insensitive { color: rgba(255, 255, 255, 0.3); background-color: transparent; border-radius: 2px; @@ -290,12 +293,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu, .popup-menu, .popup-combo-menu { - padding: 2px; - color: white; - background-color: rgba(51, 51, 51, 0.95); - border-radius: 3px; - margin: 4px; - box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); + padding: 0; + margin: 0; + box-shadow: none; + border: none; + background: none; } .menu-arrow, @@ -303,16 +305,36 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { icon-size: 16px; } +.menu .popup-menu-content, +.popup-menu .popup-menu-content, +.popup-combo-menu .popup-menu-content { + padding: 4px 0; + color: white; + background-color: rgba(60, 60, 60, 0.98); + border-radius: 3px; + margin: 4px; + box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); +} + .menu .popup-sub-menu, .popup-menu .popup-sub-menu, .popup-combo-menu .popup-sub-menu { - border-radius: 2px; + border-radius: 0; + padding: 4px 0; + margin: 0 4px; background-gradient-direction: none; box-shadow: none; - background-color: rgba(255, 255, 255, 0.05); + background-color: rgba(255, 255, 255, 0.04); color: rgba(255, 255, 255, 0.7); } +.menu .popup-sub-menu .popup-menu-item, +.popup-menu .popup-sub-menu .popup-menu-item, +.popup-combo-menu .popup-sub-menu .popup-menu-item { + margin: 0; + border-radius: 0; +} + .menu .popup-sub-menu .popup-menu-item:active, .popup-menu .popup-sub-menu .popup-menu-item:active, .popup-combo-menu .popup-sub-menu .popup-menu-item:active { @@ -334,18 +356,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-width: 0; } -.menu .popup-menu-content, -.popup-menu .popup-menu-content, -.popup-combo-menu .popup-menu-content { - padding: 2px; -} - .menu .popup-menu-item, .popup-menu .popup-menu-item, .popup-combo-menu .popup-menu-item { padding: 4px 8px; spacing: 8px; border-radius: 2px; + margin: 0 4px; } .menu .popup-menu-item:hover, .menu .popup-menu-item:active, @@ -746,12 +763,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #888; } +.calendar-main-box { + margin: 0 4px; +} + .calendar { - padding: .4em 1.75em; + padding: 4px 8px; spacing-rows: 0px; spacing-columns: 0px; } +.calendar-today-home-button, +.calendar-today-home-button-enabled { + margin: 4px 0; + padding: 4px; +} + +.calendar-today-day-label { + font-size: 1.75em; + color: rgba(255, 255, 255, 0.7); + font-weight: bold; + text-align: center; + padding-bottom: .1em; +} + +.calendar-today-date-label { + font-size: 1.1em; + color: rgba(255, 255, 255, 0.5); + font-weight: bold; + text-align: center; +} + .calendar-month-label { color: white; font-weight: bold; @@ -795,6 +837,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-image: url("assets/calendar-arrow-left.svg"); } +.calendar-day-event-dot-box { + margin-top: 1.75em; + max-rows: 1; +} + +.calendar-day-event-dot { + margin: 1px; + border-radius: 2px; + width: 4px; + height: 4px; +} + .datemenu-date-label { padding: .4em 1.75em; font-weight: normal; @@ -813,6 +867,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 9999px; } +.calendar-day-base:hover { + background-color: rgba(255, 255, 255, 0.04); +} + +.calendar-day-base:active { + background-color: rgba(255, 255, 255, 0.12); +} + +.calendar-day-base:selected { + background-color: rgba(255, 255, 255, 0.12); +} + .calendar-day-heading { color: rgba(255, 255, 255, 0.7); margin-top: 1em; @@ -840,7 +906,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .calendar-today, .calendar-today:active, .calendar-today:focus, -.calendar-today:hover { +.calendar-today:hover, +.calendar-today:selected { font-weight: bold; color: white; background-color: #3281EA; @@ -867,6 +934,131 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-top: 3px; } +.calendar-events-main-box { + height: 300px; + margin: 6px 0.8em 0 0; + padding: 6px; + min-width: 350px; + border: none; + border-radius: 2px; + background-gradient-direction: vertical; + background-gradient-start: rgba(255, 255, 255, 0.04); + background-gradient-end: rgba(255, 255, 255, 0.04); + color: rgba(255, 255, 255, 0.7); +} + +.calendar-events-no-events-button { + margin: 4px 0; + padding: 4px; + border-radius: 2px; +} + +.calendar-events-no-events-button:hover { + background-gradient-direction: vertical; + background-gradient-start: rgba(255, 255, 255, 0.04); + background-gradient-end: rgba(255, 255, 255, 0.04); + box-shadow: none; +} + +.calendar-events-no-events-icon { + color: rgba(255, 255, 255, 0.5); +} + +.calendar-events-no-events-label { + font-size: 1.1em; + color: rgba(255, 255, 255, 0.5); + font-weight: bold; + text-align: center; + margin-top: 6px; +} + +.calendar-events-date-label { + padding: 2px 0 8px 2px; + font-size: 1.1em; + color: rgba(255, 255, 255, 0.7); + font-weight: bold; + text-align: center; +} + +.calendar-events-event-container { + padding: 2px; +} + +.calendar-events-main-box .separator { + -margin-horizontal: 1em; + -gradient-height: 1px; + -gradient-start: rgba(255, 255, 255, 0.12); + -gradient-end: rgba(255, 255, 255, 0.12); +} + +.calendar-event-button { + margin: 4px 0 4px 0; + border-radius: 2px; +} + +.calendar-event-button:hover { + background-gradient-direction: vertical; + background-gradient-start: rgba(255, 255, 255, 0.04); + background-gradient-end: rgba(255, 255, 255, 0.04); + box-shadow: none; +} + +.calendar-event-color-strip { + width: 4px; + border-radius: 4px 0 0 4px; +} + +.calendar-event-row-content { + margin: 4px; +} + +.calendar-event-time-past { + color: rgba(255, 255, 255, 0.3); + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present { + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present:all-day { + color: rgba(129, 201, 149, 0.6); +} + +.calendar-event-time-future { + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-countdown { + color: rgba(255, 255, 255, 0.5); + font-weight: bold; + text-align: right; + margin-bottom: .6em; +} + +.calendar-event-countdown:soon { + color: white; +} + +.calendar-event-countdown:imminent { + color: rgba(253, 214, 51, 0.6); +} + +.calendar-event-countdown:current { + color: rgba(129, 201, 149, 0.6); +} + +.calendar-event-summary { + color: rgba(255, 255, 255, 0.5); + text-align: left; + width: 200px; +} + #notification { border-radius: 3px; padding: 8px; @@ -875,7 +1067,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-from-right-edge-of-screen: 12px; width: 28em; color: white; - background-color: rgba(43, 43, 43, 0.8); + background-color: rgba(60, 60, 60, 0.98); box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); margin: 7px 12px 17px 12px; } @@ -954,7 +1146,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .switcher-list { color: white; - background-color: rgba(51, 51, 51, 0.95); + background-color: rgba(60, 60, 60, 0.98); border: none; border-radius: 2px; padding: 20px; @@ -1265,7 +1457,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu-favorites-box { margin: auto; - margin-bottom: 4px; + margin-bottom: 6px; padding: 4px; transition-duration: 300; background-color: rgba(255, 255, 255, 0.05); @@ -1335,7 +1527,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu StScrollView.menu-application-button { padding: 2px 0; border-radius: 2px; - background-color: rgba(255, 255, 255, 0.05); + background-color: rgba(255, 255, 255, 0.04); color: rgba(255, 255, 255, 0.7); } @@ -1402,17 +1594,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .menu-selected-app-box { - padding-right: 30px; - padding-left: 28px; + padding: 10px 30px; text-align: right; height: 30px; } -.menu-selected-app-box:rtl { - padding-top: 10px; - height: 30px; -} - .menu-selected-app-title { font-weight: bold; } @@ -1436,10 +1622,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { caret-color: white; } -#menu-search-entry:focus { - box-shadow: inset 0 0 0 2px #a6c8f6; -} - .menu-search-entry-icon { icon-size: 1em; color: white; @@ -1657,6 +1839,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .grouped-window-list-thumbnail-menu { padding: 4px; + color: white; + background-color: rgba(60, 60, 60, 0.98); + border-radius: 3px; + margin: 4px; + box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); } .grouped-window-list-thumbnail-menu .item-box { @@ -1828,7 +2015,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { padding: 0 0; margin-top: 6px; border-radius: 2px; - background-color: rgba(255, 255, 255, 0.05); + background-color: rgba(255, 255, 255, 0.04); color: white; } diff --git a/src/cinnamon/cinnamon-Dark.css b/src/cinnamon/cinnamon-Dark.css index 6c29c5f8..ea9a77d9 100644 --- a/src/cinnamon/cinnamon-Dark.css +++ b/src/cinnamon/cinnamon-Dark.css @@ -1,5 +1,4 @@ stage { - font-size: 9pt; color: white; } @@ -46,25 +45,29 @@ stage { border-radius: 2px; } -.notification-button, .notification-icon-button, .menu #notification .notification-button, .menu #notification .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, #notification .notification-button, #notification .notification-icon-button { +.notification-button, .notification-icon-button, .menu #notification .notification-button, .menu #notification .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, #notification .notification-button, #notification .notification-icon-button, .calendar-today-home-button, +.calendar-today-home-button-enabled { border-radius: 2px; color: rgba(255, 255, 255, 0.7); background-color: transparent; } -.notification-button:hover, .notification-icon-button:hover, #notification .notification-button:hover, #notification .notification-icon-button:hover { +.notification-button:hover, .notification-icon-button:hover, #notification .notification-button:hover, #notification .notification-icon-button:hover, .calendar-today-home-button:hover, +.calendar-today-home-button-enabled:hover { color: white; background-color: rgba(255, 255, 255, 0.12); border-radius: 2px; } -.notification-button:active, .notification-icon-button:active, #notification .notification-button:active, #notification .notification-icon-button:active { +.notification-button:active, .notification-icon-button:active, #notification .notification-button:active, #notification .notification-icon-button:active, .calendar-today-home-button:active, +.calendar-today-home-button-enabled:active { color: white; background-color: rgba(255, 255, 255, 0.3); border-radius: 2px; } -.notification-button:insensitive, .notification-icon-button:insensitive, #notification .notification-button:insensitive, #notification .notification-icon-button:insensitive { +.notification-button:insensitive, .notification-icon-button:insensitive, #notification .notification-button:insensitive, #notification .notification-icon-button:insensitive, .calendar-today-home-button:insensitive, +.calendar-today-home-button-enabled:insensitive { color: rgba(255, 255, 255, 0.3); background-color: transparent; border-radius: 2px; @@ -290,12 +293,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu, .popup-menu, .popup-combo-menu { - padding: 3px; - color: white; - background-color: rgba(51, 51, 51, 0.95); - border-radius: 3px; - margin: 6px; - box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); + padding: 0; + margin: 0; + box-shadow: none; + border: none; + background: none; } .menu-arrow, @@ -303,16 +305,36 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { icon-size: 16px; } +.menu .popup-menu-content, +.popup-menu .popup-menu-content, +.popup-combo-menu .popup-menu-content { + padding: 6px 0; + color: white; + background-color: rgba(60, 60, 60, 0.98); + border-radius: 3px; + margin: 6px; + box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); +} + .menu .popup-sub-menu, .popup-menu .popup-sub-menu, .popup-combo-menu .popup-sub-menu { - border-radius: 2px; + border-radius: 0; + padding: 6px 0; + margin: 0 6px; background-gradient-direction: none; box-shadow: none; - background-color: rgba(255, 255, 255, 0.05); + background-color: rgba(255, 255, 255, 0.04); color: rgba(255, 255, 255, 0.7); } +.menu .popup-sub-menu .popup-menu-item, +.popup-menu .popup-sub-menu .popup-menu-item, +.popup-combo-menu .popup-sub-menu .popup-menu-item { + margin: 0; + border-radius: 0; +} + .menu .popup-sub-menu .popup-menu-item:active, .popup-menu .popup-sub-menu .popup-menu-item:active, .popup-combo-menu .popup-sub-menu .popup-menu-item:active { @@ -334,18 +356,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-width: 0; } -.menu .popup-menu-content, -.popup-menu .popup-menu-content, -.popup-combo-menu .popup-menu-content { - padding: 3px; -} - .menu .popup-menu-item, .popup-menu .popup-menu-item, .popup-combo-menu .popup-menu-item { padding: 6px 12px; spacing: 12px; border-radius: 2px; + margin: 0 6px; } .menu .popup-menu-item:hover, .menu .popup-menu-item:active, @@ -746,12 +763,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #888; } +.calendar-main-box { + margin: 0 6px; +} + .calendar { - padding: .4em 1.75em; + padding: 6px 12px; spacing-rows: 0px; spacing-columns: 0px; } +.calendar-today-home-button, +.calendar-today-home-button-enabled { + margin: 6px 0; + padding: 6px; +} + +.calendar-today-day-label { + font-size: 1.75em; + color: rgba(255, 255, 255, 0.7); + font-weight: bold; + text-align: center; + padding-bottom: .1em; +} + +.calendar-today-date-label { + font-size: 1.1em; + color: rgba(255, 255, 255, 0.5); + font-weight: bold; + text-align: center; +} + .calendar-month-label { color: white; font-weight: bold; @@ -795,6 +837,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-image: url("assets/calendar-arrow-left.svg"); } +.calendar-day-event-dot-box { + margin-top: 1.75em; + max-rows: 1; +} + +.calendar-day-event-dot { + margin: 1px; + border-radius: 2px; + width: 4px; + height: 4px; +} + .datemenu-date-label { padding: .4em 1.75em; font-weight: normal; @@ -813,6 +867,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 9999px; } +.calendar-day-base:hover { + background-color: rgba(255, 255, 255, 0.04); +} + +.calendar-day-base:active { + background-color: rgba(255, 255, 255, 0.12); +} + +.calendar-day-base:selected { + background-color: rgba(255, 255, 255, 0.12); +} + .calendar-day-heading { color: rgba(255, 255, 255, 0.7); margin-top: 1em; @@ -840,7 +906,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .calendar-today, .calendar-today:active, .calendar-today:focus, -.calendar-today:hover { +.calendar-today:hover, +.calendar-today:selected { font-weight: bold; color: white; background-color: #3281EA; @@ -867,6 +934,131 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-top: 3px; } +.calendar-events-main-box { + height: 300px; + margin: 8px 0.8em 0 0; + padding: 8px; + min-width: 350px; + border: none; + border-radius: 2px; + background-gradient-direction: vertical; + background-gradient-start: rgba(255, 255, 255, 0.04); + background-gradient-end: rgba(255, 255, 255, 0.04); + color: rgba(255, 255, 255, 0.7); +} + +.calendar-events-no-events-button { + margin: 6px 0; + padding: 6px; + border-radius: 2px; +} + +.calendar-events-no-events-button:hover { + background-gradient-direction: vertical; + background-gradient-start: rgba(255, 255, 255, 0.04); + background-gradient-end: rgba(255, 255, 255, 0.04); + box-shadow: none; +} + +.calendar-events-no-events-icon { + color: rgba(255, 255, 255, 0.5); +} + +.calendar-events-no-events-label { + font-size: 1.1em; + color: rgba(255, 255, 255, 0.5); + font-weight: bold; + text-align: center; + margin-top: 9px; +} + +.calendar-events-date-label { + padding: 3px 0 12px 3px; + font-size: 1.1em; + color: rgba(255, 255, 255, 0.7); + font-weight: bold; + text-align: center; +} + +.calendar-events-event-container { + padding: 2px; +} + +.calendar-events-main-box .separator { + -margin-horizontal: 1em; + -gradient-height: 1px; + -gradient-start: rgba(255, 255, 255, 0.12); + -gradient-end: rgba(255, 255, 255, 0.12); +} + +.calendar-event-button { + margin: 6px 0 6px 0; + border-radius: 2px; +} + +.calendar-event-button:hover { + background-gradient-direction: vertical; + background-gradient-start: rgba(255, 255, 255, 0.04); + background-gradient-end: rgba(255, 255, 255, 0.04); + box-shadow: none; +} + +.calendar-event-color-strip { + width: 4px; + border-radius: 4px 0 0 4px; +} + +.calendar-event-row-content { + margin: 6px; +} + +.calendar-event-time-past { + color: rgba(255, 255, 255, 0.3); + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present { + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present:all-day { + color: rgba(129, 201, 149, 0.6); +} + +.calendar-event-time-future { + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-countdown { + color: rgba(255, 255, 255, 0.5); + font-weight: bold; + text-align: right; + margin-bottom: .6em; +} + +.calendar-event-countdown:soon { + color: white; +} + +.calendar-event-countdown:imminent { + color: rgba(253, 214, 51, 0.6); +} + +.calendar-event-countdown:current { + color: rgba(129, 201, 149, 0.6); +} + +.calendar-event-summary { + color: rgba(255, 255, 255, 0.5); + text-align: left; + width: 200px; +} + #notification { border-radius: 3px; padding: 12px; @@ -875,7 +1067,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-from-right-edge-of-screen: 18px; width: 28em; color: white; - background-color: rgba(43, 43, 43, 0.8); + background-color: rgba(60, 60, 60, 0.98); box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); margin: 7px 12px 17px 12px; } @@ -954,7 +1146,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .switcher-list { color: white; - background-color: rgba(51, 51, 51, 0.95); + background-color: rgba(60, 60, 60, 0.98); border: none; border-radius: 2px; padding: 20px; @@ -1265,7 +1457,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu-favorites-box { margin: auto; - margin-bottom: 6px; + margin-bottom: 9px; padding: 6px; transition-duration: 300; background-color: rgba(255, 255, 255, 0.05); @@ -1335,7 +1527,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu StScrollView.menu-application-button { padding: 3px 0; border-radius: 2px; - background-color: rgba(255, 255, 255, 0.05); + background-color: rgba(255, 255, 255, 0.04); color: rgba(255, 255, 255, 0.7); } @@ -1402,17 +1594,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .menu-selected-app-box { - padding-right: 30px; - padding-left: 28px; + padding: 10px 30px; text-align: right; height: 30px; } -.menu-selected-app-box:rtl { - padding-top: 10px; - height: 30px; -} - .menu-selected-app-title { font-weight: bold; } @@ -1436,10 +1622,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { caret-color: white; } -#menu-search-entry:focus { - box-shadow: inset 0 0 0 2px #a6c8f6; -} - .menu-search-entry-icon { icon-size: 1em; color: white; @@ -1657,6 +1839,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .grouped-window-list-thumbnail-menu { padding: 6px; + color: white; + background-color: rgba(60, 60, 60, 0.98); + border-radius: 3px; + margin: 6px; + box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); } .grouped-window-list-thumbnail-menu .item-box { @@ -1828,7 +2015,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { padding: 0 0; margin-top: 6px; border-radius: 2px; - background-color: rgba(255, 255, 255, 0.05); + background-color: rgba(255, 255, 255, 0.04); color: white; } diff --git a/src/cinnamon/cinnamon-Light-compact.css b/src/cinnamon/cinnamon-Light-compact.css index 7c8eae20..20cbfdcd 100644 --- a/src/cinnamon/cinnamon-Light-compact.css +++ b/src/cinnamon/cinnamon-Light-compact.css @@ -1,5 +1,4 @@ stage { - font-size: 9pt; color: rgba(0, 0, 0, 0.87); } @@ -46,25 +45,29 @@ stage { border-radius: 2px; } -.notification-button, .notification-icon-button, .menu #notification .notification-button, .menu #notification .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, #notification .notification-button, #notification .notification-icon-button { +.notification-button, .notification-icon-button, .menu #notification .notification-button, .menu #notification .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, #notification .notification-button, #notification .notification-icon-button, .calendar-today-home-button, +.calendar-today-home-button-enabled { border-radius: 2px; color: rgba(0, 0, 0, 0.6); background-color: transparent; } -.notification-button:hover, .notification-icon-button:hover, #notification .notification-button:hover, #notification .notification-icon-button:hover { +.notification-button:hover, .notification-icon-button:hover, #notification .notification-button:hover, #notification .notification-icon-button:hover, .calendar-today-home-button:hover, +.calendar-today-home-button-enabled:hover { color: rgba(0, 0, 0, 0.87); background-color: rgba(0, 0, 0, 0.12); border-radius: 2px; } -.notification-button:active, .notification-icon-button:active, #notification .notification-button:active, #notification .notification-icon-button:active { +.notification-button:active, .notification-icon-button:active, #notification .notification-button:active, #notification .notification-icon-button:active, .calendar-today-home-button:active, +.calendar-today-home-button-enabled:active { color: rgba(0, 0, 0, 0.87); background-color: rgba(0, 0, 0, 0.26); border-radius: 2px; } -.notification-button:insensitive, .notification-icon-button:insensitive, #notification .notification-button:insensitive, #notification .notification-icon-button:insensitive { +.notification-button:insensitive, .notification-icon-button:insensitive, #notification .notification-button:insensitive, #notification .notification-icon-button:insensitive, .calendar-today-home-button:insensitive, +.calendar-today-home-button-enabled:insensitive { color: rgba(0, 0, 0, 0.26); background-color: transparent; border-radius: 2px; @@ -290,12 +293,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu, .popup-menu, .popup-combo-menu { - padding: 2px; - color: rgba(0, 0, 0, 0.87); - background-color: rgba(255, 255, 255, 0.95); - border-radius: 3px; - margin: 4px; - box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); + padding: 0; + margin: 0; + box-shadow: none; + border: none; + background: none; } .menu-arrow, @@ -303,16 +305,36 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { icon-size: 16px; } +.menu .popup-menu-content, +.popup-menu .popup-menu-content, +.popup-combo-menu .popup-menu-content { + padding: 4px 0; + color: rgba(0, 0, 0, 0.87); + background-color: rgba(255, 255, 255, 0.98); + border-radius: 3px; + margin: 4px; + box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); +} + .menu .popup-sub-menu, .popup-menu .popup-sub-menu, .popup-combo-menu .popup-sub-menu { - border-radius: 2px; + border-radius: 0; + padding: 4px 0; + margin: 0 4px; background-gradient-direction: none; box-shadow: none; - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.6); } +.menu .popup-sub-menu .popup-menu-item, +.popup-menu .popup-sub-menu .popup-menu-item, +.popup-combo-menu .popup-sub-menu .popup-menu-item { + margin: 0; + border-radius: 0; +} + .menu .popup-sub-menu .popup-menu-item:active, .popup-menu .popup-sub-menu .popup-menu-item:active, .popup-combo-menu .popup-sub-menu .popup-menu-item:active { @@ -334,18 +356,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-width: 0; } -.menu .popup-menu-content, -.popup-menu .popup-menu-content, -.popup-combo-menu .popup-menu-content { - padding: 2px; -} - .menu .popup-menu-item, .popup-menu .popup-menu-item, .popup-combo-menu .popup-menu-item { padding: 4px 8px; spacing: 8px; border-radius: 2px; + margin: 0 4px; } .menu .popup-menu-item:hover, .menu .popup-menu-item:active, @@ -746,12 +763,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #888; } +.calendar-main-box { + margin: 0 4px; +} + .calendar { - padding: .4em 1.75em; + padding: 4px 8px; spacing-rows: 0px; spacing-columns: 0px; } +.calendar-today-home-button, +.calendar-today-home-button-enabled { + margin: 4px 0; + padding: 4px; +} + +.calendar-today-day-label { + font-size: 1.75em; + color: rgba(0, 0, 0, 0.6); + font-weight: bold; + text-align: center; + padding-bottom: .1em; +} + +.calendar-today-date-label { + font-size: 1.1em; + color: rgba(0, 0, 0, 0.38); + font-weight: bold; + text-align: center; +} + .calendar-month-label { color: rgba(0, 0, 0, 0.87); font-weight: bold; @@ -795,6 +837,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-image: url("assets/calendar-arrow-left.svg"); } +.calendar-day-event-dot-box { + margin-top: 1.75em; + max-rows: 1; +} + +.calendar-day-event-dot { + margin: 1px; + border-radius: 2px; + width: 4px; + height: 4px; +} + .datemenu-date-label { padding: .4em 1.75em; font-weight: normal; @@ -813,6 +867,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 9999px; } +.calendar-day-base:hover { + background-color: rgba(0, 0, 0, 0.04); +} + +.calendar-day-base:active { + background-color: rgba(0, 0, 0, 0.12); +} + +.calendar-day-base:selected { + background-color: rgba(0, 0, 0, 0.12); +} + .calendar-day-heading { color: rgba(0, 0, 0, 0.6); margin-top: 1em; @@ -840,7 +906,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .calendar-today, .calendar-today:active, .calendar-today:focus, -.calendar-today:hover { +.calendar-today:hover, +.calendar-today:selected { font-weight: bold; color: white; background-color: #1A73E8; @@ -867,6 +934,131 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-top: 3px; } +.calendar-events-main-box { + height: 300px; + margin: 6px 0.8em 0 0; + padding: 6px; + min-width: 350px; + border: none; + border-radius: 2px; + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 0, 0, 0.04); + background-gradient-end: rgba(0, 0, 0, 0.04); + color: rgba(0, 0, 0, 0.6); +} + +.calendar-events-no-events-button { + margin: 4px 0; + padding: 4px; + border-radius: 2px; +} + +.calendar-events-no-events-button:hover { + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 0, 0, 0.04); + background-gradient-end: rgba(0, 0, 0, 0.04); + box-shadow: none; +} + +.calendar-events-no-events-icon { + color: rgba(0, 0, 0, 0.38); +} + +.calendar-events-no-events-label { + font-size: 1.1em; + color: rgba(0, 0, 0, 0.38); + font-weight: bold; + text-align: center; + margin-top: 6px; +} + +.calendar-events-date-label { + padding: 2px 0 8px 2px; + font-size: 1.1em; + color: rgba(0, 0, 0, 0.6); + font-weight: bold; + text-align: center; +} + +.calendar-events-event-container { + padding: 2px; +} + +.calendar-events-main-box .separator { + -margin-horizontal: 1em; + -gradient-height: 1px; + -gradient-start: rgba(0, 0, 0, 0.08); + -gradient-end: rgba(0, 0, 0, 0.08); +} + +.calendar-event-button { + margin: 4px 0 4px 0; + border-radius: 2px; +} + +.calendar-event-button:hover { + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 0, 0, 0.04); + background-gradient-end: rgba(0, 0, 0, 0.04); + box-shadow: none; +} + +.calendar-event-color-strip { + width: 4px; + border-radius: 4px 0 0 4px; +} + +.calendar-event-row-content { + margin: 4px; +} + +.calendar-event-time-past { + color: rgba(0, 0, 0, 0.26); + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present { + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present:all-day { + color: rgba(15, 157, 88, 0.6); +} + +.calendar-event-time-future { + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-countdown { + color: rgba(0, 0, 0, 0.38); + font-weight: bold; + text-align: right; + margin-bottom: .6em; +} + +.calendar-event-countdown:soon { + color: white; +} + +.calendar-event-countdown:imminent { + color: rgba(244, 180, 0, 0.6); +} + +.calendar-event-countdown:current { + color: rgba(15, 157, 88, 0.6); +} + +.calendar-event-summary { + color: rgba(0, 0, 0, 0.38); + text-align: left; + width: 200px; +} + #notification { border-radius: 3px; padding: 8px; @@ -875,7 +1067,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-from-right-edge-of-screen: 12px; width: 28em; color: rgba(0, 0, 0, 0.87); - background-color: rgba(255, 255, 255, 0.8); + background-color: rgba(255, 255, 255, 0.98); box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); margin: 7px 12px 17px 12px; } @@ -954,7 +1146,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .switcher-list { color: rgba(0, 0, 0, 0.87); - background-color: rgba(255, 255, 255, 0.95); + background-color: rgba(255, 255, 255, 0.98); border: none; border-radius: 2px; padding: 20px; @@ -1265,7 +1457,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu-favorites-box { margin: auto; - margin-bottom: 4px; + margin-bottom: 6px; padding: 4px; transition-duration: 300; background-color: rgba(0, 0, 0, 0.05); @@ -1335,7 +1527,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu StScrollView.menu-application-button { padding: 2px 0; border-radius: 2px; - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.6); } @@ -1402,17 +1594,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .menu-selected-app-box { - padding-right: 30px; - padding-left: 28px; + padding: 10px 30px; text-align: right; height: 30px; } -.menu-selected-app-box:rtl { - padding-top: 10px; - height: 30px; -} - .menu-selected-app-title { font-weight: bold; } @@ -1436,10 +1622,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { caret-color: rgba(0, 0, 0, 0.87); } -#menu-search-entry:focus { - box-shadow: inset 0 0 0 2px #8ebaf4; -} - .menu-search-entry-icon { icon-size: 1em; color: rgba(0, 0, 0, 0.87); @@ -1657,6 +1839,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .grouped-window-list-thumbnail-menu { padding: 4px; + color: rgba(0, 0, 0, 0.87); + background-color: rgba(255, 255, 255, 0.98); + border-radius: 3px; + margin: 4px; + box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); } .grouped-window-list-thumbnail-menu .item-box { @@ -1828,7 +2015,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { padding: 0 0; margin-top: 6px; border-radius: 2px; - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.87); } diff --git a/src/cinnamon/cinnamon-Light.css b/src/cinnamon/cinnamon-Light.css index 9452c67d..03e1ee7c 100644 --- a/src/cinnamon/cinnamon-Light.css +++ b/src/cinnamon/cinnamon-Light.css @@ -1,5 +1,4 @@ stage { - font-size: 9pt; color: rgba(0, 0, 0, 0.87); } @@ -46,25 +45,29 @@ stage { border-radius: 2px; } -.notification-button, .notification-icon-button, .menu #notification .notification-button, .menu #notification .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, #notification .notification-button, #notification .notification-icon-button { +.notification-button, .notification-icon-button, .menu #notification .notification-button, .menu #notification .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, #notification .notification-button, #notification .notification-icon-button, .calendar-today-home-button, +.calendar-today-home-button-enabled { border-radius: 2px; color: rgba(0, 0, 0, 0.6); background-color: transparent; } -.notification-button:hover, .notification-icon-button:hover, #notification .notification-button:hover, #notification .notification-icon-button:hover { +.notification-button:hover, .notification-icon-button:hover, #notification .notification-button:hover, #notification .notification-icon-button:hover, .calendar-today-home-button:hover, +.calendar-today-home-button-enabled:hover { color: rgba(0, 0, 0, 0.87); background-color: rgba(0, 0, 0, 0.12); border-radius: 2px; } -.notification-button:active, .notification-icon-button:active, #notification .notification-button:active, #notification .notification-icon-button:active { +.notification-button:active, .notification-icon-button:active, #notification .notification-button:active, #notification .notification-icon-button:active, .calendar-today-home-button:active, +.calendar-today-home-button-enabled:active { color: rgba(0, 0, 0, 0.87); background-color: rgba(0, 0, 0, 0.26); border-radius: 2px; } -.notification-button:insensitive, .notification-icon-button:insensitive, #notification .notification-button:insensitive, #notification .notification-icon-button:insensitive { +.notification-button:insensitive, .notification-icon-button:insensitive, #notification .notification-button:insensitive, #notification .notification-icon-button:insensitive, .calendar-today-home-button:insensitive, +.calendar-today-home-button-enabled:insensitive { color: rgba(0, 0, 0, 0.26); background-color: transparent; border-radius: 2px; @@ -290,12 +293,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu, .popup-menu, .popup-combo-menu { - padding: 3px; - color: rgba(0, 0, 0, 0.87); - background-color: rgba(255, 255, 255, 0.95); - border-radius: 3px; - margin: 6px; - box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); + padding: 0; + margin: 0; + box-shadow: none; + border: none; + background: none; } .menu-arrow, @@ -303,16 +305,36 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { icon-size: 16px; } +.menu .popup-menu-content, +.popup-menu .popup-menu-content, +.popup-combo-menu .popup-menu-content { + padding: 6px 0; + color: rgba(0, 0, 0, 0.87); + background-color: rgba(255, 255, 255, 0.98); + border-radius: 3px; + margin: 6px; + box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); +} + .menu .popup-sub-menu, .popup-menu .popup-sub-menu, .popup-combo-menu .popup-sub-menu { - border-radius: 2px; + border-radius: 0; + padding: 6px 0; + margin: 0 6px; background-gradient-direction: none; box-shadow: none; - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.6); } +.menu .popup-sub-menu .popup-menu-item, +.popup-menu .popup-sub-menu .popup-menu-item, +.popup-combo-menu .popup-sub-menu .popup-menu-item { + margin: 0; + border-radius: 0; +} + .menu .popup-sub-menu .popup-menu-item:active, .popup-menu .popup-sub-menu .popup-menu-item:active, .popup-combo-menu .popup-sub-menu .popup-menu-item:active { @@ -334,18 +356,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-width: 0; } -.menu .popup-menu-content, -.popup-menu .popup-menu-content, -.popup-combo-menu .popup-menu-content { - padding: 3px; -} - .menu .popup-menu-item, .popup-menu .popup-menu-item, .popup-combo-menu .popup-menu-item { padding: 6px 12px; spacing: 12px; border-radius: 2px; + margin: 0 6px; } .menu .popup-menu-item:hover, .menu .popup-menu-item:active, @@ -746,12 +763,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #888; } +.calendar-main-box { + margin: 0 6px; +} + .calendar { - padding: .4em 1.75em; + padding: 6px 12px; spacing-rows: 0px; spacing-columns: 0px; } +.calendar-today-home-button, +.calendar-today-home-button-enabled { + margin: 6px 0; + padding: 6px; +} + +.calendar-today-day-label { + font-size: 1.75em; + color: rgba(0, 0, 0, 0.6); + font-weight: bold; + text-align: center; + padding-bottom: .1em; +} + +.calendar-today-date-label { + font-size: 1.1em; + color: rgba(0, 0, 0, 0.38); + font-weight: bold; + text-align: center; +} + .calendar-month-label { color: rgba(0, 0, 0, 0.87); font-weight: bold; @@ -795,6 +837,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-image: url("assets/calendar-arrow-left.svg"); } +.calendar-day-event-dot-box { + margin-top: 1.75em; + max-rows: 1; +} + +.calendar-day-event-dot { + margin: 1px; + border-radius: 2px; + width: 4px; + height: 4px; +} + .datemenu-date-label { padding: .4em 1.75em; font-weight: normal; @@ -813,6 +867,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 9999px; } +.calendar-day-base:hover { + background-color: rgba(0, 0, 0, 0.04); +} + +.calendar-day-base:active { + background-color: rgba(0, 0, 0, 0.12); +} + +.calendar-day-base:selected { + background-color: rgba(0, 0, 0, 0.12); +} + .calendar-day-heading { color: rgba(0, 0, 0, 0.6); margin-top: 1em; @@ -840,7 +906,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .calendar-today, .calendar-today:active, .calendar-today:focus, -.calendar-today:hover { +.calendar-today:hover, +.calendar-today:selected { font-weight: bold; color: white; background-color: #1A73E8; @@ -867,6 +934,131 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-top: 3px; } +.calendar-events-main-box { + height: 300px; + margin: 8px 0.8em 0 0; + padding: 8px; + min-width: 350px; + border: none; + border-radius: 2px; + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 0, 0, 0.04); + background-gradient-end: rgba(0, 0, 0, 0.04); + color: rgba(0, 0, 0, 0.6); +} + +.calendar-events-no-events-button { + margin: 6px 0; + padding: 6px; + border-radius: 2px; +} + +.calendar-events-no-events-button:hover { + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 0, 0, 0.04); + background-gradient-end: rgba(0, 0, 0, 0.04); + box-shadow: none; +} + +.calendar-events-no-events-icon { + color: rgba(0, 0, 0, 0.38); +} + +.calendar-events-no-events-label { + font-size: 1.1em; + color: rgba(0, 0, 0, 0.38); + font-weight: bold; + text-align: center; + margin-top: 9px; +} + +.calendar-events-date-label { + padding: 3px 0 12px 3px; + font-size: 1.1em; + color: rgba(0, 0, 0, 0.6); + font-weight: bold; + text-align: center; +} + +.calendar-events-event-container { + padding: 2px; +} + +.calendar-events-main-box .separator { + -margin-horizontal: 1em; + -gradient-height: 1px; + -gradient-start: rgba(0, 0, 0, 0.08); + -gradient-end: rgba(0, 0, 0, 0.08); +} + +.calendar-event-button { + margin: 6px 0 6px 0; + border-radius: 2px; +} + +.calendar-event-button:hover { + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 0, 0, 0.04); + background-gradient-end: rgba(0, 0, 0, 0.04); + box-shadow: none; +} + +.calendar-event-color-strip { + width: 4px; + border-radius: 4px 0 0 4px; +} + +.calendar-event-row-content { + margin: 6px; +} + +.calendar-event-time-past { + color: rgba(0, 0, 0, 0.26); + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present { + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present:all-day { + color: rgba(15, 157, 88, 0.6); +} + +.calendar-event-time-future { + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-countdown { + color: rgba(0, 0, 0, 0.38); + font-weight: bold; + text-align: right; + margin-bottom: .6em; +} + +.calendar-event-countdown:soon { + color: white; +} + +.calendar-event-countdown:imminent { + color: rgba(244, 180, 0, 0.6); +} + +.calendar-event-countdown:current { + color: rgba(15, 157, 88, 0.6); +} + +.calendar-event-summary { + color: rgba(0, 0, 0, 0.38); + text-align: left; + width: 200px; +} + #notification { border-radius: 3px; padding: 12px; @@ -875,7 +1067,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-from-right-edge-of-screen: 18px; width: 28em; color: rgba(0, 0, 0, 0.87); - background-color: rgba(255, 255, 255, 0.8); + background-color: rgba(255, 255, 255, 0.98); box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); margin: 7px 12px 17px 12px; } @@ -954,7 +1146,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .switcher-list { color: rgba(0, 0, 0, 0.87); - background-color: rgba(255, 255, 255, 0.95); + background-color: rgba(255, 255, 255, 0.98); border: none; border-radius: 2px; padding: 20px; @@ -1265,7 +1457,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu-favorites-box { margin: auto; - margin-bottom: 6px; + margin-bottom: 9px; padding: 6px; transition-duration: 300; background-color: rgba(0, 0, 0, 0.05); @@ -1335,7 +1527,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu StScrollView.menu-application-button { padding: 3px 0; border-radius: 2px; - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.6); } @@ -1402,17 +1594,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .menu-selected-app-box { - padding-right: 30px; - padding-left: 28px; + padding: 10px 30px; text-align: right; height: 30px; } -.menu-selected-app-box:rtl { - padding-top: 10px; - height: 30px; -} - .menu-selected-app-title { font-weight: bold; } @@ -1436,10 +1622,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { caret-color: rgba(0, 0, 0, 0.87); } -#menu-search-entry:focus { - box-shadow: inset 0 0 0 2px #8ebaf4; -} - .menu-search-entry-icon { icon-size: 1em; color: rgba(0, 0, 0, 0.87); @@ -1657,6 +1839,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .grouped-window-list-thumbnail-menu { padding: 6px; + color: rgba(0, 0, 0, 0.87); + background-color: rgba(255, 255, 255, 0.98); + border-radius: 3px; + margin: 6px; + box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); } .grouped-window-list-thumbnail-menu .item-box { @@ -1828,7 +2015,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { padding: 0 0; margin-top: 6px; border-radius: 2px; - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.87); } diff --git a/src/cinnamon/cinnamon-compact.css b/src/cinnamon/cinnamon-compact.css index fb04624b..d5c2d77e 100644 --- a/src/cinnamon/cinnamon-compact.css +++ b/src/cinnamon/cinnamon-compact.css @@ -1,5 +1,4 @@ stage { - font-size: 9pt; color: rgba(0, 0, 0, 0.87); } @@ -46,25 +45,29 @@ stage { border-radius: 2px; } -.notification-button, .notification-icon-button, .menu #notification .notification-button, .menu #notification .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, #notification .notification-button, #notification .notification-icon-button { +.notification-button, .notification-icon-button, .menu #notification .notification-button, .menu #notification .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, #notification .notification-button, #notification .notification-icon-button, .calendar-today-home-button, +.calendar-today-home-button-enabled { border-radius: 2px; color: rgba(0, 0, 0, 0.6); background-color: transparent; } -.notification-button:hover, .notification-icon-button:hover, #notification .notification-button:hover, #notification .notification-icon-button:hover { +.notification-button:hover, .notification-icon-button:hover, #notification .notification-button:hover, #notification .notification-icon-button:hover, .calendar-today-home-button:hover, +.calendar-today-home-button-enabled:hover { color: rgba(0, 0, 0, 0.87); background-color: rgba(0, 0, 0, 0.12); border-radius: 2px; } -.notification-button:active, .notification-icon-button:active, #notification .notification-button:active, #notification .notification-icon-button:active { +.notification-button:active, .notification-icon-button:active, #notification .notification-button:active, #notification .notification-icon-button:active, .calendar-today-home-button:active, +.calendar-today-home-button-enabled:active { color: rgba(0, 0, 0, 0.87); background-color: rgba(0, 0, 0, 0.26); border-radius: 2px; } -.notification-button:insensitive, .notification-icon-button:insensitive, #notification .notification-button:insensitive, #notification .notification-icon-button:insensitive { +.notification-button:insensitive, .notification-icon-button:insensitive, #notification .notification-button:insensitive, #notification .notification-icon-button:insensitive, .calendar-today-home-button:insensitive, +.calendar-today-home-button-enabled:insensitive { color: rgba(0, 0, 0, 0.26); background-color: transparent; border-radius: 2px; @@ -290,12 +293,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu, .popup-menu, .popup-combo-menu { - padding: 2px; - color: rgba(0, 0, 0, 0.87); - background-color: rgba(255, 255, 255, 0.95); - border-radius: 3px; - margin: 4px; - box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); + padding: 0; + margin: 0; + box-shadow: none; + border: none; + background: none; } .menu-arrow, @@ -303,16 +305,36 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { icon-size: 16px; } +.menu .popup-menu-content, +.popup-menu .popup-menu-content, +.popup-combo-menu .popup-menu-content { + padding: 4px 0; + color: rgba(0, 0, 0, 0.87); + background-color: rgba(255, 255, 255, 0.98); + border-radius: 3px; + margin: 4px; + box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); +} + .menu .popup-sub-menu, .popup-menu .popup-sub-menu, .popup-combo-menu .popup-sub-menu { - border-radius: 2px; + border-radius: 0; + padding: 4px 0; + margin: 0 4px; background-gradient-direction: none; box-shadow: none; - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.6); } +.menu .popup-sub-menu .popup-menu-item, +.popup-menu .popup-sub-menu .popup-menu-item, +.popup-combo-menu .popup-sub-menu .popup-menu-item { + margin: 0; + border-radius: 0; +} + .menu .popup-sub-menu .popup-menu-item:active, .popup-menu .popup-sub-menu .popup-menu-item:active, .popup-combo-menu .popup-sub-menu .popup-menu-item:active { @@ -334,18 +356,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-width: 0; } -.menu .popup-menu-content, -.popup-menu .popup-menu-content, -.popup-combo-menu .popup-menu-content { - padding: 2px; -} - .menu .popup-menu-item, .popup-menu .popup-menu-item, .popup-combo-menu .popup-menu-item { padding: 4px 8px; spacing: 8px; border-radius: 2px; + margin: 0 4px; } .menu .popup-menu-item:hover, .menu .popup-menu-item:active, @@ -746,12 +763,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #888; } +.calendar-main-box { + margin: 0 4px; +} + .calendar { - padding: .4em 1.75em; + padding: 4px 8px; spacing-rows: 0px; spacing-columns: 0px; } +.calendar-today-home-button, +.calendar-today-home-button-enabled { + margin: 4px 0; + padding: 4px; +} + +.calendar-today-day-label { + font-size: 1.75em; + color: rgba(0, 0, 0, 0.6); + font-weight: bold; + text-align: center; + padding-bottom: .1em; +} + +.calendar-today-date-label { + font-size: 1.1em; + color: rgba(0, 0, 0, 0.38); + font-weight: bold; + text-align: center; +} + .calendar-month-label { color: rgba(0, 0, 0, 0.87); font-weight: bold; @@ -795,6 +837,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-image: url("assets/calendar-arrow-left.svg"); } +.calendar-day-event-dot-box { + margin-top: 1.75em; + max-rows: 1; +} + +.calendar-day-event-dot { + margin: 1px; + border-radius: 2px; + width: 4px; + height: 4px; +} + .datemenu-date-label { padding: .4em 1.75em; font-weight: normal; @@ -813,6 +867,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 9999px; } +.calendar-day-base:hover { + background-color: rgba(0, 0, 0, 0.04); +} + +.calendar-day-base:active { + background-color: rgba(0, 0, 0, 0.12); +} + +.calendar-day-base:selected { + background-color: rgba(0, 0, 0, 0.12); +} + .calendar-day-heading { color: rgba(0, 0, 0, 0.6); margin-top: 1em; @@ -840,7 +906,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .calendar-today, .calendar-today:active, .calendar-today:focus, -.calendar-today:hover { +.calendar-today:hover, +.calendar-today:selected { font-weight: bold; color: white; background-color: #1A73E8; @@ -867,6 +934,131 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-top: 3px; } +.calendar-events-main-box { + height: 300px; + margin: 6px 0.8em 0 0; + padding: 6px; + min-width: 350px; + border: none; + border-radius: 2px; + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 0, 0, 0.04); + background-gradient-end: rgba(0, 0, 0, 0.04); + color: rgba(0, 0, 0, 0.6); +} + +.calendar-events-no-events-button { + margin: 4px 0; + padding: 4px; + border-radius: 2px; +} + +.calendar-events-no-events-button:hover { + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 0, 0, 0.04); + background-gradient-end: rgba(0, 0, 0, 0.04); + box-shadow: none; +} + +.calendar-events-no-events-icon { + color: rgba(0, 0, 0, 0.38); +} + +.calendar-events-no-events-label { + font-size: 1.1em; + color: rgba(0, 0, 0, 0.38); + font-weight: bold; + text-align: center; + margin-top: 6px; +} + +.calendar-events-date-label { + padding: 2px 0 8px 2px; + font-size: 1.1em; + color: rgba(0, 0, 0, 0.6); + font-weight: bold; + text-align: center; +} + +.calendar-events-event-container { + padding: 2px; +} + +.calendar-events-main-box .separator { + -margin-horizontal: 1em; + -gradient-height: 1px; + -gradient-start: rgba(0, 0, 0, 0.08); + -gradient-end: rgba(0, 0, 0, 0.08); +} + +.calendar-event-button { + margin: 4px 0 4px 0; + border-radius: 2px; +} + +.calendar-event-button:hover { + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 0, 0, 0.04); + background-gradient-end: rgba(0, 0, 0, 0.04); + box-shadow: none; +} + +.calendar-event-color-strip { + width: 4px; + border-radius: 4px 0 0 4px; +} + +.calendar-event-row-content { + margin: 4px; +} + +.calendar-event-time-past { + color: rgba(0, 0, 0, 0.26); + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present { + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present:all-day { + color: rgba(15, 157, 88, 0.6); +} + +.calendar-event-time-future { + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-countdown { + color: rgba(0, 0, 0, 0.38); + font-weight: bold; + text-align: right; + margin-bottom: .6em; +} + +.calendar-event-countdown:soon { + color: white; +} + +.calendar-event-countdown:imminent { + color: rgba(244, 180, 0, 0.6); +} + +.calendar-event-countdown:current { + color: rgba(15, 157, 88, 0.6); +} + +.calendar-event-summary { + color: rgba(0, 0, 0, 0.38); + text-align: left; + width: 200px; +} + #notification { border-radius: 3px; padding: 8px; @@ -875,7 +1067,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-from-right-edge-of-screen: 12px; width: 28em; color: rgba(0, 0, 0, 0.87); - background-color: rgba(255, 255, 255, 0.8); + background-color: rgba(255, 255, 255, 0.98); box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); margin: 7px 12px 17px 12px; } @@ -954,7 +1146,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .switcher-list { color: rgba(0, 0, 0, 0.87); - background-color: rgba(255, 255, 255, 0.95); + background-color: rgba(255, 255, 255, 0.98); border: none; border-radius: 2px; padding: 20px; @@ -1265,7 +1457,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu-favorites-box { margin: auto; - margin-bottom: 4px; + margin-bottom: 6px; padding: 4px; transition-duration: 300; background-color: rgba(0, 0, 0, 0.05); @@ -1335,7 +1527,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu StScrollView.menu-application-button { padding: 2px 0; border-radius: 2px; - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.6); } @@ -1402,17 +1594,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .menu-selected-app-box { - padding-right: 30px; - padding-left: 28px; + padding: 10px 30px; text-align: right; height: 30px; } -.menu-selected-app-box:rtl { - padding-top: 10px; - height: 30px; -} - .menu-selected-app-title { font-weight: bold; } @@ -1436,10 +1622,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { caret-color: rgba(0, 0, 0, 0.87); } -#menu-search-entry:focus { - box-shadow: inset 0 0 0 2px #8ebaf4; -} - .menu-search-entry-icon { icon-size: 1em; color: rgba(0, 0, 0, 0.87); @@ -1657,6 +1839,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .grouped-window-list-thumbnail-menu { padding: 4px; + color: rgba(0, 0, 0, 0.87); + background-color: rgba(255, 255, 255, 0.98); + border-radius: 3px; + margin: 4px; + box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); } .grouped-window-list-thumbnail-menu .item-box { @@ -1828,7 +2015,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { padding: 0 0; margin-top: 6px; border-radius: 2px; - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.87); } diff --git a/src/cinnamon/cinnamon.css b/src/cinnamon/cinnamon.css index 577087c6..68dd60dd 100644 --- a/src/cinnamon/cinnamon.css +++ b/src/cinnamon/cinnamon.css @@ -1,5 +1,4 @@ stage { - font-size: 9pt; color: rgba(0, 0, 0, 0.87); } @@ -46,25 +45,29 @@ stage { border-radius: 2px; } -.notification-button, .notification-icon-button, .menu #notification .notification-button, .menu #notification .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, #notification .notification-button, #notification .notification-icon-button { +.notification-button, .notification-icon-button, .menu #notification .notification-button, .menu #notification .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, #notification .notification-button, #notification .notification-icon-button, .calendar-today-home-button, +.calendar-today-home-button-enabled { border-radius: 2px; color: rgba(0, 0, 0, 0.6); background-color: transparent; } -.notification-button:hover, .notification-icon-button:hover, #notification .notification-button:hover, #notification .notification-icon-button:hover { +.notification-button:hover, .notification-icon-button:hover, #notification .notification-button:hover, #notification .notification-icon-button:hover, .calendar-today-home-button:hover, +.calendar-today-home-button-enabled:hover { color: rgba(0, 0, 0, 0.87); background-color: rgba(0, 0, 0, 0.12); border-radius: 2px; } -.notification-button:active, .notification-icon-button:active, #notification .notification-button:active, #notification .notification-icon-button:active { +.notification-button:active, .notification-icon-button:active, #notification .notification-button:active, #notification .notification-icon-button:active, .calendar-today-home-button:active, +.calendar-today-home-button-enabled:active { color: rgba(0, 0, 0, 0.87); background-color: rgba(0, 0, 0, 0.26); border-radius: 2px; } -.notification-button:insensitive, .notification-icon-button:insensitive, #notification .notification-button:insensitive, #notification .notification-icon-button:insensitive { +.notification-button:insensitive, .notification-icon-button:insensitive, #notification .notification-button:insensitive, #notification .notification-icon-button:insensitive, .calendar-today-home-button:insensitive, +.calendar-today-home-button-enabled:insensitive { color: rgba(0, 0, 0, 0.26); background-color: transparent; border-radius: 2px; @@ -290,12 +293,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu, .popup-menu, .popup-combo-menu { - padding: 3px; - color: rgba(0, 0, 0, 0.87); - background-color: rgba(255, 255, 255, 0.95); - border-radius: 3px; - margin: 6px; - box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); + padding: 0; + margin: 0; + box-shadow: none; + border: none; + background: none; } .menu-arrow, @@ -303,16 +305,36 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { icon-size: 16px; } +.menu .popup-menu-content, +.popup-menu .popup-menu-content, +.popup-combo-menu .popup-menu-content { + padding: 6px 0; + color: rgba(0, 0, 0, 0.87); + background-color: rgba(255, 255, 255, 0.98); + border-radius: 3px; + margin: 6px; + box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); +} + .menu .popup-sub-menu, .popup-menu .popup-sub-menu, .popup-combo-menu .popup-sub-menu { - border-radius: 2px; + border-radius: 0; + padding: 6px 0; + margin: 0 6px; background-gradient-direction: none; box-shadow: none; - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.6); } +.menu .popup-sub-menu .popup-menu-item, +.popup-menu .popup-sub-menu .popup-menu-item, +.popup-combo-menu .popup-sub-menu .popup-menu-item { + margin: 0; + border-radius: 0; +} + .menu .popup-sub-menu .popup-menu-item:active, .popup-menu .popup-sub-menu .popup-menu-item:active, .popup-combo-menu .popup-sub-menu .popup-menu-item:active { @@ -334,18 +356,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-width: 0; } -.menu .popup-menu-content, -.popup-menu .popup-menu-content, -.popup-combo-menu .popup-menu-content { - padding: 3px; -} - .menu .popup-menu-item, .popup-menu .popup-menu-item, .popup-combo-menu .popup-menu-item { padding: 6px 12px; spacing: 12px; border-radius: 2px; + margin: 0 6px; } .menu .popup-menu-item:hover, .menu .popup-menu-item:active, @@ -746,12 +763,37 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { color: #888; } +.calendar-main-box { + margin: 0 6px; +} + .calendar { - padding: .4em 1.75em; + padding: 6px 12px; spacing-rows: 0px; spacing-columns: 0px; } +.calendar-today-home-button, +.calendar-today-home-button-enabled { + margin: 6px 0; + padding: 6px; +} + +.calendar-today-day-label { + font-size: 1.75em; + color: rgba(0, 0, 0, 0.6); + font-weight: bold; + text-align: center; + padding-bottom: .1em; +} + +.calendar-today-date-label { + font-size: 1.1em; + color: rgba(0, 0, 0, 0.38); + font-weight: bold; + text-align: center; +} + .calendar-month-label { color: rgba(0, 0, 0, 0.87); font-weight: bold; @@ -795,6 +837,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-image: url("assets/calendar-arrow-left.svg"); } +.calendar-day-event-dot-box { + margin-top: 1.75em; + max-rows: 1; +} + +.calendar-day-event-dot { + margin: 1px; + border-radius: 2px; + width: 4px; + height: 4px; +} + .datemenu-date-label { padding: .4em 1.75em; font-weight: normal; @@ -813,6 +867,18 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { border-radius: 9999px; } +.calendar-day-base:hover { + background-color: rgba(0, 0, 0, 0.04); +} + +.calendar-day-base:active { + background-color: rgba(0, 0, 0, 0.12); +} + +.calendar-day-base:selected { + background-color: rgba(0, 0, 0, 0.12); +} + .calendar-day-heading { color: rgba(0, 0, 0, 0.6); margin-top: 1em; @@ -840,7 +906,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .calendar-today, .calendar-today:active, .calendar-today:focus, -.calendar-today:hover { +.calendar-today:hover, +.calendar-today:selected { font-weight: bold; color: white; background-color: #1A73E8; @@ -867,6 +934,131 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-top: 3px; } +.calendar-events-main-box { + height: 300px; + margin: 8px 0.8em 0 0; + padding: 8px; + min-width: 350px; + border: none; + border-radius: 2px; + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 0, 0, 0.04); + background-gradient-end: rgba(0, 0, 0, 0.04); + color: rgba(0, 0, 0, 0.6); +} + +.calendar-events-no-events-button { + margin: 6px 0; + padding: 6px; + border-radius: 2px; +} + +.calendar-events-no-events-button:hover { + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 0, 0, 0.04); + background-gradient-end: rgba(0, 0, 0, 0.04); + box-shadow: none; +} + +.calendar-events-no-events-icon { + color: rgba(0, 0, 0, 0.38); +} + +.calendar-events-no-events-label { + font-size: 1.1em; + color: rgba(0, 0, 0, 0.38); + font-weight: bold; + text-align: center; + margin-top: 9px; +} + +.calendar-events-date-label { + padding: 3px 0 12px 3px; + font-size: 1.1em; + color: rgba(0, 0, 0, 0.6); + font-weight: bold; + text-align: center; +} + +.calendar-events-event-container { + padding: 2px; +} + +.calendar-events-main-box .separator { + -margin-horizontal: 1em; + -gradient-height: 1px; + -gradient-start: rgba(0, 0, 0, 0.08); + -gradient-end: rgba(0, 0, 0, 0.08); +} + +.calendar-event-button { + margin: 6px 0 6px 0; + border-radius: 2px; +} + +.calendar-event-button:hover { + background-gradient-direction: vertical; + background-gradient-start: rgba(0, 0, 0, 0.04); + background-gradient-end: rgba(0, 0, 0, 0.04); + box-shadow: none; +} + +.calendar-event-color-strip { + width: 4px; + border-radius: 4px 0 0 4px; +} + +.calendar-event-row-content { + margin: 6px; +} + +.calendar-event-time-past { + color: rgba(0, 0, 0, 0.26); + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present { + font-weight: bold; + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-time-present:all-day { + color: rgba(15, 157, 88, 0.6); +} + +.calendar-event-time-future { + text-align: left; + margin-bottom: .6em; +} + +.calendar-event-countdown { + color: rgba(0, 0, 0, 0.38); + font-weight: bold; + text-align: right; + margin-bottom: .6em; +} + +.calendar-event-countdown:soon { + color: white; +} + +.calendar-event-countdown:imminent { + color: rgba(244, 180, 0, 0.6); +} + +.calendar-event-countdown:current { + color: rgba(15, 157, 88, 0.6); +} + +.calendar-event-summary { + color: rgba(0, 0, 0, 0.38); + text-align: left; + width: 200px; +} + #notification { border-radius: 3px; padding: 12px; @@ -875,7 +1067,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { margin-from-right-edge-of-screen: 18px; width: 28em; color: rgba(0, 0, 0, 0.87); - background-color: rgba(255, 255, 255, 0.8); + background-color: rgba(255, 255, 255, 0.98); box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); margin: 7px 12px 17px 12px; } @@ -954,7 +1146,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .switcher-list { color: rgba(0, 0, 0, 0.87); - background-color: rgba(255, 255, 255, 0.95); + background-color: rgba(255, 255, 255, 0.98); border: none; border-radius: 2px; padding: 20px; @@ -1265,7 +1457,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu-favorites-box { margin: auto; - margin-bottom: 6px; + margin-bottom: 9px; padding: 6px; transition-duration: 300; background-color: rgba(0, 0, 0, 0.05); @@ -1335,7 +1527,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .menu StScrollView.menu-application-button { padding: 3px 0; border-radius: 2px; - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.6); } @@ -1402,17 +1594,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { } .menu-selected-app-box { - padding-right: 30px; - padding-left: 28px; + padding: 10px 30px; text-align: right; height: 30px; } -.menu-selected-app-box:rtl { - padding-top: 10px; - height: 30px; -} - .menu-selected-app-title { font-weight: bold; } @@ -1436,10 +1622,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { caret-color: rgba(0, 0, 0, 0.87); } -#menu-search-entry:focus { - box-shadow: inset 0 0 0 2px #8ebaf4; -} - .menu-search-entry-icon { icon-size: 1em; color: rgba(0, 0, 0, 0.87); @@ -1657,6 +1839,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .grouped-window-list-thumbnail-menu { padding: 6px; + color: rgba(0, 0, 0, 0.87); + background-color: rgba(255, 255, 255, 0.98); + border-radius: 3px; + margin: 6px; + box-shadow: 0 5px 12px rgba(0, 0, 0, 0.35); } .grouped-window-list-thumbnail-menu .item-box { @@ -1828,7 +2015,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { padding: 0 0; margin-top: 6px; border-radius: 2px; - background-color: rgba(0, 0, 0, 0.05); + background-color: rgba(0, 0, 0, 0.04); color: rgba(0, 0, 0, 0.87); }