diff --git a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css index bf9ae41b..56d5cda4 100644 --- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css +++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css @@ -23,7 +23,7 @@ stage { color: #eeeeec; } /* Common Stylings */ -.no-frequent-applications-label, .search-statustext { +.search-statustext { font-size: 2em; font-weight: bold; color: white; } @@ -540,11 +540,55 @@ StScrollBar { height: 1.8em; width: 2.3em; border-radius: 2px; - padding: 0.5em 0 0; margin: 6px; background-color: #1e2128; color: #fafaf9; } +/* Events */ +.events-button { + border-width: 1px; + border-style: solid; + border-radius: 7px; + margin: 4px; + color: #eeeeec; + background-color: #292c37; + border-color: #1a1c23; + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.3); + text-shadow: 0 1px rgba(0, 0, 0, 0.2); + icon-shadow: 0 1px rgba(0, 0, 0, 0.2); + padding: 12px; } + .events-button:focus { + color: #eeeeec; + text-shadow: 0 1px rgba(0, 0, 0, 0.2); + icon-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); } + .events-button:hover { + color: #eeeeec; + background-color: #2e313d; + border-color: #1a1c23; + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.3); + text-shadow: 0 1px rgba(0, 0, 0, 0.2); + icon-shadow: 0 1px rgba(0, 0, 0, 0.2); } + .events-button:active { + color: #eeeeec; + background-color: #1c1e25; + border-color: #0b0b0e; + text-shadow: none; + icon-shadow: none; + box-shadow: none; } + .events-button .events-box { + spacing: 6px; } + .events-button .events-list { + spacing: 12px; } + .events-button .events-title { + color: #878787; + font-weight: bold; + margin-bottom: 4px; } + .events-button .event-time { + color: #bebeb6; + font-feature-settings: "tnum"; + font-size: 10pt; } + /* World clocks */ .world-clocks-button { border-width: 1px; @@ -808,7 +852,7 @@ StScrollBar { .candidate-page-button-icon { icon-size: 1em; } -/* Notifications & Mesage Tray */ +/* Notifications & Message Tray */ .notification-banner { min-height: 64px; width: 34em; } @@ -891,7 +935,7 @@ StScrollBar { text-align: center; font-size: 18pt; font-weight: 800; } - .message-dialog-content .message-dialog-title.leightweight { + .message-dialog-content .message-dialog-title.lightweight { font-size: 13pt; font-weight: 800; } .message-dialog-content .message-dialog-description { @@ -1234,8 +1278,7 @@ StScrollBar { /* Window Picker */ .window-picker { - -horizontal-spacing: 12px; - -vertical-spacing: 12px; + spacing: 6px; padding: 12px; } .window-picker.external-monitor { padding: 12px; } @@ -1264,8 +1307,7 @@ StScrollBar { padding: 3px; height: 24px; width: 24px; - box-shadow: -1px 1px 5px 0px rgba(0, 0, 0, 0.5); - -shell-close-overlap: 12px; } + box-shadow: -1px 1px 5px 0px rgba(0, 0, 0, 0.5); } .window-close:hover { background-color: #4187ff; } .window-close:active { @@ -1326,6 +1368,9 @@ StScrollBar { .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked { background-color: rgba(26, 28, 35, 0.9); } +.grid-search-results { + spacing: 36px; } + .search-provider-icon .list-search-provider-content { spacing: 12px; } .search-provider-icon .list-search-provider-content .list-search-provider-details { @@ -1347,11 +1392,10 @@ StScrollBar { /* App Grid */ .icon-grid { - -shell-grid-horizontal-item-size: 144px; - -shell-grid-vertical-item-size: 144px; - spacing: 24px; } - .icon-grid .overview-icon { - icon-size: 96px; } + row-spacing: 36px; + column-spacing: 36px; + max-row-spacing: 72px; + max-column-spacing: 72px; } /* App Icons */ .app-well-app .overview-icon, @@ -1391,15 +1435,15 @@ StScrollBar { .app-folder-dialog { border-radius: 15px; border: 1px solid rgba(255, 255, 255, 0.1); - spacing: 12px; - background-color: rgba(26, 28, 35, 0.95); } + background-color: rgba(26, 28, 35, 0.95); + padding: 12px; } .app-folder-dialog .folder-name-container { padding: 24px 36px 0; spacing: 12px; /* FIXME: this is to keep the label in sync with the entry */ } .app-folder-dialog .folder-name-container .folder-name-label, .app-folder-dialog .folder-name-container .folder-name-entry { font-size: 18pt; - font-weight: bold; } + font-weight: 800; } .app-folder-dialog .folder-name-container .folder-name-entry { width: 300px; } .app-folder-dialog .folder-name-container .folder-name-label { @@ -1412,11 +1456,18 @@ StScrollBar { border-radius: 18px; } .app-folder-dialog .folder-name-container .edit-folder-button > StIcon { icon-size: 16px; } + .app-folder-dialog .icon-grid { + row-spacing: 12px; + column-spacing: 30px; } + .app-folder-dialog .page-indicators { + margin-bottom: 18px; } + .app-folder-dialog .page-indicators .page-indicator { + padding: 15px 12px; } .app-folder-dialog-container { padding: 12px; - width: 800px; - height: 600px; } + width: 620px; + height: 620px; } .app-folder-icon { padding: 6px; @@ -1447,8 +1498,7 @@ StScrollBar { border-radius: 10px; background-color: white; } -.all-apps, -.frequent-apps > StBoxLayout { +.all-apps { padding: 0px 88px 10px 88px; } .system-action-icon { @@ -1457,35 +1507,6 @@ StScrollBar { border-radius: 99px; icon-size: 48px; } -/* Frequent | All toggle */ -.app-view-controls { - padding-bottom: 32px; } - -.app-view-control { - padding: 4px 32px; - margin: 0 4px; } - .app-view-control, .app-view-control:hover, .app-view-control:checked { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); - text-shadow: none; - icon-shadow: none; - color: #bfbfbf; } - .app-view-control:hover { - color: white; - box-shadow: inset 0 -2px #bfbfbf; } - .app-view-control:active { - box-shadow: inset 0 -2px white; } - .app-view-control:checked { - color: white; - box-shadow: inset 0 -2px #2777ff; } - .app-view-control:first-child { - border-right-width: 0; - border-radius: 0; } - .app-view-control:last-child { - border-radius: 0; } - /* Dash */ #dash { font-size: 9pt; @@ -1831,6 +1852,13 @@ StScrollBar { .lg-dialog .shell-link:active { color: #5a97ff; } +.lg-dialog .actor-link { + color: #ccc; } + .lg-dialog .actor-link:hover { + color: white; } + .lg-dialog .actor-link:active { + color: #999999; } + .lg-completions-text { font-size: .9em; font-style: italic; } @@ -2181,8 +2209,7 @@ StScrollBar { /* Window Picker */ .window-clone-border { - border: 6px solid rgba(255, 255, 255, 0.25); - border-radius: 6px; } + border-color: rgba(255, 255, 255, 0.25); } .window-caption { font-size: .9em; @@ -2199,8 +2226,7 @@ StScrollBar { box-shadow: none; color: transparent; height: 32px; - width: 32px; - -shell-close-overlap: 16px; } + width: 32px; } .window-close:hover { background-image: url("assets/close-window-hover.svg"); background-color: transparent; } @@ -2289,6 +2315,38 @@ StScrollBar { width: 31.5em; background: rgba(35, 37, 46, 0.7); } +/* Events */ +.events-button { + border-width: 1px; + border-style: solid; + border-radius: 7px; + margin: 4px; + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); + text-shadow: none; + icon-shadow: none; } + .events-button:focus { + color: #eeeeec; + text-shadow: 0 1px rgba(0, 0, 0, 0.2); + icon-shadow: 0 1px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); } + .events-button:hover { + color: #eeeeec; + background-color: #2e313d; + border-color: #1a1c23; + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.3); + text-shadow: 0 1px rgba(0, 0, 0, 0.2); + icon-shadow: 0 1px rgba(0, 0, 0, 0.2); } + .events-button:active { + color: #eeeeec; + background-color: #1c1e25; + border-color: #0b0b0e; + text-shadow: none; + icon-shadow: none; + box-shadow: none; } + /* World clocks */ .world-clocks-button { border-width: 1px; @@ -2420,27 +2478,18 @@ StScrollBar { /* App Folders */ .app-well-app.app-folder { - background-color: rgba(255, 255, 255, 0.2); } + background-color: rgba(255, 255, 255, 0.2); + box-shadow: 0 2px 5px black; } + .app-well-app.app-folder:checked { + background: black; } -/* Frequent | All toggle */ -.app-view-control { - margin: 0; } - .app-view-control, .app-view-control:hover, .app-view-control:checked { - color: white; - background-color: rgba(255, 255, 255, 0.2); - font-weight: bold; - border: 0; - box-shadow: none; - text-shadow: none; } - .app-view-control:hover { - background: rgba(255, 255, 255, 0.4); } - .app-view-control:active, .app-view-control:checked { +.app-folder-dialog { + background: black; + box-shadow: 0 0 20px black; + border: none; } + .app-folder-dialog .folder-name-container .edit-folder-button, .app-folder-dialog .folder-name-container .edit-folder-button:hover, .app-folder-dialog .folder-name-container .edit-folder-button:active { background: white; color: black; } - .app-view-control:first-child { - border-radius: 5px 0 0 5px; } - .app-view-control:last-child { - border-radius: 0 5px 5px 0; } .panel-workspace-indicator { box-shadow: inset 0 0 0 100px white; diff --git a/share/themes/Kali-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Light/gnome-shell/gnome-shell.css index 6e5645f8..1f83b62c 100644 --- a/share/themes/Kali-Light/gnome-shell/gnome-shell.css +++ b/share/themes/Kali-Light/gnome-shell/gnome-shell.css @@ -23,7 +23,7 @@ stage { color: #5c616c; } /* Common Stylings */ -.no-frequent-applications-label, .search-statustext { +.search-statustext { font-size: 2em; font-weight: bold; color: white; } @@ -539,11 +539,55 @@ StScrollBar { height: 1.8em; width: 2.3em; border-radius: 2px; - padding: 0.5em 0 0; margin: 6px; background-color: #fafafa; color: #686d7a; } +/* Events */ +.events-button { + border-width: 1px; + border-style: solid; + border-radius: 7px; + margin: 4px; + color: #5c616c; + background-color: white; + border-color: #d1d1d1; + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1); + text-shadow: 0 1px rgba(255, 255, 255, 0.3); + icon-shadow: 0 1px rgba(255, 255, 255, 0.3); + padding: 12px; } + .events-button:focus { + color: #5c616c; + text-shadow: 0 1px rgba(255, 255, 255, 0.3); + icon-shadow: 0 1px rgba(255, 255, 255, 0.3); + box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); } + .events-button:hover { + color: #5c616c; + background-color: white; + border-color: #d1d1d1; + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1); + text-shadow: 0 1px rgba(255, 255, 255, 0.3); + icon-shadow: 0 1px rgba(255, 255, 255, 0.3); } + .events-button:active { + color: #5c616c; + background-color: #f7f7f7; + border-color: #d1d1d1; + text-shadow: none; + icon-shadow: none; + box-shadow: none; } + .events-button .events-box { + spacing: 6px; } + .events-button .events-list { + spacing: 12px; } + .events-button .events-title { + color: black; + font-weight: bold; + margin-bottom: 4px; } + .events-button .event-time { + color: #2d3035; + font-feature-settings: "tnum"; + font-size: 10pt; } + /* World clocks */ .world-clocks-button { border-width: 1px; @@ -807,7 +851,7 @@ StScrollBar { .candidate-page-button-icon { icon-size: 1em; } -/* Notifications & Mesage Tray */ +/* Notifications & Message Tray */ .notification-banner { min-height: 64px; width: 34em; } @@ -890,7 +934,7 @@ StScrollBar { text-align: center; font-size: 18pt; font-weight: 800; } - .message-dialog-content .message-dialog-title.leightweight { + .message-dialog-content .message-dialog-title.lightweight { font-size: 13pt; font-weight: 800; } .message-dialog-content .message-dialog-description { @@ -1233,8 +1277,7 @@ StScrollBar { /* Window Picker */ .window-picker { - -horizontal-spacing: 12px; - -vertical-spacing: 12px; + spacing: 6px; padding: 12px; } .window-picker.external-monitor { padding: 12px; } @@ -1263,8 +1306,7 @@ StScrollBar { padding: 3px; height: 24px; width: 24px; - box-shadow: -1px 1px 5px 0px rgba(0, 0, 0, 0.5); - -shell-close-overlap: 12px; } + box-shadow: -1px 1px 5px 0px rgba(0, 0, 0, 0.5); } .window-close:hover { background-color: #4187ff; } .window-close:active { @@ -1325,6 +1367,9 @@ StScrollBar { .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked { background-color: rgba(26, 28, 35, 0.9); } +.grid-search-results { + spacing: 36px; } + .search-provider-icon .list-search-provider-content { spacing: 12px; } .search-provider-icon .list-search-provider-content .list-search-provider-details { @@ -1346,11 +1391,10 @@ StScrollBar { /* App Grid */ .icon-grid { - -shell-grid-horizontal-item-size: 144px; - -shell-grid-vertical-item-size: 144px; - spacing: 24px; } - .icon-grid .overview-icon { - icon-size: 96px; } + row-spacing: 36px; + column-spacing: 36px; + max-row-spacing: 72px; + max-column-spacing: 72px; } /* App Icons */ .app-well-app .overview-icon, @@ -1390,15 +1434,15 @@ StScrollBar { .app-folder-dialog { border-radius: 15px; border: 1px solid rgba(255, 255, 255, 0.1); - spacing: 12px; - background-color: rgba(26, 28, 35, 0.95); } + background-color: rgba(26, 28, 35, 0.95); + padding: 12px; } .app-folder-dialog .folder-name-container { padding: 24px 36px 0; spacing: 12px; /* FIXME: this is to keep the label in sync with the entry */ } .app-folder-dialog .folder-name-container .folder-name-label, .app-folder-dialog .folder-name-container .folder-name-entry { font-size: 18pt; - font-weight: bold; } + font-weight: 800; } .app-folder-dialog .folder-name-container .folder-name-entry { width: 300px; } .app-folder-dialog .folder-name-container .folder-name-label { @@ -1411,11 +1455,18 @@ StScrollBar { border-radius: 18px; } .app-folder-dialog .folder-name-container .edit-folder-button > StIcon { icon-size: 16px; } + .app-folder-dialog .icon-grid { + row-spacing: 12px; + column-spacing: 30px; } + .app-folder-dialog .page-indicators { + margin-bottom: 18px; } + .app-folder-dialog .page-indicators .page-indicator { + padding: 15px 12px; } .app-folder-dialog-container { padding: 12px; - width: 800px; - height: 600px; } + width: 620px; + height: 620px; } .app-folder-icon { padding: 6px; @@ -1446,8 +1497,7 @@ StScrollBar { border-radius: 10px; background-color: white; } -.all-apps, -.frequent-apps > StBoxLayout { +.all-apps { padding: 0px 88px 10px 88px; } .system-action-icon { @@ -1456,35 +1506,6 @@ StScrollBar { border-radius: 99px; icon-size: 48px; } -/* Frequent | All toggle */ -.app-view-controls { - padding-bottom: 32px; } - -.app-view-control { - padding: 4px 32px; - margin: 0 4px; } - .app-view-control, .app-view-control:hover, .app-view-control:checked { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - icon-shadow: none; - color: #bfbfbf; } - .app-view-control:hover { - color: white; - box-shadow: inset 0 -2px #bfbfbf; } - .app-view-control:active { - box-shadow: inset 0 -2px white; } - .app-view-control:checked { - color: white; - box-shadow: inset 0 -2px #2777ff; } - .app-view-control:first-child { - border-right-width: 0; - border-radius: 0; } - .app-view-control:last-child { - border-radius: 0; } - /* Dash */ #dash { font-size: 9pt; @@ -1830,6 +1851,13 @@ StScrollBar { .lg-dialog .shell-link:active { color: #0047c0; } +.lg-dialog .actor-link { + color: #ccc; } + .lg-dialog .actor-link:hover { + color: white; } + .lg-dialog .actor-link:active { + color: #999999; } + .lg-completions-text { font-size: .9em; font-style: italic; } @@ -2177,8 +2205,7 @@ StScrollBar { /* Window Picker */ .window-clone-border { - border: 6px solid rgba(255, 255, 255, 0.25); - border-radius: 6px; } + border-color: rgba(255, 255, 255, 0.25); } .window-caption { font-size: .9em; @@ -2195,8 +2222,7 @@ StScrollBar { box-shadow: none; color: transparent; height: 32px; - width: 32px; - -shell-close-overlap: 16px; } + width: 32px; } .window-close:hover { background-image: url("assets/close-window-hover.svg"); background-color: transparent; } @@ -2285,6 +2311,38 @@ StScrollBar { width: 31.5em; background: rgba(255, 255, 255, 0.7); } +/* Events */ +.events-button { + border-width: 1px; + border-style: solid; + border-radius: 7px; + margin: 4px; + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + icon-shadow: none; } + .events-button:focus { + color: #5c616c; + text-shadow: 0 1px rgba(255, 255, 255, 0.3); + icon-shadow: 0 1px rgba(255, 255, 255, 0.3); + box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); } + .events-button:hover { + color: #5c616c; + background-color: white; + border-color: #d1d1d1; + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1); + text-shadow: 0 1px rgba(255, 255, 255, 0.3); + icon-shadow: 0 1px rgba(255, 255, 255, 0.3); } + .events-button:active { + color: #5c616c; + background-color: #f7f7f7; + border-color: #d1d1d1; + text-shadow: none; + icon-shadow: none; + box-shadow: none; } + /* World clocks */ .world-clocks-button { border-width: 1px; @@ -2416,27 +2474,18 @@ StScrollBar { /* App Folders */ .app-well-app.app-folder { - background-color: rgba(255, 255, 255, 0.2); } + background-color: rgba(255, 255, 255, 0.2); + box-shadow: 0 2px 5px black; } + .app-well-app.app-folder:checked { + background: black; } -/* Frequent | All toggle */ -.app-view-control { - margin: 0; } - .app-view-control, .app-view-control:hover, .app-view-control:checked { - color: white; - background-color: rgba(255, 255, 255, 0.2); - font-weight: bold; - border: 0; - box-shadow: none; - text-shadow: none; } - .app-view-control:hover { - background: rgba(255, 255, 255, 0.4); } - .app-view-control:active, .app-view-control:checked { +.app-folder-dialog { + background: black; + box-shadow: 0 0 20px black; + border: none; } + .app-folder-dialog .folder-name-container .edit-folder-button, .app-folder-dialog .folder-name-container .edit-folder-button:hover, .app-folder-dialog .folder-name-container .edit-folder-button:active { background: white; color: black; } - .app-view-control:first-child { - border-radius: 5px 0 0 5px; } - .app-view-control:last-child { - border-radius: 0 5px 5px 0; } .panel-workspace-indicator { box-shadow: inset 0 0 0 100px white; diff --git a/src/themes/Kali/sass/gnome-shell-sass/_common-tweaks.scss b/src/themes/Kali/sass/gnome-shell-sass/_common-tweaks.scss index 102ec524..b9c3c32f 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/_common-tweaks.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/_common-tweaks.scss @@ -88,10 +88,7 @@ $_osd_color: if($variant=='light', black, white); /* Window Picker */ // Borders on window thumbnails -.window-clone-border { - border: 6px solid transparentize(white, .75); - border-radius: 6px; -} +.window-clone-border { border-color: transparentize(white, .75); } // Window titles .window-caption { @@ -112,7 +109,6 @@ $_osd_color: if($variant=='light', black, white); color: transparent; height: 32px; width: 32px; - -shell-close-overlap: 16px; &:hover { background-image: url("assets/close-window-hover.svg"); @@ -204,6 +200,9 @@ $_osd_color: if($variant=='light', black, white); background: transparentize($bg_color, .3); } +/* Events */ +.events-button { @include notification_bubble($flat: true); } + /* World clocks */ .world-clocks-button { @@ -315,31 +314,25 @@ $_osd_color: if($variant=='light', black, white); } /* App Folders */ -.app-well-app.app-folder { background-color: $overview_transparent_bg; } +.app-well-app.app-folder { + background-color: $overview_transparent_bg; + box-shadow: 0 2px 5px black; -/* Frequent | All toggle */ - -// buttons -.app-view-control { - margin: 0; - &, &:hover, &:checked { - color: white; - background-color: $overview_transparent_bg; - font-weight: bold; - border: 0; - box-shadow: none; - text-shadow: none; - } - - &:hover { background: transparentize(white, .6); } - - &:active, &:checked { - background: white; - color: black; - } - - &:first-child { border-radius: $base_border_radius 0 0 $base_border_radius; } - - &:last-child { border-radius: 0 $base_border_radius $base_border_radius 0; } + &:checked { background: black; } +} + +.app-folder-dialog { + background: black; + box-shadow: 0 0 20px black; + border: none; + + & .folder-name-container { + & .edit-folder-button { + &, &:hover, &:active { + background: white; + color: black; + } + } + } } diff --git a/src/themes/Kali/sass/gnome-shell-sass/_drawing.scss b/src/themes/Kali/sass/gnome-shell-sass/_drawing.scss deleted file mode 100644 index 8f4611c3..00000000 --- a/src/themes/Kali/sass/gnome-shell-sass/_drawing.scss +++ /dev/null @@ -1,202 +0,0 @@ -// Drawing mixins - -// generic drawing of more complex things - -@function _widget_edge($c:$borders_edge) { -// outer highlight "used" on most widgets - @return 0 1px $c; -} - -// provide font size in rem, with px fallback -@mixin fontsize($size: 24, $base: 16) { - font-size: round($size) + pt; - //font-size: ($size / $base) * 1rem; -} - -@mixin _shadows($shadow1, $shadow2:none, $shadow3:none, $shadow4:none) { -// -// Helper function to stack up to 4 box-shadows; -// - @if $shadow4!=none { box-shadow: $shadow1, $shadow2, $shadow3, $shadow4; } - @else if $shadow3!=none { box-shadow: $shadow1, $shadow2, $shadow3; } - @else if $shadow2!=none { box-shadow: $shadow1, $shadow2; } - @else { box-shadow: $shadow1; } -} - -// entries - -@mixin entry($t, $fc:$selected_bg_color, $edge: $borders_edge) { -// -// Entries drawing function -// -// $t: entry type -// $fc: focus color -// $edge: set to none to not draw the bottom edge or specify a color to not -// use the default one -// -// possible $t values: -// normal, focus, insensitive -// - - @if $t==normal { - background-color: $base_color; - border-color: $borders_color; - - } - @if $t==focus { - border-color: if($fc==$selected_bg_color, - $selected_borders_color, - darken($fc,35%)); - } - @if $t==hover { } - @if $t==insensitive { - color: $insensitive_fg_color; - border-color: $insensitive_bg_color; - box-shadow: none; - } -} - -// buttons - -@function _border_color ($c) { @return darken($c,25%); } // colored buttons want - // the border form the - // base color - -@function _text_shadow_color ($tc:$fg_color, $bg:$bg_color) { -// -// calculate the color of text shadows -// -// $tc is the text color -// $bg is the background color -// - $_lbg: lightness($bg)/100%; - @if lightness($tc)<50% { @return transparentize(white,1-$_lbg/($_lbg*1.3)); } - @else { @return transparentize(black,$_lbg*0.8); } -} - -@function _button_hilight_color($c) { -// -// calculate the right top hilight color for buttons -// -// $c: base color; -// - @if lightness($c)>90% { @return white; } - @else if lightness($c)>80% { @return transparentize(white, 0.3); } - @else if lightness($c)>50% { @return transparentize(white, 0.5); } - @else if lightness($c)>40% { @return transparentize(white, 0.7); } - @else { @return transparentize(white, 0.9); } -} - -@mixin _button_text_shadow ($tc:$fg_color, $bg:$bg_color) { -// -// helper function for the text emboss effect -// -// $tc is the optional text color, not the shadow color -// -// TODO: this functions needs a way to deal with special cases -// - - $_shadow: _text_shadow_color($tc, $bg); - - @if lightness($tc)<50% { - text-shadow: 0 1px $_shadow; - icon-shadow: 0 1px $_shadow; - } - @else { - text-shadow: 0 -1px $_shadow; - icon-shadow: 0 -1px $_shadow; - } -} - -@mixin button($t, $c:$bg_color, $tc:$fg_color, $edge: $borders_edge) { -// -// Button drawing function -// -// $t: button type, -// $c: base button color for colored* types -// $tc: optional text color for colored* types -// $edge: set to none to not draw the bottom edge or specify a color to not -// use the default one -// -// possible $t values: -// normal, hover, active, insensitive, insensitive-active, -// backdrop, backdrop-active, backdrop-insensitive, backdrop-insensitive-active, -// osd, osd-hover, osd-active, osd-insensitive, osd-backdrop, undecorated -// - - $_hilight_color: _button_hilight_color($c); - $_button_edge: if($edge == none, none, _widget_edge($edge)); - $_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1))); - $_button_shadow: 0 1px 2px transparentize($shadow_color, 0.03); - - @if $t==normal { - // - // normal button - // - - color: $tc; - background-color: $c; - border-color: $borders_color; - box-shadow: $_button_shadow; - text-shadow: 0 1px black; - icon-shadow: 0 1px black; - } - @if $t==focus { - // - // focused button - // - color: $tc; - text-shadow: 0 1px black; - icon-shadow: 0 1px black; - box-shadow: inset 0px 0px 0px 2px $selected_bg_color; - //border-color: $selected_bg_color; - } - - @else if $t==hover { - // - // active osd button - // - color: $tc; - border-color: $borders_color; - background-color: $c; - box-shadow: $_button_shadow; - text-shadow: 0 1px black; - icon-shadow: 0 1px black; - - } - @else if $t==active { - // - // active osd button - // - color: $tc; - border-color: $borders_color; - background-color: $c; - text-shadow: none; - icon-shadow: none; - box-shadow: none; - } - @else if $t==insensitive { - - color: $insensitive_fg_color; - border-color: $insensitive_borders_color; - background-color: $insensitive_bg_color; - box-shadow: none; - text-shadow: none; - icon-shadow: none; - } - @else if $t==undecorated { - // - // reset - // - border-color: transparent; - background-color: transparent; - background-image: none; - - @include _shadows(inset 0 1px transparentize(white,1), - $_blank_edge); - - text-shadow: none; - icon-shadow: none; - } -} - diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_drawing.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_drawing.scss index 4ca723bc..54ff9d4a 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_drawing.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/_drawing.scss @@ -79,7 +79,7 @@ @function draw_button_hilight_color($c) { // -// calculate the right top hilight color for buttons +// calculate the right top highlight color for buttons // // $c: base color; // diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_app-grid.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_app-grid.scss index 3a040369..c183cfeb 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_app-grid.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_app-grid.scss @@ -1,21 +1,15 @@ /* App Grid */ $app_icon_size: 96px; -$app_icon_padding: 24px; // app icons .icon-grid { - -shell-grid-horizontal-item-size: $app_icon_size + $app_icon_padding * 2; - -shell-grid-vertical-item-size: $app_icon_size + $app_icon_padding * 2; - spacing: $base_spacing * 4; - - .overview-icon { - icon-size: $app_icon_size; - } + row-spacing: $base_spacing * 6; + column-spacing: $base_spacing * 6; + max-row-spacing: $base_spacing * 12; + max-column-spacing: $base_spacing * 12; } -//.app-display { spacing: 20px; } - /* App Icons */ $app_grid_fg_color: #fff; @@ -44,8 +38,8 @@ $app_grid_fg_color: #fff; .app-folder-dialog { border-radius: $modal_radius * 1.5; border: 1px solid $osd_outer_borders_color; - spacing: 12px; background-color: transparentize(darken($osd_bg_color,10%), 0.05); + padding: 12px; & .folder-name-container { padding: 24px 36px 0; @@ -54,7 +48,7 @@ $app_grid_fg_color: #fff; & .folder-name-label, & .folder-name-entry { font-size: 18pt; - font-weight: bold; + font-weight: 800; } & .folder-name-entry { width: 300px } @@ -73,11 +67,24 @@ $app_grid_fg_color: #fff; & > StIcon { icon-size: 16px } } } + + & .icon-grid { + row-spacing: $base_spacing * 2; + column-spacing: $base_spacing * 5; + } + + & .page-indicators { + margin-bottom: 18px; + + .page-indicator { + padding: 15px 12px; + } + } } .app-folder-dialog-container { padding: 12px; - width: 800px; - height: 600px; + width: 620px; + height: 620px; } .app-folder-icon { @@ -123,15 +130,11 @@ $app_grid_fg_color: #fff; } // Some hacks I don't even know -.all-apps, -.frequent-apps > StBoxLayout { +.all-apps { // horizontal padding to make sure scrollbars or dash don't overlap content padding: 0px 88px 10px 88px; } -// Label when no frequent apps -.no-frequent-applications-label { @extend %status_text; } - // shutdown and other actions in the grid .system-action-icon { background-color: rgba(0,0,0,0.8); @@ -139,44 +142,3 @@ $app_grid_fg_color: #fff; border-radius: 99px; icon-size: $app_icon_size * 0.5; } - -/* Frequent | All toggle */ - -// container -.app-view-controls { - padding-bottom: 32px; -} - -// buttons -.app-view-control { - padding: 4px 32px; - margin: 0 4px; - - &, &:hover, &:checked { - @include button(undecorated); - color: darken($osd_fg_color, 25%); - } - - &:hover { - color: $osd_fg_color; - box-shadow: inset 0 -2px darken($osd_fg_color, 25%); - } - - &:active { - box-shadow: inset 0 -2px $osd_fg_color; - } - - &:checked { - color: $osd_fg_color; - box-shadow: inset 0 -2px $selected_bg_color; - } - - &:first-child { - border-right-width: 0; - border-radius: 0; - } - - &:last-child { - border-radius: 0; - } -} diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss index 950d25e2..d20e82fc 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss @@ -170,13 +170,38 @@ height: 1.8em; width: 2.3em; border-radius: 2px; - padding: 0.5em 0 0; margin: 6px; background-color: darken($bg_color, 2%); color: lighten($fg_color, 5%); } } +/* Events */ +.events-button { + @include notification_bubble; + padding: $base_padding * 2; + + .events-box { + spacing: $base_spacing; + } + + .events-list { + spacing: 2 * $base_spacing; + } + + .events-title { + color: desaturate(darken($fg_color,40%), 10%); + font-weight: bold; + margin-bottom: $base_margin; + } + + .event-time { + color: darken($fg_color,20%); + font-feature-settings: "tnum"; + @include fontsize($base_font_size - 1); + } +} + /* World clocks */ .world-clocks-button { @include notification_bubble; diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_dialogs.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_dialogs.scss index 5ad99f87..fc779202 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_dialogs.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_dialogs.scss @@ -38,7 +38,7 @@ font-size: 18pt; font-weight: 800; - &.leightweight { + &.lightweight { font-size: 13pt; font-weight: 800; } diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_looking-glass.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_looking-glass.scss index 9c38e636..006c2ef9 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_looking-glass.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_looking-glass.scss @@ -1,5 +1,7 @@ /* Looking Glass */ +$text_fg_color: #ccc; + // Dialog #LookingGlassDialog { background-color: $osd_bg_color; @@ -52,6 +54,11 @@ &:hover { color: lighten($link_color, 10%); } &:active { color: darken($link_color, 10%); } } + .actor-link { + color: $text_fg_color; + &:hover { color: lighten($text_fg_color, 20%); } + &:active { color: darken($text_fg_color, 20%); } + } } .lg-completions-text { diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_notifications.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_notifications.scss index 7d0cda2b..5ff46a05 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_notifications.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_notifications.scss @@ -1,4 +1,4 @@ -/* Notifications & Mesage Tray */ +/* Notifications & Message Tray */ $notification_banner_height: 64px; $notification_banner_width: 34em; diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_search-results.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_search-results.scss index 9836724b..0d81c974 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_search-results.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_search-results.scss @@ -54,6 +54,10 @@ @extend %status_text; } +.grid-search-results { + spacing: $base_spacing * 6; +} + // Search results with icons .grid-search-result { @extend %app-well-app; diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_slider.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_slider.scss index c0fdbb08..f21d62e6 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_slider.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_slider.scss @@ -16,7 +16,7 @@ $slider_size: 15px; -barlevel-overdrive-color: $destructive_color; -barlevel-overdrive-border-color: if($variant == 'light', darken($destructive_color, 4%), lighten($destructive_color, 2%)); //trough border when red; -barlevel-overdrive-separator-width:1px; - // slider hander + // slider handler -slider-handle-radius: $slider_size * 0.5; // half the size of the size -slider-handle-border-width: 1px; -slider-handle-border-color: if($variant == 'light', $borders_color, $fg_color); diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_window-picker.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_window-picker.scss index 466b5008..1b932185 100644 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_window-picker.scss +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_window-picker.scss @@ -1,19 +1,20 @@ /* Window Picker */ -$window_picker_spacing: $base_spacing * 2; // 16px -$window_picker_padding: $base_padding * 2; // 16px +$window_picker_spacing: $base_spacing; // 6px +$window_picker_padding: $base_padding * 2; // 12px $window_thumbnail_border_color:transparentize($selected_fg_color, 0.65); $window_close_button_size: 24px; $window_close_button_padding: 3px; +$window_clone_border_size: 6px; // Window picker .window-picker { // Space between window thumbnails - -horizontal-spacing: $window_picker_spacing; - -vertical-spacing: $window_picker_spacing; + spacing: $window_picker_spacing; + // Padding for container around window thumbnails padding: $window_picker_padding; @@ -22,7 +23,7 @@ $window_close_button_padding: 3px; // Borders on window thumbnails .window-clone-border { - border-width: 6px; + border-width: $window_clone_border_size; border-style: solid; border-color: $window_thumbnail_border_color; border-radius: $base_border_radius + 2; @@ -54,8 +55,6 @@ $window_close_button_padding: 3px; width: $window_close_button_size; box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5); - -shell-close-overlap: $window_close_button_size * 0.5; - &:hover { background-color: lighten($selected_bg_color, 5%); } diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh b/src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh index deef4a99..921d182e 100755 --- a/src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh +++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh @@ -4,7 +4,7 @@ GREEN='\033[0;32m' YELLOW='\033[0;33m' RESET='\033[0m' -VERSION=3.36.5 +VERSION=3.38.0 echo echo -e " $YELLOW[ i ]$RESET Upstream version $VERSION"