diff options
89 files changed, 2093 insertions, 4068 deletions
@@ -64,9 +64,11 @@ http://software.opensuse.org/download.html?project=home%3AHorst3180&package=arc- Arch Linux users can install the theme from the AUR -https://aur.archlinux.org/packages/gtk-theme-arc-git/ +**Official Releases**: https://aur.archlinux.org/packages/gtk-theme-arc/ -**Note:** If you're having trouble with the AUR package please email the package maintainer at zach@zach-adams.com before creating an issue. +**Development Releases**: https://aur.archlinux.org/packages/gtk-theme-arc-git/ + +**Note:** If you're having trouble with the AUR packages please email the package maintainer at zach@zach-adams.com before creating an issue. #### Manual Installation diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css index 6213045..44b3bc2 100644 --- a/common/cinnamon/cinnamon-dark.css +++ b/common/cinnamon/cinnamon-dark.css @@ -11,25 +11,26 @@ stage { min-height: 20px; padding: 5px 32px; transition-duration: 0; - border-radius: 2px; text-shadow: 0 1px rgba(64, 69, 82, 0); color: #D3DAE3; background-color: #444a58; border: 1px solid #2b2e39; box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); } + .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, .sound-button, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .sound-button:focus, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive { + border-radius: 2px; } .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .sound-button:focus { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #D3DAE3; background-color: #444a58; border: 1px solid #5294E2; box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); } - .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .sound-button:hover { + .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #D3DAE3; background-color: #505666; border: 1px solid #2b2e39; box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); } - .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .sound-button:hover:focus { + .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus { text-shadow: 0 1px rgba(64, 69, 82, 0); color: #D3DAE3; background-color: #444a58; @@ -139,7 +140,7 @@ StScrollBar { background-color: rgba(64, 69, 82, 0.1); border-radius: 8px; } StScrollBar StButton#vhandle, StScrollBar StButton#hhandle { - border-radius: 4px; + border-radius: 2px; background-color: #767b87; border: 0px solid; margin: 0px; } @@ -148,7 +149,15 @@ StScrollBar { StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-color: #5294E2; } -.popup-slider-menu-item { +.separator { + -gradient-height: 1px; + -gradient-start: transparent; + -gradient-end: transparent; + -margin-horizontal: 1.5em; + height: 1em; } + +.popup-slider-menu-item, +.slider { -slider-height: 4px; -slider-background-color: #2b2e39; -slider-border-color: transparent; @@ -238,6 +247,8 @@ StScrollBar { min-width: 200px; color: #D3DAE3; border-image: url("dark-assets/menu/menu.svg") 9 9 9 9; } + .popup-menu-arrow { + icon-size: 16px; } .popup-menu .popup-sub-menu { background-gradient-direction: none; box-shadow: none; @@ -250,10 +261,6 @@ 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-sub-menu-menu-item:open { - background: none; - box-shadow: none; - border-image: url("dark-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-content { padding: 1em 0em 1em 0em; } .popup-menu .popup-menu-item { @@ -392,7 +399,7 @@ StScrollBar { .expo-workspaces-name-entry, .expo-workspaces-name-entry#selected { - spacing: 25px; + height: 15px; border-radius: 2px; font-size: 9pt; padding: 5px 8px; @@ -424,7 +431,7 @@ StScrollBar { background-color: #353945; } .workspace-thumbnails { - spacing: 14px; } + spacing: 26px; } .workspace-thumbnails-background, .workspace-thumbnails-background:rtl { padding: 8px; } @@ -432,10 +439,13 @@ StScrollBar { background-image: url("common-assets/misc/add-workspace.svg"); height: 200px; width: 35px; - transition-duration: 200; } + transition-duration: 100; } .workspace-add-button:hover { background-image: url("common-assets/misc/add-workspace-hover.svg"); - transition-duration: 200; } + transition-duration: 100; } + .workspace-add-button:active { + background-image: url("common-assets/misc/add-workspace-active.svg"); + transition-duration: 100; } .workspace-overview-background-shade { background-color: rgba(0, 0, 0, 0.5); } @@ -519,30 +529,30 @@ StScrollBar { height: 16px; } .calendar-change-month-back { - background-image: url("dark-assets/misc/calendar-arrow-left.svg"); } + background-image: url("common-assets/misc/calendar-arrow-left.svg"); } .calendar-change-month-back:focus, .calendar-change-month-back:hover { - background-image: url("dark-assets/misc/calendar-arrow-left-hover.svg"); } + background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); } .calendar-change-month-back:active { - background-image: url("dark-assets/misc/calendar-arrow-left.svg"); } + background-image: url("common-assets/misc/calendar-arrow-left.svg"); } .calendar-change-month-back:rtl { - background-image: url("dark-assets/misc/calendar-arrow-right.svg"); } + background-image: url("common-assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-back:rtl:focus, .calendar-change-month-back:rtl:hover { - background-image: url("dark-assets/misc/calendar-arrow-right-hover.svg"); } + background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); } .calendar-change-month-back:rtl:active { - background-image: url("dark-assets/misc/calendar-arrow-right.svg"); } + background-image: url("common-assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-forward { - background-image: url("dark-assets/misc/calendar-arrow-right.svg"); } + background-image: url("common-assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-forward:focus, .calendar-change-month-forward:hover { - background-image: url("dark-assets/misc/calendar-arrow-right-hover.svg"); } + background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); } .calendar-change-month-forward:active { - background-image: url("dark-assets/misc/calendar-arrow-right.svg"); } + background-image: url("common-assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-forward:rtl { - background-image: url("dark-assets/misc/calendar-arrow-left.svg"); } + background-image: url("common-assets/misc/calendar-arrow-left.svg"); } .calendar-change-month-forward:rtl:focus, .calendar-change-month-forward:rtl:hover { - background-image: url("dark-assets/misc/calendar-arrow-left-hover.svg"); } + background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); } .calendar-change-month-forward:rtl:active { - background-image: url("dark-assets/misc/calendar-arrow-left.svg"); } + background-image: url("common-assets/misc/calendar-arrow-left.svg"); } .datemenu-date-label { padding: 0.4em 1.75em; @@ -605,6 +615,8 @@ StScrollBar { .popup-menu #notification { color: #D3DAE3; 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: #BAC3CF; } @@ -625,6 +637,9 @@ StScrollBar { min-height: 159px; color: #BAC3CF; } +.notification-button, .notification-icon-button { + padding: 5px; } + .notification-icon-button > StIcon { icon-size: 36px; } @@ -639,6 +654,8 @@ StScrollBar { border-image: url("common-assets/misc/bg.svg") 9 9 9 9; border-radius: 3px; padding: 20px; } + .switcher-list > StBoxLayout { + padding: 4px; } .switcher-list-item-container { spacing: 8px; } .switcher-list .item-box { @@ -650,7 +667,7 @@ StScrollBar { .switcher-list .item-box:selected { color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; } + border: 0px solid #5294E2; } .switcher-list .thumbnail { width: 256px; } .switcher-list .thumbnail-box { @@ -871,12 +888,6 @@ StScrollBar { .menu-favorites-button { padding: 10px; border: 1px solid transparent; } - .menu-favorites-button:hover { - text-shadow: 0 1px rgba(64, 69, 82, 0); - color: #D3DAE3; - background-color: #505666; - border: 1px solid #2b2e39; - box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); } .menu-places-box { margin: auto; @@ -899,12 +910,7 @@ StScrollBar { .menu-application-button:highlighted { font-weight: bold; } .menu-application-button-selected { - padding: 7px; - text-shadow: 0 1px rgba(64, 69, 82, 0); - color: #D3DAE3; - background-color: #505666; - border: 1px solid #2b2e39; - box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); } + padding: 7px; } .menu-application-button-selected:highlighted { font-weight: bold; } .menu-application-button-label:ltr { @@ -916,12 +922,7 @@ StScrollBar { padding: 7px; border: 1px solid transparent; } .menu-category-button-selected { - padding: 7px; - text-shadow: 0 1px rgba(64, 69, 82, 0); - color: #D3DAE3; - background-color: #505666; - border: 1px solid #2b2e39; - box-shadow: inset 0 2px 4px rgba(80, 86, 102, 0.05); } + padding: 7px; } .menu-category-button-hover { background-color: red; border-radius: 2px; } @@ -1082,10 +1083,71 @@ StScrollBar { .sound-playback-control { padding: 5px 10px 10px 10px; } +.sound-player { + padding: 0 4px; } + .sound-player > StBoxLayout:first-child { + padding: 5px 10px 12px 10px; + spacing: 0.5em; } + .sound-player > StBoxLayout:first-child StButton:small { + width: 16px; + height: 8px; + padding: 1px; } + .sound-player > StBoxLayout:first-child StButton:small StIcon { + icon-size: 12px; } + .sound-player-generic-coverart { + background: rgba(0, 0, 0, 0.2); } + .sound-player-overlay { + width: 290px; + height: 70px; + padding: 15px; + spacing: 0.5em; + background: rgba(42, 45, 55, 0.85); + border: 0px solid rgba(31, 33, 40, 0.95); + border-bottom: 1px; + color: #BAC3CF; } + .sound-player-overlay StButton { + width: 22px; + height: 13px; + padding: 5px; + color: #BAC3CF; + border-radius: 2px; + border: 1px solid rgba(53, 57, 69, 0); } + .sound-player-overlay StButton StIcon { + icon-size: 16px; } + .sound-player-overlay StButton:hover { + text-shadow: 0 1px rgba(64, 69, 82, 0); + color: #BAC3CF; + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } + .sound-player-overlay StButton:active { + text-shadow: 0 1px rgba(64, 69, 82, 0); + color: #ffffff; + background-color: #5294E2; + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px #5294E2; } + .sound-player-overlay StBoxLayout { + padding-top: 2px; } + .sound-player .slider { + height: 0.5em; + padding: 0; + border: none; + -slider-height: 0.5em; + -slider-background-color: #2d303b; + -slider-border-color: transparent; + -slider-active-background-color: #5294E2; + -slider-active-border-color: transparent; + -slider-border-width: 0px; + -slider-handle-radius: 0px; } + #workspaceSwitcher { spacing: 0px; padding: 3px; } +/* Controls the styling when using the "Simple buttons" option */ +.workspace-switcher { + padding-left: 3px; + padding-right: 3px; } + .workspace-button { width: 20px; height: 10px; @@ -1098,6 +1160,32 @@ StScrollBar { .workspace-button:hover { color: rgba(82, 148, 226, 0.5); } +/* Controls the style when using the "Visual representation" option */ +.workspace-graph { + padding: 3px; + spacing: 3px; } + +.workspace-graph .workspace { + border: 1px solid rgba(0, 0, 0, 0.4); + background-gradient-direction: none; + background-color: rgba(0, 0, 0, 0.2); } + +.workspace-graph .workspace:active { + border: 1px solid #5294E2; + background-gradient-direction: none; } + +.workspace-graph .workspace .windows { + -active-window-background: rgba(76, 82, 99, 0.95); + -active-window-border: rgba(0, 0, 0, 0.8); + -inactive-window-background: rgba(76, 82, 99, 0.95); + -inactive-window-border: rgba(0, 0, 0, 0.8); } + +.workspace-graph .workspace:active .windows { + -active-window-background: rgba(87, 93, 113, 0.95); + -active-window-border: rgba(0, 0, 0, 0.8); + -inactive-window-background: rgba(54, 58, 70, 0.95); + -inactive-window-border: rgba(0, 0, 0, 0.8); } + #panel-launchers-box { padding-left: 7px; } diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css index 27a783e..daa4423 100644 --- a/common/cinnamon/cinnamon.css +++ b/common/cinnamon/cinnamon.css @@ -11,25 +11,26 @@ stage { min-height: 20px; padding: 5px 32px; transition-duration: 0; - border-radius: 2px; text-shadow: 0 1px rgba(255, 255, 255, 0); color: #5c616c; background-color: #fbfbfc; border: 1px solid #cfd6e6; box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } + .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, .sound-button, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .sound-button:focus, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive { + border-radius: 2px; } .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .sound-button:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #5c616c; background-color: #fbfbfc; border: 1px solid #5294E2; box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); } - .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .sound-button:hover { + .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #5c616c; background-color: white; border: 1px solid #cfd6e6; box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } - .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .sound-button:hover:focus { + .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .menu-favorites-button:focus:hover, .menu-application-button-selected:focus, .menu-category-button-selected:focus, .sound-button:hover:focus { text-shadow: 0 1px rgba(255, 255, 255, 0); color: #5c616c; background-color: #fbfbfc; @@ -139,7 +140,7 @@ StScrollBar { background-color: rgba(255, 255, 255, 0.1); border-radius: 8px; } StScrollBar StButton#vhandle, StScrollBar StButton#hhandle { - border-radius: 4px; + border-radius: 2px; background-color: #b8babf; border: 0px solid; margin: 0px; } @@ -148,7 +149,15 @@ StScrollBar { StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { background-color: #5294E2; } -.popup-slider-menu-item { +.separator { + -gradient-height: 1px; + -gradient-start: transparent; + -gradient-end: transparent; + -margin-horizontal: 1.5em; + height: 1em; } + +.popup-slider-menu-item, +.slider { -slider-height: 4px; -slider-background-color: #cfd6e6; -slider-border-color: transparent; @@ -238,6 +247,8 @@ StScrollBar { min-width: 200px; color: #5c616c; border-image: url("light-assets/menu/menu.svg") 9 9 9 9; } + .popup-menu-arrow { + icon-size: 16px; } .popup-menu .popup-sub-menu { background-gradient-direction: none; box-shadow: none; @@ -250,10 +261,6 @@ 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-sub-menu-menu-item:open { - background: none; - box-shadow: none; - border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-content { padding: 1em 0em 1em 0em; } .popup-menu .popup-menu-item { @@ -392,7 +399,7 @@ StScrollBar { .expo-workspaces-name-entry, .expo-workspaces-name-entry#selected { - spacing: 25px; + height: 15px; border-radius: 2px; font-size: 9pt; padding: 5px 8px; @@ -424,7 +431,7 @@ StScrollBar { background-color: #353945; } .workspace-thumbnails { - spacing: 14px; } + spacing: 26px; } .workspace-thumbnails-background, .workspace-thumbnails-background:rtl { padding: 8px; } @@ -432,10 +439,13 @@ StScrollBar { background-image: url("common-assets/misc/add-workspace.svg"); height: 200px; width: 35px; - transition-duration: 200; } + transition-duration: 100; } .workspace-add-button:hover { background-image: url("common-assets/misc/add-workspace-hover.svg"); - transition-duration: 200; } + transition-duration: 100; } + .workspace-add-button:active { + background-image: url("common-assets/misc/add-workspace-active.svg"); + transition-duration: 100; } .workspace-overview-background-shade { background-color: rgba(0, 0, 0, 0.5); } @@ -519,30 +529,30 @@ StScrollBar { height: 16px; } .calendar-change-month-back { - background-image: url("light-assets/misc/calendar-arrow-left.svg"); } + background-image: url("common-assets/misc/calendar-arrow-left.svg"); } .calendar-change-month-back:focus, .calendar-change-month-back:hover { - background-image: url("light-assets/misc/calendar-arrow-left-hover.svg"); } + background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); } .calendar-change-month-back:active { - background-image: url("light-assets/misc/calendar-arrow-left.svg"); } + background-image: url("common-assets/misc/calendar-arrow-left.svg"); } .calendar-change-month-back:rtl { - background-image: url("light-assets/misc/calendar-arrow-right.svg"); } + background-image: url("common-assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-back:rtl:focus, .calendar-change-month-back:rtl:hover { - background-image: url("light-assets/misc/calendar-arrow-right-hover.svg"); } + background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); } .calendar-change-month-back:rtl:active { - background-image: url("light-assets/misc/calendar-arrow-right.svg"); } + background-image: url("common-assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-forward { - background-image: url("light-assets/misc/calendar-arrow-right.svg"); } + background-image: url("common-assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-forward:focus, .calendar-change-month-forward:hover { - background-image: url("light-assets/misc/calendar-arrow-right-hover.svg"); } + background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); } .calendar-change-month-forward:active { - background-image: url("light-assets/misc/calendar-arrow-right.svg"); } + background-image: url("common-assets/misc/calendar-arrow-right.svg"); } .calendar-change-month-forward:rtl { - background-image: url("light-assets/misc/calendar-arrow-left.svg"); } + background-image: url("common-assets/misc/calendar-arrow-left.svg"); } .calendar-change-month-forward:rtl:focus, .calendar-change-month-forward:rtl:hover { - background-image: url("light-assets/misc/calendar-arrow-left-hover.svg"); } + background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); } .calendar-change-month-forward:rtl:active { - background-image: url("light-assets/misc/calendar-arrow-left.svg"); } + background-image: url("common-assets/misc/calendar-arrow-left.svg"); } .datemenu-date-label { padding: 0.4em 1.75em; @@ -605,6 +615,8 @@ StScrollBar { .popup-menu #notification { color: #5c616c; border-image: url("light-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: #BAC3CF; } @@ -625,6 +637,9 @@ StScrollBar { min-height: 159px; color: #BAC3CF; } +.notification-button, .notification-icon-button { + padding: 5px; } + .notification-icon-button > StIcon { icon-size: 36px; } @@ -639,6 +654,8 @@ StScrollBar { border-image: url("common-assets/misc/bg.svg") 9 9 9 9; border-radius: 3px; padding: 20px; } + .switcher-list > StBoxLayout { + padding: 4px; } .switcher-list-item-container { spacing: 8px; } .switcher-list .item-box { @@ -650,7 +667,7 @@ StScrollBar { .switcher-list .item-box:selected { color: #ffffff; background-color: #5294E2; - border: 1px solid #5294E2; } + border: 0px solid #5294E2; } .switcher-list .thumbnail { width: 256px; } .switcher-list .thumbnail-box { @@ -871,12 +888,6 @@ StScrollBar { .menu-favorites-button { padding: 10px; border: 1px solid transparent; } - .menu-favorites-button:hover { - text-shadow: 0 1px rgba(255, 255, 255, 0); - color: #5c616c; - background-color: white; - border: 1px solid #cfd6e6; - box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } .menu-places-box { margin: auto; @@ -899,12 +910,7 @@ StScrollBar { .menu-application-button:highlighted { font-weight: bold; } .menu-application-button-selected { - padding: 7px; - text-shadow: 0 1px rgba(255, 255, 255, 0); - color: #5c616c; - background-color: white; - border: 1px solid #cfd6e6; - box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } + padding: 7px; } .menu-application-button-selected:highlighted { font-weight: bold; } .menu-application-button-label:ltr { @@ -916,12 +922,7 @@ StScrollBar { padding: 7px; border: 1px solid transparent; } .menu-category-button-selected { - padding: 7px; - text-shadow: 0 1px rgba(255, 255, 255, 0); - color: #5c616c; - background-color: white; - border: 1px solid #cfd6e6; - box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); } + padding: 7px; } .menu-category-button-hover { background-color: red; border-radius: 2px; } @@ -1082,10 +1083,71 @@ StScrollBar { .sound-playback-control { padding: 5px 10px 10px 10px; } +.sound-player { + padding: 0 4px; } + .sound-player > StBoxLayout:first-child { + padding: 5px 10px 12px 10px; + spacing: 0.5em; } + .sound-player > StBoxLayout:first-child StButton:small { + width: 16px; + height: 8px; + padding: 1px; } + .sound-player > StBoxLayout:first-child StButton:small StIcon { + icon-size: 12px; } + .sound-player-generic-coverart { + background: rgba(0, 0, 0, 0.2); } + .sound-player-overlay { + width: 290px; + height: 70px; + padding: 15px; + spacing: 0.5em; + background: rgba(42, 45, 55, 0.85); + border: 0px solid rgba(31, 33, 40, 0.95); + border-bottom: 1px; + color: #BAC3CF; } + .sound-player-overlay StButton { + width: 22px; + height: 13px; + padding: 5px; + color: #BAC3CF; + border-radius: 2px; + border: 1px solid rgba(53, 57, 69, 0); } + .sound-player-overlay StButton StIcon { + icon-size: 16px; } + .sound-player-overlay StButton:hover { + text-shadow: 0 1px rgba(255, 255, 255, 0); + color: #BAC3CF; + border: 1px solid rgba(26, 28, 34, 0.35); + background-color: rgba(119, 127, 151, 0.45); } + .sound-player-overlay StButton:active { + text-shadow: 0 1px rgba(255, 255, 255, 0); + color: #ffffff; + background-color: #5294E2; + border: 1px solid #5294E2; + box-shadow: inset 0 2px 4px #5294E2; } + .sound-player-overlay StBoxLayout { + padding-top: 2px; } + .sound-player .slider { + height: 0.5em; + padding: 0; + border: none; + -slider-height: 0.5em; + -slider-background-color: #cfd6e6; + -slider-border-color: transparent; + -slider-active-background-color: #5294E2; + -slider-active-border-color: transparent; + -slider-border-width: 0px; + -slider-handle-radius: 0px; } + #workspaceSwitcher { spacing: 0px; padding: 3px; } +/* Controls the styling when using the "Simple buttons" option */ +.workspace-switcher { + padding-left: 3px; + padding-right: 3px; } + .workspace-button { width: 20px; height: 10px; @@ -1098,6 +1160,32 @@ StScrollBar { .workspace-button:hover { color: rgba(82, 148, 226, 0.5); } +/* Controls the style when using the "Visual representation" option */ +.workspace-graph { + padding: 3px; + spacing: 3px; } + +.workspace-graph .workspace { + border: 1px solid rgba(0, 0, 0, 0.4); + background-gradient-direction: none; + background-color: rgba(0, 0, 0, 0.2); } + +.workspace-graph .workspace:active { + border: 1px solid #5294E2; + background-gradient-direction: none; } + +.workspace-graph .workspace .windows { + -active-window-background: rgba(76, 82, 99, 0.95); + -active-window-border: rgba(0, 0, 0, 0.8); + -inactive-window-background: rgba(76, 82, 99, 0.95); + -inactive-window-border: rgba(0, 0, 0, 0.8); } + +.workspace-graph .workspace:active .windows { + -active-window-background: rgba(87, 93, 113, 0.95); + -active-window-border: rgba(0, 0, 0, 0.8); + -inactive-window-background: rgba(54, 58, 70, 0.95); + -inactive-window-border: rgba(0, 0, 0, 0.8); } + #panel-launchers-box { padding-left: 7px; } diff --git a/common/cinnamon/common-assets/misc/add-workspace-active.svg b/common/cinnamon/common-assets/misc/add-workspace-active.svg new file mode 100644 index 0000000..f60de34 --- /dev/null +++ b/common/cinnamon/common-assets/misc/add-workspace-active.svg @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="35" + height="200" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="add-workspace-active.svg"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="8" + inkscape:cx="-12.039549" + inkscape:cy="88.924726" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:window-width="1366" + inkscape:window-height="696" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:window-maximized="1" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-bbox="true" + inkscape:bbox-paths="true" + inkscape:snap-bbox-edge-midpoints="true" + inkscape:bbox-nodes="true"> + <inkscape:grid + type="xygrid" + id="grid3040" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + <sodipodi:guide + orientation="0,1" + position="20,100" + id="guide3893" /> + <sodipodi:guide + orientation="1,0" + position="18,190" + id="guide3895" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Ebene 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-852.36218)"> + <path + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + d="M 3 0 C 1.3380015 0 0 1.3380015 0 3 L 0 197 C 0 198.662 1.3380015 200 3 200 L 36 200 C 37.661999 200 39 198.662 39 197 L 39 3 C 39 1.3380015 37.661999 0 36 0 L 3 0 z M 3 1 L 36 1 C 37.108 1 38 1.892 38 3 L 38 197 C 38 198.108 37.108 199 36 199 L 3 199 C 1.892 199 1 198.108 1 197 L 1 3 C 1 1.892 1.892 1 3 1 z " + transform="translate(0,852.36218)" + id="rect3810" /> + <g + transform="translate(0,-0.9999969)" + id="g3917-7" + style="fill:#000000;fill-opacity:1;opacity:0.5" /> + <rect + rx="2" + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3812" + width="37" + height="198" + x="1.000005" + y="853.36218" + ry="2" /> + <g + id="g3917" + style="fill:#ffffff;fill-opacity:1"> + <rect + ry="1.1428567" + y="944.36218" + x="17" + height="15.999994" + width="2.0000002" + id="rect3897" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + <rect + transform="matrix(0,1,-1,0,0,0)" + ry="1.1428567" + y="-26" + x="951.36218" + height="15.999994" + width="2.0000002" + id="rect3897-6" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + </g> + </g> +</svg> diff --git a/common/cinnamon/common-assets/misc/add-workspace-hover.svg b/common/cinnamon/common-assets/misc/add-workspace-hover.svg index 0cb3f8a..e771e33 100644 --- a/common/cinnamon/common-assets/misc/add-workspace-hover.svg +++ b/common/cinnamon/common-assets/misc/add-workspace-hover.svg @@ -25,8 +25,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="8" - inkscape:cx="9.897951" - inkscape:cy="99.174726" + inkscape:cx="-12.039549" + inkscape:cy="128.92473" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -75,7 +75,7 @@ id="layer1" transform="translate(0,-852.36218)"> <path - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="opacity:0.45;fill:#000000;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" d="M 3 0 C 1.3380015 0 0 1.3380015 0 3 L 0 197 C 0 198.662 1.3380015 200 3 200 L 36 200 C 37.661999 200 39 198.662 39 197 L 39 3 C 39 1.3380015 37.661999 0 36 0 L 3 0 z M 3 1 L 36 1 C 37.108 1 38 1.892 38 3 L 38 197 C 38 198.108 37.108 199 36 199 L 3 199 C 1.892 199 1 198.108 1 197 L 1 3 C 1 1.892 1.892 1 3 1 z " transform="translate(0,852.36218)" id="rect3810" /> @@ -85,7 +85,7 @@ style="fill:#000000;fill-opacity:1;opacity:0.5" /> <rect rx="2" - style="opacity:0.3;fill:#000000;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + style="opacity:0.45;fill:#202229;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect3812" width="37" height="198" diff --git a/common/cinnamon/common-assets/misc/add-workspace.svg b/common/cinnamon/common-assets/misc/add-workspace.svg index d7ce9d5..65f5361 100644 --- a/common/cinnamon/common-assets/misc/add-workspace.svg +++ b/common/cinnamon/common-assets/misc/add-workspace.svg @@ -25,8 +25,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="8" - inkscape:cx="9.897951" - inkscape:cy="99.174726" + inkscape:cx="-12.039549" + inkscape:cy="128.92473" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -65,7 +65,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> diff --git a/common/cinnamon/light-assets/misc/calendar-arrow-left-hover.svg b/common/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg index 7f292f8..a5cc13e 100644 --- a/common/cinnamon/light-assets/misc/calendar-arrow-left-hover.svg +++ b/common/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg @@ -28,13 +28,13 @@ </rdf:RDF> </metadata> <sodipodi:namedview - inkscape:bbox-nodes="false" + inkscape:bbox-nodes="true" inkscape:bbox-paths="true" bordercolor="#666666" borderopacity="1" inkscape:current-layer="layer12" - inkscape:cx="-21.616809" - inkscape:cy="2.0293849" + inkscape:cx="14.072123" + inkscape:cy="8.0207106" gridtolerance="10" inkscape:guide-bbox="true" guidetolerance="10" @@ -45,8 +45,8 @@ pagecolor="#ffffff" inkscape:pageopacity="0" inkscape:pageshadow="2" - showborder="false" - showgrid="false" + showborder="true" + showgrid="true" showguides="true" inkscape:snap-bbox="true" inkscape:snap-bbox-midpoints="false" @@ -60,7 +60,8 @@ inkscape:window-width="1366" inkscape:window-x="0" inkscape:window-y="25" - inkscape:zoom="5.6568543"> + inkscape:zoom="22.627417" + inkscape:snap-bbox-edge-midpoints="true"> <inkscape:grid empspacing="2" enabled="true" @@ -143,27 +144,9 @@ style="display:inline" transform="translate(-100.0002,-747)"> <path - inkscape:connector-curvature="0" - d="m 110.875,749 a 1.0001,1.0001 0 0 0 -0.59375,0.28125 l -5,5 -0.6875,0.71875 0.6875,0.71875 5,5 a 1.016466,1.016466 0 1 0 1.4375,-1.4375 L 107.4375,755 l 4.28125,-4.28125 A 1.0001,1.0001 0 0 0 110.875,749 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;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;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" + d="m 109.82336,751.00006 a 0.67182557,0.66502524 0 0 0 -0.10367,0.009 0.67182557,0.66502524 0 0 0 -0.39887,0.18702 l -3.35878,3.32479 -0.46184,0.47795 0.46184,0.47792 3.35878,3.32481 a 0.68281953,0.67590797 0 0 0 0.698,0.16363 c 0.0374,0.0143 0.0779,0.0233 0.1207,0.0233 0.18608,0 0.33589,-0.14829 0.33589,-0.33248 0,-0.0423 -0.009,-0.0823 -0.0236,-0.11948 a 0.68281953,0.67590797 0 0 0 -0.16531,-0.69094 l -2.876,-2.84689 2.87597,-2.84686 a 0.67182557,0.66502524 0 0 0 0.17056,-0.72082 c 0.008,-0.0292 0.0185,-0.058 0.0185,-0.0896 0,-0.18421 -0.14978,-0.33249 -0.33587,-0.33249 -0.0395,0 -0.0765,0.01 -0.11152,0.022 A 0.67182557,0.66502524 0 0 0 109.82334,751 Z" id="path6040" - style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /> - <rect - height="1" - id="rect6046" - rx="0" - ry="1" - style="fill:#5294e2;fill-opacity:1;stroke:none" - width="1" - x="111.0002" - y="749" /> - <rect - height="1" - id="rect6050" - rx="0" - ry="1" - style="fill:#5294e2;fill-opacity:1;stroke:none" - width="1" - x="111.0002" - y="760" /> + inkscape:connector-curvature="0" /> </g> </svg> diff --git a/common/cinnamon/dark-assets/misc/calendar-arrow-left.svg b/common/cinnamon/common-assets/misc/calendar-arrow-left.svg index 5602eff..2774254 100644 --- a/common/cinnamon/dark-assets/misc/calendar-arrow-left.svg +++ b/common/cinnamon/common-assets/misc/calendar-arrow-left.svg @@ -28,13 +28,13 @@ </rdf:RDF> </metadata> <sodipodi:namedview - inkscape:bbox-nodes="false" + inkscape:bbox-nodes="true" inkscape:bbox-paths="true" bordercolor="#666666" borderopacity="1" inkscape:current-layer="layer12" - inkscape:cx="-9.0656635" - inkscape:cy="-4.6881295" + inkscape:cx="13.983735" + inkscape:cy="8.0207106" gridtolerance="10" inkscape:guide-bbox="true" guidetolerance="10" @@ -45,8 +45,8 @@ pagecolor="#ffffff" inkscape:pageopacity="0" inkscape:pageshadow="2" - showborder="false" - showgrid="false" + showborder="true" + showgrid="true" showguides="true" inkscape:snap-bbox="true" inkscape:snap-bbox-midpoints="false" @@ -60,7 +60,8 @@ inkscape:window-width="1366" inkscape:window-x="0" inkscape:window-y="25" - inkscape:zoom="5.6568543"> + inkscape:zoom="22.627417" + inkscape:snap-bbox-edge-midpoints="true"> <inkscape:grid empspacing="2" enabled="true" @@ -143,27 +144,9 @@ style="display:inline" transform="translate(-100.0002,-747)"> <path - inkscape:connector-curvature="0" - d="m 110.875,749 a 1.0001,1.0001 0 0 0 -0.59375,0.28125 l -5,5 -0.6875,0.71875 0.6875,0.71875 5,5 a 1.016466,1.016466 0 1 0 1.4375,-1.4375 L 107.4375,755 l 4.28125,-4.28125 A 1.0001,1.0001 0 0 0 110.875,749 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;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;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#a1a1a1;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" + d="m 109.82336,751.00006 a 0.67182557,0.66502524 0 0 0 -0.10367,0.009 0.67182557,0.66502524 0 0 0 -0.39887,0.18702 l -3.35878,3.32479 -0.46184,0.47795 0.46184,0.47792 3.35878,3.32481 a 0.68281953,0.67590797 0 0 0 0.698,0.16363 c 0.0374,0.0143 0.0779,0.0233 0.1207,0.0233 0.18608,0 0.33589,-0.14829 0.33589,-0.33248 0,-0.0423 -0.009,-0.0823 -0.0236,-0.11948 a 0.68281953,0.67590797 0 0 0 -0.16531,-0.69094 l -2.876,-2.84689 2.87597,-2.84686 a 0.67182557,0.66502524 0 0 0 0.17056,-0.72082 c 0.008,-0.0292 0.0185,-0.058 0.0185,-0.0896 0,-0.18421 -0.14978,-0.33249 -0.33587,-0.33249 -0.0395,0 -0.0765,0.01 -0.11152,0.022 A 0.67182557,0.66502524 0 0 0 109.82334,751 Z" id="path6040" - style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a1a1a1;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /> - <rect - height="1" - id="rect6046" - rx="0" - ry="1" - style="fill:#a1a1a1;fill-opacity:1;stroke:none" - width="1" - x="111.0002" - y="749" /> - <rect - height="1" - id="rect6050" - rx="0" - ry="1" - style="fill:#a1a1a1;fill-opacity:1;stroke:none" - width="1" - x="111.0002" - y="760" /> + inkscape:connector-curvature="0" /> </g> </svg> diff --git a/common/cinnamon/dark-assets/misc/calendar-arrow-left-hover.svg b/common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg index 7f292f8..f718628 100644 --- a/common/cinnamon/dark-assets/misc/calendar-arrow-left-hover.svg +++ b/common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg @@ -9,7 +9,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - sodipodi:docname="calendar-arrow-left-hover.svg" + sodipodi:docname="calendar-arrow-right-hover.svg" height="16" id="svg7384" inkscape:version="0.91 r13725" @@ -28,13 +28,13 @@ </rdf:RDF> </metadata> <sodipodi:namedview - inkscape:bbox-nodes="false" + inkscape:bbox-nodes="true" inkscape:bbox-paths="true" bordercolor="#666666" borderopacity="1" inkscape:current-layer="layer12" - inkscape:cx="-21.616809" - inkscape:cy="2.0293849" + inkscape:cx="14.072123" + inkscape:cy="8.0207106" gridtolerance="10" inkscape:guide-bbox="true" guidetolerance="10" @@ -45,8 +45,8 @@ pagecolor="#ffffff" inkscape:pageopacity="0" inkscape:pageshadow="2" - showborder="false" - showgrid="false" + showborder="true" + showgrid="true" showguides="true" inkscape:snap-bbox="true" inkscape:snap-bbox-midpoints="false" @@ -60,7 +60,8 @@ inkscape:window-width="1366" inkscape:window-x="0" inkscape:window-y="25" - inkscape:zoom="5.6568543"> + inkscape:zoom="22.627417" + inkscape:snap-bbox-edge-midpoints="true"> <inkscape:grid empspacing="2" enabled="true" @@ -143,27 +144,9 @@ style="display:inline" transform="translate(-100.0002,-747)"> <path - inkscape:connector-curvature="0" - d="m 110.875,749 a 1.0001,1.0001 0 0 0 -0.59375,0.28125 l -5,5 -0.6875,0.71875 0.6875,0.71875 5,5 a 1.016466,1.016466 0 1 0 1.4375,-1.4375 L 107.4375,755 l 4.28125,-4.28125 A 1.0001,1.0001 0 0 0 110.875,749 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;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;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" + d="m 106.17699,751.00006 a 0.67182557,0.66502524 0 0 1 0.10367,0.009 0.67182557,0.66502524 0 0 1 0.39887,0.18702 l 3.35878,3.32479 0.46184,0.47795 -0.46184,0.47792 -3.35878,3.32481 a 0.68281953,0.67590797 0 0 1 -0.698,0.16363 c -0.0374,0.0143 -0.0779,0.0233 -0.1207,0.0233 -0.18608,0 -0.33589,-0.14829 -0.33589,-0.33248 0,-0.0423 0.009,-0.0823 0.0236,-0.11948 a 0.68281953,0.67590797 0 0 1 0.16531,-0.69094 l 2.876,-2.84689 -2.87597,-2.84686 a 0.67182557,0.66502524 0 0 1 -0.17056,-0.72082 c -0.008,-0.0292 -0.0185,-0.058 -0.0185,-0.0896 0,-0.18421 0.14978,-0.33249 0.33587,-0.33249 0.0395,0 0.0765,0.01 0.11152,0.022 A 0.67182557,0.66502524 0 0 1 106.17701,751 Z" id="path6040" - style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /> - <rect - height="1" - id="rect6046" - rx="0" - ry="1" - style="fill:#5294e2;fill-opacity:1;stroke:none" - width="1" - x="111.0002" - y="749" /> - <rect - height="1" - id="rect6050" - rx="0" - ry="1" - style="fill:#5294e2;fill-opacity:1;stroke:none" - width="1" - x="111.0002" - y="760" /> + inkscape:connector-curvature="0" /> </g> </svg> diff --git a/common/cinnamon/light-assets/misc/calendar-arrow-left.svg b/common/cinnamon/common-assets/misc/calendar-arrow-right.svg index 5602eff..366e69b 100644 --- a/common/cinnamon/light-assets/misc/calendar-arrow-left.svg +++ b/common/cinnamon/common-assets/misc/calendar-arrow-right.svg @@ -9,7 +9,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - sodipodi:docname="calendar-arrow-left.svg" + sodipodi:docname="calendar-arrow-right.svg" height="16" id="svg7384" inkscape:version="0.91 r13725" @@ -28,13 +28,13 @@ </rdf:RDF> </metadata> <sodipodi:namedview - inkscape:bbox-nodes="false" + inkscape:bbox-nodes="true" inkscape:bbox-paths="true" bordercolor="#666666" borderopacity="1" inkscape:current-layer="layer12" - inkscape:cx="-9.0656635" - inkscape:cy="-4.6881295" + inkscape:cx="13.983735" + inkscape:cy="8.0207106" gridtolerance="10" inkscape:guide-bbox="true" guidetolerance="10" @@ -45,8 +45,8 @@ pagecolor="#ffffff" inkscape:pageopacity="0" inkscape:pageshadow="2" - showborder="false" - showgrid="false" + showborder="true" + showgrid="true" showguides="true" inkscape:snap-bbox="true" inkscape:snap-bbox-midpoints="false" @@ -60,7 +60,8 @@ inkscape:window-width="1366" inkscape:window-x="0" inkscape:window-y="25" - inkscape:zoom="5.6568543"> + inkscape:zoom="22.627417" + inkscape:snap-bbox-edge-midpoints="true"> <inkscape:grid empspacing="2" enabled="true" @@ -143,27 +144,9 @@ style="display:inline" transform="translate(-100.0002,-747)"> <path - inkscape:connector-curvature="0" - d="m 110.875,749 a 1.0001,1.0001 0 0 0 -0.59375,0.28125 l -5,5 -0.6875,0.71875 0.6875,0.71875 5,5 a 1.016466,1.016466 0 1 0 1.4375,-1.4375 L 107.4375,755 l 4.28125,-4.28125 A 1.0001,1.0001 0 0 0 110.875,749 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;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;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#a1a1a1;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" + d="m 106.17699,751.00006 a 0.67182557,0.66502524 0 0 1 0.10367,0.009 0.67182557,0.66502524 0 0 1 0.39887,0.18702 l 3.35878,3.32479 0.46184,0.47795 -0.46184,0.47792 -3.35878,3.32481 a 0.68281953,0.67590797 0 0 1 -0.698,0.16363 c -0.0374,0.0143 -0.0779,0.0233 -0.1207,0.0233 -0.18608,0 -0.33589,-0.14829 -0.33589,-0.33248 0,-0.0423 0.009,-0.0823 0.0236,-0.11948 a 0.68281953,0.67590797 0 0 1 0.16531,-0.69094 l 2.876,-2.84689 -2.87597,-2.84686 a 0.67182557,0.66502524 0 0 1 -0.17056,-0.72082 c -0.008,-0.0292 -0.0185,-0.058 -0.0185,-0.0896 0,-0.18421 0.14978,-0.33249 0.33587,-0.33249 0.0395,0 0.0765,0.01 0.11152,0.022 A 0.67182557,0.66502524 0 0 1 106.17701,751 Z" id="path6040" - style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a1a1a1;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /> - <rect - height="1" - id="rect6046" - rx="0" - ry="1" - style="fill:#a1a1a1;fill-opacity:1;stroke:none" - width="1" - x="111.0002" - y="749" /> - <rect - height="1" - id="rect6050" - rx="0" - ry="1" - style="fill:#a1a1a1;fill-opacity:1;stroke:none" - width="1" - x="111.0002" - y="760" /> + inkscape:connector-curvature="0" /> </g> </svg> diff --git a/common/cinnamon/dark-assets/menu/submenu-open.svg b/common/cinnamon/dark-assets/menu/submenu-open.svg deleted file mode 100644 index bd817b0..0000000 --- a/common/cinnamon/dark-assets/menu/submenu-open.svg +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="37" - height="18" - id="svg3783" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="submenu-open.svg" - inkscape:export-filename="/home/steffen/.local/share/themes/Vertex_Shell/gnome-shell/menu.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs3785" /> - <sodipodi:namedview - id="base" - pagecolor="#838383" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="16.000001" - inkscape:cx="17.662447" - inkscape:cy="6.5634088" - inkscape:document-units="px" - inkscape:current-layer="g3027" - showgrid="true" - inkscape:showpageshadow="false" - inkscape:window-width="1364" - inkscape:window-height="718" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:snap-global="true" - inkscape:snap-bbox="true" - showguides="true" - inkscape:guide-bbox="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:bbox-paths="true" - inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> - <inkscape:grid - type="xygrid" - id="grid4301" - empspacing="8" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" - originx="0" - originy="0" /> - <sodipodi:guide - orientation="0,1" - position="14.052204,22.065004" - id="guide3831" /> - <sodipodi:guide - orientation="0,1" - position="14.052204,-3.9349962" - id="guide3835" /> - </sodipodi:namedview> - <metadata - id="metadata3788"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Calque 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-5.9477962,-1025.4272)"> - <g - id="g3027" - transform="matrix(0,-1,1,0,-1048.3622,1052.3622)"> - <rect - style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect3092" - width="28.999735" - height="18" - x="1058.3102" - y="-26.934996" - transform="matrix(0,1,-1,0,0,0)" /> - <rect - style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect3883" - width="28.999802" - height="1" - x="1058.3102" - y="-26.934996" - transform="matrix(0,1,-1,0,0,0)" /> - </g> - </g> -</svg> diff --git a/common/cinnamon/dark-assets/menu/submenu.svg b/common/cinnamon/dark-assets/menu/submenu.svg index ebab963..9369544 100644 --- a/common/cinnamon/dark-assets/menu/submenu.svg +++ b/common/cinnamon/dark-assets/menu/submenu.svg @@ -28,8 +28,8 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="16.000001" - inkscape:cx="17.662447" - inkscape:cy="6.5634088" + inkscape:cx="6.5686977" + inkscape:cy="6.4384088" inkscape:document-units="px" inkscape:current-layer="g3027" showgrid="true" @@ -104,6 +104,14 @@ x="1058.3102" y="-9.9350014" transform="matrix(0,1,-1,0,0,0)" /> + <rect + style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3883-1" + width="28.999802" + height="1" + x="1058.3101" + y="-26.934996" + transform="matrix(0,1,-1,0,0,0)" /> </g> </g> </svg> diff --git a/common/cinnamon/dark-assets/misc/calendar-arrow-right-hover.svg b/common/cinnamon/dark-assets/misc/calendar-arrow-right-hover.svg deleted file mode 100644 index beadead..0000000 --- a/common/cinnamon/dark-assets/misc/calendar-arrow-right-hover.svg +++ /dev/null @@ -1,171 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - sodipodi:docname="calendar-arrow-right-hover.svg" - height="16" - id="svg7384" - inkscape:version="0.91 r13725" - version="1.1" - width="16"> - <metadata - id="metadata90"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <sodipodi:namedview - inkscape:bbox-nodes="false" - inkscape:bbox-paths="true" - bordercolor="#666666" - borderopacity="1" - inkscape:current-layer="layer12" - inkscape:cx="3.892693" - inkscape:cy="8.8200689" - gridtolerance="10" - inkscape:guide-bbox="true" - guidetolerance="10" - id="namedview88" - inkscape:object-nodes="false" - inkscape:object-paths="false" - objecttolerance="10" - pagecolor="#ffffff" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - showborder="false" - showgrid="false" - showguides="true" - inkscape:snap-bbox="true" - inkscape:snap-bbox-midpoints="false" - inkscape:snap-global="true" - inkscape:snap-grids="true" - inkscape:snap-nodes="true" - inkscape:snap-others="false" - inkscape:snap-to-guides="true" - inkscape:window-height="720" - inkscape:window-maximized="1" - inkscape:window-width="1366" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:zoom="16"> - <inkscape:grid - empspacing="2" - enabled="true" - id="grid4866" - originx="-80.000002px" - originy="530px" - snapvisiblegridlinesonly="true" - spacingx="1px" - spacingy="1px" - type="xygrid" - visible="true" /> - <inkscape:grid - color="#000000" - empcolor="#000000" - empopacity="0" - empspacing="4" - enabled="true" - id="grid5968" - opacity="0.1254902" - originx="-80.000002px" - originy="530px" - snapvisiblegridlinesonly="true" - spacingx="0.5px" - spacingy="0.5px" - type="xygrid" - visible="true" /> - </sodipodi:namedview> - <title - id="title9167">Gnome Symbolic Icon Theme</title> - <defs - id="defs7386" /> - <g - inkscape:groupmode="layer" - id="layer9" - inkscape:label="status" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer10" - inkscape:label="devices" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer11" - inkscape:label="apps" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer13" - inkscape:label="places" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer14" - inkscape:label="mimetypes" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer15" - inkscape:label="emblems" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="g71291" - inkscape:label="emotes" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="g4953" - inkscape:label="categories" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer12" - inkscape:label="actions" - style="display:inline" - transform="translate(-321.0002,-747)"> - <path - inkscape:connector-curvature="0" - d="m 325.78125,749 a 1.0001,1.0001 0 0 0 -0.5,1.71875 L 329.5625,755 l -4.28125,4.28125 a 1.016466,1.016466 0 1 0 1.4375,1.4375 l 5,-5 0.6875,-0.71875 -0.6875,-0.71875 -5,-5 A 1.0001,1.0001 0 0 0 325.78125,749 z" - id="path8460" - style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /> - <rect - height="1" - id="rect8464" - rx="0" - ry="1" - style="fill:#5294e2;fill-opacity:1;stroke:none" - transform="scale(-1,1)" - width="1" - x="-326.00021" - y="749" /> - <rect - height="1" - id="rect8468" - rx="0" - ry="1" - style="fill:#5294e2;fill-opacity:1;stroke:none" - transform="scale(-1,1)" - width="1" - x="-326.00021" - y="760" /> - </g> -</svg> diff --git a/common/cinnamon/dark-assets/misc/calendar-arrow-right.svg b/common/cinnamon/dark-assets/misc/calendar-arrow-right.svg deleted file mode 100644 index 734b53b..0000000 --- a/common/cinnamon/dark-assets/misc/calendar-arrow-right.svg +++ /dev/null @@ -1,171 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - sodipodi:docname="calendar-arrow-right.svg" - height="16" - id="svg7384" - inkscape:version="0.91 r13725" - version="1.1" - width="16"> - <metadata - id="metadata90"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <sodipodi:namedview - inkscape:bbox-nodes="false" - inkscape:bbox-paths="true" - bordercolor="#666666" - borderopacity="1" - inkscape:current-layer="layer12" - inkscape:cx="-12.348759" - inkscape:cy="7.764245" - gridtolerance="10" - inkscape:guide-bbox="true" - guidetolerance="10" - id="namedview88" - inkscape:object-nodes="false" - inkscape:object-paths="false" - objecttolerance="10" - pagecolor="#ffffff" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - showborder="false" - showgrid="false" - showguides="true" - inkscape:snap-bbox="true" - inkscape:snap-bbox-midpoints="false" - inkscape:snap-global="true" - inkscape:snap-grids="true" - inkscape:snap-nodes="true" - inkscape:snap-others="false" - inkscape:snap-to-guides="true" - inkscape:window-height="720" - inkscape:window-maximized="1" - inkscape:window-width="1366" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:zoom="8"> - <inkscape:grid - empspacing="2" - enabled="true" - id="grid4866" - originx="-80.000002px" - originy="530px" - snapvisiblegridlinesonly="true" - spacingx="1px" - spacingy="1px" - type="xygrid" - visible="true" /> - <inkscape:grid - color="#000000" - empcolor="#000000" - empopacity="0" - empspacing="4" - enabled="true" - id="grid5968" - opacity="0.1254902" - originx="-80.000002px" - originy="530px" - snapvisiblegridlinesonly="true" - spacingx="0.5px" - spacingy="0.5px" - type="xygrid" - visible="true" /> - </sodipodi:namedview> - <title - id="title9167">Gnome Symbolic Icon Theme</title> - <defs - id="defs7386" /> - <g - inkscape:groupmode="layer" - id="layer9" - inkscape:label="status" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer10" - inkscape:label="devices" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer11" - inkscape:label="apps" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer13" - inkscape:label="places" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer14" - inkscape:label="mimetypes" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer15" - inkscape:label="emblems" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="g71291" - inkscape:label="emotes" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="g4953" - inkscape:label="categories" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer12" - inkscape:label="actions" - style="display:inline" - transform="translate(-321.0002,-747)"> - <path - inkscape:connector-curvature="0" - d="m 325.78125,749 a 1.0001,1.0001 0 0 0 -0.5,1.71875 L 329.5625,755 l -4.28125,4.28125 a 1.016466,1.016466 0 1 0 1.4375,1.4375 l 5,-5 0.6875,-0.71875 -0.6875,-0.71875 -5,-5 A 1.0001,1.0001 0 0 0 325.78125,749 z" - id="path8460" - style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a1a1a1;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /> - <rect - height="1" - id="rect8464" - rx="0" - ry="1" - style="fill:#a1a1a1;fill-opacity:1;stroke:none" - transform="scale(-1,1)" - width="1" - x="-326.00021" - y="749" /> - <rect - height="1" - id="rect8468" - rx="0" - ry="1" - style="fill:#a1a1a1;fill-opacity:1;stroke:none" - transform="scale(-1,1)" - width="1" - x="-326.00021" - y="760" /> - </g> -</svg> diff --git a/common/cinnamon/light-assets/menu/submenu-open.svg b/common/cinnamon/light-assets/menu/submenu-open.svg deleted file mode 100644 index 8062443..0000000 --- a/common/cinnamon/light-assets/menu/submenu-open.svg +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="37" - height="18" - id="svg3783" - version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="submenu-open.svg" - inkscape:export-filename="/home/steffen/.local/share/themes/Vertex_Shell/gnome-shell/menu.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs3785" /> - <sodipodi:namedview - id="base" - pagecolor="#838383" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="16.000001" - inkscape:cx="7.5374477" - inkscape:cy="6.5634088" - inkscape:document-units="px" - inkscape:current-layer="g3027" - showgrid="true" - inkscape:showpageshadow="false" - inkscape:window-width="1364" - inkscape:window-height="718" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:window-maximized="0" - inkscape:snap-global="true" - inkscape:snap-bbox="true" - showguides="true" - inkscape:guide-bbox="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - inkscape:bbox-paths="true" - inkscape:bbox-nodes="true" - inkscape:snap-bbox-edge-midpoints="true"> - <inkscape:grid - type="xygrid" - id="grid4301" - empspacing="8" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" - originx="0" - originy="0" /> - <sodipodi:guide - orientation="0,1" - position="14.052204,22.065004" - id="guide3831" /> - <sodipodi:guide - orientation="0,1" - position="14.052204,-3.9349962" - id="guide3835" /> - </sodipodi:namedview> - <metadata - id="metadata3788"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Calque 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-5.9477962,-1025.4272)"> - <g - id="g3027" - transform="matrix(0,-1,1,0,-1048.3622,1052.3622)"> - <rect - style="opacity:0.05;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect3092" - width="28.999735" - height="18" - x="1058.3102" - y="8.9349957" - transform="matrix(0,1,1,0,0,0)" /> - <rect - style="opacity:0.1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect3883" - width="28.999802" - height="1" - x="1058.3102" - y="25.93499" - transform="matrix(0,1,1,0,0,0)" /> - </g> - </g> -</svg> diff --git a/common/cinnamon/light-assets/menu/submenu.svg b/common/cinnamon/light-assets/menu/submenu.svg index 766c82e..378f29b 100644 --- a/common/cinnamon/light-assets/menu/submenu.svg +++ b/common/cinnamon/light-assets/menu/submenu.svg @@ -27,9 +27,9 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="16.000001" - inkscape:cx="7.5374477" - inkscape:cy="6.5634088" + inkscape:zoom="45.254837" + inkscape:cx="2.5411162" + inkscape:cy="14.440542" inkscape:document-units="px" inkscape:current-layer="g3027" showgrid="true" @@ -104,6 +104,14 @@ x="1058.3102" y="-9.9350014" transform="matrix(0,1,-1,0,0,0)" /> + <rect + style="opacity:0.1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3883-9" + width="28.999802" + height="1" + x="1058.3101" + y="-26.935005" + transform="matrix(0,1,-1,0,0,0)" /> </g> </g> </svg> diff --git a/common/cinnamon/light-assets/misc/calendar-arrow-right-hover.svg b/common/cinnamon/light-assets/misc/calendar-arrow-right-hover.svg deleted file mode 100644 index beadead..0000000 --- a/common/cinnamon/light-assets/misc/calendar-arrow-right-hover.svg +++ /dev/null @@ -1,171 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - sodipodi:docname="calendar-arrow-right-hover.svg" - height="16" - id="svg7384" - inkscape:version="0.91 r13725" - version="1.1" - width="16"> - <metadata - id="metadata90"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <sodipodi:namedview - inkscape:bbox-nodes="false" - inkscape:bbox-paths="true" - bordercolor="#666666" - borderopacity="1" - inkscape:current-layer="layer12" - inkscape:cx="3.892693" - inkscape:cy="8.8200689" - gridtolerance="10" - inkscape:guide-bbox="true" - guidetolerance="10" - id="namedview88" - inkscape:object-nodes="false" - inkscape:object-paths="false" - objecttolerance="10" - pagecolor="#ffffff" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - showborder="false" - showgrid="false" - showguides="true" - inkscape:snap-bbox="true" - inkscape:snap-bbox-midpoints="false" - inkscape:snap-global="true" - inkscape:snap-grids="true" - inkscape:snap-nodes="true" - inkscape:snap-others="false" - inkscape:snap-to-guides="true" - inkscape:window-height="720" - inkscape:window-maximized="1" - inkscape:window-width="1366" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:zoom="16"> - <inkscape:grid - empspacing="2" - enabled="true" - id="grid4866" - originx="-80.000002px" - originy="530px" - snapvisiblegridlinesonly="true" - spacingx="1px" - spacingy="1px" - type="xygrid" - visible="true" /> - <inkscape:grid - color="#000000" - empcolor="#000000" - empopacity="0" - empspacing="4" - enabled="true" - id="grid5968" - opacity="0.1254902" - originx="-80.000002px" - originy="530px" - snapvisiblegridlinesonly="true" - spacingx="0.5px" - spacingy="0.5px" - type="xygrid" - visible="true" /> - </sodipodi:namedview> - <title - id="title9167">Gnome Symbolic Icon Theme</title> - <defs - id="defs7386" /> - <g - inkscape:groupmode="layer" - id="layer9" - inkscape:label="status" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer10" - inkscape:label="devices" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer11" - inkscape:label="apps" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer13" - inkscape:label="places" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer14" - inkscape:label="mimetypes" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer15" - inkscape:label="emblems" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="g71291" - inkscape:label="emotes" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="g4953" - inkscape:label="categories" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer12" - inkscape:label="actions" - style="display:inline" - transform="translate(-321.0002,-747)"> - <path - inkscape:connector-curvature="0" - d="m 325.78125,749 a 1.0001,1.0001 0 0 0 -0.5,1.71875 L 329.5625,755 l -4.28125,4.28125 a 1.016466,1.016466 0 1 0 1.4375,1.4375 l 5,-5 0.6875,-0.71875 -0.6875,-0.71875 -5,-5 A 1.0001,1.0001 0 0 0 325.78125,749 z" - id="path8460" - style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /> - <rect - height="1" - id="rect8464" - rx="0" - ry="1" - style="fill:#5294e2;fill-opacity:1;stroke:none" - transform="scale(-1,1)" - width="1" - x="-326.00021" - y="749" /> - <rect - height="1" - id="rect8468" - rx="0" - ry="1" - style="fill:#5294e2;fill-opacity:1;stroke:none" - transform="scale(-1,1)" - width="1" - x="-326.00021" - y="760" /> - </g> -</svg> diff --git a/common/cinnamon/light-assets/misc/calendar-arrow-right.svg b/common/cinnamon/light-assets/misc/calendar-arrow-right.svg deleted file mode 100644 index 734b53b..0000000 --- a/common/cinnamon/light-assets/misc/calendar-arrow-right.svg +++ /dev/null @@ -1,171 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - sodipodi:docname="calendar-arrow-right.svg" - height="16" - id="svg7384" - inkscape:version="0.91 r13725" - version="1.1" - width="16"> - <metadata - id="metadata90"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <sodipodi:namedview - inkscape:bbox-nodes="false" - inkscape:bbox-paths="true" - bordercolor="#666666" - borderopacity="1" - inkscape:current-layer="layer12" - inkscape:cx="-12.348759" - inkscape:cy="7.764245" - gridtolerance="10" - inkscape:guide-bbox="true" - guidetolerance="10" - id="namedview88" - inkscape:object-nodes="false" - inkscape:object-paths="false" - objecttolerance="10" - pagecolor="#ffffff" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - showborder="false" - showgrid="false" - showguides="true" - inkscape:snap-bbox="true" - inkscape:snap-bbox-midpoints="false" - inkscape:snap-global="true" - inkscape:snap-grids="true" - inkscape:snap-nodes="true" - inkscape:snap-others="false" - inkscape:snap-to-guides="true" - inkscape:window-height="720" - inkscape:window-maximized="1" - inkscape:window-width="1366" - inkscape:window-x="0" - inkscape:window-y="25" - inkscape:zoom="8"> - <inkscape:grid - empspacing="2" - enabled="true" - id="grid4866" - originx="-80.000002px" - originy="530px" - snapvisiblegridlinesonly="true" - spacingx="1px" - spacingy="1px" - type="xygrid" - visible="true" /> - <inkscape:grid - color="#000000" - empcolor="#000000" - empopacity="0" - empspacing="4" - enabled="true" - id="grid5968" - opacity="0.1254902" - originx="-80.000002px" - originy="530px" - snapvisiblegridlinesonly="true" - spacingx="0.5px" - spacingy="0.5px" - type="xygrid" - visible="true" /> - </sodipodi:namedview> - <title - id="title9167">Gnome Symbolic Icon Theme</title> - <defs - id="defs7386" /> - <g - inkscape:groupmode="layer" - id="layer9" - inkscape:label="status" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer10" - inkscape:label="devices" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer11" - inkscape:label="apps" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer13" - inkscape:label="places" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer14" - inkscape:label="mimetypes" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer15" - inkscape:label="emblems" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="g71291" - inkscape:label="emotes" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="g4953" - inkscape:label="categories" - style="display:inline" - transform="translate(-321.0002,-747)" /> - <g - inkscape:groupmode="layer" - id="layer12" - inkscape:label="actions" - style="display:inline" - transform="translate(-321.0002,-747)"> - <path - inkscape:connector-curvature="0" - d="m 325.78125,749 a 1.0001,1.0001 0 0 0 -0.5,1.71875 L 329.5625,755 l -4.28125,4.28125 a 1.016466,1.016466 0 1 0 1.4375,1.4375 l 5,-5 0.6875,-0.71875 -0.6875,-0.71875 -5,-5 A 1.0001,1.0001 0 0 0 325.78125,749 z" - id="path8460" - style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a1a1a1;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /> - <rect - height="1" - id="rect8464" - rx="0" - ry="1" - style="fill:#a1a1a1;fill-opacity:1;stroke:none" - transform="scale(-1,1)" - width="1" - x="-326.00021" - y="749" /> - <rect - height="1" - id="rect8468" - rx="0" - ry="1" - style="fill:#a1a1a1;fill-opacity:1;stroke:none" - transform="scale(-1,1)" - width="1" - x="-326.00021" - y="760" /> - </g> -</svg> diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss index 30ffa1f..5a3f27d 100644 --- a/common/cinnamon/sass/_common.scss +++ b/common/cinnamon/sass/_common.scss @@ -33,7 +33,10 @@ stage { min-height: 20px; padding: 5px 32px; transition-duration: 0; - border-radius: 2px; + + &, &:focus, &:hover, &:hover:focus, &:active, &:active:focus, &:insensitive { + border-radius: 2px; + } @include button(normal); @@ -119,7 +122,7 @@ StScrollBar { } StButton#vhandle, StButton#hhandle { - border-radius: 4px; + border-radius: 2px; background-color: mix($fg_color, $bg_color, 40%); border: 0px solid; margin: 0px; @@ -130,10 +133,19 @@ StScrollBar { } } +.separator { + -gradient-height: 1px; + -gradient-start: rgba(0,0,0,0); + -gradient-end: rgba(0,0,0,0); + -margin-horizontal: 1.5em; + height: 1em; +} + // // Slider // -.popup-slider-menu-item { +.popup-slider-menu-item, +.slider { -slider-height: 4px; -slider-background-color: $button_border; //background of the trough -slider-border-color: transparentize(black, 1); //trough border color @@ -252,6 +264,8 @@ StScrollBar { color: $fg_color; border-image: url("#{$asset_path}/menu/menu.svg") 9 9 9 9; + &-arrow { icon-size: 16px; } + .popup-sub-menu { background-gradient-direction: none; box-shadow: none; @@ -264,12 +278,6 @@ StScrollBar { padding: 4px; StBin#trough, StBin#vhandle { border-width: 0; } } - - &-menu-item:open { - background: none; - box-shadow: none; - border-image: url("#{$asset_path}/menu/submenu-open.svg") 9 9 9 9; - } } .popup-menu-content { padding: 1em 0em 1em 0em; } @@ -441,7 +449,7 @@ StScrollBar { .expo-workspaces-name-entry, .expo-workspaces-name-entry#selected { - spacing: 25px; + height: 15px; border-radius: 2px; font-size: 9pt; padding: 5px 8px; @@ -479,7 +487,7 @@ StScrollBar { //&-controls { visible-height: 32px; } &-thumbnails { - spacing: 14px; + spacing: 26px; &-background, &-background:rtl { padding: 8px; } } @@ -488,11 +496,15 @@ StScrollBar { background-image: url("common-assets/misc/add-workspace.svg"); height: 200px; width: 35px; - transition-duration: 200; + transition-duration: 100; &:hover { background-image: url("common-assets/misc/add-workspace-hover.svg"); - transition-duration: 200; + transition-duration: 100; + } + &:active { + background-image: url("common-assets/misc/add-workspace-active.svg"); + transition-duration: 100; } } &-overview-background-shade { background-color: rgba(0,0,0,0.5); } @@ -605,35 +617,35 @@ StScrollBar { //arrow back .calendar-change-month-back { - background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); + background-image: url("common-assets/misc/calendar-arrow-left.svg"); - &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-left-hover.svg"); } + &:focus, &:hover { background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); } - &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); } + &:active { background-image: url("common-assets/misc/calendar-arrow-left.svg"); } &:rtl { - background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); + background-image: url("common-assets/misc/calendar-arrow-right.svg"); - &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-right-hover.svg"); } + &:focus, &:hover { background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); } - &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); } + &:active { background-image: url("common-assets/misc/calendar-arrow-right.svg"); } } } //arrow forward .calendar-change-month-forward { - background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); + background-image: url("common-assets/misc/calendar-arrow-right.svg"); - &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-right-hover.svg"); } + &:focus, &:hover { background-image: url("common-assets/misc/calendar-arrow-right-hover.svg"); } - &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-right.svg"); } + &:active { background-image: url("common-assets/misc/calendar-arrow-right.svg"); } &:rtl { - background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); + background-image: url("common-assets/misc/calendar-arrow-left.svg"); - &:focus, &:hover { background-image: url("#{$asset_path}/misc/calendar-arrow-left-hover.svg"); } + &:focus, &:hover { background-image: url("common-assets/misc/calendar-arrow-left-hover.svg"); } - &:active { background-image: url("#{$asset_path}/misc/calendar-arrow-left.svg"); } + &:active { background-image: url("common-assets/misc/calendar-arrow-left.svg"); } } } @@ -712,7 +724,10 @@ StScrollBar { color: $fg_color; border-image: url("#{$asset_path}/misc/message.svg") 9 9 9 9; - .notification-button, .notification-icon-button { @extend %button; } + .notification-button, .notification-icon-button { + @extend %button; + padding: 5px; + } StEntry { @extend %entry; } } @@ -742,7 +757,10 @@ StScrollBar { color: $osd_fg_color; } - &-button, &-icon-button { @extend %osd_button; } + &-button, &-icon-button { + @extend %osd_button; + padding: 5px; + } &-icon-button > StIcon { icon-size: 36px; } @@ -765,6 +783,10 @@ StScrollBar { border-radius: 3px; padding: 20px; + > StBoxLayout { + padding: 4px; + } + &-item-container { spacing: 8px; } .item-box { @@ -779,7 +801,7 @@ StScrollBar { &:selected { color: $selected_fg_color; background-color: $selected_bg_color; - border: 1px solid $selected_bg_color; + border: 0px solid $selected_bg_color; } } @@ -1049,7 +1071,7 @@ StScrollBar { padding: 10px; border: 1px solid rgba(0,0,0,0); - &:hover { @include button(hover); } + &:hover { @extend %button:hover; } } &-places { @@ -1077,7 +1099,7 @@ StScrollBar { &-selected { padding: 7px; - @include button(hover); + @extend %button:hover; &:highlighted { font-weight: bold; } } @@ -1092,7 +1114,7 @@ StScrollBar { &-selected { padding: 7px; - @include button(hover); + @extend %button:hover; } &-hover { background-color: red; @@ -1290,6 +1312,70 @@ StScrollBar { .sound-playback-control { padding: 5px 10px 10px 10px; } +// 2.8 +.sound-player { + padding: 0 4px; + + > StBoxLayout:first-child { + padding: 5px 10px 12px 10px; + spacing: 0.5em; + + StButton:small { + width: 16px; + height: 8px; + padding: 1px; + + StIcon { icon-size: 12px; } + } + } + + &-generic-coverart { + background: rgba(0,0,0,0.2); + } + + &-overlay { + width: 290px; + height: 70px; + padding: 15px; + spacing: 0.5em; + background: transparentize(darken($osd_bg_color, 5%), 0.1); + border: 0px solid darken($osd_bg_color, 10%); + border-bottom: 1px ; + color: $osd_fg_color; + + StButton { + width: 22px; + height: 13px; + padding: 5px; + color: $osd_fg_color; + border-radius: 2px; + border: 1px solid transparentize($osd_bg_color,1); + + StIcon { icon-size: 16px; } + + &:hover{ @include button(osd-hover); } + &:active { @include button(active); } + } + + StBoxLayout { + padding-top: 2px; + } + } + + .slider { + height: 0.5em; + padding: 0; + border: none; + -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-border-color: rgba(0,0,0,0); + -slider-border-width: 0px; + -slider-handle-radius: 0px; + } +} + // // Workspace Switcher applet (workspaceSwitcher.js) // @@ -1298,6 +1384,12 @@ StScrollBar { padding: 3px; } +/* Controls the styling when using the "Simple buttons" option */ +.workspace-switcher { + padding-left: 3px; + padding-right: 3px; +} + .workspace-button { width: 20px; height: 10px; @@ -1310,6 +1402,37 @@ StScrollBar { &:hover { color: transparentize($selected_bg_color, 0.5) } } +/* Controls the style when using the "Visual representation" option */ +.workspace-graph { + padding: 3px; + spacing: 3px; +} + +.workspace-graph .workspace { + border: 1px solid transparentize(black, 0.6); + background-gradient-direction: none; + background-color: transparentize(black, 0.8); +} + +.workspace-graph .workspace:active { + border: 1px solid $selected_bg_color; + background-gradient-direction: none; +} + +.workspace-graph .workspace .windows { + -active-window-background: lighten($panel_bg, 15%); + -active-window-border: rgba(0, 0, 0, 0.8); + -inactive-window-background: lighten($panel_bg, 15%); + -inactive-window-border: rgba(0, 0, 0, 0.8); +} + +.workspace-graph .workspace:active .windows { + -active-window-background: lighten($panel_bg, 20%); + -active-window-border: rgba(0, 0, 0, 0.8); + -inactive-window-background: lighten($panel_bg, 5%); + -inactive-window-border: rgba(0, 0, 0, 0.8); +} + // // Panel Launchers Applet (panelLaunchers.js) // diff --git a/common/gnome-shell/3.14/common-assets/dash/running1.svg b/common/gnome-shell/3.14/common-assets/dash/running1.svg deleted file mode 100644 index 322dc8d..0000000 --- a/common/gnome-shell/3.14/common-assets/dash/running1.svg +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - width="28" - height="4" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.91 r13725" - sodipodi:docname="running1.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - style="display:inline;enable-background:new"> - <sodipodi:namedview - stroke="#ef2929" - fill="#f57900" - id="base" - pagecolor="#ffffff" - bordercolor="#808080" - borderopacity="1" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="13.979167" - inkscape:cx="8.9568436" - inkscape:cy="-0.4854291" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="true" - inkscape:window-width="1600" - inkscape:window-height="851" - inkscape:window-x="0" - inkscape:window-y="24" - width="400px" - height="300px" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - gridtolerance="10000" - inkscape:object-nodes="true" - inkscape:snap-grids="true" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-maximized="1" - inkscape:bbox-nodes="true" - inkscape:bbox-paths="false" - inkscape:snap-bbox-edge-midpoints="false" - inkscape:snap-bbox-midpoints="false" - objecttolerance="10000" - guidetolerance="10000" - borderlayer="true" - showborder="true" - guidecolor="#ff0b00" - guideopacity="1" - guidehicolor="#001aff" - guidehiopacity="0.49803922" - inkscape:snap-smooth-nodes="false" - inkscape:snap-page="true"> - <inkscape:grid - type="xygrid" - id="grid3123" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <defs - id="defs3" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:creator> - <dc:source /> - <cc:license - rdf:resource="" /> - <dc:title /> - <dc:subject> - <rdf:Bag /> - </dc:subject> - <dc:date /> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:identifier /> - <dc:relation /> - <dc:language /> - <dc:coverage /> - <dc:description /> - <dc:contributor> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:contributor> - </cc:Work> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - style="display:inline" - inkscape:groupmode="layer" - inkscape:label="Base" - id="layer1" - transform="translate(0,-296)"> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4270-9" - width="8" - height="2" - x="10" - y="298" /> - </g> -</svg> diff --git a/common/gnome-shell/3.14/common-assets/dash/running2.svg b/common/gnome-shell/3.14/common-assets/dash/running2.svg deleted file mode 100644 index 731f8e0..0000000 --- a/common/gnome-shell/3.14/common-assets/dash/running2.svg +++ /dev/null @@ -1,149 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - width="28" - height="4" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.91 r13725" - sodipodi:docname="running2.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - style="display:inline;enable-background:new"> - <sodipodi:namedview - stroke="#ef2929" - fill="#f57900" - id="base" - pagecolor="#ffffff" - bordercolor="#808080" - borderopacity="1" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="39.539055" - inkscape:cx="11.552125" - inkscape:cy="2.6434045" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="true" - inkscape:window-width="1600" - inkscape:window-height="851" - inkscape:window-x="0" - inkscape:window-y="24" - width="400px" - height="300px" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - gridtolerance="10000" - inkscape:object-nodes="true" - inkscape:snap-grids="true" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-maximized="1" - inkscape:bbox-nodes="true" - inkscape:bbox-paths="false" - inkscape:snap-bbox-edge-midpoints="false" - inkscape:snap-bbox-midpoints="false" - objecttolerance="10000" - guidetolerance="10000" - borderlayer="true" - showborder="true" - guidecolor="#ff0b00" - guideopacity="1" - guidehicolor="#001aff" - guidehiopacity="0.49803922" - inkscape:snap-smooth-nodes="false" - inkscape:snap-page="true"> - <inkscape:grid - type="xygrid" - id="grid3123" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <defs - id="defs3" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:creator> - <dc:source /> - <cc:license - rdf:resource="" /> - <dc:title /> - <dc:subject> - <rdf:Bag /> - </dc:subject> - <dc:date /> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:identifier /> - <dc:relation /> - <dc:language /> - <dc:coverage /> - <dc:description /> - <dc:contributor> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:contributor> - </cc:Work> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - style="display:inline" - inkscape:groupmode="layer" - inkscape:label="Base" - id="layer1" - transform="translate(0,-296)"> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4270-9" - width="4" - height="2" - x="9" - y="298" /> - <rect - y="298" - x="15" - height="2" - width="4" - id="rect4239" - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> - </g> -</svg> diff --git a/common/gnome-shell/3.14/common-assets/dash/running3.svg b/common/gnome-shell/3.14/common-assets/dash/running3.svg deleted file mode 100644 index ca85562..0000000 --- a/common/gnome-shell/3.14/common-assets/dash/running3.svg +++ /dev/null @@ -1,156 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - width="28" - height="4" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.91 r13725" - sodipodi:docname="running3.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - style="display:inline;enable-background:new"> - <sodipodi:namedview - stroke="#ef2929" - fill="#f57900" - id="base" - pagecolor="#ffffff" - bordercolor="#808080" - borderopacity="1" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:zoom="27.958333" - inkscape:cx="8.1058637" - inkscape:cy="5.6243161" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="true" - inkscape:window-width="1600" - inkscape:window-height="851" - inkscape:window-x="0" - inkscape:window-y="24" - width="400px" - height="300px" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - gridtolerance="10000" - inkscape:object-nodes="true" - inkscape:snap-grids="true" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-maximized="1" - inkscape:bbox-nodes="true" - inkscape:bbox-paths="false" - inkscape:snap-bbox-edge-midpoints="false" - inkscape:snap-bbox-midpoints="false" - objecttolerance="10000" - guidetolerance="10000" - borderlayer="true" - showborder="true" - guidecolor="#ff0b00" - guideopacity="1" - guidehicolor="#001aff" - guidehiopacity="0.49803922" - inkscape:snap-smooth-nodes="false" - inkscape:snap-page="true"> - <inkscape:grid - type="xygrid" - id="grid3123" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <defs - id="defs3" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:creator> - <dc:source /> - <cc:license - rdf:resource="" /> - <dc:title /> - <dc:subject> - <rdf:Bag /> - </dc:subject> - <dc:date /> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:identifier /> - <dc:relation /> - <dc:language /> - <dc:coverage /> - <dc:description /> - <dc:contributor> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:contributor> - </cc:Work> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - style="display:inline" - inkscape:groupmode="layer" - inkscape:label="Base" - id="layer1" - transform="translate(0,-296)"> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4270-9" - width="4" - height="2" - x="6" - y="298" /> - <rect - y="298" - x="12" - height="2" - width="4" - id="rect4239" - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4140" - width="4" - height="2" - x="18" - y="298" /> - </g> -</svg> diff --git a/common/gnome-shell/3.14/common-assets/dash/running4.svg b/common/gnome-shell/3.14/common-assets/dash/running4.svg deleted file mode 100644 index 7393122..0000000 --- a/common/gnome-shell/3.14/common-assets/dash/running4.svg +++ /dev/null @@ -1,163 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - width="28" - height="4" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.91 r13725" - sodipodi:docname="running4.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - style="display:inline;enable-background:new"> - <sodipodi:namedview - stroke="#ef2929" - fill="#f57900" - id="base" - pagecolor="#ffffff" - bordercolor="#808080" - borderopacity="1" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:zoom="19.769527" - inkscape:cx="7.1711103" - inkscape:cy="3.7516472" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="true" - inkscape:window-width="1600" - inkscape:window-height="851" - inkscape:window-x="0" - inkscape:window-y="24" - width="400px" - height="300px" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - gridtolerance="10000" - inkscape:object-nodes="true" - inkscape:snap-grids="true" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-maximized="1" - inkscape:bbox-nodes="true" - inkscape:bbox-paths="false" - inkscape:snap-bbox-edge-midpoints="false" - inkscape:snap-bbox-midpoints="false" - objecttolerance="10000" - guidetolerance="10000" - borderlayer="true" - showborder="true" - guidecolor="#ff0b00" - guideopacity="1" - guidehicolor="#001aff" - guidehiopacity="0.49803922" - inkscape:snap-smooth-nodes="false" - inkscape:snap-page="true"> - <inkscape:grid - type="xygrid" - id="grid3123" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <defs - id="defs3" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:creator> - <dc:source /> - <cc:license - rdf:resource="" /> - <dc:title /> - <dc:subject> - <rdf:Bag /> - </dc:subject> - <dc:date /> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:identifier /> - <dc:relation /> - <dc:language /> - <dc:coverage /> - <dc:description /> - <dc:contributor> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:contributor> - </cc:Work> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - style="display:inline" - inkscape:groupmode="layer" - inkscape:label="Base" - id="layer1" - transform="translate(0,-296)"> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4270-9" - width="4" - height="2" - x="3" - y="298" /> - <rect - y="298" - x="9" - height="2" - width="4" - id="rect4202" - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4208" - width="4" - height="2" - x="15" - y="298" /> - <rect - y="298" - x="21" - height="2" - width="4" - id="rect4214" - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> - </g> -</svg> diff --git a/common/gnome-shell/3.14/gnome-shell-dark.css b/common/gnome-shell/3.14/gnome-shell-dark.css index 08d4237..25ab240 100644 --- a/common/gnome-shell/3.14/gnome-shell-dark.css +++ b/common/gnome-shell/3.14/gnome-shell-dark.css @@ -184,12 +184,14 @@ StScrollBar { .slider { -slider-height: 4px; - -slider-background-color: #2b2e39; - -slider-border-color: transparent; - -slider-active-background-color: #5294E2; - -slider-active-border-color: transparent; + -slider-background-color: #2b2e39 !important; + -slider-border-color: transparent !important; + -slider-active-background-color: #5294E2 !important; + -slider-active-border-color: transparent !important; -slider-border-width: 0; -slider-handle-radius: 4px; + -slider-handle-border-color: transparent !important; + -slider-handle-border-width: 0 !important; height: 18px; border: 0 solid transparent; border-right-width: 1px; @@ -451,7 +453,8 @@ StScrollBar { background-gradient-direction: none !important; border-image: url("dark-assets/menu/submenu.svg") 9 9 9 9; } .popup-menu .popup-submenu-menu-item:open { - background: none; + color: #D3DAE3 !important; + background: none !important; box-shadow: none; border-image: url("dark-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-content { @@ -463,16 +466,18 @@ StScrollBar { .popup-menu .popup-menu-item:rtl { padding: 0.4em 0em 0.4em 3em; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #D3DAE3; + color: #D3DAE3 !important; background-color: transparent; border-image: url("dark-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { - color: rgba(211, 218, 227, 0.5); + color: rgba(211, 218, 227, 0.5) !important; background: none; } .popup-menu .popup-inactive-menu-item { color: #D3DAE3; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(211, 218, 227, 0.45); } + .popup-menu .popup-status-menu-item, .popup-menu .popup-subtitle-menu-item { + color: #D3DAE3 !important; } .popup-menu.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; } @@ -483,12 +488,13 @@ StScrollBar { width: 16px; } .popup-menu-boxpointer { - -arrow-border-radius: 2px; - -arrow-background-color: transparent; - -arrow-border-width: 1px; - -arrow-border-color: transparent; - -arrow-base: 0; - -arrow-rise: 0; } + -arrow-border-radius: 2px !important; + -arrow-background-color: transparent !important; + -arrow-border-width: 1px !important; + -arrow-border-color: transparent !important; + -arrow-base: 0 !important; + -arrow-rise: 0 !important; + color: #D3DAE3 !important; } .candidate-popup-boxpointer { -arrow-border-radius: 2px; @@ -631,7 +637,10 @@ StScrollBar { font-weight: bold; height: 2.1em; min-height: 27px; - border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } + background-color: transparent !important; + background-gradient-direction: none !important; + border-bottom: 0px !important; + border-image: url("common-assets/panel/panel.svg") 1 1 1 1 !important; } #panel.dynamic-top-bar-white-btn { border-image: none; } #panel.unlock-screen, @@ -655,10 +664,10 @@ StScrollBar { -panel-corner-background-color: transparent; -panel-corner-border-color: transparent; } #panel .panel-button { - -natural-hpadding: 10px; - -minimum-hpadding: 6px; + -natural-hpadding: 10px !important; + -minimum-hpadding: 6px !important; font-weight: bold; - color: #ffffff; + color: #ffffff !important; transition-duration: 100ms; border-bottom-width: 1px; border-color: transparent; } @@ -668,17 +677,17 @@ StScrollBar { margin-left: 0px; margin-right: 0px; } #panel .panel-button:hover { - color: #ffffff; + color: #ffffff !important; background-color: rgba(0, 0, 0, 0.17); border-bottom-width: 1px; border-color: transparent; text-shadow: 0 0 transparent; } #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked { - color: #ffffff; + color: #ffffff !important; background: #5294E2, url("common-assets/misc/null.svg"); border-image: none; box-shadow: none; - border-bottom-width: 1px; + border-bottom-width: 1px !important; border-color: black; text-shadow: 0 0 transparent; } #panel .panel-button:active > .system-status-icon, #panel .panel-button:overview > .system-status-icon, #panel .panel-button:focus > .system-status-icon, #panel .panel-button:checked > .system-status-icon { @@ -741,29 +750,30 @@ StScrollBar { spacing: 4px; padding: 0 8px; } #appMenu .label-shadow { - color: transparent; } + color: transparent !important; } .aggregate-menu { width: 360px; } .aggregate-menu .popup-menu-icon { - padding: 0 4px; } + padding: 0 4px; + color: #D3DAE3 !important; } .system-menu-action { padding: 13px; - color: #D3DAE3; + color: #D3DAE3 !important; border-radius: 32px; /* wish we could do 50% */ - border: 1px solid transparent; } + border: 1px solid transparent !important; } .system-menu-action:hover, .system-menu-action:focus { transition-duration: 100ms; padding: 13px; - color: #D3DAE3; - background-color: transparent; - border: 1px solid #5294E2; } + color: #D3DAE3 !important; + background-color: transparent !important; + border: 1px solid #5294E2 !important; } .system-menu-action:active { - color: #ffffff; - background-color: #5294E2; - border: 1px solid #5294E2; } + color: #ffffff !important; + background-color: #5294E2 !important; + border: 1px solid #5294E2 !important; } .system-menu-action > StIcon { icon-size: 16px; } @@ -776,7 +786,7 @@ StScrollBar { padding: 0.4em 1.75em 0.8em 2.5em; } .calendar-month-label { - color: #D3DAE3; + color: #D3DAE3 !important; font-weight: bold; padding: 8px 0; } @@ -824,7 +834,7 @@ StScrollBar { padding: 0.4em 1.7em; font-weight: bold; text-align: center; - color: #D3DAE3; + color: #D3DAE3 !important; border-radius: 4px; } .calendar-day-base { @@ -834,12 +844,14 @@ StScrollBar { height: 25px; padding: 0.1em; margin: 2px; - border-radius: 12.5px; } + border-radius: 12.5px; + color: #D3DAE3 !important; } .calendar-day-base:hover, .calendar-day-base:focus { - background-color: rgba(0, 0, 0, 0.1); } + background-color: rgba(0, 0, 0, 0.1) !important; + color: #D3DAE3 !important; } .calendar-day-base:active { - color: #D3DAE3; - background-color: rgba(0, 0, 0, 0.15); + color: #D3DAE3 !important; + background-color: rgba(0, 0, 0, 0.15) !important; border-width: 0; } .calendar-day-base.calendar-day-heading { color: rgba(211, 218, 227, 0.85); @@ -862,7 +874,7 @@ StScrollBar { .calendar-nonwork-day { background-color: transparent; - color: #D3DAE3; + color: #D3DAE3 !important; font-weight: bold; } .calendar-today, @@ -870,8 +882,8 @@ StScrollBar { .calendar-today:focus, .calendar-today:hover { font-weight: bold; - color: #ffffff; - background: #5294E2, url("common-assets/misc/null.svg"); + color: #ffffff !important; + background: #5294E2, url("common-assets/misc/null.svg") !important; border-width: 0; } .calendar-day-with-events { @@ -896,7 +908,7 @@ StScrollBar { .events-day-header { font-weight: bold; - color: rgba(211, 218, 227, 0.8); + color: rgba(211, 218, 227, 0.8) !important; padding-left: 0.4em; padding-top: 1.2em; } .events-day-header:first-child { @@ -906,14 +918,14 @@ StScrollBar { padding-right: 0.4em; } .events-day-dayname { - color: rgba(211, 218, 227, 0.5); + color: rgba(211, 218, 227, 0.5) !important; text-align: left; min-width: 20px; } .events-day-dayname:rtl { text-align: right; } .events-day-time { - color: rgba(211, 218, 227, 0.4); + color: rgba(211, 218, 227, 0.4) !important; text-align: right; } .events-day-time:rtl { text-align: left; } diff --git a/common/gnome-shell/3.14/gnome-shell.css b/common/gnome-shell/3.14/gnome-shell.css index 4a05834..d79eac5 100644 --- a/common/gnome-shell/3.14/gnome-shell.css +++ b/common/gnome-shell/3.14/gnome-shell.css @@ -184,12 +184,14 @@ StScrollBar { .slider { -slider-height: 4px; - -slider-background-color: #cfd6e6; - -slider-border-color: transparent; - -slider-active-background-color: #5294E2; - -slider-active-border-color: transparent; + -slider-background-color: #cfd6e6 !important; + -slider-border-color: transparent !important; + -slider-active-background-color: #5294E2 !important; + -slider-active-border-color: transparent !important; -slider-border-width: 0; -slider-handle-radius: 4px; + -slider-handle-border-color: transparent !important; + -slider-handle-border-width: 0 !important; height: 18px; border: 0 solid transparent; border-right-width: 1px; @@ -451,7 +453,8 @@ StScrollBar { background-gradient-direction: none !important; border-image: url("light-assets/menu/submenu.svg") 9 9 9 9; } .popup-menu .popup-submenu-menu-item:open { - background: none; + color: #5c616c !important; + background: none !important; box-shadow: none; border-image: url("light-assets/menu/submenu-open.svg") 9 9 9 9; } .popup-menu .popup-menu-content { @@ -463,16 +466,18 @@ StScrollBar { .popup-menu .popup-menu-item:rtl { padding: 0.4em 0em 0.4em 3em; } .popup-menu .popup-menu-item:active, .popup-menu .popup-menu-item.selected { - color: #5c616c; + color: #5c616c !important; background-color: transparent; border-image: url("light-assets/menu/menu-hover.svg") 9 9 1 1; } .popup-menu .popup-menu-item:insensitive { - color: rgba(92, 97, 108, 0.5); + color: rgba(92, 97, 108, 0.5) !important; background: none; } .popup-menu .popup-inactive-menu-item { color: #5c616c; } .popup-menu .popup-inactive-menu-item:insensitive { color: rgba(92, 97, 108, 0.55); } + .popup-menu .popup-status-menu-item, .popup-menu .popup-subtitle-menu-item { + color: #5c616c !important; } .popup-menu.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; } @@ -483,12 +488,13 @@ StScrollBar { width: 16px; } .popup-menu-boxpointer { - -arrow-border-radius: 2px; - -arrow-background-color: transparent; - -arrow-border-width: 1px; - -arrow-border-color: transparent; - -arrow-base: 0; - -arrow-rise: 0; } + -arrow-border-radius: 2px !important; + -arrow-background-color: transparent !important; + -arrow-border-width: 1px !important; + -arrow-border-color: transparent !important; + -arrow-base: 0 !important; + -arrow-rise: 0 !important; + color: #5c616c !important; } .candidate-popup-boxpointer { -arrow-border-radius: 2px; @@ -631,7 +637,10 @@ StScrollBar { font-weight: bold; height: 2.1em; min-height: 27px; - border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } + background-color: transparent !important; + background-gradient-direction: none !important; + border-bottom: 0px !important; + border-image: url("common-assets/panel/panel.svg") 1 1 1 1 !important; } #panel.dynamic-top-bar-white-btn { border-image: none; } #panel.unlock-screen, @@ -655,10 +664,10 @@ StScrollBar { -panel-corner-background-color: transparent; -panel-corner-border-color: transparent; } #panel .panel-button { - -natural-hpadding: 10px; - -minimum-hpadding: 6px; + -natural-hpadding: 10px !important; + -minimum-hpadding: 6px !important; font-weight: bold; - color: #ffffff; + color: #ffffff !important; transition-duration: 100ms; border-bottom-width: 1px; border-color: transparent; } @@ -668,17 +677,17 @@ StScrollBar { margin-left: 0px; margin-right: 0px; } #panel .panel-button:hover { - color: #ffffff; + color: #ffffff !important; background-color: rgba(0, 0, 0, 0.17); border-bottom-width: 1px; border-color: transparent; text-shadow: 0 0 transparent; } #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked { - color: #ffffff; + color: #ffffff !important; background: #5294E2, url("common-assets/misc/null.svg"); border-image: none; box-shadow: none; - border-bottom-width: 1px; + border-bottom-width: 1px !important; border-color: black; text-shadow: 0 0 transparent; } #panel .panel-button:active > .system-status-icon, #panel .panel-button:overview > .system-status-icon, #panel .panel-button:focus > .system-status-icon, #panel .panel-button:checked > .system-status-icon { @@ -741,29 +750,30 @@ StScrollBar { spacing: 4px; padding: 0 8px; } #appMenu .label-shadow { - color: transparent; } + color: transparent !important; } .aggregate-menu { width: 360px; } .aggregate-menu .popup-menu-icon { - padding: 0 4px; } + padding: 0 4px; + color: #5c616c !important; } .system-menu-action { padding: 13px; - color: #5c616c; + color: #5c616c !important; border-radius: 32px; /* wish we could do 50% */ - border: 1px solid transparent; } + border: 1px solid transparent !important; } .system-menu-action:hover, .system-menu-action:focus { transition-duration: 100ms; padding: 13px; - color: #5c616c; - background-color: transparent; - border: 1px solid #5294E2; } + color: #5c616c !important; + background-color: transparent !important; + border: 1px solid #5294E2 !important; } .system-menu-action:active { - color: #ffffff; - background-color: #5294E2; - border: 1px solid #5294E2; } + color: #ffffff !important; + background-color: #5294E2 !important; + border: 1px solid #5294E2 !important; } .system-menu-action > StIcon { icon-size: 16px; } @@ -776,7 +786,7 @@ StScrollBar { padding: 0.4em 1.75em 0.8em 2.5em; } .calendar-month-label { - color: #5c616c; + color: #5c616c !important; font-weight: bold; padding: 8px 0; } @@ -824,7 +834,7 @@ StScrollBar { padding: 0.4em 1.7em; font-weight: bold; text-align: center; - color: #5c616c; + color: #5c616c !important; border-radius: 4px; } .calendar-day-base { @@ -834,12 +844,14 @@ StScrollBar { height: 25px; padding: 0.1em; margin: 2px; - border-radius: 12.5px; } + border-radius: 12.5px; + color: #5c616c !important; } .calendar-day-base:hover, .calendar-day-base:focus { - background-color: rgba(0, 0, 0, 0.1); } + background-color: rgba(0, 0, 0, 0.1) !important; + color: #5c616c !important; } .calendar-day-base:active { - color: #5c616c; - background-color: rgba(0, 0, 0, 0.15); + color: #5c616c !important; + background-color: rgba(0, 0, 0, 0.15) !important; border-width: 0; } .calendar-day-base.calendar-day-heading { color: rgba(92, 97, 108, 0.85); @@ -862,7 +874,7 @@ StScrollBar { .calendar-nonwork-day { background-color: transparent; - color: #5c616c; + color: #5c616c !important; font-weight: bold; } .calendar-today, @@ -870,8 +882,8 @@ StScrollBar { .calendar-today:focus, .calendar-today:hover { font-weight: bold; - color: #ffffff; - background: #5294E2, url("common-assets/misc/null.svg"); + color: #ffffff !important; + background: #5294E2, url("common-assets/misc/null.svg") !important; border-width: 0; } .calendar-day-with-events { @@ -896,7 +908,7 @@ StScrollBar { .events-day-header { font-weight: bold; - color: rgba(92, 97, 108, 0.8); + color: rgba(92, 97, 108, 0.8) !important; padding-left: 0.4em; padding-top: 1.2em; } .events-day-header:first-child { @@ -906,14 +918,14 @@ StScrollBar { padding-right: 0.4em; } .events-day-dayname { - color: rgba(92, 97, 108, 0.5); + color: rgba(92, 97, 108, 0.5) !important; text-align: left; min-width: 20px; } .events-day-dayname:rtl { text-align: right; } .events-day-time { - color: rgba(92, 97, 108, 0.4); + color: rgba(92, 97, 108, 0.4) !important; text-align: right; } .events-day-time:rtl { text-align: left; } diff --git a/common/gnome-shell/3.14/sass/_common.scss b/common/gnome-shell/3.14/sass/_common.scss index 0c7baf3..14556b6 100644 --- a/common/gnome-shell/3.14/sass/_common.scss +++ b/common/gnome-shell/3.14/sass/_common.scss @@ -164,12 +164,14 @@ StScrollBar { // .slider { -slider-height: 4px; - -slider-background-color: $button_border; //background of the trough - -slider-border-color: transparentize(black, 1); //trough border color - -slider-active-background-color: $selected_bg_color; //active trough fill - -slider-active-border-color: transparentize(black, 1); //active trough border + -slider-background-color: $button_border !important; //background of the trough + -slider-border-color: transparentize(black, 1) !important; //trough border color + -slider-active-background-color: $selected_bg_color !important; //active trough fill + -slider-active-border-color: transparentize(black, 1) !important; //active trough border -slider-border-width: 0; -slider-handle-radius: 4px; + -slider-handle-border-color: transparent !important; + -slider-handle-border-width: 0 !important; height: 18px; border: 0 solid transparent; border-right-width: 1px; @@ -551,7 +553,8 @@ StScrollBar { } .popup-submenu-menu-item:open { - background: none; + color: $fg_color !important; + background: none !important; box-shadow: none; border-image: url("#{$asset_path}/menu/submenu-open.svg") 9 9 9 9; } @@ -564,13 +567,13 @@ StScrollBar { &:rtl { padding: .4em 0em .4em 3em; } &:active, &.selected { - color: $fg_color; + color: $fg_color !important; background-color: transparent; border-image: url("#{$asset_path}/menu/menu-hover.svg") 9 9 1 1; } &:insensitive { - color: transparentize($fg_color, 0.5); + color: transparentize($fg_color, 0.5) !important; background: none; } } @@ -580,7 +583,7 @@ StScrollBar { &:insensitive { color: $insensitive_fg_color; } } - //.popup-status-menu-item { font-weight: normal; color: pink; } //dunno what that is + .popup-status-menu-item, .popup-subtitle-menu-item { color: $fg_color !important; } &.panel-menu { -boxpointer-gap: 0px; margin-bottom: 1.75em; @@ -594,12 +597,13 @@ StScrollBar { } .popup-menu-boxpointer { - -arrow-border-radius: 2px; - -arrow-background-color: rgba(0,0,0,0.0); - -arrow-border-width: 1px; - -arrow-border-color: rgba(0,0,0,0.0); - -arrow-base: 0; - -arrow-rise: 0; + -arrow-border-radius: 2px !important; + -arrow-background-color: rgba(0,0,0,0.0) !important; + -arrow-border-width: 1px !important; + -arrow-border-color: rgba(0,0,0,0.0) !important; + -arrow-base: 0 !important; + -arrow-rise: 0 !important; + color: $fg_color !important; } .candidate-popup-boxpointer { @@ -804,7 +808,10 @@ StScrollBar { font-weight: bold; height: 2.1em; min-height: 27px; - border-image: url('common-assets/panel/panel.svg') 1 1 1 1; + background-color: transparent !important; + background-gradient-direction: none !important; + border-bottom: 0px !important; + border-image: url('common-assets/panel/panel.svg') 1 1 1 1 !important; // Fix dynamic top bar extension &.dynamic-top-bar-white-btn { border-image: none; } @@ -840,10 +847,10 @@ StScrollBar { } .panel-button { - -natural-hpadding: 10px; - -minimum-hpadding: 6px; + -natural-hpadding: 10px !important; + -minimum-hpadding: 6px !important; font-weight: bold; - color: $selected_fg_color; + color: $selected_fg_color !important; transition-duration: 100ms; border-bottom-width: 1px; border-color: transparent; @@ -856,7 +863,7 @@ StScrollBar { } &:hover { - color: $selected_fg_color; + color: $selected_fg_color !important; background-color: transparentize(black, 0.83); border-bottom-width: 1px; border-color: transparent; @@ -864,11 +871,11 @@ StScrollBar { } &:active, &:overview, &:focus, &:checked { - color: $selected_fg_color; + color: $selected_fg_color !important; background:$selected_bg_color, url("common-assets/misc/null.svg"); border-image: none; box-shadow: none; - border-bottom-width: 1px; + border-bottom-width: 1px !important; border-color: black; text-shadow: 0 0 rgba(0,0,0,0); @@ -940,31 +947,34 @@ StScrollBar { spacing: 4px; padding: 0 8px; - .label-shadow { color: transparent; } + .label-shadow { color: transparent !important; } } .aggregate-menu { width: 360px; - .popup-menu-icon { padding: 0 4px; } + .popup-menu-icon { + padding: 0 4px; + color: $fg_color !important; + } } .system-menu-action { padding: 13px; - color: $fg_color; + color: $fg_color !important; border-radius: 32px; /* wish we could do 50% */ - border: 1px solid transparent; + border: 1px solid transparent !important; &:hover, &:focus { transition-duration: 100ms; padding: 13px; - color: $fg_color; - background-color: transparent; - border: 1px solid $selected_bg_color; + color: $fg_color !important; + background-color: transparent !important; + border: 1px solid $selected_bg_color !important; } &:active { - color: $selected_fg_color; - background-color: $selected_bg_color; - border: 1px solid $selected_bg_color; + color: $selected_fg_color !important; + background-color: $selected_bg_color !important; + border: 1px solid $selected_bg_color !important; } & > StIcon { icon-size: 16px; } @@ -984,7 +994,7 @@ StScrollBar { } .calendar-month-label { - color: $fg_color; + color: $fg_color !important; font-weight: bold; padding: 8px 0; &:focus {} @@ -1044,7 +1054,7 @@ StScrollBar { padding: .4em 1.7em; font-weight: bold; text-align: center; - color: $fg_color; + color: $fg_color !important; border-radius: 4px; &:hover, &:focus {} @@ -1058,12 +1068,16 @@ StScrollBar { padding: 0.1em; margin: 2px; border-radius: 12.5px; + color: $fg_color !important; - &:hover, &:focus { background-color: transparentize(black, 0.9); } + &:hover, &:focus { + background-color: transparentize(black, 0.9) !important; + color: $fg_color !important; + } &:active { - color: $fg_color; - background-color: transparentize(black, 0.85); + color: $fg_color !important; + background-color: transparentize(black, 0.85) !important; border-width: 0; //avoid jumparound due to today } @@ -1092,7 +1106,7 @@ StScrollBar { .calendar-nonwork-day { background-color: transparent; - color: $fg_color; + color: $fg_color !important; font-weight: bold; } @@ -1101,8 +1115,8 @@ StScrollBar { .calendar-today:focus, .calendar-today:hover { font-weight: bold; - color: $selected_fg_color; - background: $selected_bg_color, url("common-assets/misc/null.svg"); + color: $selected_fg_color !important; + background: $selected_bg_color, url("common-assets/misc/null.svg") !important; border-width: 0; } @@ -1129,7 +1143,7 @@ StScrollBar { .events-day-header { font-weight: bold; - color: transparentize($fg_color, 0.2); + color: transparentize($fg_color, 0.2) !important; padding-left: 0.4em; padding-top: 1.2em; @@ -1141,7 +1155,7 @@ StScrollBar { } .events-day-dayname { - color: transparentize($fg_color, 0.5); + color: transparentize($fg_color, 0.5) !important; text-align: left; min-width: 20px; @@ -1149,7 +1163,7 @@ StScrollBar { } .events-day-time { - color: transparentize($fg_color, 0.6); + color: transparentize($fg_color, 0.6) !important; text-align: right; &:rtl { text-align: left; } diff --git a/common/gnome-shell/3.16/common-assets/dash/running1.svg b/common/gnome-shell/3.16/common-assets/dash/running1.svg deleted file mode 100644 index 322dc8d..0000000 --- a/common/gnome-shell/3.16/common-assets/dash/running1.svg +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - width="28" - height="4" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.91 r13725" - sodipodi:docname="running1.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - style="display:inline;enable-background:new"> - <sodipodi:namedview - stroke="#ef2929" - fill="#f57900" - id="base" - pagecolor="#ffffff" - bordercolor="#808080" - borderopacity="1" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="13.979167" - inkscape:cx="8.9568436" - inkscape:cy="-0.4854291" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="true" - inkscape:window-width="1600" - inkscape:window-height="851" - inkscape:window-x="0" - inkscape:window-y="24" - width="400px" - height="300px" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - gridtolerance="10000" - inkscape:object-nodes="true" - inkscape:snap-grids="true" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-maximized="1" - inkscape:bbox-nodes="true" - inkscape:bbox-paths="false" - inkscape:snap-bbox-edge-midpoints="false" - inkscape:snap-bbox-midpoints="false" - objecttolerance="10000" - guidetolerance="10000" - borderlayer="true" - showborder="true" - guidecolor="#ff0b00" - guideopacity="1" - guidehicolor="#001aff" - guidehiopacity="0.49803922" - inkscape:snap-smooth-nodes="false" - inkscape:snap-page="true"> - <inkscape:grid - type="xygrid" - id="grid3123" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <defs - id="defs3" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:creator> - <dc:source /> - <cc:license - rdf:resource="" /> - <dc:title /> - <dc:subject> - <rdf:Bag /> - </dc:subject> - <dc:date /> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:identifier /> - <dc:relation /> - <dc:language /> - <dc:coverage /> - <dc:description /> - <dc:contributor> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:contributor> - </cc:Work> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - style="display:inline" - inkscape:groupmode="layer" - inkscape:label="Base" - id="layer1" - transform="translate(0,-296)"> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4270-9" - width="8" - height="2" - x="10" - y="298" /> - </g> -</svg> diff --git a/common/gnome-shell/3.16/common-assets/dash/running2.svg b/common/gnome-shell/3.16/common-assets/dash/running2.svg deleted file mode 100644 index 731f8e0..0000000 --- a/common/gnome-shell/3.16/common-assets/dash/running2.svg +++ /dev/null @@ -1,149 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - width="28" - height="4" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.91 r13725" - sodipodi:docname="running2.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - style="display:inline;enable-background:new"> - <sodipodi:namedview - stroke="#ef2929" - fill="#f57900" - id="base" - pagecolor="#ffffff" - bordercolor="#808080" - borderopacity="1" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="39.539055" - inkscape:cx="11.552125" - inkscape:cy="2.6434045" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="true" - inkscape:window-width="1600" - inkscape:window-height="851" - inkscape:window-x="0" - inkscape:window-y="24" - width="400px" - height="300px" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - gridtolerance="10000" - inkscape:object-nodes="true" - inkscape:snap-grids="true" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-maximized="1" - inkscape:bbox-nodes="true" - inkscape:bbox-paths="false" - inkscape:snap-bbox-edge-midpoints="false" - inkscape:snap-bbox-midpoints="false" - objecttolerance="10000" - guidetolerance="10000" - borderlayer="true" - showborder="true" - guidecolor="#ff0b00" - guideopacity="1" - guidehicolor="#001aff" - guidehiopacity="0.49803922" - inkscape:snap-smooth-nodes="false" - inkscape:snap-page="true"> - <inkscape:grid - type="xygrid" - id="grid3123" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <defs - id="defs3" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:creator> - <dc:source /> - <cc:license - rdf:resource="" /> - <dc:title /> - <dc:subject> - <rdf:Bag /> - </dc:subject> - <dc:date /> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:identifier /> - <dc:relation /> - <dc:language /> - <dc:coverage /> - <dc:description /> - <dc:contributor> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:contributor> - </cc:Work> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - style="display:inline" - inkscape:groupmode="layer" - inkscape:label="Base" - id="layer1" - transform="translate(0,-296)"> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4270-9" - width="4" - height="2" - x="9" - y="298" /> - <rect - y="298" - x="15" - height="2" - width="4" - id="rect4239" - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> - </g> -</svg> diff --git a/common/gnome-shell/3.16/common-assets/dash/running3.svg b/common/gnome-shell/3.16/common-assets/dash/running3.svg deleted file mode 100644 index ca85562..0000000 --- a/common/gnome-shell/3.16/common-assets/dash/running3.svg +++ /dev/null @@ -1,156 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - width="28" - height="4" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.91 r13725" - sodipodi:docname="running3.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - style="display:inline;enable-background:new"> - <sodipodi:namedview - stroke="#ef2929" - fill="#f57900" - id="base" - pagecolor="#ffffff" - bordercolor="#808080" - borderopacity="1" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:zoom="27.958333" - inkscape:cx="8.1058637" - inkscape:cy="5.6243161" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="true" - inkscape:window-width="1600" - inkscape:window-height="851" - inkscape:window-x="0" - inkscape:window-y="24" - width="400px" - height="300px" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - gridtolerance="10000" - inkscape:object-nodes="true" - inkscape:snap-grids="true" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-maximized="1" - inkscape:bbox-nodes="true" - inkscape:bbox-paths="false" - inkscape:snap-bbox-edge-midpoints="false" - inkscape:snap-bbox-midpoints="false" - objecttolerance="10000" - guidetolerance="10000" - borderlayer="true" - showborder="true" - guidecolor="#ff0b00" - guideopacity="1" - guidehicolor="#001aff" - guidehiopacity="0.49803922" - inkscape:snap-smooth-nodes="false" - inkscape:snap-page="true"> - <inkscape:grid - type="xygrid" - id="grid3123" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <defs - id="defs3" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:creator> - <dc:source /> - <cc:license - rdf:resource="" /> - <dc:title /> - <dc:subject> - <rdf:Bag /> - </dc:subject> - <dc:date /> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:identifier /> - <dc:relation /> - <dc:language /> - <dc:coverage /> - <dc:description /> - <dc:contributor> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:contributor> - </cc:Work> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - style="display:inline" - inkscape:groupmode="layer" - inkscape:label="Base" - id="layer1" - transform="translate(0,-296)"> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4270-9" - width="4" - height="2" - x="6" - y="298" /> - <rect - y="298" - x="12" - height="2" - width="4" - id="rect4239" - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4140" - width="4" - height="2" - x="18" - y="298" /> - </g> -</svg> diff --git a/common/gnome-shell/3.16/common-assets/dash/running4.svg b/common/gnome-shell/3.16/common-assets/dash/running4.svg deleted file mode 100644 index 7393122..0000000 --- a/common/gnome-shell/3.16/common-assets/dash/running4.svg +++ /dev/null @@ -1,163 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - width="28" - height="4" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.91 r13725" - sodipodi:docname="running4.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - style="display:inline;enable-background:new"> - <sodipodi:namedview - stroke="#ef2929" - fill="#f57900" - id="base" - pagecolor="#ffffff" - bordercolor="#808080" - borderopacity="1" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:zoom="19.769527" - inkscape:cx="7.1711103" - inkscape:cy="3.7516472" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="true" - inkscape:window-width="1600" - inkscape:window-height="851" - inkscape:window-x="0" - inkscape:window-y="24" - width="400px" - height="300px" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - gridtolerance="10000" - inkscape:object-nodes="true" - inkscape:snap-grids="true" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-maximized="1" - inkscape:bbox-nodes="true" - inkscape:bbox-paths="false" - inkscape:snap-bbox-edge-midpoints="false" - inkscape:snap-bbox-midpoints="false" - objecttolerance="10000" - guidetolerance="10000" - borderlayer="true" - showborder="true" - guidecolor="#ff0b00" - guideopacity="1" - guidehicolor="#001aff" - guidehiopacity="0.49803922" - inkscape:snap-smooth-nodes="false" - inkscape:snap-page="true"> - <inkscape:grid - type="xygrid" - id="grid3123" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <defs - id="defs3" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:creator> - <dc:source /> - <cc:license - rdf:resource="" /> - <dc:title /> - <dc:subject> - <rdf:Bag /> - </dc:subject> - <dc:date /> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:identifier /> - <dc:relation /> - <dc:language /> - <dc:coverage /> - <dc:description /> - <dc:contributor> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:contributor> - </cc:Work> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - style="display:inline" - inkscape:groupmode="layer" - inkscape:label="Base" - id="layer1" - transform="translate(0,-296)"> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4270-9" - width="4" - height="2" - x="3" - y="298" /> - <rect - y="298" - x="9" - height="2" - width="4" - id="rect4202" - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4208" - width="4" - height="2" - x="15" - y="298" /> - <rect - y="298" - x="21" - height="2" - width="4" - id="rect4214" - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> - </g> -</svg> diff --git a/common/gnome-shell/3.16/gnome-shell-dark.css b/common/gnome-shell/3.16/gnome-shell-dark.css index e85a580..e466afa 100644 --- a/common/gnome-shell/3.16/gnome-shell-dark.css +++ b/common/gnome-shell/3.16/gnome-shell-dark.css @@ -594,6 +594,9 @@ StScrollBar { font-weight: bold; height: 2.1em; min-height: 27px; + background-gradient-direction: none; + background-color: transparent; + border-bottom-width: 0; border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } #panel.dynamic-top-bar-white-btn { border-image: none; } @@ -1188,23 +1191,6 @@ StScrollBar { margin-bottom: 6px; background-color: #5294E2; } -#dashtodockContainer .app-well-app-running-dot { - background: none; - width: 28px; - height: 4px; } - -#dashtodockContainer .running1 .app-well-app-running-dot { - background-image: url("common-assets/dash/running1.svg"); } - -#dashtodockContainer .running2 .app-well-app-running-dot { - background-image: url("common-assets/dash/running2.svg"); } - -#dashtodockContainer .running3 .app-well-app-running-dot { - background-image: url("common-assets/dash/running3.svg"); } - -#dashtodockContainer .running4 .app-well-app-running-dot { - background-image: url("common-assets/dash/running4.svg"); } - .show-apps .overview-icon { padding: 11px; background-color: rgba(0, 0, 0, 0.5); diff --git a/common/gnome-shell/3.16/gnome-shell.css b/common/gnome-shell/3.16/gnome-shell.css index 7c174b3..848c521 100644 --- a/common/gnome-shell/3.16/gnome-shell.css +++ b/common/gnome-shell/3.16/gnome-shell.css @@ -594,6 +594,9 @@ StScrollBar { font-weight: bold; height: 2.1em; min-height: 27px; + background-gradient-direction: none; + background-color: transparent; + border-bottom-width: 0; border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } #panel.dynamic-top-bar-white-btn { border-image: none; } @@ -1188,23 +1191,6 @@ StScrollBar { margin-bottom: 6px; background-color: #5294E2; } -#dashtodockContainer .app-well-app-running-dot { - background: none; - width: 28px; - height: 4px; } - -#dashtodockContainer .running1 .app-well-app-running-dot { - background-image: url("common-assets/dash/running1.svg"); } - -#dashtodockContainer .running2 .app-well-app-running-dot { - background-image: url("common-assets/dash/running2.svg"); } - -#dashtodockContainer .running3 .app-well-app-running-dot { - background-image: url("common-assets/dash/running3.svg"); } - -#dashtodockContainer .running4 .app-well-app-running-dot { - background-image: url("common-assets/dash/running4.svg"); } - .show-apps .overview-icon { padding: 11px; background-color: rgba(0, 0, 0, 0.5); diff --git a/common/gnome-shell/3.16/sass/_common.scss b/common/gnome-shell/3.16/sass/_common.scss index 7815964..492dcfe 100644 --- a/common/gnome-shell/3.16/sass/_common.scss +++ b/common/gnome-shell/3.16/sass/_common.scss @@ -771,6 +771,9 @@ StScrollBar { font-weight: bold; height: 2.1em; min-height: 27px; + background-gradient-direction: none; + background-color: transparent; + border-bottom-width: 0; border-image: url('common-assets/panel/panel.svg') 1 1 1 1; // Fix dynamic top bar extension @@ -1496,20 +1499,6 @@ StScrollBar { } } -#dashtodockContainer { - .app-well-app-running-dot { - background: none; - width: 28px; - height: 4px; - } - - @each $var in 1, 2, 3, 4 { - .running#{$var} .app-well-app-running-dot { - background-image: url("common-assets/dash/running#{$var}.svg"); - } - } -} - .show-apps { .overview-icon { diff --git a/common/gnome-shell/3.18/common-assets/dash/running1.svg b/common/gnome-shell/3.18/common-assets/dash/running1.svg deleted file mode 100644 index 322dc8d..0000000 --- a/common/gnome-shell/3.18/common-assets/dash/running1.svg +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - width="28" - height="4" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.91 r13725" - sodipodi:docname="running1.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - style="display:inline;enable-background:new"> - <sodipodi:namedview - stroke="#ef2929" - fill="#f57900" - id="base" - pagecolor="#ffffff" - bordercolor="#808080" - borderopacity="1" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="13.979167" - inkscape:cx="8.9568436" - inkscape:cy="-0.4854291" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="true" - inkscape:window-width="1600" - inkscape:window-height="851" - inkscape:window-x="0" - inkscape:window-y="24" - width="400px" - height="300px" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - gridtolerance="10000" - inkscape:object-nodes="true" - inkscape:snap-grids="true" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-maximized="1" - inkscape:bbox-nodes="true" - inkscape:bbox-paths="false" - inkscape:snap-bbox-edge-midpoints="false" - inkscape:snap-bbox-midpoints="false" - objecttolerance="10000" - guidetolerance="10000" - borderlayer="true" - showborder="true" - guidecolor="#ff0b00" - guideopacity="1" - guidehicolor="#001aff" - guidehiopacity="0.49803922" - inkscape:snap-smooth-nodes="false" - inkscape:snap-page="true"> - <inkscape:grid - type="xygrid" - id="grid3123" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <defs - id="defs3" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:creator> - <dc:source /> - <cc:license - rdf:resource="" /> - <dc:title /> - <dc:subject> - <rdf:Bag /> - </dc:subject> - <dc:date /> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:identifier /> - <dc:relation /> - <dc:language /> - <dc:coverage /> - <dc:description /> - <dc:contributor> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:contributor> - </cc:Work> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - style="display:inline" - inkscape:groupmode="layer" - inkscape:label="Base" - id="layer1" - transform="translate(0,-296)"> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4270-9" - width="8" - height="2" - x="10" - y="298" /> - </g> -</svg> diff --git a/common/gnome-shell/3.18/common-assets/dash/running2.svg b/common/gnome-shell/3.18/common-assets/dash/running2.svg deleted file mode 100644 index 731f8e0..0000000 --- a/common/gnome-shell/3.18/common-assets/dash/running2.svg +++ /dev/null @@ -1,149 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - width="28" - height="4" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.91 r13725" - sodipodi:docname="running2.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - style="display:inline;enable-background:new"> - <sodipodi:namedview - stroke="#ef2929" - fill="#f57900" - id="base" - pagecolor="#ffffff" - bordercolor="#808080" - borderopacity="1" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="39.539055" - inkscape:cx="11.552125" - inkscape:cy="2.6434045" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="true" - inkscape:window-width="1600" - inkscape:window-height="851" - inkscape:window-x="0" - inkscape:window-y="24" - width="400px" - height="300px" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - gridtolerance="10000" - inkscape:object-nodes="true" - inkscape:snap-grids="true" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-maximized="1" - inkscape:bbox-nodes="true" - inkscape:bbox-paths="false" - inkscape:snap-bbox-edge-midpoints="false" - inkscape:snap-bbox-midpoints="false" - objecttolerance="10000" - guidetolerance="10000" - borderlayer="true" - showborder="true" - guidecolor="#ff0b00" - guideopacity="1" - guidehicolor="#001aff" - guidehiopacity="0.49803922" - inkscape:snap-smooth-nodes="false" - inkscape:snap-page="true"> - <inkscape:grid - type="xygrid" - id="grid3123" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <defs - id="defs3" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:creator> - <dc:source /> - <cc:license - rdf:resource="" /> - <dc:title /> - <dc:subject> - <rdf:Bag /> - </dc:subject> - <dc:date /> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:identifier /> - <dc:relation /> - <dc:language /> - <dc:coverage /> - <dc:description /> - <dc:contributor> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:contributor> - </cc:Work> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - style="display:inline" - inkscape:groupmode="layer" - inkscape:label="Base" - id="layer1" - transform="translate(0,-296)"> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4270-9" - width="4" - height="2" - x="9" - y="298" /> - <rect - y="298" - x="15" - height="2" - width="4" - id="rect4239" - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> - </g> -</svg> diff --git a/common/gnome-shell/3.18/common-assets/dash/running3.svg b/common/gnome-shell/3.18/common-assets/dash/running3.svg deleted file mode 100644 index ca85562..0000000 --- a/common/gnome-shell/3.18/common-assets/dash/running3.svg +++ /dev/null @@ -1,156 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - width="28" - height="4" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.91 r13725" - sodipodi:docname="running3.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - style="display:inline;enable-background:new"> - <sodipodi:namedview - stroke="#ef2929" - fill="#f57900" - id="base" - pagecolor="#ffffff" - bordercolor="#808080" - borderopacity="1" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:zoom="27.958333" - inkscape:cx="8.1058637" - inkscape:cy="5.6243161" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="true" - inkscape:window-width="1600" - inkscape:window-height="851" - inkscape:window-x="0" - inkscape:window-y="24" - width="400px" - height="300px" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - gridtolerance="10000" - inkscape:object-nodes="true" - inkscape:snap-grids="true" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-maximized="1" - inkscape:bbox-nodes="true" - inkscape:bbox-paths="false" - inkscape:snap-bbox-edge-midpoints="false" - inkscape:snap-bbox-midpoints="false" - objecttolerance="10000" - guidetolerance="10000" - borderlayer="true" - showborder="true" - guidecolor="#ff0b00" - guideopacity="1" - guidehicolor="#001aff" - guidehiopacity="0.49803922" - inkscape:snap-smooth-nodes="false" - inkscape:snap-page="true"> - <inkscape:grid - type="xygrid" - id="grid3123" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <defs - id="defs3" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:creator> - <dc:source /> - <cc:license - rdf:resource="" /> - <dc:title /> - <dc:subject> - <rdf:Bag /> - </dc:subject> - <dc:date /> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:identifier /> - <dc:relation /> - <dc:language /> - <dc:coverage /> - <dc:description /> - <dc:contributor> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:contributor> - </cc:Work> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - style="display:inline" - inkscape:groupmode="layer" - inkscape:label="Base" - id="layer1" - transform="translate(0,-296)"> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4270-9" - width="4" - height="2" - x="6" - y="298" /> - <rect - y="298" - x="12" - height="2" - width="4" - id="rect4239" - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4140" - width="4" - height="2" - x="18" - y="298" /> - </g> -</svg> diff --git a/common/gnome-shell/3.18/common-assets/dash/running4.svg b/common/gnome-shell/3.18/common-assets/dash/running4.svg deleted file mode 100644 index 7393122..0000000 --- a/common/gnome-shell/3.18/common-assets/dash/running4.svg +++ /dev/null @@ -1,163 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - width="28" - height="4" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.91 r13725" - sodipodi:docname="running4.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - style="display:inline;enable-background:new"> - <sodipodi:namedview - stroke="#ef2929" - fill="#f57900" - id="base" - pagecolor="#ffffff" - bordercolor="#808080" - borderopacity="1" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:zoom="19.769527" - inkscape:cx="7.1711103" - inkscape:cy="3.7516472" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="true" - inkscape:window-width="1600" - inkscape:window-height="851" - inkscape:window-x="0" - inkscape:window-y="24" - width="400px" - height="300px" - inkscape:snap-nodes="true" - inkscape:snap-bbox="true" - gridtolerance="10000" - inkscape:object-nodes="true" - inkscape:snap-grids="true" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-maximized="1" - inkscape:bbox-nodes="true" - inkscape:bbox-paths="false" - inkscape:snap-bbox-edge-midpoints="false" - inkscape:snap-bbox-midpoints="false" - objecttolerance="10000" - guidetolerance="10000" - borderlayer="true" - showborder="true" - guidecolor="#ff0b00" - guideopacity="1" - guidehicolor="#001aff" - guidehiopacity="0.49803922" - inkscape:snap-smooth-nodes="false" - inkscape:snap-page="true"> - <inkscape:grid - type="xygrid" - id="grid3123" - empspacing="4" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" /> - </sodipodi:namedview> - <defs - id="defs3" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:creator> - <dc:source /> - <cc:license - rdf:resource="" /> - <dc:title /> - <dc:subject> - <rdf:Bag /> - </dc:subject> - <dc:date /> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:identifier /> - <dc:relation /> - <dc:language /> - <dc:coverage /> - <dc:description /> - <dc:contributor> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:contributor> - </cc:Work> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - style="display:inline" - inkscape:groupmode="layer" - inkscape:label="Base" - id="layer1" - transform="translate(0,-296)"> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4270-9" - width="4" - height="2" - x="3" - y="298" /> - <rect - y="298" - x="9" - height="2" - width="4" - id="rect4202" - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> - <rect - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" - id="rect4208" - width="4" - height="2" - x="15" - y="298" /> - <rect - y="298" - x="21" - height="2" - width="4" - id="rect4214" - style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" /> - </g> -</svg> diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css index f0d98b6..a8a57e9 100644 --- a/common/gnome-shell/3.18/gnome-shell-dark.css +++ b/common/gnome-shell/3.18/gnome-shell-dark.css @@ -580,6 +580,9 @@ StScrollBar { font-weight: bold; height: 2.1em; min-height: 27px; + background-gradient-direction: none; + background-color: transparent; + border-bottom-width: 0; border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } #panel.dynamic-top-bar-white-btn { border-image: none; } @@ -1185,23 +1188,6 @@ StScrollBar { margin-bottom: 6px; background-color: #5294E2; } -#dashtodockContainer .app-well-app-running-dot { - background: none; - width: 28px; - height: 4px; } - -#dashtodockContainer .running1 .app-well-app-running-dot { - background-image: url("common-assets/dash/running1.svg"); } - -#dashtodockContainer .running2 .app-well-app-running-dot { - background-image: url("common-assets/dash/running2.svg"); } - -#dashtodockContainer .running3 .app-well-app-running-dot { - background-image: url("common-assets/dash/running3.svg"); } - -#dashtodockContainer .running4 .app-well-app-running-dot { - background-image: url("common-assets/dash/running4.svg"); } - .show-apps .overview-icon { padding: 11px; background-color: rgba(0, 0, 0, 0.5); diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css index 56d1e01..23f2ac3 100644 --- a/common/gnome-shell/3.18/gnome-shell.css +++ b/common/gnome-shell/3.18/gnome-shell.css @@ -580,6 +580,9 @@ StScrollBar { font-weight: bold; height: 2.1em; min-height: 27px; + background-gradient-direction: none; + background-color: transparent; + border-bottom-width: 0; border-image: url("common-assets/panel/panel.svg") 1 1 1 1; } #panel.dynamic-top-bar-white-btn { border-image: none; } @@ -1185,23 +1188,6 @@ StScrollBar { margin-bottom: 6px; background-color: #5294E2; } -#dashtodockContainer .app-well-app-running-dot { - background: none; - width: 28px; - height: 4px; } - -#dashtodockContainer .running1 .app-well-app-running-dot { - background-image: url("common-assets/dash/running1.svg"); } - -#dashtodockContainer .running2 .app-well-app-running-dot { - background-image: url("common-assets/dash/running2.svg"); } - -#dashtodockContainer .running3 .app-well-app-running-dot { - background-image: url("common-assets/dash/running3.svg"); } - -#dashtodockContainer .running4 .app-well-app-running-dot { - background-image: url("common-assets/dash/running4.svg"); } - .show-apps .overview-icon { padding: 11px; background-color: rgba(0, 0, 0, 0.5); diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss index fc818a7..913f388 100644 --- a/common/gnome-shell/3.18/sass/_common.scss +++ b/common/gnome-shell/3.18/sass/_common.scss @@ -782,6 +782,9 @@ StScrollBar { font-weight: bold; height: 2.1em; min-height: 27px; + background-gradient-direction: none; + background-color: transparent; + border-bottom-width: 0; border-image: url('common-assets/panel/panel.svg') 1 1 1 1; // Fix dynamic top bar extension @@ -1525,20 +1528,6 @@ StScrollBar { } } -#dashtodockContainer { - .app-well-app-running-dot { - background: none; - width: 28px; - height: 4px; - } - - @each $var in 1, 2, 3, 4 { - .running#{$var} .app-well-app-running-dot { - background-image: url("common-assets/dash/running#{$var}.svg"); - } - } -} - .show-apps { .overview-icon { diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index 2e76f77..cba9510 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -372,6 +372,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -392,6 +394,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -720,7 +724,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1396,14 +1400,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2b2e39; + background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; border-width: 0; } @@ -1463,45 +1468,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #D3DAE3; background-color: rgba(255, 255, 255, 0.05); border: solid rgba(255, 255, 255, 0.07); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2452,6 +2460,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } @@ -2869,9 +2880,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2896,6 +2904,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #404552; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3414,7 +3425,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3550,6 +3562,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3562,8 +3577,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #a5abb5; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3841,10 +3855,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(42, 45, 55, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3882,10 +3896,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(38, 42, 51, 0.97); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(47, 52, 63, 0.97); } @@ -3900,13 +3910,22 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(42, 45, 55, 0.95); } - GeditWindow.background.csd > .titlebar.default-decoration, - GeditWindow.background.csd > .titlebar.default-decoration:backdrop { - background-color: #2f343f; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(42, 45, 55, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #2b2e39; } + +GeditWindow.background > .titlebar.default-decoration, +GeditWindow.background > .titlebar.default-decoration:backdrop { + background-color: #2f343f; } .gedit-bottom-panel-paned { background-color: #404552; } diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index dca07d7..0f669e0 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1399,14 +1403,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1466,45 +1471,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2455,6 +2463,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } @@ -2872,9 +2883,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2899,6 +2907,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #ffffff; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3417,7 +3428,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3553,6 +3565,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3565,8 +3580,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3834,10 +3848,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3875,10 +3889,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(38, 42, 51, 0.97); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(47, 52, 63, 0.97); } @@ -3893,13 +3903,22 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(53, 57, 69, 0.95); } - GeditWindow.background.csd > .titlebar.default-decoration, - GeditWindow.background.csd > .titlebar.default-decoration:backdrop { - background-color: #2f343f; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } + +GeditWindow.background > .titlebar.default-decoration, +GeditWindow.background > .titlebar.default-decoration:backdrop { + background-color: #2f343f; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index e815030..01c40c4 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -372,6 +372,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -392,6 +394,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -720,7 +724,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1396,14 +1400,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2b2e39; + background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; border-width: 0; } @@ -1463,45 +1468,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #D3DAE3; background-color: rgba(255, 255, 255, 0.05); border: solid rgba(255, 255, 255, 0.07); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2452,6 +2460,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } @@ -2869,9 +2880,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2896,6 +2904,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #404552; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3414,7 +3425,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3550,6 +3562,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3562,8 +3577,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #a5abb5; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3841,10 +3855,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #2a2d37; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3882,10 +3896,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #262a33; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #2f343f; } @@ -3900,13 +3910,22 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #2a2d37; } - GeditWindow.background.csd > .titlebar.default-decoration, - GeditWindow.background.csd > .titlebar.default-decoration:backdrop { - background-color: #2f343f; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #2a2d37; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #2b2e39; } + +GeditWindow.background > .titlebar.default-decoration, +GeditWindow.background > .titlebar.default-decoration:backdrop { + background-color: #2f343f; } .gedit-bottom-panel-paned { background-color: #404552; } diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index 073614b..a720b5f 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1399,14 +1403,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1466,45 +1471,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2455,6 +2463,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } @@ -2872,9 +2883,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2899,6 +2907,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #ffffff; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3417,7 +3428,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3553,6 +3565,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3565,8 +3580,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3834,10 +3848,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3875,10 +3889,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #262a33; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #2f343f; } @@ -3893,13 +3903,22 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #353945; } - GeditWindow.background.csd > .titlebar.default-decoration, - GeditWindow.background.csd > .titlebar.default-decoration:backdrop { - background-color: #2f343f; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #353945; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } + +GeditWindow.background > .titlebar.default-decoration, +GeditWindow.background > .titlebar.default-decoration:backdrop { + background-color: #2f343f; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index 20dcea4..cb5c4df 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1399,14 +1403,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1466,45 +1471,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2455,6 +2463,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } @@ -2872,9 +2883,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2899,6 +2907,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #ffffff; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3417,7 +3428,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3553,6 +3565,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3565,8 +3580,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3834,10 +3848,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3875,10 +3889,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #d4d5db; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #e7e8eb; } @@ -3893,13 +3903,22 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #eff0f2; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #353945; } - GeditWindow.background.csd > .titlebar.default-decoration, - GeditWindow.background.csd > .titlebar.default-decoration:backdrop { - background-color: #e7e8eb; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #353945; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } + +GeditWindow.background > .titlebar.default-decoration, +GeditWindow.background > .titlebar.default-decoration:backdrop { + background-color: #e7e8eb; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 6864b67..fa315ab 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1399,14 +1403,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1466,45 +1471,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2455,6 +2463,9 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.csd.popup, .window-frame.csd.menu { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } @@ -2872,9 +2883,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2899,6 +2907,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- box-shadow: none; background-color: #ffffff; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3417,7 +3428,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3553,6 +3565,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3565,8 +3580,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3834,10 +3848,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3875,10 +3889,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(212, 213, 219, 0.95); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(231, 232, 235, 0.95); } @@ -3893,13 +3903,22 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #eff0f2; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(53, 57, 69, 0.95); } - GeditWindow.background.csd > .titlebar.default-decoration, - GeditWindow.background.csd > .titlebar.default-decoration:backdrop { - background-color: #e7e8eb; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } + +GeditWindow.background > .titlebar.default-decoration, +GeditWindow.background > .titlebar.default-decoration:backdrop { + background-color: #e7e8eb; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss index 5c0841f..2f6738b 100644 --- a/common/gtk-3.0/3.14/sass/_applications.scss +++ b/common/gtk-3.0/3.14/sass/_applications.scss @@ -71,8 +71,6 @@ TerminalWindow { // // Nautilus // -NautilusCanvasViewContainer.view .entry { border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -96,62 +94,56 @@ NautilusNotebook.notebook { } } -//NautilusNotebook.notebook { -// background-color: $base_color; -//} - NautilusQueryEditor .search-bar.toolbar { padding: 5px; box-shadow: none; background-color: $base_color; } - // // Nemo // -NemoIconViewContainer { @extend NautilusCanvasViewContainer.view } - -NemoWindow .sidebar .frame { - border-width: 0; -} - -NemoWindow GtkSeparator.separator.horizontal { - color: $borders_color; -} - .nemo-desktop.nemo-canvas-item { @extend .nautilus-desktop.nautilus-canvas-item; } -NemoWindow .primary-toolbar NemoPathBar.linked > .button { - $_linked_separator_color: $header_button_border; +NemoWindow { - @include button(header-hover); + EelEditableLabel.entry { transition: none; } // Workaround for invisible text in rename entry - &:hover { background-color: lighten($header_button_bg, 15%); } - &:active, &:checked { @include button(header-active); } - &:insensitive { color: transparentize($header_fg, 0.4); } + .sidebar .frame { border-width: 0; } - @extend %linked; + GtkSeparator.separator.horizontal { color: $borders_color; } - &:hover { - box-shadow: inset 1px 0 $_linked_separator_color, - inset -1px 0 $_linked_separator_color; - } - &:active, &:checked { box-shadow: none; } + .primary-toolbar NemoPathBar.linked > .button { + $_linked_separator_color: $header_button_border; - &:first-child { - &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } - &:active, &:checked { box-shadow: none; } - } - &:last-child { - &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } - &:active, &:checked { box-shadow: none; } - } - &:only-child { - &:hover { box-shadow: none; } + @include button(header-hover); + + &:hover { background-color: lighten($header_button_bg, 15%); } + &:active, &:checked { @include button(header-active); } + &:insensitive { color: transparentize($header_fg, 0.4); } + + @extend %linked; + + &:hover { + box-shadow: inset 1px 0 $_linked_separator_color, + inset -1px 0 $_linked_separator_color; + } &:active, &:checked { box-shadow: none; } + + &:first-child { + &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:last-child { + &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:only-child { + &:hover { box-shadow: none; } + &:active, &:checked { box-shadow: none; } + } } } diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss index 8ed1d94..05abc85 100644 --- a/common/gtk-3.0/3.14/sass/_common.scss +++ b/common/gtk-3.0/3.14/sass/_common.scss @@ -473,6 +473,7 @@ $_dot_color: $selected_bg_color; &:hover { @include button(osd-hover); @extend %linked; + &, &:first-child, &:last-child { box-shadow: none; } } &:active, &:checked { background-clip: padding-box; @@ -489,6 +490,7 @@ $_dot_color: $selected_bg_color; box-shadow: none; &:hover { @include button(osd-hover); + &, &:first-child, &:last-child { box-shadow: none; } } &:insensitive { @include button(osd-insensitive); @@ -1481,16 +1483,17 @@ GtkTreeView.view { // treeview grid lines a &.progressbar { // progress bar in treeviews color: $selected_fg_color; border-radius: 3px; + background-image: linear-gradient(to bottom, $selected_bg_color); &:selected { color: $selected_bg_color; box-shadow: none; - background-color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_fg_color); } } &.trough, &.trough:selected { // progress bar trough in treeviews color: $fg_color; - background-color: $button_border; + background-image: linear-gradient(to bottom, $button_border); border-radius: 3px; border-width: 0; } @@ -1584,7 +1587,7 @@ column-header.button.dnd { // for treeview-like derive widgets } } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; @@ -1630,6 +1633,8 @@ column-header.button.dnd { // for treeview-like derive widgets } } +.csd .popup { border-radius: 2px; } + .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } /************ @@ -2684,6 +2689,10 @@ GtkVolumeButton.button { padding: 8px; } &.tiled { border-radius: 0; } + &.popup { + box-shadow: none; + border-radius: 0; + } &.csd { &.popup, &.menu { border-radius: 2px; diff --git a/common/gtk-3.0/3.14/sass/_granite.scss b/common/gtk-3.0/3.14/sass/_granite.scss index 1e53c7f..8e3b35d 100644 --- a/common/gtk-3.0/3.14/sass/_granite.scss +++ b/common/gtk-3.0/3.14/sass/_granite.scss @@ -192,6 +192,11 @@ GraniteWidgetsPopOver * { } // +// Xs Entry +// +GraniteWidgetsXsEntry.entry { padding: 4px; } + +// // Text Styles // .h1 { font: open sans 24px; } @@ -201,7 +206,6 @@ GraniteWidgetsPopOver * { .category-label { color: mix($bg_color, $text_color, 30%); font-weight: 600; - text-shadow: 0 1px transparentize(white, 0.4); } .h4 { diff --git a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss index b04ed38..c89875f 100644 --- a/common/gtk-3.0/3.14/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.14/sass/_transparent_widgets.scss @@ -53,10 +53,13 @@ MarlinViewWindow { .scrollbar { @extend %dark_sidebar_scrollbar } } &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); } - - .pane-separator { background-color: $dark_sidebar_border; } } +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator {background-color: $dark_sidebar_border} + GtkFileChooserDialog { &.background.csd, &.background { background-color: $dark_sidebar_bg } @@ -100,8 +103,6 @@ GeditWindow.background.csd { > .titlebar .pane-separator:backdrop, &.maximized > .titlebar .pane-separator:backdrop { background-color: $header_border; } - > .titlebar { background-color: transparent; } - > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: $header_bg; @@ -115,11 +116,17 @@ GeditWindow.background.csd { } } -// Gedit -GeditWindow.background.csd { +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { background-color: transparent; +} + +// Gedit +GeditWindow.background { + &.csd { background-color: transparent; } - .pane-separator { background-color: $dark_sidebar_border; } + .gedit-side-panel-paned .pane-separator { background-color: $dark_sidebar_border; } + .gedit-bottom-panel-paned .pane-separator { background-color: $borders_color; } > .titlebar.default-decoration, > .titlebar.default-decoration:backdrop { background-color: opacify($header_bg, 1); } // fix for elementary OS diff --git a/common/gtk-3.0/3.14/sass/_unity.scss b/common/gtk-3.0/3.14/sass/_unity.scss index 48ebb2b..00fec8f 100644 --- a/common/gtk-3.0/3.14/sass/_unity.scss +++ b/common/gtk-3.0/3.14/sass/_unity.scss @@ -53,6 +53,7 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: $selected_bg_color; + color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_bg_color); border-bottom: none; } diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index e58b5de..f38632e 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -372,6 +372,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -392,6 +394,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -720,7 +724,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1402,14 +1406,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2b2e39; + background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; border-width: 0; } @@ -1469,45 +1474,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #D3DAE3; background-color: rgba(255, 255, 255, 0.05); border: solid rgba(255, 255, 255, 0.07); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2530,12 +2538,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { @@ -2556,12 +2567,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2582,7 +2592,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2778,9 +2789,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2836,6 +2844,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #313541; border-color: #1b1d24; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3365,7 +3376,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3501,6 +3513,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3513,8 +3528,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #a5abb5; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3786,10 +3800,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(42, 45, 55, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3827,10 +3841,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(38, 42, 51, 0.97); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(47, 52, 63, 0.97); } @@ -3845,10 +3855,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(42, 45, 55, 0.95); } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(42, 45, 55, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #2b2e39; } .gedit-bottom-panel-paned { background-color: #404552; } diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index 970b8e8..30da6e9 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1405,14 +1409,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1472,45 +1477,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2533,12 +2541,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { @@ -2559,12 +2570,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2585,7 +2595,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2781,9 +2792,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2839,6 +2847,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #edeef0; border-color: #d0d5da; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3368,7 +3379,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3504,6 +3516,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3516,8 +3531,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3779,10 +3793,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3820,10 +3834,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(38, 42, 51, 0.97); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(47, 52, 63, 0.97); } @@ -3838,10 +3848,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index 3523ad9..4934854 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -372,6 +372,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -392,6 +394,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -720,7 +724,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1402,14 +1406,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2b2e39; + background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; border-width: 0; } @@ -1469,45 +1474,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #D3DAE3; background-color: rgba(255, 255, 255, 0.05); border: solid rgba(255, 255, 255, 0.07); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2530,12 +2538,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { @@ -2556,12 +2567,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2582,7 +2592,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2778,9 +2789,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2836,6 +2844,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #313541; border-color: #1b1d24; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3365,7 +3376,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3501,6 +3513,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3513,8 +3528,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #a5abb5; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3786,10 +3800,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #2a2d37; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3827,10 +3841,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #262a33; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #2f343f; } @@ -3845,10 +3855,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #2a2d37; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #2a2d37; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #2b2e39; } .gedit-bottom-panel-paned { background-color: #404552; } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css index 1716acc..530f297 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1405,14 +1409,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1472,45 +1477,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2533,12 +2541,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { @@ -2559,12 +2570,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2585,7 +2595,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2781,9 +2792,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2839,6 +2847,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #edeef0; border-color: #d0d5da; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3368,7 +3379,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3504,6 +3516,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3516,8 +3531,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3779,10 +3793,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3820,10 +3834,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #262a33; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #2f343f; } @@ -3838,10 +3848,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #353945; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #353945; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index 291b0a9..2599d8e 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.4); background-color: rgba(119, 127, 151, 0.5); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.4); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1405,14 +1409,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1472,45 +1477,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2533,12 +2541,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { @@ -2559,12 +2570,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(231, 232, 235, 0); - border-width: 0; } + background-color: rgba(231, 232, 235, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(82, 93, 118, 0.8); @@ -2585,7 +2595,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2781,9 +2792,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2839,6 +2847,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #edeef0; border-color: #d0d5da; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3368,7 +3379,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3504,6 +3516,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3516,8 +3531,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3779,10 +3793,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3820,10 +3834,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #d4d5db; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #e7e8eb; } @@ -3838,10 +3848,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #eff0f2; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #353945; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #353945; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 3eb5ee3..82d98f3 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -371,6 +371,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child { + box-shadow: none; } .osd .button:active, .osd .button:checked { background-clip: padding-box; color: #ffffff; @@ -391,6 +393,8 @@ GtkSearchEntry.entry { outline-color: rgba(186, 195, 207, 0.3); border-color: rgba(26, 28, 34, 0.35); background-color: rgba(119, 127, 151, 0.45); } + .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child { + box-shadow: none; } .osd .button.flat:insensitive { color: #5d626e; border-color: rgba(26, 28, 34, 0.35); @@ -719,7 +723,7 @@ GtkSearchEntry.entry { .linked.vertical > GtkComboBox:only-child > .button:checked { box-shadow: none; } -.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, +.menuitem.button.flat, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .list-row.button, .app-notification .button.flat, .app-notification.frame .button.flat, .app-notification .button.flat:insensitive, .app-notification.frame .button.flat:insensitive { border-color: transparent; @@ -1405,14 +1409,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1472,45 +1477,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator, .popup .menuitem.separator, .popup GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .popup .menuitem.view.separator { + .menu .menuitem.separator, .menu GtkPlacesSidebar.sidebar .menuitem.view.separator, GtkPlacesSidebar.sidebar .menu .menuitem.view.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2533,12 +2541,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { @@ -2559,12 +2570,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(231, 232, 235, 0); - border-width: 0; } + background-color: rgba(231, 232, 235, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(82, 93, 118, 0.8); @@ -2585,7 +2595,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2781,9 +2792,6 @@ TerminalWindow .scrollbar.vertical .slider { TerminalWindow .scrollbar.trough { border-width: 0; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -2839,6 +2847,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- background-color: #edeef0; border-color: #d0d5da; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3368,7 +3379,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3504,6 +3516,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3516,8 +3531,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -3779,10 +3793,10 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -GtkFileChooserDialog .pane-separator, -NautilusWindow .pane-separator, -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -3820,10 +3834,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(212, 213, 219, 0.95); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(231, 232, 235, 0.95); } @@ -3838,10 +3848,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #eff0f2; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss index af9eb56..259be9f 100644 --- a/common/gtk-3.0/3.16/sass/_applications.scss +++ b/common/gtk-3.0/3.16/sass/_applications.scss @@ -71,8 +71,6 @@ TerminalWindow { // // Nautilus // -NautilusCanvasViewContainer.view .entry { border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -139,48 +137,47 @@ $disk_space_free: darken($bg_color, 3%); // // Nemo // -NemoIconViewContainer { @extend NautilusCanvasViewContainer.view } - -NemoWindow .sidebar .frame { - border-width: 0; -} - -NemoWindow GtkSeparator.separator.horizontal { - color: $borders_color; -} - .nemo-desktop.nemo-canvas-item { @extend .nautilus-desktop.nautilus-canvas-item; } -NemoWindow .primary-toolbar NemoPathBar.linked > .button { - $_linked_separator_color: $header_button_border; +NemoWindow { - @include button(header-hover); + EelEditableLabel.entry { transition: none; } // Workaround for invisible text in rename entry - &:hover { background-color: lighten($header_button_bg, 15%); } - &:active, &:checked { @include button(header-active); } - &:insensitive { color: transparentize($header_fg, 0.4); } + .sidebar .frame { border-width: 0; } - @extend %linked; + GtkSeparator.separator.horizontal { color: $borders_color; } - &:hover { - box-shadow: inset 1px 0 $_linked_separator_color, - inset -1px 0 $_linked_separator_color; - } - &:active, &:checked { box-shadow: none; } + .primary-toolbar NemoPathBar.linked > .button { + $_linked_separator_color: $header_button_border; - &:first-child { - &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } - &:active, &:checked { box-shadow: none; } - } - &:last-child { - &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } - &:active, &:checked { box-shadow: none; } - } - &:only-child { - &:hover { box-shadow: none; } + @include button(header-hover); + + &:hover { background-color: lighten($header_button_bg, 15%); } + &:active, &:checked { @include button(header-active); } + &:insensitive { color: transparentize($header_fg, 0.4); } + + @extend %linked; + + &:hover { + box-shadow: inset 1px 0 $_linked_separator_color, + inset -1px 0 $_linked_separator_color; + } &:active, &:checked { box-shadow: none; } + + &:first-child { + &:hover { box-shadow: inset -1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:last-child { + &:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + &:active, &:checked { box-shadow: none; } + } + &:only-child { + &:hover { box-shadow: none; } + &:active, &:checked { box-shadow: none; } + } } } diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss index 87c21fc..ec66a1a 100644 --- a/common/gtk-3.0/3.16/sass/_common.scss +++ b/common/gtk-3.0/3.16/sass/_common.scss @@ -473,6 +473,7 @@ $_dot_color: $selected_bg_color; &:hover { @include button(osd-hover); @extend %linked; + &, &:first-child, &:last-child { box-shadow: none; } } &:active, &:checked { background-clip: padding-box; @@ -489,6 +490,7 @@ $_dot_color: $selected_bg_color; box-shadow: none; &:hover { @include button(osd-hover); + &, &:first-child, &:last-child { box-shadow: none; } } &:insensitive { @include button(osd-insensitive); @@ -1495,16 +1497,17 @@ GtkTreeView.view { // treeview grid lines a &.progressbar { // progress bar in treeviews color: $selected_fg_color; border-radius: 3px; + background-image: linear-gradient(to bottom, $selected_bg_color); &:selected { color: $selected_bg_color; box-shadow: none; - background-color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_fg_color); } } &.trough, &.trough:selected { // progress bar trough in treeviews color: $fg_color; - background-color: $button_border; + background-image: linear-gradient(to bottom, $button_border); border-radius: 3px; border-width: 0; } @@ -1598,7 +1601,7 @@ column-header.button.dnd { // for treeview-like derive widgets } } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; @@ -1644,6 +1647,8 @@ column-header.button.dnd { // for treeview-like derive widgets } } +.csd .popup { border-radius: 2px; } + .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } /************ @@ -2804,6 +2809,10 @@ GtkVolumeButton.button { padding: 8px; } &.tiled { border-radius: 0; } + &.popup { + box-shadow: none; + border-radius: 0; + } // server-side decorations as used by mutter &.ssd { border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0); @@ -2812,7 +2821,7 @@ GtkVolumeButton.button { padding: 8px; } &.maximized { border-radius: 0; } } &.csd { - &.popup, &.menu { + &.popup { border-radius: 2px; box-shadow: 0 3px 6px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1)), 0 0 0 1px if($variant == 'light', $_wm_border, darken($bg_color, 10%)); @@ -2843,11 +2852,10 @@ GtkVolumeButton.button { padding: 8px; } } .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; @include button(undecorated); background-color: transparentize($header_bg, 1); - border-width: 0; &:hover { @include button(header-hover); @@ -2862,6 +2870,7 @@ GtkVolumeButton.button { padding: 8px; } background-color: transparent; background-position: center; background-repeat: no-repeat; + border-width: 0; &:backdrop { opacity: 1; } } diff --git a/common/gtk-3.0/3.16/sass/_granite.scss b/common/gtk-3.0/3.16/sass/_granite.scss index 1e53c7f..8e3b35d 100644 --- a/common/gtk-3.0/3.16/sass/_granite.scss +++ b/common/gtk-3.0/3.16/sass/_granite.scss @@ -192,6 +192,11 @@ GraniteWidgetsPopOver * { } // +// Xs Entry +// +GraniteWidgetsXsEntry.entry { padding: 4px; } + +// // Text Styles // .h1 { font: open sans 24px; } @@ -201,7 +206,6 @@ GraniteWidgetsPopOver * { .category-label { color: mix($bg_color, $text_color, 30%); font-weight: 600; - text-shadow: 0 1px transparentize(white, 0.4); } .h4 { diff --git a/common/gtk-3.0/3.16/sass/_transparent_widgets.scss b/common/gtk-3.0/3.16/sass/_transparent_widgets.scss index 4c1b9c6..c69ed40 100644 --- a/common/gtk-3.0/3.16/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.16/sass/_transparent_widgets.scss @@ -44,19 +44,20 @@ MarlinViewWindow { } } - &.frame { - color: $dark_sidebar_fg; - } + &.frame { color: $dark_sidebar_fg; } .separator { color: transparent; } .scrollbar { @extend %dark_sidebar_scrollbar } } &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); } - - .pane-separator { background-color: $dark_sidebar_border; } } +GtkFileChooserDialog, +NautilusWindow, +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator {background-color: $dark_sidebar_border} + GtkFileChooserDialog { &.background.csd, &.background { background-color: $dark_sidebar_bg } @@ -100,8 +101,6 @@ GeditWindow.background.csd { > .titlebar .pane-separator:backdrop, &.maximized > .titlebar .pane-separator:backdrop { background-color: $header_border; } - > .titlebar { background-color: transparent; } - > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: $header_bg; @@ -115,11 +114,17 @@ GeditWindow.background.csd { } } -// Gedit -GeditWindow.background.csd { +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { background-color: transparent; +} + +// Gedit +GeditWindow.background { + &.csd { background-color: transparent; } - .pane-separator { background-color: $dark_sidebar_border; } + .gedit-side-panel-paned .pane-separator { background-color: $dark_sidebar_border; } + .gedit-bottom-panel-paned .pane-separator { background-color: $borders_color; } } .gedit-bottom-panel-paned { background-color: $base_color; } diff --git a/common/gtk-3.0/3.16/sass/_unity.scss b/common/gtk-3.0/3.16/sass/_unity.scss index 48ebb2b..00fec8f 100644 --- a/common/gtk-3.0/3.16/sass/_unity.scss +++ b/common/gtk-3.0/3.16/sass/_unity.scss @@ -53,6 +53,7 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: $selected_bg_color; + color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_bg_color); border-bottom: none; } diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css index 4b4d7f9..a88f858 100644 --- a/common/gtk-3.0/3.18/gtk-contained-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-dark.css @@ -801,7 +801,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1540,14 +1540,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2b2e39; + background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; border-width: 0; } @@ -1607,45 +1608,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #D3DAE3; background-color: rgba(255, 255, 255, 0.05); border: solid rgba(255, 255, 255, 0.07); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2429,8 +2433,7 @@ GtkCalendar { GtkCalendar:inconsistent { color: alpha(currentColor,0.55); } GtkCalendar.highlight { - color: #D3DAE3; - background-color: rgba(43, 46, 57, 0.5); } + color: #D3DAE3; } /*********** * Dialogs * @@ -2516,6 +2519,17 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-item.needs-attention > GtkLabel { background-size: 6px 6px, 0 0; } +GtkPlacesView .server-list-button > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(0turn); } + +GtkPlacesView .server-list-button:checked > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(-0.5turn); } + +GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup { + background-color: transparent; } + GtkPaned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; @@ -2703,12 +2717,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { @@ -2729,12 +2746,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2755,7 +2771,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2970,9 +2987,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active { color: #5294E2; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -3032,6 +3046,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- NautilusListView .view { border-bottom: 1px solid #2b2e39; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3576,7 +3593,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3712,6 +3730,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3724,8 +3745,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #a5abb5; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -4009,8 +4029,8 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(42, 45, 55, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -4048,10 +4068,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(38, 42, 51, 0.97); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(47, 52, 63, 0.97); } @@ -4066,10 +4082,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(42, 45, 55, 0.95); } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(42, 45, 55, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #2b2e39; } .gedit-bottom-panel-paned { background-color: #404552; } diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css index 50ff653..00d3ffc 100644 --- a/common/gtk-3.0/3.18/gtk-contained-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-darker.css @@ -800,7 +800,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1543,14 +1543,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1610,45 +1611,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2432,8 +2436,7 @@ GtkCalendar { GtkCalendar:inconsistent { color: alpha(currentColor,0.55); } GtkCalendar.highlight { - color: #5c616c; - background-color: rgba(207, 214, 230, 0.5); } + color: #5c616c; } /*********** * Dialogs * @@ -2519,6 +2522,17 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-item.needs-attention > GtkLabel { background-size: 6px 6px, 0 0; } +GtkPlacesView .server-list-button > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(0turn); } + +GtkPlacesView .server-list-button:checked > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(-0.5turn); } + +GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup { + background-color: transparent; } + GtkPaned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; @@ -2706,12 +2720,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.87), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { @@ -2732,12 +2749,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2758,7 +2774,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2973,9 +2990,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active { color: #5294E2; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -3035,6 +3049,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- NautilusListView .view { border-bottom: 1px solid #dbdfe3; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3579,7 +3596,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3715,6 +3733,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3727,8 +3748,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -4002,8 +4022,8 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -4041,10 +4061,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(38, 42, 51, 0.97); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(47, 52, 63, 0.97); } @@ -4059,10 +4075,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css index c72f3b5..261a428 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css @@ -801,7 +801,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1540,14 +1540,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #D3DAE3; - background-color: #2b2e39; + background-image: linear-gradient(to bottom, #2b2e39); border-radius: 3px; border-width: 0; } @@ -1607,45 +1608,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #383C4A; border: 1px solid #2b2e39; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #D3DAE3; background-color: rgba(255, 255, 255, 0.05); border: solid rgba(255, 255, 255, 0.07); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(211, 218, 227, 0.45); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(64, 69, 82, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #4f5461; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #4f5461; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #4f5461; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2429,8 +2433,7 @@ GtkCalendar { GtkCalendar:inconsistent { color: alpha(currentColor,0.55); } GtkCalendar.highlight { - color: #D3DAE3; - background-color: rgba(43, 46, 57, 0.5); } + color: #D3DAE3; } /*********** * Dialogs * @@ -2516,6 +2519,17 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-item.needs-attention > GtkLabel { background-size: 6px 6px, 0 0; } +GtkPlacesView .server-list-button > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(0turn); } + +GtkPlacesView .server-list-button:checked > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(-0.5turn); } + +GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup { + background-color: transparent; } + GtkPaned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; @@ -2703,12 +2717,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.35); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; } .window-frame.csd.tooltip { @@ -2729,12 +2746,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2755,7 +2771,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2970,9 +2987,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active { color: #5294E2; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -3032,6 +3046,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- NautilusListView .view { border-bottom: 1px solid #2b2e39; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3576,7 +3593,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3712,6 +3730,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3724,8 +3745,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #a5abb5; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -4009,8 +4029,8 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #2a2d37; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -4048,10 +4068,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #262a33; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #2f343f; } @@ -4066,10 +4082,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #2a2d37; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #2a2d37; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #2b2e39; } .gedit-bottom-panel-paned { background-color: #404552; } diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css index 3da7479..f7062c4 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css @@ -800,7 +800,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1543,14 +1543,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1610,45 +1611,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(207, 218, 231, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2432,8 +2436,7 @@ GtkCalendar { GtkCalendar:inconsistent { color: alpha(currentColor,0.55); } GtkCalendar.highlight { - color: #5c616c; - background-color: rgba(207, 214, 230, 0.5); } + color: #5c616c; } /*********** * Dialogs * @@ -2519,6 +2522,17 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-item.needs-attention > GtkLabel { background-size: 6px 6px, 0 0; } +GtkPlacesView .server-list-button > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(0turn); } + +GtkPlacesView .server-list-button:checked > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(-0.5turn); } + +GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup { + background-color: transparent; } + GtkPaned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; @@ -2706,12 +2720,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(32, 35, 43, 0.9), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 3px 3px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { @@ -2732,12 +2749,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(47, 52, 63, 0); - border-width: 0; } + background-color: rgba(47, 52, 63, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(207, 218, 231, 0.8); @@ -2758,7 +2774,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2973,9 +2990,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active { color: #5294E2; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -3035,6 +3049,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- NautilusListView .view { border-bottom: 1px solid #dbdfe3; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3579,7 +3596,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3715,6 +3733,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3727,8 +3748,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -4002,8 +4022,8 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -4041,10 +4061,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #262a33; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #2f343f; } @@ -4059,10 +4075,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #323843; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #353945; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #353945; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css index 7f48e8f..5c646b3 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid.css @@ -800,7 +800,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1547,14 +1547,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1614,45 +1615,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2436,8 +2440,7 @@ GtkCalendar { GtkCalendar:inconsistent { color: alpha(currentColor,0.55); } GtkCalendar.highlight { - color: #5c616c; - background-color: rgba(207, 214, 230, 0.5); } + color: #5c616c; } /*********** * Dialogs * @@ -2523,6 +2526,17 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-item.needs-attention > GtkLabel { background-size: 6px 6px, 0 0; } +GtkPlacesView .server-list-button > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(0turn); } + +GtkPlacesView .server-list-button:checked > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(-0.5turn); } + +GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup { + background-color: transparent; } + GtkPaned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; @@ -2710,12 +2724,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { @@ -2736,12 +2753,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(231, 232, 235, 0); - border-width: 0; } + background-color: rgba(231, 232, 235, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(82, 93, 118, 0.8); @@ -2762,7 +2778,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2977,9 +2994,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active { color: #5294E2; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -3039,6 +3053,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- NautilusListView .view { border-bottom: 1px solid #dbdfe3; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3583,7 +3600,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3719,6 +3737,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3731,8 +3752,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -4006,8 +4026,8 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: #353945; } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -4045,10 +4065,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: #d4d5db; } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: #e7e8eb; } @@ -4063,10 +4079,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #eff0f2; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: #353945; } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: #353945; } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css index 1616fe1..d9e204e 100644 --- a/common/gtk-3.0/3.18/gtk-contained.css +++ b/common/gtk-3.0/3.18/gtk-contained.css @@ -800,7 +800,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > . .linked.vertical > .button:first-child { border-top-style: solid; } -.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat, +.menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .notebook tab .button, .app-notification .button.flat, .app-notification .sidebar-button.button, .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive, .app-notification .sidebar-button.button:insensitive, @@ -1547,14 +1547,15 @@ GtkTreeView.view { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } GtkTreeView.view.progressbar { color: #ffffff; - border-radius: 3px; } + border-radius: 3px; + background-image: linear-gradient(to bottom, #5294E2); } GtkTreeView.view.progressbar:selected { color: #5294E2; box-shadow: none; - background-color: #ffffff; } + background-image: linear-gradient(to bottom, #ffffff); } GtkTreeView.view.trough, GtkTreeView.view.trough:selected { color: #5c616c; - background-color: #cfd6e6; + background-image: linear-gradient(to bottom, #cfd6e6); border-radius: 3px; border-width: 0; } @@ -1614,45 +1615,48 @@ column-header .button, column-header .button:hover, column-header .button:active color: rgba(82, 93, 118, 0.2); border-color: transparent; } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; background-color: #ffffff; border: 1px solid #dbdfe3; } - .csd .menu, .csd .popup { + .csd .menu { padding: 4px 0px; border-radius: 2px; border: none; } - .menu .menuitem, .popup .menuitem { + .menu .menuitem { padding: 5px; } - .menu .menuitem:hover, .popup .menuitem:hover { + .menu .menuitem:hover { color: #5c616c; background-color: rgba(0, 0, 0, 0.04); border: solid rgba(0, 0, 0, 0.08); border-width: 1px 0 1px 0; } - .menu .menuitem:insensitive, .popup .menuitem:insensitive { + .menu .menuitem:insensitive { color: rgba(92, 97, 108, 0.55); } - .menu .menuitem.separator, .popup .menuitem.separator { + .menu .menuitem.separator { color: rgba(255, 255, 255, 0); } - .menu .menuitem.arrow, .popup .menuitem.arrow { + .menu .menuitem.arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - .menu .menuitem.arrow:dir(rtl), .popup .menuitem.arrow:dir(rtl) { + .menu .menuitem.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } - .menu.button, .popup.button { + .menu.button { border-style: none; border-radius: 0; } - .menu.button.top, .popup.button.top { + .menu.button.top { border-bottom: 1px solid #efeff0; } - .menu.button.bottom, .popup.button.bottom { + .menu.button.bottom { border-top: 1px solid #efeff0; } - .menu.button:hover, .popup.button:hover { + .menu.button:hover { background-color: #efeff0; } - .menu.button:insensitive, .popup.button:insensitive { + .menu.button:insensitive { color: transparent; background-color: transparent; border-color: transparent; } +.csd .popup { + border-radius: 2px; } + .menuitem .accelerator { color: alpha(currentColor,0.55); } @@ -2436,8 +2440,7 @@ GtkCalendar { GtkCalendar:inconsistent { color: alpha(currentColor,0.55); } GtkCalendar.highlight { - color: #5c616c; - background-color: rgba(207, 214, 230, 0.5); } + color: #5c616c; } /*********** * Dialogs * @@ -2523,6 +2526,17 @@ GtkPlacesSidebar.sidebar .list-row.activatable { .sidebar-item.needs-attention > GtkLabel { background-size: 6px 6px, 0 0; } +GtkPlacesView .server-list-button > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(0turn); } + +GtkPlacesView .server-list-button:checked > GtkImage { + transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + -gtk-icon-transform: rotate(-0.5turn); } + +GtkPlacesView .list-row.activatable:hover, GtkPlacesView GtkPlacesSidebar.sidebar .has-open-popup, GtkPlacesSidebar.sidebar GtkPlacesView .has-open-popup { + background-color: transparent; } + GtkPaned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; @@ -2710,12 +2724,15 @@ GtkVolumeButton.button { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1), 0 5px 5px 0 rgba(0, 0, 0, 0.2); } .window-frame.tiled { border-radius: 0; } + .window-frame.popup { + box-shadow: none; + border-radius: 0; } .window-frame.ssd { border-radius: 4px 4px 0 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.ssd.maximized { border-radius: 0; } - .window-frame.csd.popup, .window-frame.csd.menu { + .window-frame.csd.popup { border-radius: 2px; box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.1); } .window-frame.csd.tooltip { @@ -2736,12 +2753,11 @@ GtkVolumeButton.button { .header-bar .button.titlebutton, .titlebar .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; border-color: transparent; background-color: transparent; background-image: none; - background-color: rgba(231, 232, 235, 0); - border-width: 0; } + background-color: rgba(231, 232, 235, 0); } .header-bar .button.titlebutton:hover, .titlebar .button.titlebutton:hover { color: rgba(82, 93, 118, 0.8); @@ -2762,7 +2778,8 @@ GtkVolumeButton.button { color: transparent; background-color: transparent; background-position: center; - background-repeat: no-repeat; } + background-repeat: no-repeat; + border-width: 0; } .header-bar .button.titlebutton.close:backdrop, .header-bar .button.titlebutton.maximize:backdrop, .header-bar .button.titlebutton.minimize:backdrop, @@ -2977,9 +2994,6 @@ TerminalWindow .notebook .active-page .button:hover, TerminalWindow .notebook .p TerminalWindow .notebook .active-page .button:active, TerminalWindow .notebook .prelight-page .button:active { color: #5294E2; } -NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry { - border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -3039,6 +3053,9 @@ NautilusQueryEditor .search-bar.toolbar, NautilusQueryEditor .search-bar.inline- NautilusListView .view { border-bottom: 1px solid #dbdfe3; } +NemoWindow EelEditableLabel.entry { + transition: none; } + NemoWindow .sidebar .frame { border-width: 0; } @@ -3583,7 +3600,8 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: #5294E2; + color: #ffffff; + background-image: linear-gradient(to bottom, #5294E2); border-bottom: none; } .overlay-bar { @@ -3719,6 +3737,9 @@ GraniteWidgetsPopOver .sidebar.view, GraniteWidgetsPopOver * { background-color: transparent; } +GraniteWidgetsXsEntry.entry { + padding: 4px; } + .h1 { font: open sans 24px; } @@ -3731,8 +3752,7 @@ GraniteWidgetsPopOver * { .h4, .category-label { color: #8a8e96; - font-weight: 600; - text-shadow: 0 1px rgba(255, 255, 255, 0.6); } + font-weight: 600; } .h4 { padding-bottom: 6px; @@ -4006,8 +4026,8 @@ NemoWindow.maximized .sidebar, MarlinViewWindow.maximized .sidebar { background-color: #353945; } -NemoWindow .pane-separator, -MarlinViewWindow .pane-separator { +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: rgba(53, 57, 69, 0.95); } GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background { @@ -4045,10 +4065,6 @@ GeditWindow.background.csd > .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized > .titlebar .pane-separator:backdrop { background-color: rgba(212, 213, 219, 0.95); } -FeedReaderreaderUI.background.csd > .titlebar, -GeditWindow.background.csd > .titlebar { - background-color: transparent; } - FeedReaderreaderUI.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar, GeditWindow.background.csd > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: rgba(231, 232, 235, 0.95); } @@ -4063,10 +4079,18 @@ GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.title GeditWindow.background.csd.maximized > .titlebar > GtkHeaderBar.header-bar.titlebar:backdrop { background-color: #eff0f2; } +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { + background-color: transparent; } + GeditWindow.background.csd { background-color: transparent; } - GeditWindow.background.csd .pane-separator { - background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-side-panel-paned .pane-separator { + background-color: rgba(53, 57, 69, 0.95); } + +GeditWindow.background .gedit-bottom-panel-paned .pane-separator { + background-color: #dbdfe3; } .gedit-bottom-panel-paned { background-color: #ffffff; } diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss index e95a754..6418e56 100644 --- a/common/gtk-3.0/3.18/sass/_applications.scss +++ b/common/gtk-3.0/3.18/sass/_applications.scss @@ -90,8 +90,6 @@ TerminalWindow { // // Nautilus // -NautilusCanvasViewContainer.view .entry { border-radius: 3px; } - .nautilus-canvas-item { border-radius: 2px; } @@ -162,50 +160,47 @@ NautilusListView .view { border-bottom: 1px solid $borders_color; } // // Nemo // -NemoIconViewContainer { @extend NautilusCanvasViewContainer.view } +.nemo-desktop.nemo-canvas-item { @extend .nautilus-desktop.nautilus-canvas-item; } -NemoWindow .sidebar .frame { - border-width: 0; -} +NemoWindow { -NemoWindow GtkSeparator.separator.horizontal { - color: $borders_color; -} + EelEditableLabel.entry { transition: none; } // Workaround for invisible text in rename entry -.nemo-desktop.nemo-canvas-item { - @extend .nautilus-desktop.nautilus-canvas-item; -} + .sidebar .frame { border-width: 0; } -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button { + GtkSeparator.separator.horizontal { color: $borders_color; } - @include button(header-hover); + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button { - &:hover { background-color: lighten($header_button_bg, 15%); } - &:active, &:checked { @include button(header-active); } - &:insensitive { color: transparentize($header_fg, 0.4); } -} + @include button(header-hover); -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button, -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover, -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active, -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked, -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive { - @extend %linked; - @extend %linked_button; -} + &:hover { background-color: lighten($header_button_bg, 15%); } + &:active, &:checked { @include button(header-active); } + &:insensitive { color: transparentize($header_fg, 0.4); } + } -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) { + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button, + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover, + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active, + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked, + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive { + @extend %linked; + @extend %linked_button; + } - $_linked_separator_color: $header_button_border; + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) { - > .button:hover:not(:checked):not(:active):not(:only-child) { + $_linked_separator_color: $header_button_border; - &:hover { - box-shadow: inset 1px 0 $_linked_separator_color, - inset -1px 0 $_linked_separator_color; - } - &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; } - &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + > .button:hover:not(:checked):not(:active):not(:only-child) { + + &:hover { + box-shadow: inset 1px 0 $_linked_separator_color, + inset -1px 0 $_linked_separator_color; + } + &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; } + &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; } + } } } diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss index 1ce7d17..db4fb6c 100644 --- a/common/gtk-3.0/3.18/sass/_common.scss +++ b/common/gtk-3.0/3.18/sass/_common.scss @@ -1594,16 +1594,17 @@ GtkTreeView.view { // treeview grid lines a &.progressbar { // progress bar in treeviews color: $selected_fg_color; border-radius: 3px; + background-image: linear-gradient(to bottom, $selected_bg_color); &:selected { color: $selected_bg_color; box-shadow: none; - background-color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_fg_color); } } &.trough, &.trough:selected { // progress bar trough in treeviews color: $fg_color; - background-color: $button_border; + background-image: linear-gradient(to bottom, $button_border); border-radius: 3px; border-width: 0; } @@ -1697,7 +1698,7 @@ column-header.button.dnd { // for treeview-like derive widgets } } -.menu, .popup { +.menu { margin: 4px; padding: 0; border-radius: 0; @@ -1743,6 +1744,8 @@ column-header.button.dnd { // for treeview-like derive widgets } } +.csd .popup { border-radius: 2px; } + .menuitem .accelerator { color: gtkalpha(currentColor,0.55); } /************ @@ -2569,7 +2572,6 @@ GtkCalendar { &:inconsistent { color: gtkalpha(currentColor,0.55); } &.highlight { color: $fg_color; - background-color: transparentize($button_border, 0.5); } } @@ -2707,6 +2709,23 @@ GtkPlacesSidebar.sidebar { } // +// File chooser +// +GtkPlacesView { + .server-list-button > GtkImage { + transition: 200ms $ease-out-quad; + -gtk-icon-transform: rotate(0turn); + } + + .server-list-button:checked > GtkImage { + transition: 200ms $ease-out-quad; + -gtk-icon-transform: rotate(-0.5turn); + } + + .list-row.activatable:hover { background-color: transparent; } +} + +// // Paned // GtkPaned { // this is for the standard paned separator @@ -2951,6 +2970,10 @@ GtkVolumeButton.button { padding: 8px; } &.tiled { border-radius: 0; } + &.popup { + box-shadow: none; + border-radius: 0; + } // server-side decorations as used by mutter &.ssd { border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0); @@ -2959,7 +2982,7 @@ GtkVolumeButton.button { padding: 8px; } &.maximized { border-radius: 0; } } &.csd { - &.popup, &.menu { + &.popup { border-radius: 2px; box-shadow: 0 3px 6px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1)), 0 0 0 1px if($variant == 'light', $_wm_border, darken($bg_color, 10%)); @@ -2990,11 +3013,10 @@ GtkVolumeButton.button { padding: 8px; } } .button.titlebutton { - padding: 7px 4px; + padding: 6px 4px; @include button(undecorated); background-color: transparentize($header_bg, 1); - border-width: 0; &:hover { @include button(header-hover); @@ -3009,6 +3031,7 @@ GtkVolumeButton.button { padding: 8px; } background-color: transparent; background-position: center; background-repeat: no-repeat; + border-width: 0; &:backdrop { opacity: 1; } } diff --git a/common/gtk-3.0/3.18/sass/_granite.scss b/common/gtk-3.0/3.18/sass/_granite.scss index 1e53c7f..8e3b35d 100644 --- a/common/gtk-3.0/3.18/sass/_granite.scss +++ b/common/gtk-3.0/3.18/sass/_granite.scss @@ -192,6 +192,11 @@ GraniteWidgetsPopOver * { } // +// Xs Entry +// +GraniteWidgetsXsEntry.entry { padding: 4px; } + +// // Text Styles // .h1 { font: open sans 24px; } @@ -201,7 +206,6 @@ GraniteWidgetsPopOver * { .category-label { color: mix($bg_color, $text_color, 30%); font-weight: 600; - text-shadow: 0 1px transparentize(white, 0.4); } .h4 { diff --git a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss index 92c1b59..c738981 100644 --- a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss +++ b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss @@ -96,9 +96,12 @@ MarlinViewWindow { } &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); } - .pane-separator { background-color: $dark_sidebar_border; } } +NemoWindow.background > GtkGrid > GtkPaned > .pane-separator, +MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: $dark_sidebar_border } + + GtkFileChooserDialog { &.background.csd, &.background { background-color: $dark_sidebar_bg } @@ -142,8 +145,6 @@ GeditWindow.background.csd { > .titlebar .pane-separator:backdrop, &.maximized > .titlebar .pane-separator:backdrop { background-color: $header_border; } - > .titlebar { background-color: transparent; } - > .titlebar > GtkHeaderBar.header-bar.titlebar { background-color: $header_bg; @@ -157,11 +158,17 @@ GeditWindow.background.csd { } } -// Gedit -GeditWindow.background.csd { +FeedReaderreaderUI.background.csd > FeedReaderreaderHeaderbar.titlebar, +GeditWindow.background.csd > .titlebar { background-color: transparent; +} + +// Gedit +GeditWindow.background { + &.csd { background-color: transparent; } - .pane-separator { background-color: $dark_sidebar_border; } + .gedit-side-panel-paned .pane-separator { background-color: $dark_sidebar_border; } + .gedit-bottom-panel-paned .pane-separator { background-color: $borders_color; } } .gedit-bottom-panel-paned { background-color: $base_color; } diff --git a/common/gtk-3.0/3.18/sass/_unity.scss b/common/gtk-3.0/3.18/sass/_unity.scss index 48ebb2b..00fec8f 100644 --- a/common/gtk-3.0/3.18/sass/_unity.scss +++ b/common/gtk-3.0/3.18/sass/_unity.scss @@ -53,6 +53,7 @@ UnityPanelWidget, .unity-panel.menubar.menuitem:hover, .unity-panel.menubar .menuitem *:hover { border-radius: 0; - color: $selected_bg_color; + color: $selected_fg_color; + background-image: linear-gradient(to bottom, $selected_bg_color); border-bottom: none; } diff --git a/common/unity/launcher_arrow_ltr_19.svg b/common/unity/launcher_arrow_ltr_19.svg index 8ddb9e5..957b03b 100644 --- a/common/unity/launcher_arrow_ltr_19.svg +++ b/common/unity/launcher_arrow_ltr_19.svg @@ -34,20 +34,20 @@ </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="#828282" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="20.962996" - inkscape:cx="6.5395899" + inkscape:cx="-0.75898517" inkscape:cy="9.0594719" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" - inkscape:window-width="1301" - inkscape:window-height="650" - inkscape:window-x="65" + inkscape:window-width="1275" + inkscape:window-height="630" + inkscape:window-x="49" inkscape:window-y="24" inkscape:window-maximized="1" inkscape:snap-bbox="true" @@ -90,7 +90,7 @@ id="layer1" transform="translate(0,-1033.3622)"> <rect - style="fill:#5294e2;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" + style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.90196079" id="rect3338" width="2" height="17" diff --git a/common/unity/launcher_arrow_ltr_37.svg b/common/unity/launcher_arrow_ltr_37.svg index cc3b564..c2c2ec7 100644 --- a/common/unity/launcher_arrow_ltr_37.svg +++ b/common/unity/launcher_arrow_ltr_37.svg @@ -34,19 +34,19 @@ </defs> <sodipodi:namedview id="base" - pagecolor="#ffffff" + pagecolor="#828282" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="22.627417" - inkscape:cx="8.2254385" - inkscape:cy="0.39374777" + inkscape:cx="1.4637299" + inkscape:cy="12.768116" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1301" - inkscape:window-height="650" + inkscape:window-height="744" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="1" @@ -90,7 +90,7 @@ id="layer1" transform="translate(0,-1015.3622)"> <rect - style="fill:#5294e2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:0.90196079;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="rect3338" width="4" height="33.000019" diff --git a/common/unity/launcher_arrow_rtl_19.svg b/common/unity/launcher_arrow_rtl_19.svg index c3904f7..ae9337d 100644 --- a/common/unity/launcher_arrow_rtl_19.svg +++ b/common/unity/launcher_arrow_rtl_19.svg @@ -40,13 +40,13 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="20.962996" - inkscape:cx="3.0572632" + inkscape:cx="-4.2413119" inkscape:cy="9.0594719" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1301" - inkscape:window-height="650" + inkscape:window-height="744" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="1" @@ -80,7 +80,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -90,7 +90,7 @@ id="layer1" transform="translate(0,-1033.3622)"> <rect - style="fill:#5294e2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:0.90196079;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="rect3338" width="2" height="17" diff --git a/common/unity/launcher_arrow_rtl_37.svg b/common/unity/launcher_arrow_rtl_37.svg index a10ed7a..f592c52 100644 --- a/common/unity/launcher_arrow_rtl_37.svg +++ b/common/unity/launcher_arrow_rtl_37.svg @@ -40,13 +40,13 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="22.627417" - inkscape:cx="8.2254385" + inkscape:cx="1.4637299" inkscape:cy="5.6970486" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1301" - inkscape:window-height="650" + inkscape:window-height="744" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="1" @@ -80,7 +80,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -90,7 +90,7 @@ id="layer1" transform="translate(0,-1015.3622)"> <rect - style="fill:#5294e2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:0.90196079;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="rect3338" width="4" height="33.000019" diff --git a/common/unity/launcher_pip_ltr_19.svg b/common/unity/launcher_pip_ltr_19.svg index f8c258f..34b1757 100644 --- a/common/unity/launcher_pip_ltr_19.svg +++ b/common/unity/launcher_pip_ltr_19.svg @@ -40,13 +40,13 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="15.178831" - inkscape:cx="12.461715" + inkscape:cx="2.3818874" inkscape:cy="5.0805669" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1301" - inkscape:window-height="650" + inkscape:window-height="648" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="1" @@ -80,7 +80,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -90,7 +90,7 @@ id="layer1" transform="translate(0,-1033.3622)"> <rect - style="fill:#5294e2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:0.90196079;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="rect3338" width="2" height="3.0000174" diff --git a/common/unity/launcher_pip_ltr_37.svg b/common/unity/launcher_pip_ltr_37.svg index de9b0ba..d8dc422 100644 --- a/common/unity/launcher_pip_ltr_37.svg +++ b/common/unity/launcher_pip_ltr_37.svg @@ -40,13 +40,13 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="16" - inkscape:cx="2.0149514" + inkscape:cx="-7.5475486" inkscape:cy="14.518805" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1301" - inkscape:window-height="650" + inkscape:window-height="744" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="1" @@ -81,7 +81,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -92,7 +92,7 @@ transform="translate(0,-1015.3622)"> <rect rx="3.0675728e-06" - style="fill:#5294e2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:0.90196079;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="rect3338" width="4" height="5.0000172" diff --git a/common/unity/launcher_pip_rtl_19.svg b/common/unity/launcher_pip_rtl_19.svg index c03fa79..3194b73 100644 --- a/common/unity/launcher_pip_rtl_19.svg +++ b/common/unity/launcher_pip_rtl_19.svg @@ -40,13 +40,13 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="32" - inkscape:cx="5.2345129" - inkscape:cy="19.009685" + inkscape:cx="0.4532629" + inkscape:cy="12.759685" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1301" - inkscape:window-height="650" + inkscape:window-height="744" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="1" @@ -81,7 +81,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -91,7 +91,7 @@ id="layer1" transform="translate(0,-1033.3622)"> <rect - style="fill:#5294e2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:0.90196079;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="rect3338" width="2" height="3.0000174" diff --git a/common/unity/launcher_pip_rtl_37.svg b/common/unity/launcher_pip_rtl_37.svg index 76ecc64..461250f 100644 --- a/common/unity/launcher_pip_rtl_37.svg +++ b/common/unity/launcher_pip_rtl_37.svg @@ -40,13 +40,13 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="11.313709" - inkscape:cx="17.497826" + inkscape:cx="3.9744094" inkscape:cy="10.722806" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1301" - inkscape:window-height="650" + inkscape:window-height="744" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="1" @@ -81,7 +81,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -92,7 +92,7 @@ transform="translate(0,-1015.3622)"> <rect rx="3.0675728e-06" - style="fill:#5294e2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:0.90196079;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="rect3338" width="4" height="5.0000172" diff --git a/configure.ac b/configure.ac index b5e6144..2d42f6c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT( [arc-theme], - [20151002], + [20151031], [https://github.com/horst3180/Arc-theme/issues], [arc-theme], [https://github.com/horst3180/Arc-theme], diff --git a/extra/Chrome/arc-darker-theme.crx b/extra/Chrome/arc-darker-theme.crx Binary files differindex c2ba9e0..3b98ce4 100644 --- a/extra/Chrome/arc-darker-theme.crx +++ b/extra/Chrome/arc-darker-theme.crx diff --git a/extra/Chrome/arc-darker-theme/images/theme_frame_inactive.png b/extra/Chrome/arc-darker-theme/images/theme_frame_inactive.png Binary files differdeleted file mode 100644 index 5e47c88..0000000 --- a/extra/Chrome/arc-darker-theme/images/theme_frame_inactive.png +++ /dev/null diff --git a/extra/Chrome/arc-darker-theme/manifest.json b/extra/Chrome/arc-darker-theme/manifest.json index 42dcc6e..f9e5413 100644 --- a/extra/Chrome/arc-darker-theme/manifest.json +++ b/extra/Chrome/arc-darker-theme/manifest.json @@ -19,7 +19,7 @@ }, "images": { "theme_frame": "images/theme_frame.png", - "theme_frame_inactive": "images/theme_frame_inactive.png", + "theme_frame_inactive": "images/theme_frame.png", "theme_toolbar": "images/theme_toolbar.png" }, "properties": { diff --git a/extra/Chrome/arc-theme.crx b/extra/Chrome/arc-theme.crx Binary files differindex 26ff10d..12a172c 100644 --- a/extra/Chrome/arc-theme.crx +++ b/extra/Chrome/arc-theme.crx diff --git a/extra/Chrome/arc-theme/images/theme_frame_inactive.png b/extra/Chrome/arc-theme/images/theme_frame_inactive.png Binary files differdeleted file mode 100644 index 7fa8831..0000000 --- a/extra/Chrome/arc-theme/images/theme_frame_inactive.png +++ /dev/null diff --git a/extra/Chrome/arc-theme/manifest.json b/extra/Chrome/arc-theme/manifest.json index 4b58257..fb8b6f4 100644 --- a/extra/Chrome/arc-theme/manifest.json +++ b/extra/Chrome/arc-theme/manifest.json @@ -19,7 +19,7 @@ }, "images": { "theme_frame": "images/theme_frame.png", - "theme_frame_inactive": "images/theme_frame_inactive.png", + "theme_frame_inactive": "images/theme_frame.png", "theme_toolbar": "images/theme_toolbar.png" }, "properties": { diff --git a/m4/arc-gnome.m4 b/m4/arc-gnome.m4 index 82bd510..349d1e0 100644 --- a/m4/arc-gnome.m4 +++ b/m4/arc-gnome.m4 @@ -3,18 +3,23 @@ AC_DEFUN([ARC_GNOME], [ GNOMEDIR="$srcdir/common/gtk-3.0" - PKG_CHECK_EXISTS( - [gtk+-3.0], - [GNOME_VERSION=`$PKG_CONFIG --modversion gtk+-3.0`], - [GNOME_VERSION=`ls -1 "$GNOMEDIR" | tail -1`] - ) AC_ARG_WITH( [gnome], [AS_HELP_STRING( [--with-gnome], [GNOME minor version] )], - [GNOME_VERSION="$withval"] + [GNOME_VERSION="$withval"], + [AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes) + AS_IF( + [test "x$HAVE_PKG_CONFIG" != "xyes"], + [AC_MSG_ERROR([Could not find pkg-config.])] + ) + PKG_CHECK_EXISTS( + [gtk+-3.0], + [GNOME_VERSION=`$PKG_CONFIG --modversion gtk+-3.0`], + [AC_MSG_ERROR([Could not determine GNOME version. Install GTK3 and its development files (libgtk-3-dev for Debian/Ubuntu based distros and gtk3-devel for RPM based distros).])] + )] ) # Trim version extras @@ -31,7 +36,8 @@ AC_DEFUN([ARC_GNOME], [ ) AS_IF( [! test -e "$GNOMEDIR/$GNOME_VERSION"], - [AC_MSG_ERROR([invalid GNOME version: $GNOME_VERSION])] + [AC_MSG_ERROR([Invalid GNOME version: $GNOME_VERSION])] ) AC_SUBST([GNOME_VERSION]) + AC_MSG_RESULT([Building for GNOME $GNOME_VERSION]) ]) |
