From 3d01a86eee66532acb90383a39cccdd6aea9ec19 Mon Sep 17 00:00:00 2001 From: didrocks <1823296+didrocks@users.noreply.github.com> Date: Thu, 21 Nov 2024 01:55:51 +0000 Subject: [PATCH] New upstream snapshot for Cinnamon --- cinnamon-shell/upstream/cinnamon-dark.css | 869 +++++++++--------- cinnamon-shell/upstream/cinnamon.css | 655 ++++++------- .../upstream/mint-y-dark-thumbnail.png | Bin 14266 -> 14303 bytes cinnamon-shell/upstream/mint-y-thumbnail.png | Bin 14401 -> 14474 bytes cinnamon-shell/upstream/parse-sass.sh | 4 +- cinnamon-shell/upstream/sass/_colors.scss | 61 +- cinnamon-shell/upstream/sass/_common.scss | 477 +++------- cinnamon-shell/upstream/sass/_dialogs.scss | 387 ++++++++ cinnamon-shell/upstream/sass/_drawing.scss | 24 +- .../upstream/sass/cinnamon-dark.scss | 1 + cinnamon-shell/upstream/sass/cinnamon.scss | 1 + 11 files changed, 1328 insertions(+), 1151 deletions(-) create mode 100644 cinnamon-shell/upstream/sass/_dialogs.scss diff --git a/cinnamon-shell/upstream/cinnamon-dark.css b/cinnamon-shell/upstream/cinnamon-dark.css index a267a0733e..6b297acb13 100644 --- a/cinnamon-shell/upstream/cinnamon-dark.css +++ b/cinnamon-shell/upstream/cinnamon-dark.css @@ -1,46 +1,46 @@ stage { - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; } .label-shadow { color: rgba(0, 0, 0, 0); } -.sound-button, .modal-dialog-button-box .modal-dialog-button, .notification-button, .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button { +.sound-button, .notification-button, .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button { min-height: 20px; padding: 5px 32px; transition-duration: 0; - color: rgba(255, 255, 255, 0.87); - background-color: #454545; - border: 1px solid #202020; - box-shadow: inset 0 2px 4px rgba(69, 69, 69, 0.05); } - .sound-button, .modal-dialog-button-box .modal-dialog-button, .notification-button, .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button { + color: #e1e1e1; + background-color: #303030; + border: 1px solid #303030; + box-shadow: inset 0 2px 4px rgba(48, 48, 48, 0.05); } + .sound-button, .notification-button, .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button { border-radius: 2px; } - .sound-button:focus, .modal-dialog-button-box .modal-dialog-button:focus, .notification-button:focus, .notification-icon-button:focus, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus { - color: rgba(255, 255, 255, 0.87); - background-color: #454545; + .sound-button:focus, .notification-button:focus, .notification-icon-button:focus, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus { + color: #e1e1e1; + background-color: #303030; border: 1px solid #35a854; - box-shadow: inset 0 2px 4px rgba(69, 69, 69, 0.05); } - .sound-button:hover, .modal-dialog-button-box .modal-dialog-button:hover, .notification-button:hover, .notification-icon-button:hover, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover { - color: rgba(255, 255, 255, 0.87); - background-color: #525252; - border: 1px solid #202020; - box-shadow: inset 0 2px 4px rgba(82, 82, 82, 0.05); } - .sound-button:hover:focus, .modal-dialog-button-box .modal-dialog-button:hover:focus, .notification-button:hover:focus, .notification-icon-button:hover:focus, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus { - color: rgba(255, 255, 255, 0.87); - background-color: #525252; + box-shadow: inset 0 2px 4px rgba(48, 48, 48, 0.05); } + .sound-button:hover, .notification-button:hover, .notification-icon-button:hover, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover { + color: #e1e1e1; + background-color: #3d3d3d; + border: 1px solid #303030; + box-shadow: inset 0 2px 4px rgba(61, 61, 61, 0.05); } + .sound-button:hover:focus, .notification-button:hover:focus, .notification-icon-button:hover:focus, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus { + color: #e1e1e1; + background-color: #3d3d3d; border: 1px solid #35a854; - box-shadow: inset 0 2px 4px rgba(69, 69, 69, 0.05); } - .sound-button:active, .modal-dialog-button-box .modal-dialog-button:active, .notification-button:active, .notification-icon-button:active, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active { + box-shadow: inset 0 2px 4px rgba(48, 48, 48, 0.05); } + .sound-button:active, .notification-button:active, .notification-icon-button:active, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active { color: #ffffff; background-color: #35a854; border: 1px solid #35a854; box-shadow: inset 0 2px 4px #35a854; } - .sound-button:insensitive, .modal-dialog-button-box .modal-dialog-button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive { - color: rgba(255, 255, 255, 0.32); - border: 1px solid rgba(32, 32, 32, 0.55); - background-color: rgba(69, 69, 69, 0.55); - box-shadow: inset 0 2px 4px rgba(69, 69, 69, 0.05); } + .sound-button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive { + color: rgba(225, 225, 225, 0.45); + border: 1px solid rgba(48, 48, 48, 0.55); + background-color: rgba(48, 48, 48, 0.55); + box-shadow: inset 0 2px 4px rgba(48, 48, 48, 0.05); } -#menu-search-entry, .popup-menu #notification StEntry { +.prompt-dialog-password-entry, .run-dialog-entry, #menu-search-entry, .popup-menu #notification StEntry { padding: 7px; caret-size: 1px; selection-background-color: #35a854; @@ -48,20 +48,20 @@ stage { transition-duration: 300ms; border-radius: 3px; color: #D3D3D3; - background-color: #404040; - border: 1px solid #202020; - box-shadow: inset 0 2px 4px rgba(64, 64, 64, 0.05); } - #menu-search-entry:focus, .popup-menu #notification StEntry:focus, #menu-search-entry:hover, .popup-menu #notification StEntry:hover { - color: rgba(255, 255, 255, 0.87); - background-color: #404040; + background-color: #303030; + border: 1px solid #303030; + box-shadow: inset 0 2px 4px rgba(48, 48, 48, 0.05); } + .prompt-dialog-password-entry:focus, .run-dialog-entry:focus, #menu-search-entry:focus, .popup-menu #notification StEntry:focus, .prompt-dialog-password-entry:hover, .run-dialog-entry:hover, #menu-search-entry:hover, .popup-menu #notification StEntry:hover { + color: #e1e1e1; + background-color: #303030; border: 1px solid #35a854; - box-shadow: inset 0 2px 4px rgba(64, 64, 64, 0.05); } - #menu-search-entry:insensitive, .popup-menu #notification StEntry:insensitive { - color: rgba(255, 255, 255, 0.32); - background-color: #383838; - border-color: 1px solid #272727; - box-shadow: inset 0 2px 4px rgba(56, 56, 56, 0.05); } - #menu-search-entry StIcon.capslock-warning, .popup-menu #notification StEntry StIcon.capslock-warning { + box-shadow: inset 0 2px 4px rgba(48, 48, 48, 0.05); } + .prompt-dialog-password-entry:insensitive, .run-dialog-entry:insensitive, #menu-search-entry:insensitive, .popup-menu #notification StEntry:insensitive { + color: rgba(225, 225, 225, 0.45); + background-color: #2a2a2a; + border-color: 1px solid #2a2a2a; + box-shadow: inset 0 2px 4px rgba(42, 42, 42, 0.05); } + .prompt-dialog-password-entry StIcon.capslock-warning, .run-dialog-entry StIcon.capslock-warning, #menu-search-entry StIcon.capslock-warning, .popup-menu #notification StEntry StIcon.capslock-warning { icon-size: 16px; warning-color: #F27835; padding: 0 4px; } @@ -75,8 +75,8 @@ stage { transition-duration: 300ms; border-radius: 3px; color: #c3c3c3; - background-color: rgba(109, 109, 109, 0.4); - border: 1px solid rgba(22, 22, 22, 0.4); + background-color: rgba(104, 104, 104, 0.4); + border: 1px solid rgba(17, 17, 17, 0.4); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .notification StEntry:focus { color: #ffffff; @@ -85,8 +85,8 @@ stage { box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .notification StEntry:insensitive { color: rgba(195, 195, 195, 0.55); - background-color: rgba(109, 109, 109, 0.25); - border: 1px solid rgba(22, 22, 22, 0.4); + background-color: rgba(104, 104, 104, 0.25); + border: 1px solid rgba(17, 17, 17, 0.4); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } StScrollView.vfade { @@ -101,15 +101,15 @@ StScrollBar { min-width: 5px; min-height: 5px; } StScrollBar StBin#trough { - background-color: rgba(64, 64, 64, 0.1); + background-color: rgba(48, 48, 48, 0.1); border-radius: 8px; } StScrollBar StButton#vhandle, StScrollBar StButton#hhandle { border-radius: 2px; - background-color: rgba(118, 118, 118, 0.948); + background-color: #303030; border: 0px solid; margin: 0px; } StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover { - background-color: rgba(99, 99, 99, 0.961); } + background-color: #454545; } StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-color: #35a854; } @@ -130,10 +130,10 @@ StScrollBar { .popup-slider-menu-item, .slider { -slider-height: 0.3em; - -slider-background-color: #202020; - -slider-border-color: rgba(47, 47, 47, 0.3); + -slider-background-color: #303030; + -slider-border-color: rgba(34, 34, 34, 0.3); -slider-active-background-color: #35a854; - -slider-active-border-color: rgba(47, 47, 47, 0.3); + -slider-active-border-color: rgba(34, 34, 34, 0.3); -slider-border-width: 1px; -slider-handle-radius: 0.5em; height: 1em; @@ -215,34 +215,33 @@ StScrollBar { margin: 3px; } #LookingGlassDialog { - color: rgba(255, 255, 255, 0.87); - border: 1px solid #202020; + color: #e1e1e1; + border: 1px solid #303030; border-radius: 3px; - background-color: #2f2f2f; + background-color: #222222; spacing: 4px; padding: 8px; } .menu { - color: rgba(255, 255, 255, 0.87); - border: 1px solid #202020; - border-radius: 3px; - background-color: rgba(47, 47, 47, 0.99); } - .menu.top { - border-radius: 0 0 3px 3px; } - .menu.bottom { - border-radius: 3px 3px 0 0; } - .menu.left { - border-radius: 0 3px 3px 0; } - .menu.right { - border-radius: 3px 0 0 3px; } + border: 1px solid rgba(0, 0, 0, 0); + color: #e1e1e1; + background-color: #222222; } + .menu-top { + border-radius: 0 0 6px 6px; } + .menu-bottom { + border-radius: 6px 6px 0 0; } + .menu-left { + border-radius: 0 6px 6px 0; } + .menu-right { + border-radius: 6px 0 0 6px; } .popup-sub-menu { - background-color: #404040; + background-color: #222222; box-shadow: none; } .popup-sub-menu .popup-menu-item:ltr { - padding-right: 1.75em; } + padding-left: 2.5em; } .popup-sub-menu .popup-menu-item:rtl { - padding-left: 1.75em; } + padding-right: 2.5em; } .popup-sub-menu StScrollBar { padding: 4px; } .popup-sub-menu StScrollBar StBin#trough, .popup-sub-menu StScrollBar StBin#vhandle { @@ -258,70 +257,22 @@ StScrollBar { border-right-width: 0; } .popup-menu-item:active { color: #ffffff; - background-color: #525352; } + background-color: #303030; } .popup-menu-item:insensitive { - color: rgba(255, 255, 255, 0.37); + color: rgba(225, 225, 225, 0.5); background: none; } .popup-inactive-menu-item { - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; } .popup-inactive-menu-item:insensitive { - color: rgba(255, 255, 255, 0.32); } - -/* This is for popup menus in Cinnamon versions < 3.2 */ -.popup-menu { - color: white; - color: rgba(255, 255, 255, 0.87); } - .popup-menu-arrow { - icon-size: 16px; } - .popup-menu .popup-sub-menu { - background-color: #404040; - box-shadow: none; } - .popup-menu .popup-sub-menu .popup-menu-item:ltr { - padding-right: 1.75em; } - .popup-menu .popup-sub-menu .popup-menu-item:rtl { - padding-left: 1.75em; } - .popup-menu .popup-sub-menu StScrollBar { - padding: 4px; } - .popup-menu .popup-sub-menu StScrollBar StBin#trough, .popup-menu .popup-sub-menu StScrollBar StBin#vhandle { - border-width: 0; } - .popup-menu .popup-menu-content { - padding: 1em 0em 1em 0em; } - .popup-menu .popup-menu-item { - padding: .4em 1.75em; - spacing: 1em; - border: 1px solid transparent; - border-left-width: 0; - border-right-width: 0; } - .popup-menu .popup-menu-item:active { - color: rgba(255, 255, 255, 0.87); - border-color: rgba(255, 255, 255, 0); - background-color: rgba(255, 255, 255, 0); } - .popup-menu .popup-menu-item:insensitive { - color: rgba(255, 255, 255, 0.37); - background: none; } - .popup-menu .popup-inactive-menu-item { - color: rgba(255, 255, 255, 0.87); } - .popup-menu .popup-inactive-menu-item:insensitive { - color: rgba(255, 255, 255, 0.32); } - .popup-menu-icon { - icon-size: 16px; } - -.popup-menu-boxpointer { - -arrow-border-radius: 3px; - -arrow-background-color: #2f2f2f; - -arrow-border-width: 1px; - -arrow-border-color: #202020; - -arrow-base: 21px; - -arrow-rise: 9px; - -boxpointer-gap: 2px; } + color: rgba(225, 225, 225, 0.45); } /*Scale view context menu*/ .popup-combo-menu { - color: rgba(255, 255, 255, 0.87); - border: 1px solid #202020; + color: #e1e1e1; + border: 1px solid #303030; border-radius: 3px; - background-color: #404040; + background-color: #303030; box-shadow: none; padding: 1em 0em 1em 0em; } @@ -334,8 +285,8 @@ StScrollBar { .popup-separator-menu-item { -gradient-height: 1px; - -gradient-start: #202020; - -gradient-end: #202020; + -gradient-start: #272727; + -gradient-end: #272727; -margin-horizontal: 0; height: 1px; } @@ -343,7 +294,15 @@ StScrollBar { font-weight: normal; } .popup-device-menu-item { - spacing: .5em; } + spacing: .5em; + font-weight: bold; + color: #e1e1e1; } + .popup-device-menu-item:insensitive { + color: #e1e1e1; + spacing: 1em; } + .popup-device-menu-item .popup-inactive-menu-item { + font-weight: normal; + color: #e1e1e1; } .popup-subtitle-menu-item { font-weight: normal; } @@ -358,7 +317,7 @@ StScrollBar { /* sets the width of vertical panels */ width: 32px; /* Set the symbolic foreground color for icons, and importantly, the system tray applet icons */ - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; } #panelLeft { spacing: 4px; } #panelLeft:dnd { @@ -453,21 +412,21 @@ StScrollBar { .panel-top, .panel-bottom, .panel-left, .panel-right { color: #ffffff; border: none; - background-color: rgba(47, 47, 47, 0.99); + background-color: rgba(26, 26, 26, 0.99); font-size: 1em; padding: 0px; } .panel-top { - box-shadow: 0 1px #202020; } + box-shadow: 0 1px #222222; } .panel-bottom { - box-shadow: 0 -1px #202020; } + box-shadow: 0 -1px #222222; } .panel-left { - box-shadow: 1px 0 #202020; } + box-shadow: 1px 0 #222222; } .panel-right { - box-shadow: -1px 0 #202020; } + box-shadow: -1px 0 #222222; } .panel-dummy { background-color: rgba(252, 65, 56, 0.5); } @@ -479,7 +438,7 @@ StScrollBar { -natural-hpadding: 3px; -minimum-hpadding: 3px; font-weight: bold; - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; } .panel-button { -natural-hpadding: 6px; @@ -500,8 +459,8 @@ StScrollBar { spacing: 12px; } .window-caption { - background-color: #353535; - border: 1px solid #353535; + background-color: #303030; + border: 1px solid #303030; color: #c3c3c3; spacing: 8px; border-radius: 2px; @@ -532,8 +491,8 @@ StScrollBar { padding: 5px 8px; -cinnamon-caption-spacing: 4px; color: #c3c3c3; - background-color: rgba(109, 109, 109, 0.4); - border: 1px solid rgba(22, 22, 22, 0.4); + background-color: rgba(104, 104, 104, 0.4); + border: 1px solid rgba(17, 17, 17, 0.4); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .expo-workspaces-name-entry:focus, .expo-workspaces-name-entry#selected:focus { @@ -555,7 +514,7 @@ StScrollBar { border-radius: 2px; } .expo-background { - background-color: #353535; } + background-color: #303030; } .workspace-thumbnails { spacing: 26px; } @@ -614,14 +573,16 @@ StScrollBar { margin-right: .5em; padding: .5em; min-width: 350px; - border: 1px solid #202020; - background-color: #404040; } + border: 1px solid rgba(0, 0, 0, 0); + background-color: #303030; + border-radius: 6px; } .calendar-events-no-events-button { margin: 6px 0 6px 0; padding: 6px; } .calendar-events-no-events-button:hover { - background-color: #35a854; } + background-color: #35a854; + border-radius: 6px; } .calendar-events-no-events-button:hover .calendar-events-no-events-icon, .calendar-events-no-events-button:hover .calendar-events-no-events-label { color: #ffffff; } @@ -629,12 +590,12 @@ StScrollBar { .calendar-events-no-events-icon, .calendar-events-no-events-label { font-weight: bold; - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; text-align: center; } .calendar-events-date-label { padding: .1em .1em .5em .1em; - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; font-weight: bold; text-align: center; } @@ -644,30 +605,30 @@ StScrollBar { .calendar-event-button { border: 1px solid rgba(0, 0, 0, 0); } .calendar-event-button .calendar-event-time-past { - color: rgba(255, 255, 255, 0.27); + color: rgba(225, 225, 225, 0.4); font-weight: bold; text-align: left; margin-bottom: .2em; } .calendar-event-button .calendar-event-time-present { - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; font-weight: bold; text-align: left; margin-bottom: .2em; } .calendar-event-button .calendar-event-time-present:all-day { color: #35a854; } .calendar-event-button .calendar-event-time-future { - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; font-weight: bold; text-align: left; margin-bottom: .2em; } .calendar-event-button .calendar-event-summary { - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; text-align: left; width: 200px; } .calendar-event-button .calendar-event-countdown { text-align: right; margin-bottom: .6em; - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; } .calendar-event-button .calendar-event-countdown:soon { font-weight: bold; } .calendar-event-button .calendar-event-countdown:imminent { @@ -678,7 +639,7 @@ StScrollBar { color: #35a854; } .calendar-event-button:hover { background-color: #35a854; - border: 1px solid #202020; } + border: 1px solid #303030; } .calendar-event-button:hover .calendar-event-time-past, .calendar-event-button:hover .calendar-event-time-present, .calendar-event-button:hover .calendar-event-time-future, @@ -703,14 +664,14 @@ StScrollBar { .calendar-today-day-label { font-size: 1.75em; - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; font-weight: bold; text-align: center; padding-bottom: .1em; } .calendar-today-date-label { font-size: 1.1em; - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; font-weight: bold; text-align: center; } @@ -724,7 +685,7 @@ StScrollBar { color: #ffffff; } .calendar-month-label { - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; font-weight: bold; padding: 8px 0; } @@ -778,16 +739,17 @@ StScrollBar { .calendar-day-base:hover { font-weight: bold; color: #ffffff; - background-color: #35a854; } + background-color: #35a854; + border-radius: 6px; } .calendar-day-heading { - color: rgba(255, 255, 255, 0.72); + color: rgba(225, 225, 225, 0.85); margin-top: 1em; font-size: 1.05em; } .calendar-day { border-width: 0; - color: rgba(255, 255, 255, 0.77); } + color: rgba(225, 225, 225, 0.9); } .calendar-day-top { border-top-width: 0; } @@ -796,28 +758,30 @@ StScrollBar { border-left-width: 0; } .calendar-nonwork-day { - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; background-color: transparent; font-weight: bold; } .calendar-today { - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; background-color: rgba(53, 168, 84, 0.4); - border-width: 0; } + border-width: 0; + border-radius: 6px; } .calendar-today:selected { font-weight: bold; } .calendar-not-today { - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; + border-radius: 6px; } .calendar-not-today:selected { font-weight: bold; - background-color: rgba(255, 255, 255, 0.27); } + background-color: rgba(225, 225, 225, 0.4); } .calendar-not-today:selected:hover { font-weight: bold; - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; } .calendar-other-month-day { - color: rgba(255, 255, 255, 0.17); + color: rgba(225, 225, 225, 0.3); opacity: 1; } .calendar-other-month-day:hover { @@ -825,30 +789,30 @@ StScrollBar { opacity: 1; } .calendar-week-number { - color: rgba(255, 255, 255, 0.72); + color: rgba(225, 225, 225, 0.85); font-size: 0.8em; margin-top: 0.8em; } #notification { - box-shadow: 0 1px 15px 4px #202020; + box-shadow: 0 1px 15px 4px #303030; border-top-color: #35a854; border-top: 4px; border-radius: 5px; - background-color: #2f2f2f; + background-color: #222222; padding: 13px; spacing-rows: 10px; spacing-columns: 10px; margin-from-right-edge-of-screen: 20px; width: 34em; - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; } .popup-menu #notification { - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; border-image: url("dark-assets/misc/message.svg") 9 9 9 9; } .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button { padding: 5px; } #notification.multi-line-notification { padding-bottom: 13px; - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; } #notification-scrollview { max-height: 10em; } #notification-scrollview > .top-shadow, #notification-scrollview > .bottom-shadow { @@ -864,7 +828,7 @@ StScrollBar { .notification-with-image { min-height: 159px; - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; } .notification-button, .notification-icon-button { padding: 5px; } @@ -877,10 +841,10 @@ StScrollBar { spacing: 16px; } .switcher-list { - color: rgba(255, 255, 255, 0.87); - border: 1px solid #202020; - background-color: #2f2f2f; - border-radius: 3px; + color: #e1e1e1; + border: 1px solid #303030; + background-color: #1a1a1a; + border-radius: 6px; padding: 20px; } .switcher-list > StBoxLayout { padding: 4px; } @@ -888,13 +852,12 @@ StScrollBar { spacing: 8px; } .switcher-list .item-box { padding: 8px; - border-radius: 2px; } + border-radius: 6px; } .switcher-list .item-box:outlined { padding: 8px; border: 1px solid #35a854; } .switcher-list .item-box:selected { - color: #ffffff; - background-color: #35a854; + background-color: #393939; border: 0px solid #35a854; } .switcher-list .thumbnail { width: 256px; } @@ -907,7 +870,7 @@ StScrollBar { .switcher-arrow { border-color: rgba(0, 0, 0, 0); - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; } .switcher-arrow:highlighted { border-color: rgba(0, 0, 0, 0); color: #ffffff; } @@ -934,137 +897,13 @@ StScrollBar { .ripple-box:rtl { background-image: url("common-assets/misc/corner-ripple.svg"); } -.lightbox { - background-color: rgba(0, 0, 0, 0.4); } - -.flashspot { - background-color: white; } - -.modal-dialog { - background-color: #2f2f2f; - border: 1px solid #202020; - border-radius: 3px; - padding: 5px 10px; } - .modal-dialog > StBoxLayout:first-child { - padding: 10px; } - .modal-dialog-button-box { - spacing: 0; - margin: 0px; - padding: 10px; - border: none; - background-color: #2f2f2f; } - .modal-dialog-button-box .modal-dialog-button { - padding-top: 0; - padding-bottom: 0; - height: 30px; } - .modal-dialog .confirm-dialog-title { - text-align: center; - font-weight: bold; - font-size: 1.3em; - padding-bottom: 12px; } - -.run-dialog { - padding: 10px 15px 10px 15px; - border: 1px solid #202020; - border-radius: 3px; - background-color: #2f2f2f; } - .run-dialog > * { - padding: 0; } - .run-dialog-label { - font-size: 1.3em; - font-weight: bold; - color: rgba(255, 255, 255, 0.87); - padding-bottom: 15px; - text-align: center; } - .run-dialog-description { - color: rgba(255, 255, 255, 0.87); - padding-top: 15px; - text-align: center; } - .run-dialog-description.error { - color: #FC4138; } - .run-dialog-completion-box { - padding-top: 5px; - padding-left: 15px; - font-size: 1em; } - .run-dialog-entry { - width: 21em; - height: 1.2em; - padding: 7px; - border-radius: 3px; - caret-color: #c3c3c3; - selected-color: #ffffff; - selection-background-color: #35a854; - color: #c3c3c3; - background-color: rgba(109, 109, 109, 0.4); - border: 1px solid rgba(22, 22, 22, 0.4); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } - .run-dialog-entry:focus { - color: rgba(255, 255, 255, 0.87); - background-color: #404040; - border: 1px solid #35a854; - box-shadow: inset 0 2px 4px rgba(64, 64, 64, 0.05); } - .run-dialog .modal-dialog-button-box { - border: none; - box-shadow: none; - background: none; } - -/* CinnamonMountOperation Dialogs */ -.cinnamon-mount-operation-icon { - icon-size: 48px; } - -.mount-password-reask { - color: #F27835; } - -.show-processes-dialog, -.mount-question-dialog { - spacing: 24px; } - .show-processes-dialog-subject, - .mount-question-dialog-subject { - padding-top: 10px; - padding-left: 17px; - padding-bottom: 6px; } - .show-processes-dialog-subject:rtl, - .mount-question-dialog-subject:rtl { - padding-left: 0px; - padding-right: 17px; } - .show-processes-dialog-description, - .mount-question-dialog-description { - padding-left: 17px; - width: 28em; } - .show-processes-dialog-description:rtl, - .mount-question-dialog-description:rtl { - padding-right: 17px; } - -.show-processes-dialog-app-list { - max-height: 200px; - padding-top: 24px; - padding-left: 49px; - padding-right: 32px; } - .show-processes-dialog-app-list:rtl { - padding-right: 49px; - padding-left: 32px; } - .show-processes-dialog-app-list-item { - color: #ccc; } - .show-processes-dialog-app-list-item:hover { - color: white; } - .show-processes-dialog-app-list-item:ltr { - padding-right: 1em; } - .show-processes-dialog-app-list-item:rtl { - padding-left: 1em; } - .show-processes-dialog-app-list-item-icon:ltr { - padding-right: 17px; } - .show-processes-dialog-app-list-item-icon:rtl { - padding-left: 17px; } - .show-processes-dialog-app-list-item-name { - font-size: 1.1em; } - .magnifier-zoom-region { border: 2px solid maroon; } .magnifier-zoom-region .full-screen { border-width: 0px; } #keyboard { - background-color: #353535; + background-color: #303030; border-width: 0; border-top-width: 1px; border-color: rgba(0, 0, 0, 0.4); } @@ -1084,26 +923,26 @@ StScrollBar { border-radius: 3px; box-shadow: none; color: #c3c3c3; - border: 1px solid #202020; - background-color: rgba(109, 109, 109, 0.4); } + border: 1px solid #303030; + background-color: rgba(104, 104, 104, 0.4); } .keyboard-key:hover { color: #c3c3c3; - border: 1px solid rgba(2, 2, 2, 0.4); - background-color: rgba(127, 127, 127, 0.5); } + border: 1px solid rgba(0, 0, 0, 0.4); + background-color: rgba(122, 122, 122, 0.5); } .keyboard-key:active, .keyboard-key:checked { color: #ffffff; border: 1px solid #35a854; background-color: #35a854; } .keyboard-key:grayed { - color: #606060; - border: 1px solid rgba(2, 2, 2, 0.4); - background-color: rgba(109, 109, 109, 0.25); } + color: #5c5c5c; + border: 1px solid rgba(0, 0, 0, 0.4); + background-color: rgba(104, 104, 104, 0.25); } .keyboard-subkeys { color: #c3c3c3; padding: 5px; -arrow-border-radius: 2px; - -arrow-background-color: #353535; + -arrow-background-color: #303030; -arrow-border-width: 1px; -arrow-border-color: rgba(0, 0, 0, 0.4); -arrow-base: 20px; @@ -1113,15 +952,16 @@ StScrollBar { .menu-favorites-box { padding: 10px; transition-duration: 300; - background-color: #333333; - border: 1px solid #202020; } + background-color: #303030; + border: 1px solid rgba(0, 0, 0, 0); + border-radius: 6px; } .menu-favorites-button { padding: .9em 1em; border: 1px solid rgba(0, 0, 0, 0); - border-radius: 2px; } + border-radius: 6px; } .menu-favorites-button:hover { - background-color: #525352; } + background-color: #454545; } .menu-places-box { padding: 10px; @@ -1144,8 +984,9 @@ StScrollBar { .menu-application-button-selected { padding: 7px; color: #ffffff; - background-color: #525352; - border: 1px solid #202020; } + background-color: #303030; + border: 1px solid rgba(0, 0, 0, 0); + border-radius: 6px; } .menu-application-button-selected:highlighted { font-weight: bold; } .menu-application-button-label:ltr { @@ -1159,15 +1000,12 @@ StScrollBar { .menu-category-button-selected { padding: 7px; color: #ffffff; - background-color: #525352; - border: 1px solid #202020; } - .menu-category-button:hover { - background-color: #3d3d3d; - border: 1px solid #292929; - border-radius: 0px; } + background-color: #303030; + border: 1px solid rgba(0, 0, 0, 0); + border-radius: 6px; } .menu-category-button-greyed { padding: 7px; - color: rgba(255, 255, 255, 0.32); + color: rgba(225, 225, 225, 0.45); border: 1px solid rgba(0, 0, 0, 0); } .menu-category-button-label:ltr { padding-left: 5px; } @@ -1199,49 +1037,14 @@ StScrollBar { width: 250px; min-height: 16px; font-weight: normal; - caret-color: rgba(255, 255, 255, 0.87); } + caret-color: #e1e1e1; + border-radius: 6px; } .menu-search-entry-icon { icon-size: 1em; - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; } /* Context menu (at the moment only for favorites) */ -.info-osd { - text-align: center; - font-weight: bold; - spacing: 1em; - padding: 16px; - color: rgba(255, 255, 255, 0.87); - border: 1px solid #202020; - border-radius: 5px; - background-color: #2f2f2f; } - -.restart-osd { - font-size: 1.6em; } - -.workspace-osd { - font-size: 4em; } - -.osd-window { - text-align: center; - font-weight: bold; - spacing: 1em; - padding: 20px; - color: rgba(255, 255, 255, 0.87); - background-color: #2f2f2f; - border: 1px solid #202020; - border-radius: 5px; } - .osd-window .osd-monitor-label { - font-size: 3em; } - .osd-window .level { - padding: 0; - height: 0.7em; - background-color: rgba(0, 0, 0, 0.5); - border-radius: 2px; } - .osd-window .level-bar { - border-radius: 2px; - background-color: #35a854; } - .window-list-box { spacing: 6px; padding-left: 10px; @@ -1267,7 +1070,7 @@ StScrollBar { padding-left: 8px; padding-right: 8px; transition-duration: 100; - color: rgba(255, 255, 255, 0.67); } + color: rgba(225, 225, 225, 0.8); } .window-list-item-box.top, .window-list-item-box.bottom { border-bottom-width: 2px; } .window-list-item-box.top StLabel, .window-list-item-box.bottom StLabel { @@ -1285,12 +1088,12 @@ StScrollBar { .window-list-item-box.left StBin { padding-left: 1px; } .window-list-item-box:hover, .window-list-item-box:groupFocus { - color: rgba(255, 255, 255, 0.87); - background-color: rgba(255, 255, 255, 0.07); } + color: #e1e1e1; + background-color: rgba(225, 225, 225, 0.2); } .window-list-item-box:active, .window-list-item-box:checked, .window-list-item-box:focus, .window-list-item-box:running { - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; border-color: #35a854; - background-color: rgba(255, 255, 255, 0.07); } + background-color: rgba(225, 225, 225, 0.2); } .window-list-item-box .progress { background-color: rgba(53, 168, 84, 0.8); } @@ -1301,9 +1104,9 @@ StScrollBar { .window-list-preview { spacing: 6px; - color: rgba(255, 255, 255, 0.87); - border: 1px solid #202020; - background-color: #2f2f2f; + color: #e1e1e1; + border: 1px solid rgba(0, 0, 0, 0); + background-color: #222222; border-radius: 3px; padding: 6px 12px 12px 12px; font-size: 1em; } @@ -1321,7 +1124,7 @@ StScrollBar { padding-left: 8px; padding-right: 8px; transition-duration: 100; - color: rgba(255, 255, 255, 0.67); } + color: rgba(225, 225, 225, 0.8); } .grouped-window-list-item-box.top, .grouped-window-list-item-box.bottom { border-bottom-width: 2px; } .grouped-window-list-item-box.top StLabel, .grouped-window-list-item-box.bottom StLabel { @@ -1339,10 +1142,10 @@ StScrollBar { .grouped-window-list-item-box.left StBin { padding-left: 1px; } .grouped-window-list-item-box:hover, .grouped-window-list-item-box:focus { - color: rgba(255, 255, 255, 0.87); - background-color: rgba(255, 255, 255, 0.17); } + color: #e1e1e1; + background-color: rgba(225, 225, 225, 0.3); } .grouped-window-list-item-box:active, .grouped-window-list-item-box:checked { - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; border-color: #35a854; } .grouped-window-list-item-box .progress { background-color: rgba(53, 168, 84, 0.8); } @@ -1372,9 +1175,9 @@ StScrollBar { background: rgba(255, 52, 52, 0.3); } .grouped-window-list-thumbnail-menu { - color: rgba(255, 255, 255, 0.87); - border: 1px solid #202020; - background-color: #2f2f2f; + color: #e1e1e1; + border: 1px solid rgba(0, 0, 0, 0); + background-color: #222222; border-radius: 3px; padding: 0px; } .grouped-window-list-thumbnail-menu > StBoxLayout { @@ -1451,10 +1254,10 @@ StScrollBar { .sound-player > StBoxLayout:first-child StButton:small StIcon { icon-size: 12px; } .sound-player > StBoxLayout:first-child StButton:small:hover { - color: rgba(255, 255, 255, 0.87); - background-color: #525252; - border: 1px solid #202020; - box-shadow: inset 0 2px 4px rgba(82, 82, 82, 0.05); } + color: #e1e1e1; + background-color: #3d3d3d; + border: 1px solid #303030; + box-shadow: inset 0 2px 4px rgba(61, 61, 61, 0.05); } .sound-player > StBoxLayout:first-child StButton:small:active { color: #ffffff; background-color: #35a854; @@ -1468,23 +1271,23 @@ StScrollBar { width: 290px; padding: 15px; spacing: 0.5em; - background: rgba(47, 47, 47, 0.9); - border-top: 1px solid #202020; - color: rgba(255, 255, 255, 0.87); } + background: rgba(34, 34, 34, 0.9); + border-top: 1px solid #303030; + color: #e1e1e1; } .sound-player-overlay StButton { width: 22px; height: 13px; padding: 5px; - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; border-radius: 2px; border: 1px solid transparent; } .sound-player-overlay StButton StIcon { icon-size: 16px; } .sound-player-overlay StButton:hover { - color: rgba(255, 255, 255, 0.87); - background-color: #525252; - border: 1px solid #202020; - box-shadow: inset 0 2px 4px rgba(82, 82, 82, 0.05); } + color: #e1e1e1; + background-color: #3d3d3d; + border: 1px solid #303030; + box-shadow: inset 0 2px 4px rgba(61, 61, 61, 0.05); } .sound-player-overlay StButton:active { color: #ffffff; background-color: #35a854; @@ -1500,7 +1303,7 @@ StScrollBar { padding: 0; border: none; -slider-height: 0.5em; - -slider-background-color: #222222; + -slider-background-color: #151515; -slider-border-color: rgba(0, 0, 0, 0); -slider-active-background-color: #35a854; -slider-active-border-color: rgba(0, 0, 0, 0); @@ -1519,7 +1322,6 @@ StScrollBar { padding: 0; } .workspace-button { - border: 1px solid rgba(0, 0, 0, 0.4); background-color: rgba(0, 0, 0, 0.2); width: 20px; height: 14px; @@ -1540,7 +1342,7 @@ StScrollBar { background-color: rgba(53, 168, 84, 0.7); color: #ffffff; } .workspace-button:hover { - background-color: rgba(255, 255, 255, 0.07); + background-color: rgba(225, 225, 225, 0.2); color: #ffffff; } /* Controls the style when using the "Visual representation" option */ @@ -1549,22 +1351,21 @@ StScrollBar { spacing: 6px; } .workspace-graph .workspace { - border: 1px solid rgba(0, 0, 0, 0.4); - background-color: rgba(0, 0, 0, 0.2); } + border: 1px solid #303030; } .workspace-graph .workspace:active { border: 1px solid #35a854; } .workspace-graph .workspace .windows { - -active-window-background: #555555; + -active-window-background: #404040; -active-window-border: rgba(0, 0, 0, 0.8); - -inactive-window-background: #555555; + -inactive-window-background: #404040; -inactive-window-border: rgba(0, 0, 0, 0.8); } .workspace-graph .workspace:active .windows { - -active-window-background: #6f6f6f; + -active-window-background: #5a5a5a; -active-window-border: rgba(0, 0, 0, 0.8); - -inactive-window-background: #3c3c3c; + -inactive-window-background: #272727; -inactive-window-border: rgba(0, 0, 0, 0.8); } .panel-launchers { @@ -1576,7 +1377,7 @@ StScrollBar { padding-bottom: 2px; transition-duration: 200; } .panel-launchers .launcher:hover { - background-color: #525352; } + background-color: #303030; } .panel-launchers.vertical { padding-top: 2px; padding-bottom: 2px; @@ -1599,16 +1400,16 @@ StScrollBar { .applet-separator-line { width: 1px; - background: rgba(255, 255, 255, 0.12); } + background: #303030; } .applet-separator-line-vertical { height: 1px; - background: rgba(255, 255, 255, 0.12); } + background: #303030; } .applet-box { padding-left: 4px; padding-right: 4px; spacing: 4px; - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; text-shadow: none; transition-duration: 100; text-align: center; } @@ -1619,7 +1420,7 @@ StScrollBar { padding-bottom: 3px; } .applet-box:hover, .applet-box:checked { color: #ffffff; - background-color: #525352; } + background-color: #303030; } .applet-box:highlight { background-image: none; border-image: none; @@ -1627,7 +1428,7 @@ StScrollBar { .applet-label { font-weight: bold; - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; } .applet-label:hover, .applet-label:checked, .applet-box:hover .applet-label, .applet-box:checked .applet-label { color: #ffffff; text-shadow: none; } @@ -1640,47 +1441,44 @@ StScrollBar { text-shadow: none; } .user-icon { - width: 32px; - height: 32px; - background-color: transparent; - border: none; - border-radius: 0; } + border: 1px solid rgba(225, 225, 225, 0.5); + border-radius: 99px; } .user-label { - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; font-size: 1em; font-weight: bold; margin: 0px; } .applet-cornerbar { width: 8px; - background-color: rgba(255, 255, 255, 0.12); } + background-color: #303030; } .applet-cornerbar-box { padding: 4px 4px; } .applet-cornerbar-box:hover > .applet-cornerbar { - background-color: rgba(255, 255, 255, 0.22); } + background-color: #303030; } .applet-cornerbar.vertical { height: 8px; } .desklet { - color: rgba(255, 255, 255, 0.87); } + color: #e1e1e1; } .desklet:highlight { background-color: rgba(252, 65, 56, 0.5); } .desklet-with-borders { - border: 1px solid #202020; + border: 1px solid #303030; border-radius: 5px; - background-color: #2f2f2f; - color: rgba(255, 255, 255, 0.87); + background-color: #222222; + color: #e1e1e1; padding: 12px; padding-bottom: 16px; } .desklet-with-borders:highlight { background-color: rgba(252, 65, 56, 0.5); } .desklet-with-borders-and-header { - border: 1px solid #202020; + border: 1px solid #303030; border-top-width: 0; border-radius: 0 0 5px 5px; - background-color: #2f2f2f; - color: rgba(255, 255, 255, 0.87); + background-color: #222222; + color: #e1e1e1; border-radius: 0; border-radius-topleft: 0; border-radius-topright: 0; @@ -1689,10 +1487,10 @@ StScrollBar { .desklet-with-borders-and-header:highlight { background-color: rgba(252, 65, 56, 0.5); } .desklet-header { - border: 1px solid #202020; + border: 1px solid #303030; border-radius: 5px 5px 0 0; - background-color: #272727; - color: rgba(255, 255, 255, 0.87); + background-color: #1a1a1a; + color: #e1e1e1; font-size: 1em; padding: 12px; padding-bottom: 6px; } @@ -1701,10 +1499,10 @@ StScrollBar { background-color: rgba(53, 168, 84, 0.3); } .photoframe-box { - border: 1px solid #202020; + border: 1px solid #303030; border-radius: 5px; - background-color: #2f2f2f; - color: rgba(255, 255, 255, 0.87); + background-color: #222222; + color: #e1e1e1; padding: 12px; padding-bottom: 16px; } @@ -1751,3 +1549,226 @@ StScrollBar { border: 0px; background-color: rgba(0, 0, 0, 0); border-radius: 0px; } + +.prompt-dialog-error-label, .prompt-dialog-info-label, .prompt-dialog-null-label, .run-dialog-description, .message-dialog-content .message-dialog-caption { + font-weight: 400; + font-size: 0.818em; } + +.message-dialog-content .message-dialog-title, .dialog .confirm-dialog-title { + font-weight: 800; + font-size: 1.364em; } + +.workspace-switch-osd, .media-keys-osd, .message-dialog-content .message-dialog-title.leightweight { + font-weight: 700; + font-size: 1.182em; } + +.audio-device-selection-dialog .audio-selection-box .audio-selection-device { + color: #e1e1e1; + background-color: #222222; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:focus { + color: #e1e1e1; + background-color: #222222; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:hover { + color: #e1e1e1; + background-color: #3c3c3c; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:insensitive { + color: rgba(225, 225, 225, 0.5); + background-color: #222222; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:selected, .audio-device-selection-dialog .audio-selection-box .audio-selection-device:active { + color: #e1e1e1; + background-color: #2f2f2f; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:checked { + color: #e1e1e1; + background-color: #2f2f2f; } + +.dialog .dialog-button, .dialog .dialog-button:destructive-action, .dialog .dialog-button:default { + font-weight: bold; + padding: 12px; + border-radius: 18px; + color: #e1e1e1; + background-color: #303030; } + .dialog .dialog-button:focus { + color: #e1e1e1; + background-color: #303030; } + .dialog .dialog-button:hover { + color: #e1e1e1; + background-color: #4a4a4a; } + .dialog .dialog-button:active { + color: #e1e1e1; + background-color: #3d3d3d; } + .dialog .dialog-button:checked { + color: #e1e1e1; + background-color: #3d3d3d; } + .dialog .dialog-button:insensitive { + color: rgba(225, 225, 225, 0.5); + background-color: #282828; } + +.dialog .dialog-button:default { + color: #e1e1e1; + background-color: #35a854; } + .dialog .dialog-button:hover:default { + color: #e1e1e1; + background-color: #4ac66b; } + .dialog .dialog-button:active:default { + color: #e1e1e1; + background-color: #3bbb5e; } + .dialog .dialog-button:checked:default { + color: #e1e1e1; + background-color: #3bbb5e; } + .dialog .dialog-button:insensitive:default { + border-color: #303030; + color: rgba(225, 225, 225, 0.5); + background-color: #282828; } + +.dialog .dialog-button:destructive-action { + color: #e1e1e1; + background-color: #c01c28; } + .dialog .dialog-button:hover:destructive-action { + color: #e1e1e1; + background-color: #e12e3b; } + .dialog .dialog-button:active:destructive-action { + color: #e1e1e1; + background-color: #d61f2d; } + .dialog .dialog-button:checked:destructive-action { + color: #e1e1e1; + background-color: #d61f2d; } + .dialog .dialog-button:insensitive:destructive-action { + border-color: #303030; + color: rgba(225, 225, 225, 0.5); + background-color: #282828; } + +.dialog { + background-color: #222222; + border-radius: 18px; + border: 1px solid #303030; + padding: 18px; } + .dialog .dialog-content-box { + margin-top: 8px; + margin-bottom: 16px; + spacing: 32px; + max-width: 28em; } + .dialog .confirm-dialog-title { + text-align: center; } + +.message-dialog-content { + spacing: 18px; } + .message-dialog-content .message-dialog-title { + text-align: center; } + .message-dialog-content .message-dialog-description { + text-align: center; } + .message-dialog-content .message-dialog-caption { + text-align: center; } + +.run-dialog .dialog-content-box { + margin: 4px; } + +.run-dialog-description { + text-align: center; + color: #aeaeae; } + .run-dialog-description.error { + color: #FC4138; } + +.run-dialog-completion-box { + padding-top: 6px; + padding-left: 12px; } + +.run-dialog-entry { + width: 20em; + height: 1.2em; } + +.prompt-dialog { + width: 28em; } + .prompt-dialog .dialog-content-box { + spacing: 16px; + margin-bottom: 12px; } + .prompt-dialog-password-entry { + width: 20em; } + .prompt-dialog-password-layout { + spacing: 8px; } + .prompt-dialog-error-label, .prompt-dialog-info-label, .prompt-dialog-null-label { + text-align: center; } + .prompt-dialog-error-label { + color: #FC4138; } + +.audio-device-selection-dialog { + min-width: 24em; } + .audio-device-selection-dialog .audio-selection-box { + spacing: 12px; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device { + border-radius: 20px; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device .audio-selection-device-box { + padding: 12px; + spacing: 12px; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device .audio-selection-device-icon { + icon-size: 64px; } + +.workspace-switch-osd, .info-osd, .media-keys-osd { + background-color: #222222; + border: 1px solid #303030; + border-radius: 20px; + text-align: center; + padding: 24px; } + +.media-keys-osd { + margin-bottom: 1em; + border-radius: 20px; + font-weight: bold; + spacing: 12px; + padding: 12px 24px; } + .media-keys-osd > * { + spacing: 12px; } + .media-keys-osd StIcon { + icon-size: 32px; } + .media-keys-osd StLabel:ltr { + margin-right: 6px; } + .media-keys-osd StLabel:rtl { + margin-left: 6px; } + .media-keys-osd .level { + min-width: 160px; + -barlevel-height: 6px; + -barlevel-background-color: #303030; + -barlevel-active-background-color: #e1e1e1; + -barlevel-amplify-color: #F27835; + -barlevel-amplify-separator-width: 3px; } + .media-keys-osd .level:ltr { + margin-right: 6px; } + .media-keys-osd .level:rtl { + margin-left: 6px; } + .media-keys-osd .level-bar { + border-radius: 20px; + background-color: #e1e1e1; } + +.info-osd { + font-size: 1.2em; + font-weight: 700; + text-align: center; } + +.workspace-switch-osd { + min-width: 140px; + margin-bottom: 1em; + border-radius: 20px; + font-weight: bold; + padding: 12px 36px 0 36px; } + .workspace-switch-osd-indicator-box { + spacing: 12px; } + .workspace-switch-osd-indicator { + background-color: rgba(225, 225, 225, 0.5); + padding: 3px; + margin: 15px; + border-radius: 36px; } + .workspace-switch-osd-indicator:active { + background-color: #35a854; + padding: 6px; + margin: 12px; } + +.monitor-label { + border-radius: 0; + color: black; + padding: 12px; + text-align: center; } + +.resize-popup { + color: #e1e1e1; + background-color: #222222; + border-radius: 6px; + padding: 12px; } diff --git a/cinnamon-shell/upstream/cinnamon.css b/cinnamon-shell/upstream/cinnamon.css index 1c5b372a90..20958a9412 100644 --- a/cinnamon-shell/upstream/cinnamon.css +++ b/cinnamon-shell/upstream/cinnamon.css @@ -4,43 +4,43 @@ stage { .label-shadow { color: rgba(0, 0, 0, 0); } -.sound-button, .modal-dialog-button-box .modal-dialog-button, .notification-button, .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button { +.sound-button, .notification-button, .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button { min-height: 20px; padding: 5px 32px; transition-duration: 0; color: #303030; - background-color: #ededed; + background-color: #b0b0b0; border: 1px solid #b5b5b5; - box-shadow: inset 0 2px 4px rgba(237, 237, 237, 0.05); } - .sound-button, .modal-dialog-button-box .modal-dialog-button, .notification-button, .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button { + box-shadow: inset 0 2px 4px rgba(176, 176, 176, 0.05); } + .sound-button, .notification-button, .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button { border-radius: 2px; } - .sound-button:focus, .modal-dialog-button-box .modal-dialog-button:focus, .notification-button:focus, .notification-icon-button:focus, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus { + .sound-button:focus, .notification-button:focus, .notification-icon-button:focus, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus { color: #303030; - background-color: #ededed; + background-color: #b0b0b0; border: 1px solid #35a854; - box-shadow: inset 0 2px 4px rgba(237, 237, 237, 0.05); } - .sound-button:hover, .modal-dialog-button-box .modal-dialog-button:hover, .notification-button:hover, .notification-icon-button:hover, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover { + box-shadow: inset 0 2px 4px rgba(176, 176, 176, 0.05); } + .sound-button:hover, .notification-button:hover, .notification-icon-button:hover, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover { color: #303030; - background-color: #fafafa; + background-color: #bdbdbd; border: 1px solid #b5b5b5; - box-shadow: inset 0 2px 4px rgba(250, 250, 250, 0.05); } - .sound-button:hover:focus, .modal-dialog-button-box .modal-dialog-button:hover:focus, .notification-button:hover:focus, .notification-icon-button:hover:focus, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus { + box-shadow: inset 0 2px 4px rgba(189, 189, 189, 0.05); } + .sound-button:hover:focus, .notification-button:hover:focus, .notification-icon-button:hover:focus, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus { color: #303030; - background-color: #fafafa; + background-color: #bdbdbd; border: 1px solid #35a854; - box-shadow: inset 0 2px 4px rgba(237, 237, 237, 0.05); } - .sound-button:active, .modal-dialog-button-box .modal-dialog-button:active, .notification-button:active, .notification-icon-button:active, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active { + box-shadow: inset 0 2px 4px rgba(176, 176, 176, 0.05); } + .sound-button:active, .notification-button:active, .notification-icon-button:active, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active { color: #ffffff; background-color: #35a854; border: 1px solid #35a854; box-shadow: inset 0 2px 4px #35a854; } - .sound-button:insensitive, .modal-dialog-button-box .modal-dialog-button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive { + .sound-button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive { color: rgba(48, 48, 48, 0.55); border: 1px solid rgba(181, 181, 181, 0.55); - background-color: rgba(237, 237, 237, 0.55); - box-shadow: inset 0 2px 4px rgba(237, 237, 237, 0.05); } + background-color: rgba(176, 176, 176, 0.55); + box-shadow: inset 0 2px 4px rgba(176, 176, 176, 0.05); } -#menu-search-entry, .popup-menu #notification StEntry { +.prompt-dialog-password-entry, .run-dialog-entry, #menu-search-entry, .popup-menu #notification StEntry { padding: 7px; caret-size: 1px; selection-background-color: #35a854; @@ -48,20 +48,20 @@ stage { transition-duration: 300ms; border-radius: 3px; color: #303030; - background-color: #f4f4f4; + background-color: #c0c0c0; border: 1px solid #cfd6e6; - box-shadow: inset 0 2px 4px rgba(244, 244, 244, 0.05); } - #menu-search-entry:focus, .popup-menu #notification StEntry:focus, #menu-search-entry:hover, .popup-menu #notification StEntry:hover { + box-shadow: inset 0 2px 4px rgba(192, 192, 192, 0.05); } + .prompt-dialog-password-entry:focus, .run-dialog-entry:focus, #menu-search-entry:focus, .popup-menu #notification StEntry:focus, .prompt-dialog-password-entry:hover, .run-dialog-entry:hover, #menu-search-entry:hover, .popup-menu #notification StEntry:hover { color: #303030; - background-color: #f4f4f4; + background-color: #c0c0c0; border: 1px solid #35a854; - box-shadow: inset 0 2px 4px rgba(244, 244, 244, 0.05); } - #menu-search-entry:insensitive, .popup-menu #notification StEntry:insensitive { + box-shadow: inset 0 2px 4px rgba(192, 192, 192, 0.05); } + .prompt-dialog-password-entry:insensitive, .run-dialog-entry:insensitive, #menu-search-entry:insensitive, .popup-menu #notification StEntry:insensitive { color: rgba(48, 48, 48, 0.55); - background-color: #efefef; + background-color: #d2d2d2; border-color: 1px solid #dadee7; - box-shadow: inset 0 2px 4px rgba(239, 239, 239, 0.05); } - #menu-search-entry StIcon.capslock-warning, .popup-menu #notification StEntry StIcon.capslock-warning { + box-shadow: inset 0 2px 4px rgba(210, 210, 210, 0.05); } + .prompt-dialog-password-entry StIcon.capslock-warning, .run-dialog-entry StIcon.capslock-warning, #menu-search-entry StIcon.capslock-warning, .popup-menu #notification StEntry StIcon.capslock-warning { icon-size: 16px; warning-color: #F27835; padding: 0 4px; } @@ -75,8 +75,8 @@ stage { transition-duration: 300ms; border-radius: 3px; color: #c3c3c3; - background-color: rgba(109, 109, 109, 0.4); - border: 1px solid rgba(22, 22, 22, 0.4); + background-color: rgba(104, 104, 104, 0.4); + border: 1px solid rgba(17, 17, 17, 0.4); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .notification StEntry:focus { color: #ffffff; @@ -85,8 +85,8 @@ stage { box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .notification StEntry:insensitive { color: rgba(195, 195, 195, 0.55); - background-color: rgba(109, 109, 109, 0.25); - border: 1px solid rgba(22, 22, 22, 0.4); + background-color: rgba(104, 104, 104, 0.25); + border: 1px solid rgba(17, 17, 17, 0.4); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } StScrollView.vfade { @@ -101,15 +101,15 @@ StScrollBar { min-width: 5px; min-height: 5px; } StScrollBar StBin#trough { - background-color: rgba(244, 244, 244, 0.1); + background-color: rgba(192, 192, 192, 0.1); border-radius: 8px; } StScrollBar StButton#vhandle, StScrollBar StButton#hhandle { border-radius: 2px; - background-color: #9e9e9e; + background-color: #c0c0c0; border: 0px solid; margin: 0px; } StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover { - background-color: #b1b1b1; } + background-color: #b0b0b0; } StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-color: #35a854; } @@ -223,26 +223,25 @@ StScrollBar { padding: 8px; } .menu { + border: 1px solid rgba(0, 0, 0, 0); color: #303030; - border: 1px solid #b5b5b5; - border-radius: 3px; - background-color: rgba(232, 232, 232, 0.99); } - .menu.top { - border-radius: 0 0 3px 3px; } - .menu.bottom { - border-radius: 3px 3px 0 0; } - .menu.left { - border-radius: 0 3px 3px 0; } - .menu.right { - border-radius: 3px 0 0 3px; } + background-color: #e8e8e8; } + .menu-top { + border-radius: 0 0 6px 6px; } + .menu-bottom { + border-radius: 6px 6px 0 0; } + .menu-left { + border-radius: 0 6px 6px 0; } + .menu-right { + border-radius: 6px 0 0 6px; } .popup-sub-menu { - background-color: #f4f4f4; + background-color: #e8e8e8; box-shadow: none; } .popup-sub-menu .popup-menu-item:ltr { - padding-right: 1.75em; } + padding-left: 2.5em; } .popup-sub-menu .popup-menu-item:rtl { - padding-left: 1.75em; } + padding-right: 2.5em; } .popup-sub-menu StScrollBar { padding: 4px; } .popup-sub-menu StScrollBar StBin#trough, .popup-sub-menu StScrollBar StBin#vhandle { @@ -268,60 +267,12 @@ StScrollBar { .popup-inactive-menu-item:insensitive { color: rgba(48, 48, 48, 0.55); } -/* This is for popup menus in Cinnamon versions < 3.2 */ -.popup-menu { - color: white; - color: #303030; } - .popup-menu-arrow { - icon-size: 16px; } - .popup-menu .popup-sub-menu { - background-color: #f4f4f4; - box-shadow: none; } - .popup-menu .popup-sub-menu .popup-menu-item:ltr { - padding-right: 1.75em; } - .popup-menu .popup-sub-menu .popup-menu-item:rtl { - padding-left: 1.75em; } - .popup-menu .popup-sub-menu StScrollBar { - padding: 4px; } - .popup-menu .popup-sub-menu StScrollBar StBin#trough, .popup-menu .popup-sub-menu StScrollBar StBin#vhandle { - border-width: 0; } - .popup-menu .popup-menu-content { - padding: 1em 0em 1em 0em; } - .popup-menu .popup-menu-item { - padding: .4em 1.75em; - spacing: 1em; - border: 1px solid transparent; - border-left-width: 0; - border-right-width: 0; } - .popup-menu .popup-menu-item:active { - color: #303030; - border-color: rgba(48, 48, 48, 0.11); - background-color: rgba(48, 48, 48, 0.08); } - .popup-menu .popup-menu-item:insensitive { - color: rgba(48, 48, 48, 0.5); - background: none; } - .popup-menu .popup-inactive-menu-item { - color: #303030; } - .popup-menu .popup-inactive-menu-item:insensitive { - color: rgba(48, 48, 48, 0.55); } - .popup-menu-icon { - icon-size: 16px; } - -.popup-menu-boxpointer { - -arrow-border-radius: 3px; - -arrow-background-color: #e8e8e8; - -arrow-border-width: 1px; - -arrow-border-color: #b5b5b5; - -arrow-base: 21px; - -arrow-rise: 9px; - -boxpointer-gap: 2px; } - /*Scale view context menu*/ .popup-combo-menu { color: #303030; border: 1px solid #b5b5b5; border-radius: 3px; - background-color: #f4f4f4; + background-color: #c0c0c0; box-shadow: none; padding: 1em 0em 1em 0em; } @@ -343,7 +294,15 @@ StScrollBar { font-weight: normal; } .popup-device-menu-item { - spacing: .5em; } + spacing: .5em; + font-weight: bold; + color: #303030; } + .popup-device-menu-item:insensitive { + color: #303030; + spacing: 1em; } + .popup-device-menu-item .popup-inactive-menu-item { + font-weight: normal; + color: #303030; } .popup-subtitle-menu-item { font-weight: normal; } @@ -453,21 +412,21 @@ StScrollBar { .panel-top, .panel-bottom, .panel-left, .panel-right { color: #ffffff; border: none; - background-color: rgba(232, 232, 232, 0.99); + background-color: rgba(240, 240, 240, 0.99); font-size: 1em; padding: 0px; } .panel-top { - box-shadow: 0 1px #b5b5b5; } + box-shadow: 0 1px #e8e8e8; } .panel-bottom { - box-shadow: 0 -1px #b5b5b5; } + box-shadow: 0 -1px #e8e8e8; } .panel-left { - box-shadow: 1px 0 #b5b5b5; } + box-shadow: 1px 0 #e8e8e8; } .panel-right { - box-shadow: -1px 0 #b5b5b5; } + box-shadow: -1px 0 #e8e8e8; } .panel-dummy { background-color: rgba(252, 65, 56, 0.5); } @@ -500,8 +459,8 @@ StScrollBar { spacing: 12px; } .window-caption { - background-color: #353535; - border: 1px solid #353535; + background-color: #303030; + border: 1px solid #303030; color: #c3c3c3; spacing: 8px; border-radius: 2px; @@ -532,8 +491,8 @@ StScrollBar { padding: 5px 8px; -cinnamon-caption-spacing: 4px; color: #c3c3c3; - background-color: rgba(109, 109, 109, 0.4); - border: 1px solid rgba(22, 22, 22, 0.4); + background-color: rgba(104, 104, 104, 0.4); + border: 1px solid rgba(17, 17, 17, 0.4); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } .expo-workspaces-name-entry:focus, .expo-workspaces-name-entry#selected:focus { @@ -555,7 +514,7 @@ StScrollBar { border-radius: 2px; } .expo-background { - background-color: #353535; } + background-color: #303030; } .workspace-thumbnails { spacing: 26px; } @@ -614,14 +573,16 @@ StScrollBar { margin-right: .5em; padding: .5em; min-width: 350px; - border: 1px solid #b5b5b5; - background-color: #f4f4f4; } + border: 1px solid rgba(0, 0, 0, 0); + background-color: #c0c0c0; + border-radius: 6px; } .calendar-events-no-events-button { margin: 6px 0 6px 0; padding: 6px; } .calendar-events-no-events-button:hover { - background-color: #35a854; } + background-color: #35a854; + border-radius: 6px; } .calendar-events-no-events-button:hover .calendar-events-no-events-icon, .calendar-events-no-events-button:hover .calendar-events-no-events-label { color: #ffffff; } @@ -778,7 +739,8 @@ StScrollBar { .calendar-day-base:hover { font-weight: bold; color: #ffffff; - background-color: #35a854; } + background-color: #35a854; + border-radius: 6px; } .calendar-day-heading { color: rgba(48, 48, 48, 0.85); @@ -803,12 +765,14 @@ StScrollBar { .calendar-today { color: #303030; background-color: rgba(53, 168, 84, 0.4); - border-width: 0; } + border-width: 0; + border-radius: 6px; } .calendar-today:selected { font-weight: bold; } .calendar-not-today { - color: #303030; } + color: #303030; + border-radius: 6px; } .calendar-not-today:selected { font-weight: bold; background-color: rgba(48, 48, 48, 0.3); } @@ -879,8 +843,8 @@ StScrollBar { .switcher-list { color: #303030; border: 1px solid #b5b5b5; - background-color: #e8e8e8; - border-radius: 3px; + background-color: #f0f0f0; + border-radius: 6px; padding: 20px; } .switcher-list > StBoxLayout { padding: 4px; } @@ -888,13 +852,12 @@ StScrollBar { spacing: 8px; } .switcher-list .item-box { padding: 8px; - border-radius: 2px; } + border-radius: 6px; } .switcher-list .item-box:outlined { padding: 8px; border: 1px solid #35a854; } .switcher-list .item-box:selected { - color: #ffffff; - background-color: #35a854; + background-color: #c0c0c0; border: 0px solid #35a854; } .switcher-list .thumbnail { width: 256px; } @@ -934,137 +897,13 @@ StScrollBar { .ripple-box:rtl { background-image: url("common-assets/misc/corner-ripple.svg"); } -.lightbox { - background-color: rgba(0, 0, 0, 0.4); } - -.flashspot { - background-color: white; } - -.modal-dialog { - background-color: #e8e8e8; - border: 1px solid #b5b5b5; - border-radius: 3px; - padding: 5px 10px; } - .modal-dialog > StBoxLayout:first-child { - padding: 10px; } - .modal-dialog-button-box { - spacing: 0; - margin: 0px; - padding: 10px; - border: none; - background-color: #e8e8e8; } - .modal-dialog-button-box .modal-dialog-button { - padding-top: 0; - padding-bottom: 0; - height: 30px; } - .modal-dialog .confirm-dialog-title { - text-align: center; - font-weight: bold; - font-size: 1.3em; - padding-bottom: 12px; } - -.run-dialog { - padding: 10px 15px 10px 15px; - border: 1px solid #b5b5b5; - border-radius: 3px; - background-color: #e8e8e8; } - .run-dialog > * { - padding: 0; } - .run-dialog-label { - font-size: 1.3em; - font-weight: bold; - color: #303030; - padding-bottom: 15px; - text-align: center; } - .run-dialog-description { - color: #303030; - padding-top: 15px; - text-align: center; } - .run-dialog-description.error { - color: #FC4138; } - .run-dialog-completion-box { - padding-top: 5px; - padding-left: 15px; - font-size: 1em; } - .run-dialog-entry { - width: 21em; - height: 1.2em; - padding: 7px; - border-radius: 3px; - caret-color: #c3c3c3; - selected-color: #ffffff; - selection-background-color: #35a854; - color: #c3c3c3; - background-color: rgba(109, 109, 109, 0.4); - border: 1px solid rgba(22, 22, 22, 0.4); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); } - .run-dialog-entry:focus { - color: #303030; - background-color: #f4f4f4; - border: 1px solid #35a854; - box-shadow: inset 0 2px 4px rgba(244, 244, 244, 0.05); } - .run-dialog .modal-dialog-button-box { - border: none; - box-shadow: none; - background: none; } - -/* CinnamonMountOperation Dialogs */ -.cinnamon-mount-operation-icon { - icon-size: 48px; } - -.mount-password-reask { - color: #F27835; } - -.show-processes-dialog, -.mount-question-dialog { - spacing: 24px; } - .show-processes-dialog-subject, - .mount-question-dialog-subject { - padding-top: 10px; - padding-left: 17px; - padding-bottom: 6px; } - .show-processes-dialog-subject:rtl, - .mount-question-dialog-subject:rtl { - padding-left: 0px; - padding-right: 17px; } - .show-processes-dialog-description, - .mount-question-dialog-description { - padding-left: 17px; - width: 28em; } - .show-processes-dialog-description:rtl, - .mount-question-dialog-description:rtl { - padding-right: 17px; } - -.show-processes-dialog-app-list { - max-height: 200px; - padding-top: 24px; - padding-left: 49px; - padding-right: 32px; } - .show-processes-dialog-app-list:rtl { - padding-right: 49px; - padding-left: 32px; } - .show-processes-dialog-app-list-item { - color: #ccc; } - .show-processes-dialog-app-list-item:hover { - color: white; } - .show-processes-dialog-app-list-item:ltr { - padding-right: 1em; } - .show-processes-dialog-app-list-item:rtl { - padding-left: 1em; } - .show-processes-dialog-app-list-item-icon:ltr { - padding-right: 17px; } - .show-processes-dialog-app-list-item-icon:rtl { - padding-left: 17px; } - .show-processes-dialog-app-list-item-name { - font-size: 1.1em; } - .magnifier-zoom-region { border: 2px solid maroon; } .magnifier-zoom-region .full-screen { border-width: 0px; } #keyboard { - background-color: #353535; + background-color: #303030; border-width: 0; border-top-width: 1px; border-color: rgba(0, 0, 0, 0.4); } @@ -1085,25 +924,25 @@ StScrollBar { box-shadow: none; color: #c3c3c3; border: 1px solid #b5b5b5; - background-color: rgba(109, 109, 109, 0.4); } + background-color: rgba(104, 104, 104, 0.4); } .keyboard-key:hover { color: #c3c3c3; - border: 1px solid rgba(2, 2, 2, 0.4); - background-color: rgba(127, 127, 127, 0.5); } + border: 1px solid rgba(0, 0, 0, 0.4); + background-color: rgba(122, 122, 122, 0.5); } .keyboard-key:active, .keyboard-key:checked { color: #ffffff; border: 1px solid #35a854; background-color: #35a854; } .keyboard-key:grayed { - color: #606060; - border: 1px solid rgba(2, 2, 2, 0.4); - background-color: rgba(109, 109, 109, 0.25); } + color: #5c5c5c; + border: 1px solid rgba(0, 0, 0, 0.4); + background-color: rgba(104, 104, 104, 0.25); } .keyboard-subkeys { color: #c3c3c3; padding: 5px; -arrow-border-radius: 2px; - -arrow-background-color: #353535; + -arrow-background-color: #303030; -arrow-border-width: 1px; -arrow-border-color: rgba(0, 0, 0, 0.4); -arrow-base: 20px; @@ -1113,15 +952,16 @@ StScrollBar { .menu-favorites-box { padding: 10px; transition-duration: 300; - background-color: #e7e7e7; - border: 1px solid #b5b5b5; } + background-color: #c0c0c0; + border: 1px solid rgba(0, 0, 0, 0); + border-radius: 6px; } .menu-favorites-button { padding: .9em 1em; border: 1px solid rgba(0, 0, 0, 0); - border-radius: 2px; } + border-radius: 6px; } .menu-favorites-button:hover { - background-color: #c0c0c0; } + background-color: #b0b0b0; } .menu-places-box { padding: 10px; @@ -1145,7 +985,8 @@ StScrollBar { padding: 7px; color: #303030; background-color: #c0c0c0; - border: 1px solid #b5b5b5; } + border: 1px solid rgba(0, 0, 0, 0); + border-radius: 6px; } .menu-application-button-selected:highlighted { font-weight: bold; } .menu-application-button-label:ltr { @@ -1160,11 +1001,8 @@ StScrollBar { padding: 7px; color: #303030; background-color: #c0c0c0; - border: 1px solid #b5b5b5; } - .menu-category-button:hover { - background-color: #d8d8d8; - border: 1px solid #d4d4d4; - border-radius: 0px; } + border: 1px solid rgba(0, 0, 0, 0); + border-radius: 6px; } .menu-category-button-greyed { padding: 7px; color: rgba(48, 48, 48, 0.55); @@ -1199,49 +1037,14 @@ StScrollBar { width: 250px; min-height: 16px; font-weight: normal; - caret-color: #303030; } + caret-color: #303030; + border-radius: 6px; } .menu-search-entry-icon { icon-size: 1em; color: #303030; } /* Context menu (at the moment only for favorites) */ -.info-osd { - text-align: center; - font-weight: bold; - spacing: 1em; - padding: 16px; - color: #303030; - border: 1px solid #b5b5b5; - border-radius: 5px; - background-color: #e8e8e8; } - -.restart-osd { - font-size: 1.6em; } - -.workspace-osd { - font-size: 4em; } - -.osd-window { - text-align: center; - font-weight: bold; - spacing: 1em; - padding: 20px; - color: #303030; - background-color: #e8e8e8; - border: 1px solid #b5b5b5; - border-radius: 5px; } - .osd-window .osd-monitor-label { - font-size: 3em; } - .osd-window .level { - padding: 0; - height: 0.7em; - background-color: rgba(0, 0, 0, 0.5); - border-radius: 2px; } - .osd-window .level-bar { - border-radius: 2px; - background-color: #35a854; } - .window-list-box { spacing: 6px; padding-left: 10px; @@ -1302,7 +1105,7 @@ StScrollBar { .window-list-preview { spacing: 6px; color: #303030; - border: 1px solid #b5b5b5; + border: 1px solid rgba(0, 0, 0, 0); background-color: #e8e8e8; border-radius: 3px; padding: 6px 12px 12px 12px; @@ -1373,7 +1176,7 @@ StScrollBar { .grouped-window-list-thumbnail-menu { color: #303030; - border: 1px solid #b5b5b5; + border: 1px solid rgba(0, 0, 0, 0); background-color: #e8e8e8; border-radius: 3px; padding: 0px; } @@ -1452,9 +1255,9 @@ StScrollBar { icon-size: 12px; } .sound-player > StBoxLayout:first-child StButton:small:hover { color: #303030; - background-color: #fafafa; + background-color: #bdbdbd; border: 1px solid #b5b5b5; - box-shadow: inset 0 2px 4px rgba(250, 250, 250, 0.05); } + box-shadow: inset 0 2px 4px rgba(189, 189, 189, 0.05); } .sound-player > StBoxLayout:first-child StButton:small:active { color: #ffffff; background-color: #35a854; @@ -1482,9 +1285,9 @@ StScrollBar { icon-size: 16px; } .sound-player-overlay StButton:hover { color: #303030; - background-color: #fafafa; + background-color: #bdbdbd; border: 1px solid #b5b5b5; - box-shadow: inset 0 2px 4px rgba(250, 250, 250, 0.05); } + box-shadow: inset 0 2px 4px rgba(189, 189, 189, 0.05); } .sound-player-overlay StButton:active { color: #ffffff; background-color: #35a854; @@ -1519,7 +1322,6 @@ StScrollBar { padding: 0; } .workspace-button { - border: 1px solid rgba(0, 0, 0, 0.4); background-color: rgba(0, 0, 0, 0.2); width: 20px; height: 14px; @@ -1549,8 +1351,7 @@ StScrollBar { spacing: 6px; } .workspace-graph .workspace { - border: 1px solid rgba(0, 0, 0, 0.4); - background-color: rgba(0, 0, 0, 0.2); } + border: 1px solid #b5b5b5; } .workspace-graph .workspace:active { border: 1px solid #35a854; } @@ -1564,7 +1365,7 @@ StScrollBar { .workspace-graph .workspace:active .windows { -active-window-background: white; -active-window-border: rgba(0, 0, 0, 0.8); - -inactive-window-background: whitesmoke; + -inactive-window-background: #fdfdfd; -inactive-window-border: rgba(0, 0, 0, 0.8); } .panel-launchers { @@ -1599,10 +1400,10 @@ StScrollBar { .applet-separator-line { width: 1px; - background: #c2c2c2; } + background: #b5b5b5; } .applet-separator-line-vertical { height: 1px; - background: #c2c2c2; } + background: #b5b5b5; } .applet-box { padding-left: 4px; @@ -1640,11 +1441,8 @@ StScrollBar { text-shadow: none; } .user-icon { - width: 32px; - height: 32px; - background-color: transparent; - border: none; - border-radius: 0; } + border: 1px solid rgba(48, 48, 48, 0.5); + border-radius: 99px; } .user-label { color: #303030; @@ -1654,11 +1452,11 @@ StScrollBar { .applet-cornerbar { width: 8px; - background-color: #c2c2c2; } + background-color: #b5b5b5; } .applet-cornerbar-box { padding: 4px 4px; } .applet-cornerbar-box:hover > .applet-cornerbar { - background-color: #a8a8a8; } + background-color: #9c9c9c; } .applet-cornerbar.vertical { height: 8px; } @@ -1751,3 +1549,226 @@ StScrollBar { border: 0px; background-color: rgba(0, 0, 0, 0); border-radius: 0px; } + +.prompt-dialog-error-label, .prompt-dialog-info-label, .prompt-dialog-null-label, .run-dialog-description, .message-dialog-content .message-dialog-caption { + font-weight: 400; + font-size: 0.818em; } + +.message-dialog-content .message-dialog-title, .dialog .confirm-dialog-title { + font-weight: 800; + font-size: 1.364em; } + +.workspace-switch-osd, .media-keys-osd, .message-dialog-content .message-dialog-title.leightweight { + font-weight: 700; + font-size: 1.182em; } + +.audio-device-selection-dialog .audio-selection-box .audio-selection-device { + color: #303030; + background-color: #e8e8e8; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:focus { + color: #303030; + background-color: #e8e8e8; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:hover { + color: #303030; + background-color: white; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:insensitive { + color: rgba(48, 48, 48, 0.5); + background-color: #e8e8e8; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:selected, .audio-device-selection-dialog .audio-selection-box .audio-selection-device:active { + color: #303030; + background-color: #f2f2f2; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:checked { + color: #303030; + background-color: #f2f2f2; } + +.dialog .dialog-button, .dialog .dialog-button:destructive-action, .dialog .dialog-button:default { + font-weight: bold; + padding: 12px; + border-radius: 18px; + color: #303030; + background-color: #b0b0b0; } + .dialog .dialog-button:focus { + color: #303030; + background-color: #b0b0b0; } + .dialog .dialog-button:hover { + color: #303030; + background-color: #cacaca; } + .dialog .dialog-button:active { + color: #303030; + background-color: #bdbdbd; } + .dialog .dialog-button:checked { + color: #303030; + background-color: #bdbdbd; } + .dialog .dialog-button:insensitive { + color: rgba(48, 48, 48, 0.5); + background-color: #a8a8a8; } + +.dialog .dialog-button:default { + color: #303030; + background-color: #35a854; } + .dialog .dialog-button:hover:default { + color: #303030; + background-color: #4ac66b; } + .dialog .dialog-button:active:default { + color: #303030; + background-color: #3bbb5e; } + .dialog .dialog-button:checked:default { + color: #303030; + background-color: #3bbb5e; } + .dialog .dialog-button:insensitive:default { + border-color: #b5b5b5; + color: rgba(48, 48, 48, 0.5); + background-color: #a8a8a8; } + +.dialog .dialog-button:destructive-action { + color: #303030; + background-color: #F04A50; } + .dialog .dialog-button:hover:destructive-action { + color: #303030; + background-color: #f4797e; } + .dialog .dialog-button:active:destructive-action { + color: #303030; + background-color: #f26267; } + .dialog .dialog-button:checked:destructive-action { + color: #303030; + background-color: #f26267; } + .dialog .dialog-button:insensitive:destructive-action { + border-color: #b5b5b5; + color: rgba(48, 48, 48, 0.5); + background-color: #a8a8a8; } + +.dialog { + background-color: #e8e8e8; + border-radius: 18px; + border: 1px solid #b5b5b5; + padding: 18px; } + .dialog .dialog-content-box { + margin-top: 8px; + margin-bottom: 16px; + spacing: 32px; + max-width: 28em; } + .dialog .confirm-dialog-title { + text-align: center; } + +.message-dialog-content { + spacing: 18px; } + .message-dialog-content .message-dialog-title { + text-align: center; } + .message-dialog-content .message-dialog-description { + text-align: center; } + .message-dialog-content .message-dialog-caption { + text-align: center; } + +.run-dialog .dialog-content-box { + margin: 4px; } + +.run-dialog-description { + text-align: center; + color: black; } + .run-dialog-description.error { + color: #FC4138; } + +.run-dialog-completion-box { + padding-top: 6px; + padding-left: 12px; } + +.run-dialog-entry { + width: 20em; + height: 1.2em; } + +.prompt-dialog { + width: 28em; } + .prompt-dialog .dialog-content-box { + spacing: 16px; + margin-bottom: 12px; } + .prompt-dialog-password-entry { + width: 20em; } + .prompt-dialog-password-layout { + spacing: 8px; } + .prompt-dialog-error-label, .prompt-dialog-info-label, .prompt-dialog-null-label { + text-align: center; } + .prompt-dialog-error-label { + color: #FC4138; } + +.audio-device-selection-dialog { + min-width: 24em; } + .audio-device-selection-dialog .audio-selection-box { + spacing: 12px; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device { + border-radius: 20px; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device .audio-selection-device-box { + padding: 12px; + spacing: 12px; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device .audio-selection-device-icon { + icon-size: 64px; } + +.workspace-switch-osd, .info-osd, .media-keys-osd { + background-color: #e8e8e8; + border: 1px solid #b5b5b5; + border-radius: 20px; + text-align: center; + padding: 24px; } + +.media-keys-osd { + margin-bottom: 1em; + border-radius: 20px; + font-weight: bold; + spacing: 12px; + padding: 12px 24px; } + .media-keys-osd > * { + spacing: 12px; } + .media-keys-osd StIcon { + icon-size: 32px; } + .media-keys-osd StLabel:ltr { + margin-right: 6px; } + .media-keys-osd StLabel:rtl { + margin-left: 6px; } + .media-keys-osd .level { + min-width: 160px; + -barlevel-height: 6px; + -barlevel-background-color: #c0c0c0; + -barlevel-active-background-color: #303030; + -barlevel-amplify-color: #F27835; + -barlevel-amplify-separator-width: 3px; } + .media-keys-osd .level:ltr { + margin-right: 6px; } + .media-keys-osd .level:rtl { + margin-left: 6px; } + .media-keys-osd .level-bar { + border-radius: 20px; + background-color: #303030; } + +.info-osd { + font-size: 1.2em; + font-weight: 700; + text-align: center; } + +.workspace-switch-osd { + min-width: 140px; + margin-bottom: 1em; + border-radius: 20px; + font-weight: bold; + padding: 12px 36px 0 36px; } + .workspace-switch-osd-indicator-box { + spacing: 12px; } + .workspace-switch-osd-indicator { + background-color: rgba(48, 48, 48, 0.5); + padding: 3px; + margin: 15px; + border-radius: 36px; } + .workspace-switch-osd-indicator:active { + background-color: #35a854; + padding: 6px; + margin: 12px; } + +.monitor-label { + border-radius: 0; + color: black; + padding: 12px; + text-align: center; } + +.resize-popup { + color: #303030; + background-color: #e8e8e8; + border-radius: 6px; + padding: 12px; } diff --git a/cinnamon-shell/upstream/mint-y-dark-thumbnail.png b/cinnamon-shell/upstream/mint-y-dark-thumbnail.png index cf25ac4979eeac60f2b054fcbf5ae7d808e2fc81..4a5756024f0bc105df09dfb0b532540865cb86c9 100644 GIT binary patch delta 10762 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 E0VmWw4*&oF diff --git a/cinnamon-shell/upstream/mint-y-thumbnail.png b/cinnamon-shell/upstream/mint-y-thumbnail.png index 208cd2c12658ce846e56869dd28e3eb97a1ce821..cf2c02d38d635a74bf52a9190af26542437271c1 100644 GIT binary patch delta 10946 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 delta 11027 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 diff --git a/cinnamon-shell/upstream/parse-sass.sh b/cinnamon-shell/upstream/parse-sass.sh index b4483da1e8..95e64e7513 100755 --- a/cinnamon-shell/upstream/parse-sass.sh +++ b/cinnamon-shell/upstream/parse-sass.sh @@ -1,4 +1,4 @@ #! /bin/bash -sassc ./sass/cinnamon.scss cinnamon.css -sassc ./sass/cinnamon-dark.scss cinnamon-dark.css \ No newline at end of file +pysassc ./sass/cinnamon.scss cinnamon.css +pysassc ./sass/cinnamon-dark.scss cinnamon-dark.css diff --git a/cinnamon-shell/upstream/sass/_colors.scss b/cinnamon-shell/upstream/sass/_colors.scss index 3d041e1b53..d901d72172 100644 --- a/cinnamon-shell/upstream/sass/_colors.scss +++ b/cinnamon-shell/upstream/sass/_colors.scss @@ -1,36 +1,46 @@ -// When color definition differs for dark and light variant, -// it gets @if ed depending on $variant -// We need to set this first because we use it to tint many -// of the remaining colors -$selected_bg_color: if($variant == 'light', #35a854, #35a854); +// General +$accent_color: if($variant == 'light', #35a854, #35a854); +$radius: 6px; -$base_color: if($variant =='light', mix($selected_bg_color, #f4f4f4, 0%), mix($selected_bg_color, #404040, 0%)); -$text_color: if($variant == 'light', #303030, #D3D3D3); -$bg_color: if($variant == 'light', mix($selected_bg_color, #e8e8e8, 0%), mix($selected_bg_color, #2f2f2f, 0%)); -$fg_color: if($variant =='light', #303030, transparentize(white, 0.13)); +// Panel +$panel_bg: if($variant == 'light', #f0f0f0, #1a1a1a); +$panel_fg: if($variant =='light', #303030, #e1e1e1); -$selected_fg_color: #ffffff; +// Clutter background colors +$bg_color: if($variant == 'light', #e8e8e8, #222222); +$bg_color2: if($variant=='light', #c0c0c0, #303030); +$bg_color3: if($variant == 'light', #b0b0b0, #454545); +$bg_color4: if($variant == 'light', #c0c0c0, #393939); -$borders_color: if($variant =='light', darken($bg_color, 20%), darken($bg_color, 6%)); +// Borders and separators +$borders_color: if($variant =='light', darken($bg_color, 20%), $bg_color2); +$menus_border_color: transparentize(black, 1.0); +$separator_color: if($variant == 'light', darken($bg_color, 15%), lighten($bg_color, 2%)); -$separator_color: if($variant == 'light', darken($bg_color, 15%), darken($bg_color, 6%)); +// Text +$text_color: if($variant == 'light', #303030, #D3D3D3); +$fg_color: if($variant =='light', #303030, #e1e1e1); +$noaccent_selected_fg_color: if($variant=='light', $text_color, #ffffff); +$selected_fg_color: #ffffff; -$link_color: if($variant == 'light', darken($selected_bg_color,10%), - lighten($selected_bg_color,20%)); + +$link_color: if($variant == 'light', darken($accent_color,10%), + lighten($accent_color,20%)); $warning_color: #F27835; $error_color: #FC4138; $destructive_color: #F04A50; +$osd_destructive_color: if($variant == 'light', #F04A50, #c01c28); $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55)); -$tooltip_bg_color: transparentize(mix($selected_bg_color, black, 95%), 0.05); +$tooltip_bg_color: transparentize(mix($accent_color, black, 95%), 0.05); $tooltip_fg_color: $selected_fg_color; $tooltip_border_color: #d0d0d0; $osd_fg_color: #c3c3c3; -$osd_bg_color: #353535; +$osd_bg_color: #303030; $osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6); $osd_button_border: transparentize(darken($osd_bg_color, 20%), 0.6); @@ -40,24 +50,13 @@ $osd_entry_border: transparentize(darken($osd_bg_color, 12%), 0.6); $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 30%); -$panel_bg: $bg_color; -$panel_fg: $fg_color; - -$entry_bg: if($variant=='light', $base_color, lighten($base_color, 0%)); -$entry_border: if($variant == 'light', #cfd6e6, darken($borders_color, 0%)); +$entry_bg: if($variant=='light', $bg_color2, $bg_color2); +$entry_border: if($variant == 'light', #cfd6e6, $borders_color); -$button_bg: if($variant == 'light', lighten($bg_color, 2%), lighten($base_color, 2%)); +$button_bg: if($variant == 'light', $bg_color3, $bg_color2); $button_border: $entry_border; -// Colors used for highlights in places where we don't want to use accents -$noaccent_light_bg_color: #c0c0c0; -$noaccent_light_fg_color: $text_color; -$noaccent_dark_bg_color: #525352; -$noaccent_dark_fg_color: #ffffff; -$noaccent_selected_bg_color: if($variant=='light', $noaccent_light_bg_color, $noaccent_dark_bg_color); -$noaccent_selected_fg_color: if($variant=='light', $noaccent_light_fg_color, $noaccent_dark_fg_color); - -$applet_separator_color: if($variant == 'light', darken($bg_color, 15%), rgba(255,255,255, 0.12)); +$applet_separator_color: $borders_color; $corner_bar_unhighlighted: $applet_separator_color; $corner_bar_highlighted: if($variant == 'light', darken($applet_separator_color, 10%), opacify($applet_separator_color, .1)); diff --git a/cinnamon-shell/upstream/sass/_common.scss b/cinnamon-shell/upstream/sass/_common.scss index b93ca417fe..da53d99bb0 100644 --- a/cinnamon-shell/upstream/sass/_common.scss +++ b/cinnamon-shell/upstream/sass/_common.scss @@ -39,7 +39,7 @@ stage { @include button(osd); &:hover { @include button(osd-hover); } - &:focus { color: $selected_bg_color; } + &:focus { color: $accent_color; } &:active { @include button(osd-active); } &:insensitive { @include button(osd-insensitive); } } @@ -50,7 +50,7 @@ stage { %entry { padding: 7px; caret-size: 1px; - selection-background-color: $selected_bg_color; + selection-background-color: $accent_color; selected-color: $selected_fg_color; transition-duration: 300ms; border-radius: 3px; @@ -71,7 +71,7 @@ stage { padding: 7px; caret-size: 1px; caret-color: $osd_fg_color; - selection-background-color: $selected_bg_color; + selection-background-color: $accent_color; selected-color: $selected_fg_color; transition-duration: 300ms; border-radius: 3px; @@ -100,19 +100,19 @@ StScrollBar { } StBin#trough { - background-color: transparentize($base_color, 0.9); + background-color: transparentize($bg_color2, 0.9); border-radius: 8px; } StButton#vhandle, StButton#hhandle { border-radius: 2px; - background-color: mix($fg_color, $bg_color, 40%); + background-color: $bg_color2; border: 0px solid; margin: 0px; - &:hover { background-color: mix($fg_color, $bg_color, 30%); } + &:hover { background-color: $bg_color3; } - &:active { background-color: $selected_bg_color; } + &:active { background-color: $accent_color; } } } @@ -131,8 +131,8 @@ StScrollBar { width: 50px; height: 50px; border-radius: 25px; - background-color: transparentize($selected_bg_color, 0.7); - box-shadow: 0 0 2px 2px $selected_bg_color; + background-color: transparentize($accent_color, 0.7); + box-shadow: 0 0 2px 2px $accent_color; } // @@ -143,7 +143,7 @@ StScrollBar { -slider-height: 0.3em; -slider-background-color: $button_border; //background of the trough -slider-border-color: transparentize($bg_color, 0.7); //trough border color - -slider-active-background-color: $selected_bg_color; //active trough fill + -slider-active-background-color: $accent_color; //active trough fill -slider-active-border-color: transparentize($bg_color, 0.7); //active trough border -slider-border-width: 1px; -slider-handle-radius: 0.5em; @@ -263,37 +263,36 @@ StScrollBar { } // -// Popvers/Menus +// Popovers/Menus // .menu { + border: 1px solid $menus_border_color; color: $fg_color; - border: 1px solid $borders_color; - border-radius: 3px; - background-color: transparentize($bg_color, 0.01); + background-color: $bg_color; - &.top { - border-radius: 0 0 3px 3px; + &-top { + border-radius: 0 0 $radius $radius; } - &.bottom { - border-radius: 3px 3px 0 0; + &-bottom { + border-radius: $radius $radius 0 0; } - &.left { - border-radius: 0 3px 3px 0; + &-left { + border-radius: 0 $radius $radius 0; } - &.right { - border-radius: 3px 0 0 3px; + &-right { + border-radius: $radius 0 0 $radius; } } .popup-sub-menu { - background-color: $base_color; + background-color: $bg_color; box-shadow: none; - .popup-menu-item:ltr { padding-right: 1.75em; } - .popup-menu-item:rtl { padding-left: 1.75em; } + .popup-menu-item:ltr { padding-left: 2.5em; } + .popup-menu-item:rtl { padding-right: 2.5em; } StScrollBar { padding: 4px; @@ -305,14 +304,12 @@ StScrollBar { .popup-menu-item { padding: .4em 1.75em; spacing: 1em; - // border: 1px solid transparent; border-left-width: 0; border-right-width: 0; &:active { color: $noaccent_selected_fg_color; - // border-color: transparentize($fg_color, 0.89); - background-color: $noaccent_selected_bg_color; + background-color: $bg_color2; } &:insensitive { color: transparentize($fg_color, 0.5); @@ -326,71 +323,12 @@ StScrollBar { &:insensitive { color: $insensitive_fg_color; } } - -/* This is for popup menus in Cinnamon versions < 3.2 */ -.popup-menu { - color: white; - color: $fg_color; - - &-arrow { icon-size: 16px; } - - .popup-sub-menu { - background-color: $base_color; - box-shadow: none; - - .popup-menu-item:ltr { padding-right: 1.75em; } - .popup-menu-item:rtl { padding-left: 1.75em; } - - StScrollBar { - padding: 4px; - StBin#trough, StBin#vhandle { border-width: 0; } - } - } - - .popup-menu-content { padding: 1em 0em 1em 0em; } - .popup-menu-item { - padding: .4em 1.75em; - spacing: 1em; - border: 1px solid transparent; - border-left-width: 0; - border-right-width: 0; - - &:active { - color: $fg_color; - border-color: transparentize($fg_color, 0.89); - background-color: transparentize($fg_color, 0.92); - } - &:insensitive { - color: transparentize($fg_color, 0.5); - background: none; - } - } - - .popup-inactive-menu-item { //all icons and other graphical elements - color: $fg_color; - - &:insensitive { color: $insensitive_fg_color; } - } - - &-icon { icon-size: 16px; } -} - -.popup-menu-boxpointer { - -arrow-border-radius: 3px; - -arrow-background-color: $bg_color; - -arrow-border-width: 1px; - -arrow-border-color: $borders_color; - -arrow-base: 21px; - -arrow-rise: 9px; - -boxpointer-gap: 2px; -} - /*Scale view context menu*/ .popup-combo-menu { color: $fg_color; border: 1px solid $borders_color; border-radius: 3px; - background-color: $base_color; + background-color: $bg_color2; box-shadow: none; padding: 1em 0em 1em 0em; } @@ -417,7 +355,19 @@ StScrollBar { font-weight: normal; } -.popup-device-menu-item { spacing: .5em; } +.popup-device-menu-item { + spacing: .5em; + + font-weight: bold; + color: $fg_color; + + &:insensitive { color: $fg_color; spacing: 1em;} + + .popup-inactive-menu-item { + font-weight: normal; + color: $fg_color; + } +} .popup-subtitle-menu-item { font-weight: normal; } @@ -546,19 +496,19 @@ StScrollBar { } &-top { - box-shadow: 0 1px $borders_color; + box-shadow: 0 1px $bg_color; } &-bottom { - box-shadow: 0 -1px $borders_color; + box-shadow: 0 -1px $bg_color; } &-left { - box-shadow: 1px 0 $borders_color; + box-shadow: 1px 0 $bg_color; } &-right { - box-shadow: -1px 0 $borders_color; + box-shadow: -1px 0 $bg_color; } &-dummy { @@ -612,18 +562,18 @@ StScrollBar { -cinnamon-caption-spacing: 8px; &:focus { - background-color: $selected_bg_color; + background-color: $accent_color; color: $selected_fg_color; - border: 1px solid $selected_bg_color; + border: 1px solid $accent_color; } } .window-border { - border: 3px $selected_bg_color; + border: 3px $accent_color; border-radius: 2px; background-color: rgba(255,255,255,.05); /* Cover rounded corners and some bad adjustment gaps */ - box-shadow: 0 0 0 1px $selected_bg_color inset; + box-shadow: 0 0 0 1px $accent_color inset; } .overview-empty-placeholder { @@ -641,13 +591,13 @@ StScrollBar { @include entry(osd); &:focus { - border: 1px solid $selected_bg_color; - background-color: $selected_bg_color; + border: 1px solid $accent_color; + background-color: $accent_color; color: $selected_fg_color; font-style: italic; transition-duration: 300; selection-background-color: $selected_fg_color; - selected-color: $selected_bg_color; + selected-color: $accent_color; } } @@ -657,7 +607,7 @@ StScrollBar { border-radius: 2px; &#active { - border: 4px solid $selected_bg_color; + border: 4px solid $accent_color; background-color: black; border-radius: 2px; } @@ -748,8 +698,9 @@ StScrollBar { margin-right: .5em; padding: .5em; min-width: 350px; - border: 1px solid $borders_color; - background-color: $base_color; + border: 1px solid $menus_border_color; + background-color: $bg_color2; + border-radius: $radius; } .calendar-events-no-events-box { @@ -760,7 +711,8 @@ StScrollBar { padding: 6px; &:hover { - background-color: $selected_bg_color; + background-color: $accent_color; + border-radius: $radius; .calendar-events-no-events-icon, .calendar-events-no-events-label { @@ -803,7 +755,7 @@ StScrollBar { margin-bottom: .2em; &:all-day { - color: $selected_bg_color; + color: $accent_color; } } .calendar-event-time-future { @@ -833,12 +785,12 @@ StScrollBar { } &:current { font-weight: bold; - color: $selected_bg_color; + color: $accent_color; } } &:hover { - background-color: $selected_bg_color; + background-color: $accent_color; border: 1px solid $borders_color; .calendar-event-time-past, .calendar-event-time-present, @@ -895,7 +847,7 @@ StScrollBar { padding: 6px; &:hover { - background-color: $selected_bg_color; + background-color: $accent_color; .calendar-today-day-label { color: $selected_fg_color @@ -974,7 +926,8 @@ StScrollBar { &:hover { font-weight: bold; color: $selected_fg_color; - background-color: $selected_bg_color; + background-color: $accent_color; + border-radius: $radius; } } @@ -1005,8 +958,9 @@ StScrollBar { .calendar-today { color: $fg_color; - background-color: if($variant == 'light', transparentize($selected_bg_color, 0.6), transparentize($selected_bg_color, 0.6)); + background-color: if($variant == 'light', transparentize($accent_color, 0.6), transparentize($accent_color, 0.6)); border-width: 0; + border-radius: $radius; &:selected { font-weight: bold; @@ -1015,6 +969,7 @@ StScrollBar { .calendar-not-today { color: $fg_color; + border-radius: $radius; &:selected { font-weight: bold; @@ -1048,7 +1003,7 @@ StScrollBar { // #notification { box-shadow: 0 1px 15px 4px $borders_color; - border-top-color: $selected_bg_color; + border-top-color: $accent_color; border-top: 4px; border-radius: 5px; background-color: $bg_color; @@ -1117,8 +1072,8 @@ StScrollBar { .switcher-list { color: $fg_color; border: 1px solid $borders_color; - background-color: $bg_color; - border-radius: 3px; + background-color: $panel_bg; + border-radius: $radius; padding: 20px; > StBoxLayout { @@ -1129,17 +1084,16 @@ StScrollBar { .item-box { padding: 8px; - border-radius: 2px; + border-radius: $radius; &:outlined { padding: 8px; - border: 1px solid $selected_bg_color; + border: 1px solid $accent_color; } &:selected { - color: $selected_fg_color; - background-color: $selected_bg_color; - border: 0px solid $selected_bg_color; + background-color: $bg_color4; + border: 0px solid $accent_color; } } @@ -1195,161 +1149,6 @@ StScrollBar { &:rtl { background-image: url("common-assets/misc/corner-ripple.svg"); } } -// -// Modal dialogs -// -.lightbox { background-color: rgba(0, 0, 0, 0.4); } -.flashspot { background-color: white; } - -.modal-dialog { - background-color: $bg_color; - border: 1px solid $borders_color; - border-radius: 3px; - padding: 5px 10px; - - > StBoxLayout:first-child { - padding: 10px; - } - - &-button-box { - spacing: 0; - margin: 0px; - padding: 10px; - border: none; - background-color: $bg_color; - - .modal-dialog-button { - padding-top: 0; - padding-bottom: 0; - height: 30px; - - @extend %button; - } - } - - .confirm-dialog-title { - text-align: center; - font-weight: bold; - font-size: 1.3em; - padding-bottom: 12px; - } -} - -// -// Run dialog -// -.run-dialog { - padding: 10px 15px 10px 15px; - border: 1px solid $borders_color; - border-radius: 3px; - background-color: $bg_color; - - > * { padding: 0; } - - &-label { - font-size: 1.3em; - font-weight: bold; - color: $fg_color; - padding-bottom: 15px; - text-align: center; - } - - &-description { - color: $fg_color; - padding-top: 15px; - text-align: center; - - &.error { color: $error_color; } - } - - // &-error-label { color: $error_color; } - - // &-error-box { - // padding-top: 15px; - // spacing: 5px; - // } - &-completion-box { - padding-top: 5px; - padding-left: 15px; - font-size: 1em; - } - &-entry { - width: 21em; - height: 1.2em; - padding: 7px; - border-radius: 3px; - caret-color: $osd_fg_color; - selected-color: $selected_fg_color; - selection-background-color: $selected_bg_color; - - @include entry(osd); - - &:focus { @include entry(focus); } - } - .modal-dialog-button-box { - border: none; - box-shadow: none; - background: none; - } -} - -/* CinnamonMountOperation Dialogs */ -.cinnamon-mount-operation-icon { - icon-size: 48px; -} - -.mount-password-reask { - color: $warning_color; -} - -.show-processes-dialog, -.mount-question-dialog { - spacing: 24px; - - &-subject { - padding-top: 10px; - padding-left: 17px; - padding-bottom: 6px; - - &:rtl { - padding-left: 0px; - padding-right: 17px; - } - } - &-description { - padding-left: 17px; - width: 28em; - - &:rtl { padding-right: 17px; } - } -} - -.show-processes-dialog-app-list { - max-height: 200px; - padding-top: 24px; - padding-left: 49px; - padding-right: 32px; - - &:rtl { - padding-right: 49px; - padding-left: 32px; - } - - &-item { - color: #ccc; - - &:hover { color: white } - - &:ltr { padding-right: 1em; } - &:rtl { padding-left: 1em; } - - &-icon:ltr { padding-right: 17px; } - &-icon:rtl { padding-left: 17px; } - - &-name { font-size: 1.1em; } - } -} - // // Magnifier // @@ -1417,17 +1216,18 @@ StScrollBar { &-favorites-box { padding: 10px; transition-duration: 300; - background-color: darken($base_color, 5%); - border: 1px solid $borders_color; + background-color: $bg_color2; + border: 1px solid $menus_border_color; + border-radius: $radius; } &-favorites-button { padding: .9em 1em; border: 1px solid rgba(0,0,0,0); - border-radius: 2px; + border-radius: $radius; &:hover { - background-color: $noaccent_selected_bg_color; + background-color: $bg_color3; } } @@ -1456,8 +1256,9 @@ StScrollBar { &-selected { padding: 7px; color: $noaccent_selected_fg_color; - background-color: $noaccent_selected_bg_color; - border: 1px solid $borders_color; + background-color: $bg_color2; + border: 1px solid $menus_border_color; + border-radius: $radius; &:highlighted { font-weight: bold; } } @@ -1473,13 +1274,9 @@ StScrollBar { &-selected { padding: 7px; color: $noaccent_selected_fg_color; - background-color: $noaccent_selected_bg_color; - border: 1px solid $borders_color; - } - &:hover { - background-color: mix($noaccent_selected_bg_color, $bg_color, 40%); - border: 1px solid mix($borders_color, $bg_color, 40%); - border-radius: 0px; + background-color: $bg_color2; + border: 1px solid $menus_border_color; + border-radius: $radius; } &-greyed { padding: 7px; @@ -1518,6 +1315,7 @@ StScrollBar { min-height: 16px; font-weight: normal; caret-color: $fg_color; + border-radius: $radius; @extend %entry; } @@ -1531,54 +1329,6 @@ StScrollBar { .menu-context-menu { } -// -// OSD -// -.info-osd { - text-align: center; - font-weight: bold; - spacing: 1em; - padding: 16px; - color: $fg_color; - border: 1px solid $borders_color; - border-radius: 5px; - background-color: $bg_color; -} - -.restart-osd { - font-size: 1.6em; -} - -.workspace-osd { - font-size: 4em; -} - -.osd-window { - text-align: center; - font-weight: bold; - spacing: 1em; - padding: 20px; - - color: $fg_color; - background-color: $bg_color; - border: 1px solid $borders_color; - border-radius: 5px; - - .osd-monitor-label { font-size: 3em; } - - .level { - padding: 0; - height: 0.7em; - background-color: transparentize(black, 0.5); - border-radius: 2px; - } - - .level-bar { - border-radius: 2px; - background-color: $selected_bg_color; - } -} - // // Window list (windowList.js) // @@ -1651,12 +1401,12 @@ StScrollBar { &:focus, &:running { color: $panel_fg; - border-color: $selected_bg_color; + border-color: $accent_color; background-color: transparentize($panel_fg, 0.8); } & .progress { - background-color: transparentize($selected_bg_color, 0.2); + background-color: transparentize($accent_color, 0.2); } } @@ -1669,7 +1419,7 @@ StScrollBar { &-preview { spacing: 6px; color: $fg_color; - border: 1px solid $borders_color; + border: 1px solid $menus_border_color; background-color: $bg_color; border-radius: 3px; padding: 6px 12px 12px 12px; @@ -1731,11 +1481,11 @@ StScrollBar { &:active, &:checked { color: $panel_fg; - border-color: $selected_bg_color; + border-color: $accent_color; } & .progress { - background-color: transparentize($selected_bg_color, 0.2); + background-color: transparentize($accent_color, 0.2); } } @@ -1757,7 +1507,7 @@ StScrollBar { &-badge { border-radius: 9999px; - background-color: $selected_bg_color; + background-color: $accent_color; margin: 0; } @@ -1771,7 +1521,7 @@ StScrollBar { &-thumbnail-menu { color: $fg_color; - border: 1px solid $borders_color; + border: 1px solid $menus_border_color; background-color: $bg_color; border-radius: 3px; padding: 0px; @@ -1787,11 +1537,11 @@ StScrollBar { &:outlined { padding: 8px; - border: 1px solid $selected_bg_color; + border: 1px solid $accent_color; } &:selected { - border: 1px solid $selected_bg_color; + border: 1px solid $accent_color; } } @@ -1927,7 +1677,7 @@ StScrollBar { -slider-height: 0.5em; -slider-background-color: if($variant == 'light', $button_border, darken($bg_color, 5%)); -slider-border-color: rgba(0,0,0,0); - -slider-active-background-color: $selected_bg_color; + -slider-active-background-color: $accent_color; -slider-active-border-color: rgba(0,0,0,0); -slider-border-width: 0px; -slider-handle-radius: 0px; @@ -1954,7 +1704,6 @@ StScrollBar { } .workspace-button { - border: 1px solid transparentize(black, 0.6); background-color: transparentize(black, 0.8); width: 20px; height: 14px; @@ -1972,11 +1721,11 @@ StScrollBar { } &:outlined { - background-color: $selected_bg_color; + background-color: $accent_color; color: $selected_fg_color; &:hover { - background-color: transparentize($selected_bg_color, 0.3); + background-color: transparentize($accent_color, 0.3); color: $selected_fg_color; } } @@ -1994,12 +1743,11 @@ StScrollBar { } .workspace-graph .workspace { - border: 1px solid transparentize(black, 0.6); - background-color: transparentize(black, 0.8); + border: 1px solid $borders_color; } .workspace-graph .workspace:active { - border: 1px solid $selected_bg_color; + border: 1px solid $accent_color; } .workspace-graph .workspace .windows { @@ -2029,7 +1777,9 @@ StScrollBar { padding-bottom: 2px; // border-bottom-width: 1px; transition-duration: 200; - &:hover { background-color: $noaccent_selected_bg_color; } + &:hover { + background-color: $bg_color2; + } } &.vertical { @@ -2094,7 +1844,7 @@ StScrollBar { &:hover, &:checked { color: $noaccent_selected_fg_color; - background-color: $noaccent_selected_bg_color; + background-color: $bg_color2; } &:highlight { @@ -2136,11 +1886,8 @@ StScrollBar { // User Applet // .user-icon { - width: 32px; - height: 32px; - background-color: transparent; - border: none; - border-radius: 0; + border: 1px solid transparentize($fg_color, 0.5); + border-radius: 99px; } .user-label { @@ -2221,8 +1968,8 @@ StScrollBar { } &-drag-placeholder { - border: 2px solid $selected_bg_color; - background-color: transparentize($selected_bg_color, 0.7); + border: 2px solid $accent_color; + background-color: transparentize($accent_color, 0.7); } } @@ -2246,17 +1993,17 @@ StScrollBar { // Tile Preview // .tile-preview { - background-color: transparentize($selected_bg_color, 0.7); - border: 1px solid $selected_bg_color; + background-color: transparentize($accent_color, 0.7); + border: 1px solid $accent_color; - &.snap { background-color: transparentize($selected_bg_color, 0.4); } + &.snap { background-color: transparentize($accent_color, 0.4); } } .tile-hud { - background-color: transparentize($selected_bg_color, 0.7); - border: 1px solid $selected_bg_color; + background-color: transparentize($accent_color, 0.7); + border: 1px solid $accent_color; - &.snap { background-color: transparentize($selected_bg_color, 0.4); } + &.snap { background-color: transparentize($accent_color, 0.4); } &:top { border-top-width: 0px; } &:bottom { border-bottom-width: 0px; } diff --git a/cinnamon-shell/upstream/sass/_dialogs.scss b/cinnamon-shell/upstream/sass/_dialogs.scss new file mode 100644 index 0000000000..7b1148fbbe --- /dev/null +++ b/cinnamon-shell/upstream/sass/_dialogs.scss @@ -0,0 +1,387 @@ +// Modal dialogs + +$base_padding: 6px; +$base_margin: 4px; +$dialog_radius: 18px; +$osd_radius: 20px; + +// Mixin to convert provided font size in pt to em units +@mixin fontsize($size, $base: 16px, $unit: pt) { + // if pt, convert into unitless value with the assumption: 1pt = 1.091px + $adjusted_size: if($unit == pt, $size * 1.091, $size) * 1000; + $rounded_size: round($adjusted_size / $base) / 1000; + font-size: $rounded_size * 1em; +} + +// Button drawing function +@mixin styled_button($type, $tc:$fg_color, $c:$bg_color, $style: null) { + // + // $type: button type, possible values: + // - normal, focus, hover, active, checked, insensitive, default, undecorated + // $c: button bg color, derived from bg_color + // $tc: button text color, derived from fg_color + // $style: button style, possible values: flat, default + // + + // mix input colors to get button background color + $button_bg_color: $button_bg; + + // background color mix override for flat style; the button bg color is the background color input + @if $style == 'flat' { $button_bg_color: $c;} + // background color mix override for default button style + @if $style == 'default' { $button_bg_color: $c;} + + // button base state background colors + $hover_button_bg_color: lighten($button_bg_color, 10%); + $active_button_bg_color: darken($hover_button_bg_color, 5%); + $checked_button_bg_color: darken($hover_button_bg_color, 5%); + $insensitive_button_bg_color: darken($button_bg_color, 3%); + + // flat style overrides + @if $style == 'flat' { + $insensitive_button_bg_color: $button_bg_color; + } + + // normal style + @if $type == 'normal' { + color: $tc; + background-color: $button_bg_color; + } + + @if $type == 'focus' { + color: $tc; + background-color: $button_bg_color; + } + + // hover button + @else if $type == 'hover' { + color: $tc; + background-color: $hover_button_bg_color; + } + + // active button + @else if $type == 'active' { + color: $tc; + background-color: $active_button_bg_color; + } + + // checked button + @else if $type == 'checked' { + color: $tc; + background-color: $checked_button_bg_color; + } + + // insensitive button + @else if $type == 'insensitive' { + $insensitive_button_fg_color: transparentize($tc, .5); + color: $insensitive_button_fg_color; + background-color: $insensitive_button_bg_color; + } + + // reset (unstyled button) + @else if $type == 'undecorated' { + background-color: transparent; + border-color: transparent; + box-shadow: none; + + &:insensitive { + background-color: transparent !important; + } + } +} + +%caption_heading { + font-weight: 700; + @include fontsize(9pt); +} + +%caption { + font-weight: 400; + @include fontsize(9pt); +} + +%title_2 { + font-weight: 800; + @include fontsize(15pt); +} + +%title_4 { + font-weight: 700; + @include fontsize(13pt); +} + +%flat_styled_button { + @include styled_button(normal, $style: flat); + &:focus { @include styled_button(focus, $style: flat); } + &:hover { @include styled_button(hover, $style: flat); } + &:insensitive { @include styled_button(insensitive, $style: flat); } + &:selected, + &:active { @include styled_button(active, $style: flat); } + &:checked { @include styled_button(checked, $style: flat); } +} + +%dialog_button { + font-weight: bold; + padding: $base_padding * 2; + border-radius: $dialog_radius; + + @include styled_button(normal); + &:focus { @include styled_button(focus); } + &:hover { @include styled_button(hover); } + &:active { @include styled_button(active); } + &:checked { @include styled_button(checked); } + &:insensitive { @include styled_button(insensitive); } +} + +%dialog_button_default { + @extend %dialog_button; + + @include styled_button(normal, $c: $accent_color, $style: default); + &:hover { @include styled_button(hover, $c: $accent_color, $style: default); } + &:active { @include styled_button(active, $c: $accent_color, $style: default); } + &:checked { @include styled_button(checked, $c: $accent_color, $style: default); } + &:insensitive { + border-color: $borders_color; + + @include styled_button(insensitive); + } +} + +%dialog_button_destructive { + @extend %dialog_button; + + @include styled_button(normal, $c: $osd_destructive_color, $style: default); + &:hover { @include styled_button(hover, $c: $osd_destructive_color, $style: default); } + &:active { @include styled_button(active, $c: $osd_destructive_color, $style: default); } + &:checked { @include styled_button(checked, $c: $osd_destructive_color, $style: default); } + &:insensitive { + border-color: $borders_color; + + @include styled_button(insensitive); + } +} + +.dialog { + background-color: $bg_color; + border-radius: $dialog_radius; + border: 1px solid $borders_color; + padding: $base_padding * 3; + + .dialog-content-box { + margin-top: $base_margin * 2; + margin-bottom: $base_margin * 4; + spacing: $base_margin * 8; + max-width: 28em; + } + + .dialog-button { + @extend %dialog_button; + + &:default { @extend %dialog_button_default; } + &:destructive-action { @extend %dialog_button_destructive; } + } + + .confirm-dialog-title { + @extend %title_2; + text-align: center; + } +} + +// message dialog + +.message-dialog-content { + spacing: $base_padding * 3; + + .message-dialog-title { + text-align: center; + @extend %title_2; + + &.leightweight { @extend %title_4; } + } + + .message-dialog-description { text-align: center; } + + .message-dialog-caption { + @extend %caption; + text-align: center; + } +} + +// run dialog + +.run-dialog { + + .dialog-content-box { + margin: $base_margin; + } + + &-description { + @extend %caption; + + text-align: center; + color: darken($fg_color, 20%); + + &.error { color: $error_color; } + } + + &-completion-box { + padding-top: $base_padding; + padding-left: $base_padding * 2; + } + + &-entry { + @extend %entry; + + width: 20em; + height: 1.2em; + } +} + +// password or authentication dialog + +.prompt-dialog { + width: 28em; + + .dialog-content-box { + spacing: $base_margin * 4; + margin-bottom: $base_margin * 3; + } + + &-password-entry { + @extend %entry; + width: 20em; + } + + &-password-layout { spacing: $base_margin * 2;} + + &-error-label, + &-info-label, + &-null-label { + text-align: center; + @extend %caption; + } + + &-error-label { color: $error_color; } +} + +// Audio selection dialog + +.audio-device-selection-dialog { + min-width: 24em; + + .audio-selection-box { + spacing: $base_padding *2; + + .audio-selection-device { + @extend %flat_styled_button; + border-radius: $osd_radius; + + .audio-selection-device-box { + padding: $base_padding * 2; + spacing: $base_padding * 2; + } + + .audio-selection-device-icon { icon-size: 64px;} + } + } +} + +// various on screen popups + +%osd_base { + background-color: $bg_color; + border: 1px solid $borders_color; + border-radius: $osd_radius; + text-align: center; + padding: $base_padding * 4; +} + +// media keys osd + +.media-keys-osd { + @extend %osd_base; + @extend %title_4; + + margin-bottom: 1em; + border-radius: $osd_radius; + font-weight: bold; + spacing: $base_padding * 2; + padding: $base_padding * 2 $base_padding * 4; + & > * { spacing: $base_padding * 2; } + + StIcon { + icon-size: 32px; + } + + StLabel { + &:ltr { margin-right: $base_padding; } + &:rtl { margin-left: $base_padding; } + } + + .level { + min-width: 160px; + -barlevel-height: 6px; + -barlevel-background-color: $bg_color2; + -barlevel-active-background-color: $fg_color; + -barlevel-amplify-color: $warning_color; + -barlevel-amplify-separator-width: $base_padding * 0.5; + + &:ltr { margin-right: $base_padding; } + &:rtl { margin-left: $base_padding; } + } + + .level-bar { + border-radius: $osd_radius; + background-color: $fg_color; + } +} + +.info-osd { + @extend %osd_base; + + font-size: 1.2em; + font-weight: 700; + text-align: center; +} + +.workspace-switch-osd { + @extend %osd_base; + @extend %title_4; + + min-width: 140px; + margin-bottom: 1em; + border-radius: $osd_radius; + font-weight: bold; + padding: $base_padding * 2 $base_padding * 6 0 $base_padding * 6; + + &-indicator-box { spacing: $base_padding * 2; } + + &-indicator { + background-color: transparentize($fg_color, 0.5); + padding: 3px; + margin: 15px; + border-radius: 36px; + + &:active { + background-color: $accent_color; + padding: 6px; + margin: 12px; + } + } +} + +.monitor-label { + border-radius: 0; + color: black; + padding: $base_padding * 2; + text-align: center; +} + +// resize popup + +.resize-popup { + color: $fg_color; + background-color: $bg_color; + border-radius: $radius; + padding: $base_padding * 2; +} \ No newline at end of file diff --git a/cinnamon-shell/upstream/sass/_drawing.scss b/cinnamon-shell/upstream/sass/_drawing.scss index a3114af4ff..d4a6e03c6a 100644 --- a/cinnamon-shell/upstream/sass/_drawing.scss +++ b/cinnamon-shell/upstream/sass/_drawing.scss @@ -9,15 +9,15 @@ @if $t==normal { color: $text_color; - background-color: $base_color; + background-color: $bg_color2; border: 1px solid $entry_border; box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95); } @if $t==focus { color: $fg_color; - background-color: $base_color; - border: 1px solid $selected_bg_color; + background-color: $bg_color2; + border: 1px solid $accent_color; box-shadow: inset 0 2px 4px transparentize($entry_bg, 0.95); } @@ -37,8 +37,8 @@ @if $t==osd-focus { color: $selected_fg_color; - background-color: $selected_bg_color; - border: 1px solid $selected_bg_color; + background-color: $accent_color; + border: 1px solid $accent_color; box-shadow: inset 0 2px 4px transparentize(black, 0.95); } @@ -73,7 +73,7 @@ // color: $fg_color; background-color: $button_bg; - border: 1px solid $selected_bg_color; + border: 1px solid $accent_color; box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @@ -83,7 +83,7 @@ // color: $fg_color; background-color: lighten($button_bg, 5%); - border: 1px solid $selected_bg_color; + border: 1px solid $accent_color; box-shadow: inset 0 2px 4px transparentize($button_bg, 0.95); } @@ -102,9 +102,9 @@ // pushed button // color: $selected_fg_color; - background-color: $selected_bg_color; - border: 1px solid $selected_bg_color; - box-shadow: inset 0 2px 4px $selected_bg_color; + background-color: $accent_color; + border: 1px solid $accent_color; + box-shadow: inset 0 2px 4px $accent_color; } @else if $t==insensitive { @@ -140,8 +140,8 @@ // active osd button // color: $selected_fg_color; - border: 1px solid $selected_bg_color; - background-color: $selected_bg_color; + border: 1px solid $accent_color; + background-color: $accent_color; } @else if $t==osd-insensitive { diff --git a/cinnamon-shell/upstream/sass/cinnamon-dark.scss b/cinnamon-shell/upstream/sass/cinnamon-dark.scss index 6e75827de5..c114587149 100644 --- a/cinnamon-shell/upstream/sass/cinnamon-dark.scss +++ b/cinnamon-shell/upstream/sass/cinnamon-dark.scss @@ -3,3 +3,4 @@ $variant: 'dark'; @import "_colors"; //use gtk colors @import "_drawing"; @import "_common"; +@import "_dialogs"; // new in Cinnamon 6.4 diff --git a/cinnamon-shell/upstream/sass/cinnamon.scss b/cinnamon-shell/upstream/sass/cinnamon.scss index 83092862c0..bda6c08ea8 100644 --- a/cinnamon-shell/upstream/sass/cinnamon.scss +++ b/cinnamon-shell/upstream/sass/cinnamon.scss @@ -3,3 +3,4 @@ $variant: 'light'; @import "_colors"; //use gtk colors @import "_drawing"; @import "_common"; +@import "_dialogs"; // new in Cinnamon 6.4