From 1851e5ad7229788c17cc32a603422f6f0683daf1 Mon Sep 17 00:00:00 2001 From: didrocks <1823296+didrocks@users.noreply.github.com> Date: Sun, 8 Dec 2024 02:08:42 +0000 Subject: [PATCH] New upstream snapshot for Cinnamon --- cinnamon-shell/upstream/cinnamon-dark.css | 941 ++++++++++-------- cinnamon-shell/upstream/cinnamon.css | 727 ++++++++------ .../dark-assets/switch/switch-off.svg | 4 +- .../upstream/dark-assets/switch/switch-on.svg | 6 +- .../upstream/mint-y-dark-thumbnail.png | Bin 14266 -> 5661 bytes cinnamon-shell/upstream/mint-y-thumbnail.png | Bin 14401 -> 5744 bytes cinnamon-shell/upstream/parse-sass.sh | 4 +- cinnamon-shell/upstream/sass/_colors.scss | 62 +- cinnamon-shell/upstream/sass/_common.scss | 485 +++------ cinnamon-shell/upstream/sass/_dialogs.scss | 444 +++++++++ cinnamon-shell/upstream/sass/_drawing.scss | 24 +- .../upstream/sass/cinnamon-dark.scss | 1 + cinnamon-shell/upstream/sass/cinnamon.scss | 1 + 13 files changed, 1543 insertions(+), 1156 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..fe401deeb5 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,23 +48,28 @@ 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; } + .prompt-dialog-password-entry StLabel.hint-text, .run-dialog-entry StLabel.hint-text, #menu-search-entry StLabel.hint-text, .popup-menu #notification StEntry StLabel.hint-text { + color: rgba(225, 225, 225, 0.3); } + .prompt-dialog-password-entry StIcon.peek-password, .run-dialog-entry StIcon.peek-password, #menu-search-entry StIcon.peek-password, .popup-menu #notification StEntry StIcon.peek-password { + icon-size: 16px; + color: #e1e1e1; } .notification StEntry { padding: 7px; @@ -75,8 +80,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 +90,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 +106,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 +135,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 +220,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; } + color: #e1e1e1; + background-color: #222222; + box-shadow: 0 0 6px rgba(0, 0, 0, 0.5); } + .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 +262,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 +290,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 +299,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 +322,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 +417,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 +443,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 +464,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 +496,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 +519,7 @@ StScrollBar { border-radius: 2px; } .expo-background { - background-color: #353535; } + background-color: #303030; } .workspace-thumbnails { spacing: 26px; } @@ -614,14 +578,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 +595,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 +610,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 +644,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 +669,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 +690,7 @@ StScrollBar { color: #ffffff; } .calendar-month-label { - color: rgba(255, 255, 255, 0.87); + color: #e1e1e1; font-weight: bold; padding: 8px 0; } @@ -778,16 +744,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 +763,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 +794,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 +833,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 +846,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 +857,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 +875,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 +902,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 +928,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 +957,17 @@ 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; + border: 1px solid rgba(0, 0, 0, 0); } .menu-places-box { padding: 10px; @@ -1144,8 +990,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 +1006,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 +1043,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 +1076,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 +1094,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 +1110,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 +1130,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 +1148,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 +1181,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 +1260,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 +1277,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 +1309,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 +1328,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 +1348,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 +1357,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 +1383,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 +1406,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 +1426,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 +1434,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 +1447,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 +1493,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 +1505,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 +1555,292 @@ 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, .dialog-list .dialog-list-box .dialog-list-item .dialog-list-item-description { + 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; } + +.dialog-list .dialog-list-title { + font-weight: 700; + font-size: 1em; } + +.audio-device-selection-dialog .audio-selection-box .audio-selection-device { + border: 1px solid #222222; + color: #e1e1e1; + background-color: #222222; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:focus { + border: 1px solid #222222; + color: #e1e1e1; + background-color: #222222; + border: 1px solid #6f6f6f; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:hover { + border: 1px solid #222222; + color: #e1e1e1; + background-color: #3c3c3c; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:insensitive { + border: 1px solid #222222; + 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 { + border: 1px solid #222222; + color: #e1e1e1; + background-color: #2f2f2f; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:checked { + border: 1px solid #222222; + 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; + border: 1px solid #303030; + color: #e1e1e1; + background-color: #303030; } + .dialog .dialog-button:focus { + border: 1px solid #303030; + color: #e1e1e1; + background-color: #303030; + border: 1px solid #7d7d7d; } + .dialog .dialog-button:hover { + border: 1px solid #303030; + color: #e1e1e1; + background-color: #4a4a4a; } + .dialog .dialog-button:active { + border: 1px solid #303030; + color: #e1e1e1; + background-color: #3d3d3d; } + .dialog .dialog-button:checked { + border: 1px solid #303030; + color: #e1e1e1; + background-color: #3d3d3d; } + .dialog .dialog-button:insensitive { + border: 1px solid #303030; + color: rgba(225, 225, 225, 0.5); + background-color: #282828; } + +.dialog .dialog-button:default { + border: 1px solid #35a854; + color: #e1e1e1; + background-color: #35a854; } + .dialog .dialog-button:focus:default { + border: 1px solid #35a854; + color: #e1e1e1; + background-color: #35a854; + border: 1px solid #98deab; } + .dialog .dialog-button:hover:default { + border: 1px solid #35a854; + color: #e1e1e1; + background-color: #4ac66b; } + .dialog .dialog-button:active:default { + border: 1px solid #35a854; + color: #e1e1e1; + background-color: #3bbb5e; } + .dialog .dialog-button:checked:default { + border: 1px solid #35a854; + color: #e1e1e1; + background-color: #3bbb5e; } + .dialog .dialog-button:insensitive:default { + border-color: #303030; + border: 1px solid #303030; + color: rgba(225, 225, 225, 0.5); + background-color: #282828; } + +.dialog .dialog-button:destructive-action { + border: 1px solid #c01c28; + color: #e1e1e1; + background-color: #c01c28; } + .dialog .dialog-button:focus:destructive-action { + border: 1px solid #c01c28; + color: #e1e1e1; + background-color: #c01c28; + border: 1px solid #ee878f; } + .dialog .dialog-button:hover:destructive-action { + border: 1px solid #c01c28; + color: #e1e1e1; + background-color: #e12e3b; } + .dialog .dialog-button:active:destructive-action { + border: 1px solid #c01c28; + color: #e1e1e1; + background-color: #d61f2d; } + .dialog .dialog-button:checked:destructive-action { + border: 1px solid #c01c28; + color: #e1e1e1; + background-color: #d61f2d; } + .dialog .dialog-button:insensitive:destructive-action { + border-color: #303030; + border: 1px solid #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; } + +.dialog-list { + spacing: 18px; } + .dialog-list .dialog-list-title { + text-align: center; } + .dialog-list .dialog-list-scrollview { + max-height: 200px; } + .dialog-list .dialog-list-box { + spacing: 1em; } + .dialog-list .dialog-list-box .dialog-list-item { + spacing: 1em; } + .dialog-list .dialog-list-box .dialog-list-item .dialog-list-item-title { + font-weight: bold; } + .dialog-list .dialog-list-box .dialog-list-item .dialog-list-item-description { + color: #d4d4d4; } + +.end-session-dialog { + width: 40em; } + .end-session-dialog .dialog-content-box { + spacing: 0; } + .end-session-dialog .dialog-list { + spacing: 0; } + .end-session-dialog .dialog-list .dialog-list-title { + color: #F27835; + background-color: tranparentize(#F27835, 0.9); + padding: 9px; + border-radius: 20px; + margin: 4px 0; } + +.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..928463c403 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,23 +48,28 @@ 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; } + .prompt-dialog-password-entry StLabel.hint-text, .run-dialog-entry StLabel.hint-text, #menu-search-entry StLabel.hint-text, .popup-menu #notification StEntry StLabel.hint-text { + color: rgba(48, 48, 48, 0.3); } + .prompt-dialog-password-entry StIcon.peek-password, .run-dialog-entry StIcon.peek-password, #menu-search-entry StIcon.peek-password, .popup-menu #notification StEntry StIcon.peek-password { + icon-size: 16px; + color: #303030; } .notification StEntry { padding: 7px; @@ -75,8 +80,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 +90,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 +106,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; } @@ -224,25 +229,24 @@ StScrollBar { .menu { 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; + box-shadow: 0 0 6px rgba(0, 0, 0, 0.5); } + .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 +272,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 +299,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 +417,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 +464,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 +496,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 +519,7 @@ StScrollBar { border-radius: 2px; } .expo-background { - background-color: #353535; } + background-color: #303030; } .workspace-thumbnails { spacing: 26px; } @@ -614,14 +578,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 +744,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 +770,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 +848,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 +857,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 +902,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 +929,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 +957,17 @@ 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; + border: 1px solid rgba(0, 0, 0, 0); } .menu-places-box { padding: 10px; @@ -1145,7 +991,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 +1007,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 +1043,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 +1111,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 +1182,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 +1261,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 +1291,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 +1328,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 +1357,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 +1371,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 +1406,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 +1447,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 +1458,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 +1555,292 @@ 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, .dialog-list .dialog-list-box .dialog-list-item .dialog-list-item-description { + 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; } + +.dialog-list .dialog-list-title { + font-weight: 700; + font-size: 1em; } + +.audio-device-selection-dialog .audio-selection-box .audio-selection-device { + border: 1px solid #e8e8e8; + color: #303030; + background-color: #e8e8e8; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:focus { + border: 1px solid #e8e8e8; + color: #303030; + background-color: #e8e8e8; + border: 1px solid #9c9c9c; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:hover { + border: 1px solid #e8e8e8; + color: #303030; + background-color: white; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:insensitive { + border: 1px solid #e8e8e8; + 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 { + border: 1px solid #e8e8e8; + color: #303030; + background-color: #f2f2f2; } + .audio-device-selection-dialog .audio-selection-box .audio-selection-device:checked { + border: 1px solid #e8e8e8; + 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; + border: 1px solid #b0b0b0; + color: #303030; + background-color: #b0b0b0; } + .dialog .dialog-button:focus { + border: 1px solid #b0b0b0; + color: #303030; + background-color: #b0b0b0; + border: 1px solid #646464; } + .dialog .dialog-button:hover { + border: 1px solid #b0b0b0; + color: #303030; + background-color: #cacaca; } + .dialog .dialog-button:active { + border: 1px solid #b0b0b0; + color: #303030; + background-color: #bdbdbd; } + .dialog .dialog-button:checked { + border: 1px solid #b0b0b0; + color: #303030; + background-color: #bdbdbd; } + .dialog .dialog-button:insensitive { + border: 1px solid #b0b0b0; + color: rgba(48, 48, 48, 0.5); + background-color: #a8a8a8; } + +.dialog .dialog-button:default { + border: 1px solid #35a854; + color: #303030; + background-color: #35a854; } + .dialog .dialog-button:focus:default { + border: 1px solid #35a854; + color: #303030; + background-color: #35a854; + border: 1px solid #10341a; } + .dialog .dialog-button:hover:default { + border: 1px solid #35a854; + color: #303030; + background-color: #4ac66b; } + .dialog .dialog-button:active:default { + border: 1px solid #35a854; + color: #303030; + background-color: #3bbb5e; } + .dialog .dialog-button:checked:default { + border: 1px solid #35a854; + color: #303030; + background-color: #3bbb5e; } + .dialog .dialog-button:insensitive:default { + border-color: #b5b5b5; + border: 1px solid #b0b0b0; + color: rgba(48, 48, 48, 0.5); + background-color: #a8a8a8; } + +.dialog .dialog-button:destructive-action { + border: 1px solid #F04A50; + color: #303030; + background-color: #F04A50; } + .dialog .dialog-button:focus:destructive-action { + border: 1px solid #F04A50; + color: #303030; + background-color: #F04A50; + border: 1px solid #950c11; } + .dialog .dialog-button:hover:destructive-action { + border: 1px solid #F04A50; + color: #303030; + background-color: #f4797e; } + .dialog .dialog-button:active:destructive-action { + border: 1px solid #F04A50; + color: #303030; + background-color: #f26267; } + .dialog .dialog-button:checked:destructive-action { + border: 1px solid #F04A50; + color: #303030; + background-color: #f26267; } + .dialog .dialog-button:insensitive:destructive-action { + border-color: #b5b5b5; + border: 1px solid #b0b0b0; + 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; } + +.dialog-list { + spacing: 18px; } + .dialog-list .dialog-list-title { + text-align: center; } + .dialog-list .dialog-list-scrollview { + max-height: 200px; } + .dialog-list .dialog-list-box { + spacing: 1em; } + .dialog-list .dialog-list-box .dialog-list-item { + spacing: 1em; } + .dialog-list .dialog-list-box .dialog-list-item .dialog-list-item-title { + font-weight: bold; } + .dialog-list .dialog-list-box .dialog-list-item .dialog-list-item-description { + color: #232323; } + +.end-session-dialog { + width: 40em; } + .end-session-dialog .dialog-content-box { + spacing: 0; } + .end-session-dialog .dialog-list { + spacing: 0; } + .end-session-dialog .dialog-list .dialog-list-title { + color: #F27835; + background-color: tranparentize(#F27835, 0.9); + padding: 9px; + border-radius: 20px; + margin: 4px 0; } + +.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/dark-assets/switch/switch-off.svg b/cinnamon-shell/upstream/dark-assets/switch/switch-off.svg index 5d6df1f17f..a9af96776f 100644 --- a/cinnamon-shell/upstream/dark-assets/switch/switch-off.svg +++ b/cinnamon-shell/upstream/dark-assets/switch/switch-off.svg @@ -183,7 +183,7 @@ ry="11" rx="11" /> + style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" /> diff --git a/cinnamon-shell/upstream/dark-assets/switch/switch-on.svg b/cinnamon-shell/upstream/dark-assets/switch/switch-on.svg index a6197cccc5..f330f4dfd5 100644 --- a/cinnamon-shell/upstream/dark-assets/switch/switch-on.svg +++ b/cinnamon-shell/upstream/dark-assets/switch/switch-on.svg @@ -184,7 +184,7 @@ ry="11" rx="11" /> + style="display:inline;opacity:1;fill:#222222;fill-opacity:1;stroke:none" /> + style="display:inline;opacity:1;fill:#222222;fill-opacity:1;stroke:none" /> diff --git a/cinnamon-shell/upstream/mint-y-dark-thumbnail.png b/cinnamon-shell/upstream/mint-y-dark-thumbnail.png index cf25ac4979eeac60f2b054fcbf5ae7d808e2fc81..a4f1398888a0e98266c474452c69d8cef77eb014 100644 GIT binary patch literal 5661 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 literal 14266 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 L(p0RHw+#Cqr8PaU literal 14401 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 StBoxLayout { @@ -1129,17 +1091,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 +1156,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 +1223,19 @@ 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; + border: 1px solid $menus_border_color; } } @@ -1456,8 +1264,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 +1282,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 +1323,7 @@ StScrollBar { min-height: 16px; font-weight: normal; caret-color: $fg_color; + border-radius: $radius; @extend %entry; } @@ -1531,54 +1337,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 +1409,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 +1427,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 +1489,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 +1515,7 @@ StScrollBar { &-badge { border-radius: 9999px; - background-color: $selected_bg_color; + background-color: $accent_color; margin: 0; } @@ -1771,7 +1529,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 +1545,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 +1685,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 +1712,6 @@ StScrollBar { } .workspace-button { - border: 1px solid transparentize(black, 0.6); background-color: transparentize(black, 0.8); width: 20px; height: 14px; @@ -1972,11 +1729,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 +1751,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 +1785,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 +1852,7 @@ StScrollBar { &:hover, &:checked { color: $noaccent_selected_fg_color; - background-color: $noaccent_selected_bg_color; + background-color: $bg_color2; } &:highlight { @@ -2136,11 +1894,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 +1976,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 +2001,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..31b28f3d17 --- /dev/null +++ b/cinnamon-shell/upstream/sass/_dialogs.scss @@ -0,0 +1,444 @@ +// 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%); + $focus_button_bg_border_color: if($variant =='light', darken($button_bg_color, 30%), lighten($button_bg_color, 30%)); + + border: 1px solid $button_bg_color; + + // 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; + border: 1px solid $focus_button_bg_border_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); +} + +%heading { + font-weight: 700; + @include fontsize(11pt); +} + +%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); + &:focus { @include styled_button(focus, $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); + &:focus { @include styled_button(focus, $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; + } +} + +// Lists in dialogs + +.dialog-list { + spacing: $base_padding * 3; + + .dialog-list-title { + @extend %heading; + text-align: center; + } + + .dialog-list-scrollview { max-height: 200px; } + .dialog-list-box { + spacing: 1em; + + .dialog-list-item { + spacing: 1em; + + .dialog-list-item-title { font-weight: bold; } + .dialog-list-item-description { + @extend %caption; + color: darken($fg_color, 5%); + } + } + } +} + +// End session dialog + +.end-session-dialog { + width: 40em; + + .dialog-content-box { spacing: 0; } + + .dialog-list { + spacing: 0; + + .dialog-list-title { + color: $warning_color; + background-color: tranparentize($warning_color, 0.9); + padding: $base_padding * 1.5; + border-radius: $osd_radius; + margin: $base_margin 0; + } + } +} + +// 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