Update and fixed bugs

This commit is contained in:
vinceliuice 2018-02-17 21:03:00 +08:00
parent 711c7f3290
commit ab546ab8e4
21 changed files with 15477 additions and 171 deletions

18
Install
View File

@ -17,22 +17,23 @@ srcdir=${repodir}/src
rm -rf $DEST_DIR/Sierra*
# Copying files
for trans in '' '-solid' ; do
for color in '-light' '-dark'; do
echo -e " Installing Sierra${color} ..."
echo -e " Installing Sierra${color}${trans} ..."
themedir=$DEST_DIR/Sierra${color}
themedir=$DEST_DIR/Sierra${color}${trans}
install -d ${themedir}
# Install index.theme
echo "[Desktop Entry]" >> ${themedir}/index.theme
echo "Type=X-GNOME-Metatheme" >> ${themedir}/index.theme
echo "Name=Sierra${color}" >> ${themedir}/index.theme
echo "Name=Sierra${color}${trans}" >> ${themedir}/index.theme
echo "Comment=An Stylish Gtk+ theme based on Elegant Design" >> ${themedir}/index.theme
echo "Encoding=UTF-8" >> ${themedir}/index.theme
echo "" >> ${themedir}/index.theme
echo "[X-GNOME-Metatheme]" >> ${themedir}/index.theme
echo "GtkTheme=Sierra${color}" >> ${themedir}/index.theme
echo "MetacityTheme=Sierra${color}" >> ${themedir}/index.theme
echo "GtkTheme=Sierra${color}${trans}" >> ${themedir}/index.theme
echo "MetacityTheme=Sierra${color}${trans}" >> ${themedir}/index.theme
echo "IconTheme=Adwaita" >> ${themedir}/index.theme
echo "CursorTheme=Adwaita" >> ${themedir}/index.theme
echo "ButtonLayout=close,minimize,maximize:menu" >> ${themedir}/index.theme
@ -42,7 +43,7 @@ srcdir=${repodir}/src
cd ${srcdir}/gnome-shell
cp -ur \
gnome-shell${color}.css \
gnome-shell${color}${trans}.css \
${themedir}/gnome-shell/gnome-shell.css
cp -ur \
@ -145,11 +146,11 @@ srcdir=${repodir}/src
${themedir}/gtk-3.0/thumbnail.png
cp -ur \
gtk${color}.css \
gtk${color}${trans}.css \
${themedir}/gtk-3.0/gtk.css
cp -ur \
gtk-dark.css \
gtk-dark${trans}.css \
${themedir}/gtk-3.0/gtk-dark.css
# Install Metacity Theme
@ -190,4 +191,5 @@ srcdir=${repodir}/src
${themedir}/xfwm4/themerc
done
done

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,10 @@
$variant: 'dark';
$laptop: 'true';
$panel: 'dark';
$trans: 'false';
@import 'sass/variables';
@import 'sass/colors';
@import 'sass/drawing';
@import 'sass/common';
@import 'sass/extensions';

View File

@ -72,7 +72,7 @@ stage {
.modal-dialog-linked-button {
min-height: 40px;
padding: 0 16px;
border-top: 1px solid rgba(0, 0, 0, 0.26) !important;
border-top: 1px solid rgba(255, 255, 255, 0.12) !important;
border-right-width: 0;
font-size: 9.75pt;
font-weight: 500;
@ -130,14 +130,14 @@ StEntry {
font-weight: 400;
background-color: #212121;
border-radius: 5px;
border: 1px solid rgba(0, 0, 0, 0.26);
border: 1px solid rgba(255, 255, 255, 0.12);
box-shadow: none; }
StEntry:focus {
border: 1px solid #4d91ff;
box-shadow: 0 0 0 2px #4d91ff; }
StEntry:insensitive {
color: rgba(255, 255, 255, 0.5);
border: 1px solid rgba(0, 0, 0, 0.5); }
border: 1px solid rgba(255, 255, 255, 0.5); }
StEntry StIcon.capslock-warning {
icon-size: 16px;
warning-color: #FF6D00;
@ -482,7 +482,7 @@ StScrollBar {
spacing: 20px; }
.audio-selection-device {
border: 1px solid rgba(0, 0, 0, 0.26);
border: 1px solid rgba(255, 255, 255, 0.12);
border-radius: 8px; }
.audio-selection-device:active, .audio-selection-device:hover, .audio-selection-device:focus {
background-color: #0062FF; }
@ -524,17 +524,17 @@ StScrollBar {
/* Popovers/Menus */
.popup-menu {
min-width: 160px;
min-width: 12em;
background-color: transparent; }
.popup-menu .popup-sub-menu {
background-color: rgba(100, 100, 100, 0.45);
background-color: rgba(100, 100, 100, 0.35);
box-shadow: 0 0 transparent;
border-radius: 0 0 5px 5px; }
.popup-menu .popup-menu-content {
padding: 6px 0;
margin: 0 2px; }
.popup-menu .popup-menu-item {
spacing: 8px;
spacing: 4px;
transition-duration: 100ms;
border-radius: 5px; }
.popup-menu .popup-menu-item:ltr {
@ -544,9 +544,10 @@ StScrollBar {
.popup-menu .popup-menu-item:checked {
background-color: #0062FF;
color: rgba(255, 255, 255, 0.85);
box-shadow: 0 0 transparent;
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
font-weight: normal;
border-radius: 5px 5px 0 0; }
border-radius: 5px 5px 0 0;
text-shadow: 0 1px rgba(0, 0, 0, 0.45); }
.popup-menu .popup-menu-item:checked.selected {
background-color: rgba(29, 116, 255, 0.9775);
color: rgba(255, 255, 255, 0.85); }
@ -597,13 +598,13 @@ StScrollBar {
.popup-separator-menu-item {
height: 1px;
margin: 0 38px;
background-color: transparent;
border-color: rgba(0, 0, 0, 0.1);
border-bottom-width: 1px;
background-color: rgba(255, 255, 255, 0.12);
border-color: transparent;
border-bottom-width: 0;
border-bottom-style: solid; }
.background-menu {
-boxpointer-gap: 4px;
-boxpointer-gap: 8px;
-arrow-rise: 0; }
/* fallback menu
@ -673,7 +674,7 @@ StScrollBar {
.switcher-list .separator {
width: 1px;
background: rgba(0, 0, 0, 0.26); }
background: rgba(255, 255, 255, 0.12); }
.switcher-arrow {
border-color: transparent;
@ -863,7 +864,7 @@ StScrollBar {
spacing: 8px; }
.datemenu-calendar-column {
border: 0 solid rgba(0, 0, 0, 0.26); }
border: 0 solid rgba(255, 255, 255, 0.12); }
.datemenu-calendar-column:ltr {
border-left-width: 0; }
.datemenu-calendar-column:rtl {
@ -1493,7 +1494,7 @@ StScrollBar {
width: 5px;
height: 5px;
border-radius: 3px;
background-color: rgba(255, 255, 255, 0.85);
background-color: #0062FF;
margin-bottom: 0; }
.search-provider-icon,
@ -1617,7 +1618,7 @@ StScrollBar {
.notification-banner .notification-actions {
background-color: transparent;
padding-top: 0;
border-top: 1px solid rgba(0, 0, 0, 0.26);
border-top: 1px solid rgba(255, 255, 255, 0.12);
spacing: 1px; }
.notification-banner .notification-button {
min-height: 40px;
@ -1865,14 +1866,14 @@ StScrollBar {
selected-color: rgba(255, 255, 255, 0.85);
background-color: #212121;
border-radius: 5px;
border: 1px solid rgba(0, 0, 0, 0.26);
border: 1px solid rgba(255, 255, 255, 0.12);
box-shadow: none; }
.login-dialog StEntry:focus {
border: 1px solid #4d91ff;
box-shadow: 0 0 0 2px #4d91ff; }
.login-dialog StEntry:insensitive {
color: rgba(255, 255, 255, 0.5);
border: 1px solid rgba(0, 0, 0, 0.5);
border: 1px solid rgba(255, 255, 255, 0.5);
color: rgba(255, 255, 255, 0.5); }
.login-dialog .modal-dialog-button-box {
spacing: 3px; }
@ -2119,7 +2120,7 @@ StScrollBar {
border: none;
border-radius: 0;
background-color: rgba(36, 36, 36, 0.01);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.26); }
box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.12); }
#LookingGlassDialog .labels {
spacing: 0; }
#LookingGlassDialog .notebook-tab {
@ -2395,7 +2396,7 @@ StScrollBar {
selected-color: rgba(255, 255, 255, 0.85);
background-color: #212121;
border-radius: 5px;
border: 1px solid rgba(0, 0, 0, 0.26);
border: 1px solid rgba(255, 255, 255, 0.12);
box-shadow: none; }
.popup-menu .search-entry:focus {
border: 1px solid #4d91ff;

View File

@ -1,6 +1,7 @@
$variant: 'dark';
$laptop: 'true';
$panel: 'dark';
$trans: 'true';
@import 'sass/variables';
@import 'sass/colors';

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,10 @@
$variant: 'light';
$laptop: 'true';
$panel: 'light';
$trans: 'false';
@import 'sass/variables';
@import 'sass/colors';
@import 'sass/drawing';
@import 'sass/common';
@import 'sass/extensions';

View File

@ -524,17 +524,17 @@ StScrollBar {
/* Popovers/Menus */
.popup-menu {
min-width: 160px;
min-width: 12em;
background-color: transparent; }
.popup-menu .popup-sub-menu {
background-color: rgba(191, 191, 191, 0.45);
background-color: rgba(191, 191, 191, 0.35);
box-shadow: 0 0 transparent;
border-radius: 0 0 5px 5px; }
.popup-menu .popup-menu-content {
padding: 6px 0;
margin: 0 2px; }
.popup-menu .popup-menu-item {
spacing: 8px;
spacing: 4px;
transition-duration: 100ms;
border-radius: 5px; }
.popup-menu .popup-menu-item:ltr {
@ -544,9 +544,10 @@ StScrollBar {
.popup-menu .popup-menu-item:checked {
background-color: #0e6bff;
color: rgba(255, 255, 255, 0.85);
box-shadow: 0 0 transparent;
box-shadow: inset 0 -1px rgba(0, 0, 0, 0.15);
font-weight: normal;
border-radius: 5px 5px 0 0; }
border-radius: 5px 5px 0 0;
text-shadow: 0 1px rgba(0, 0, 0, 0.45); }
.popup-menu .popup-menu-item:checked.selected {
background-color: rgba(42, 124, 255, 0.9775);
color: rgba(255, 255, 255, 0.85); }
@ -597,13 +598,13 @@ StScrollBar {
.popup-separator-menu-item {
height: 1px;
margin: 0 38px;
background-color: transparent;
border-color: rgba(0, 0, 0, 0.1);
border-bottom-width: 1px;
background-color: rgba(0, 0, 0, 0.12);
border-color: transparent;
border-bottom-width: 0;
border-bottom-style: solid; }
.background-menu {
-boxpointer-gap: 4px;
-boxpointer-gap: 8px;
-arrow-rise: 0; }
/* fallback menu
@ -1493,7 +1494,7 @@ StScrollBar {
width: 5px;
height: 5px;
border-radius: 3px;
background-color: rgba(255, 255, 255, 0.85);
background-color: #0e6bff;
margin-bottom: 0; }
.search-provider-icon,

View File

@ -1,6 +1,7 @@
$variant: 'light';
$laptop: 'true';
$panel: 'light';
$trans: 'true';
@import 'sass/variables';
@import 'sass/colors';

View File

@ -44,8 +44,6 @@ $alt_base_color: if($variant =='dark', lighten($base_color, 25%), darken($base_c
$bg_color: rgba($black, $middle_opacity);
$alt_bg_color: rgba($black, $lower_opacity);
$inverse_bg_color: rgba($inverse_fg_color, 0.13);
$panel_bg_color: rgba($base_color, 0.65);
$panel_fg_color: if($panel == 'dark', #dedede, #242424);
// Misc colors
@ -53,6 +51,10 @@ $primary_color: if($variant == 'light', #0e6bff, #0062FF);
$alt_primary_color: if($variant == 'light', #0e6bff, #0062FF);
$accent_color: if($variant == 'light', #0e6bff, #0062FF);
$panel_bg_color: if($trans == 'true', rgba($base_color, 0.65), $base_color);
$panel_fg_color: if($panel == 'dark', #dedede, #242424);
$menu_bg_color: if($trans == 'true', rgba($base_color, 0.95), $base_color);
$link_color: $primary_color;
$visited_link_color: $purple_A200;
@ -68,6 +70,6 @@ $question_bg_color: $blue_400;
$warning_bg_color: $orange_400;
$error_bg_color: $red_400;
$border_color: if($variant == 'light', rgba($black, 0.12), rgba($black, 0.26));
$border_color: if($variant == 'light', rgba($black, 0.12), rgba($white, 0.12));
$highlight_color: if($variant == 'light', rgba($white, 0.4), rgba($white, 0.1));
$alt_highlight_color: rgba($white, 0.2);

View File

@ -555,19 +555,19 @@ $slider_color: if($variant == 'light', $accent_color, white);
/* Popovers/Menus */
.popup-menu {
min-width: 160px;
min-width: 12em;
background-color: transparent;
.popup-menu-arrow { } //defined globally in the TOP BAR
.popup-sub-menu {
background-color: rgba($alt_base_color, 0.45);
background-color: rgba($alt_base_color, 0.35);
box-shadow: $shadow_0;
border-radius: 0 0 $material_radius $material_radius;
}
.popup-menu-content { padding: 6px 0; margin: 0 2px; }
.popup-menu-item {
spacing: 8px;
spacing: 4px;
transition-duration: $shorter_duration;
border-radius: $material_radius;
@ -576,9 +576,11 @@ $slider_color: if($variant == 'light', $accent_color, white);
&:checked {
background-color: $primary_color;
color: $inverse_fg_color;
box-shadow: $shadow_0;
box-shadow: inset 0 -1px rgba(black, 0.15);
font-weight: normal;
border-radius: $material_radius $material_radius 0 0;
text-shadow: 0 1px rgba(black, 0.45);
&.selected {
background-color: mix($inverse_fg_color, $primary_color, percentage($lower_opacity / 2));
color: $inverse_fg_color;
@ -631,7 +633,7 @@ $slider_color: if($variant == 'light', $accent_color, white);
-arrow-rise: 0;
-arrow-box-shadow: none; //dreaming. bug #689995
margin: 2px 6px 6px;
background-color: rgba($base_color, 0.95);
background-color: $menu_bg_color;
border-radius: $material_radius;
box-shadow: $shadow_2;
}
@ -639,14 +641,14 @@ $slider_color: if($variant == 'light', $accent_color, white);
.popup-separator-menu-item {
height: 1px; //not really the whole box
margin: 0 38px;
background-color: transparent;
border-color: rgba($border_color, 0.1);
border-bottom-width: 1px;
background-color: $border_color;
border-color: transparent;
border-bottom-width: 0;
border-bottom-style: solid;
}
// Background menu
.background-menu { -boxpointer-gap: 4px; -arrow-rise: 0; }
.background-menu { -boxpointer-gap: 8px; -arrow-rise: 0; }
/* fallback menu
- odd thing for styling App menu when apparently not running under shell. Light Adwaita styled
@ -810,7 +812,7 @@ $slider_color: if($variant == 'light', $accent_color, white);
/* TOP BAR */
#panel {
background-color: $panel_bg_color;;
background-color: $panel_bg_color;
/* transition from solid to transparent */
transition-duration: 250ms;
font-weight: bold;
@ -1634,7 +1636,7 @@ $slider_color: if($variant == 'light', $accent_color, white);
.app-well-app-running-dot { //running apps indicator
width: 5px; height: 5px;
border-radius: 3px;
background-color: $inverse_fg_color;
background-color: $primary_color;
margin-bottom: 0;
}

View File

@ -62,3 +62,5 @@ $shadow_3: 0 10px 10px rgba(0, 0, 0, 0.19 * 1.5), 0 6px 3px rgba(0, 0, 0, 0.23 *
$shadow_4: 0 14px 14px rgba(0, 0, 0, 0.25 * 2), 0 10px 5px rgba(0, 0, 0, 0.22 * 2);
$shadow_5: 0 19px 19px rgba(0, 0, 0, 0.30 * 2), 0 15px 6px rgba(0, 0, 0, 0.22 * 2);
$shadow_6: 0 0 8px rgba(0, 0, 0, 0.2), 0 0 4px rgba(0, 0, 0, 0.3);
$text_shadow: 0 -1px rgba(#ffffff, 0.04), -1px 0px rgba(#202020, 0.05), 1px 0px rgba(#202020, 0.05),
0px 1px rgba(#202020, 0.3), 0px 2px rgba(#202020, 0.05); // text and icon shadow

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,13 @@
$variant: 'dark';
$darker: 'false';
$transparency: 'false';
@import 'sass/colors';
@import 'sass/drawing';
@import 'sass/common';
@import 'sass/applications';
@import 'sass/unity';
@import 'sass/granite';
@import 'sass/lightdm';
@import 'sass/transparent_widgets';
@import 'sass/colors-public';

View File

@ -90,15 +90,13 @@ flowbox flowboxchild {
flowbox flowboxchild:selected {
outline-offset: -2px; }
label.separator, popover label.separator,
popover.background label.separator {
label.separator, popover label.separator {
color: #dedede; }
label selection {
color: #ffffff;
background-color: #0062FF; }
.dim-label, label.separator, popover label.separator,
popover.background label.separator, headerbar .subtitle,
.dim-label, label.separator, popover label.separator, headerbar .subtitle,
.titlebar:not(headerbar) .subtitle {
opacity: 0.55; }
@ -116,11 +114,7 @@ assistant .sidebar label.highlight {
textview {
background-color: #242424; }
popover.osd, popover.magnifier, .csd popover.osd, .csd popover.magnifier,
popover.background.osd,
popover.background.magnifier, .csd
popover.background.osd, .csd
popover.background.magnifier, .osd .scale-popup, .osd {
popover.osd, popover.magnifier, .csd popover.osd, .csd popover.magnifier, .osd .scale-popup, .osd {
color: #dedede;
border: none;
background-color: rgba(36, 36, 36, 0.95);
@ -937,6 +931,12 @@ searchbar {
border-color: #4B4B4B;
border-width: 0 0 1px;
padding: 3px; }
searchbar button.flat, searchbar button.sidebar-button {
min-height: 16px;
min-width: 16px;
margin: 4px 6px;
padding: 0 2px;
border-radius: 100px; }
actionbar {
padding: 6px;
@ -1052,9 +1052,12 @@ headerbar,
.titlebar {
border-radius: 6px 6px 0 0; }
headerbar entry, headerbar button, headerbar separator {
headerbar button, headerbar separator {
margin-top: 6px;
margin-bottom: 6px; }
headerbar entry {
margin-top: 5px;
margin-bottom: 5px; }
separator:first-child + headerbar, separator:first-child + headerbar:backdrop, headerbar:first-child, headerbar:first-child:backdrop {
border-top-left-radius: 6px; }
.maximized separator:first-child + headerbar, .tiled separator:first-child + headerbar, .maximized separator:first-child + headerbar:backdrop, .tiled separator:first-child + headerbar:backdrop, .maximized headerbar:first-child, .tiled headerbar:first-child, .maximized headerbar:first-child:backdrop, .tiled headerbar:first-child:backdrop {
@ -1085,7 +1088,6 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop, w
opacity: 0.6; }
headerbar entry, .nemo-window .primary-toolbar entry {
min-height: 22px;
border: none;
color: rgba(225, 219, 219, 0.8);
background-color: rgba(119, 119, 119, 0.55);
@ -1093,7 +1095,9 @@ headerbar entry, .nemo-window .primary-toolbar entry {
headerbar entry image, .nemo-window .primary-toolbar entry image, headerbar entry image:hover, .nemo-window .primary-toolbar entry image:hover {
color: inherit; }
headerbar entry:backdrop, .nemo-window .primary-toolbar entry:backdrop {
opacity: 0.85; }
opacity: 0.85;
box-shadow: none;
background-image: none; }
headerbar entry:focus, .nemo-window .primary-toolbar entry:focus {
border: none;
box-shadow: 0 0 0 2px #66a1ff, inset 0 0 0 1px #66a1ff;
@ -1608,16 +1612,13 @@ menu,
.context-menu,
popover.touch-selection,
.csd popover.touch-selection,
popover.background.touch-selection,
.csd popover.background.touch-selection,
.menu {
margin: 0;
padding: 10px 0;
border-radius: 6px;
background-color: rgba(51, 51, 51, 0.95);
border: 1px solid rgba(255, 255, 255, 0.12); }
background-color: rgba(51, 51, 51, 0.95); }
.csd menu, .csd
.context-menu, .csd popover.touch-selection, .csd popover.background.touch-selection, .csd
.context-menu, .csd popover.touch-selection, .csd
.menu {
border-radius: 6px;
background-color: rgba(51, 51, 51, 0.95);
@ -1625,10 +1626,8 @@ popover.background.touch-selection,
menu separator, .csd menu separator,
.context-menu separator,
popover.touch-selection separator,
.csd popover.touch-selection separator,
popover.background.touch-selection separator,
.csd popover.background.touch-selection separator, .csd
.context-menu separator, .csd popover.touch-selection separator, .csd popover.background.touch-selection separator,
.csd popover.touch-selection separator, .csd
.context-menu separator, .csd popover.touch-selection separator,
.menu separator, .csd
.menu separator {
margin: 4px 0;
@ -1639,8 +1638,6 @@ popover.background.touch-selection,
.context-menu menuitem,
popover.touch-selection menuitem,
.csd popover.touch-selection menuitem,
popover.background.touch-selection menuitem,
.csd popover.background.touch-selection menuitem,
.menu menuitem {
min-height: 12px;
min-width: 40px;
@ -1651,7 +1648,6 @@ popover.background.touch-selection,
menu menuitem:hover,
.context-menu menuitem:hover,
popover.touch-selection menuitem:hover,
.csd popover.background.touch-selection menuitem:hover,
.menu menuitem:hover {
color: #ffffff;
background-color: #0062FF;
@ -1661,22 +1657,18 @@ popover.background.touch-selection,
menu menuitem:hover arrow,
.context-menu menuitem:hover arrow,
popover.touch-selection menuitem:hover arrow,
.csd popover.background.touch-selection menuitem:hover arrow,
.menu menuitem:hover arrow {
color: #ffffff;
-gtk-icon-shadow: none; }
menu menuitem:disabled,
.context-menu menuitem:disabled,
popover.touch-selection menuitem:disabled,
.csd popover.background.touch-selection menuitem:disabled,
.menu menuitem:disabled {
color: rgba(222, 222, 222, 0.45); }
menu menuitem arrow,
.context-menu menuitem arrow,
popover.touch-selection menuitem arrow,
.csd popover.touch-selection menuitem arrow,
popover.background.touch-selection menuitem arrow,
.csd popover.background.touch-selection menuitem arrow,
.menu menuitem arrow {
min-height: 16px;
min-width: 16px;
@ -1687,14 +1679,12 @@ popover.background.touch-selection,
menu menuitem arrow:dir(ltr),
.context-menu menuitem arrow:dir(ltr),
popover.touch-selection menuitem arrow:dir(ltr),
.csd popover.background.touch-selection menuitem arrow:dir(ltr),
.menu menuitem arrow:dir(ltr) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
margin-right: 0; }
menu menuitem arrow:dir(rtl),
.context-menu menuitem arrow:dir(rtl),
popover.touch-selection menuitem arrow:dir(rtl),
.csd popover.background.touch-selection menuitem arrow:dir(rtl),
.menu menuitem arrow:dir(rtl) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
margin-left: 0; }
@ -1713,8 +1703,6 @@ popover.background.touch-selection,
.context-menu > arrow,
popover.touch-selection > arrow,
.csd popover.touch-selection > arrow,
popover.background.touch-selection > arrow,
.csd popover.background.touch-selection > arrow,
.menu > arrow {
min-width: 16px;
min-height: 16px;
@ -1755,31 +1743,29 @@ popover.background.touch-selection,
background-color: transparent;
border-color: transparent; }
popover,
popover.background {
padding: 2px;
border-radius: 5px;
background-color: rgba(51, 51, 51, 0.95); }
.csd popover.background, popover.background {
border-radius: 5px; }
popover {
padding: 2px;
border-radius: 5px;
background-clip: border-box;
background-color: rgba(51, 51, 51, 0.95);
box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.15); }
.csd popover, popover, .csd
popover.background,
popover.background {
.csd popover, popover {
border-radius: 5px;
border: 1px solid rgba(255, 255, 255, 0.12); }
popover separator,
popover.background separator {
popover separator {
background-color: #333333; }
popover > list,
popover > .view,
popover > iconview,
popover > toolbar,
popover > .inline-toolbar,
popover.background > list,
popover.background > .view,
popover.background > iconview,
popover.background > toolbar,
popover.background > .inline-toolbar {
popover > .inline-toolbar {
border-style: none;
background-color: transparent; }
@ -3206,9 +3192,7 @@ colorchooser .popover.osd {
background-color: #5c5c5c;
box-shadow: none; }
.context-menu, popover.touch-selection, .csd popover.touch-selection,
popover.background.touch-selection, .csd
popover.background.touch-selection {
.context-menu, popover.touch-selection, .csd popover.touch-selection {
font: initial; }
.monospace {
@ -3472,8 +3456,7 @@ terminal-window notebook > header.top button,
color: #ffffff;
text-shadow: none; }
.nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator,
popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle,
.nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle,
.titlebar:not(headerbar) .nautilus-canvas-item.subtitle,
.nautilus-list-dim-label {
color: #898989; }
@ -4428,8 +4411,7 @@ window.background:not(.csd) > widget > button > button {
window.background:not(.csd) > menu,
window.background:not(.csd) .menu {
background-color: #404040;
border-radius: 0;
border: none; }
border-radius: 0; }
window.background:not(.csd) > menu .separator:not(label), .csd window.background:not(.csd) > menu .separator:not(label),
window.background:not(.csd) .menu .separator:not(label), .csd
window.background:not(.csd) .menu .separator:not(label) {

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,13 @@
$variant: 'light';
$darker: 'false';
$transparency: 'false';
@import 'sass/colors';
@import 'sass/drawing';
@import 'sass/common';
@import 'sass/applications';
@import 'sass/unity';
@import 'sass/granite';
@import 'sass/lightdm';
@import 'sass/transparent_widgets';
@import 'sass/colors-public';

View File

@ -90,15 +90,13 @@ flowbox flowboxchild {
flowbox flowboxchild:selected {
outline-offset: -2px; }
label.separator, popover label.separator,
popover.background label.separator {
label.separator, popover label.separator {
color: #242424; }
label selection {
color: #ffffff;
background-color: #0e6bff; }
.dim-label, label.separator, popover label.separator,
popover.background label.separator, headerbar .subtitle,
.dim-label, label.separator, popover label.separator, headerbar .subtitle,
.titlebar:not(headerbar) .subtitle {
opacity: 0.55; }
@ -116,11 +114,7 @@ assistant .sidebar label.highlight {
textview {
background-color: #ffffff; }
popover.osd, popover.magnifier, .csd popover.osd, .csd popover.magnifier,
popover.background.osd,
popover.background.magnifier, .csd
popover.background.osd, .csd
popover.background.magnifier, .osd .scale-popup, .osd {
popover.osd, popover.magnifier, .csd popover.osd, .csd popover.magnifier, .osd .scale-popup, .osd {
color: #363636;
border: none;
background-color: rgba(245, 245, 245, 0.95);
@ -940,6 +934,12 @@ searchbar {
border-color: #E1E1E1;
border-width: 0 0 1px;
padding: 3px; }
searchbar button.flat, searchbar button.sidebar-button {
min-height: 16px;
min-width: 16px;
margin: 4px 6px;
padding: 0 2px;
border-radius: 100px; }
actionbar {
padding: 6px;
@ -1055,9 +1055,12 @@ headerbar,
.titlebar {
border-radius: 6px 6px 0 0; }
headerbar entry, headerbar button, headerbar separator {
headerbar button, headerbar separator {
margin-top: 6px;
margin-bottom: 6px; }
headerbar entry {
margin-top: 5px;
margin-bottom: 5px; }
separator:first-child + headerbar, separator:first-child + headerbar:backdrop, headerbar:first-child, headerbar:first-child:backdrop {
border-top-left-radius: 6px; }
.maximized separator:first-child + headerbar, .tiled separator:first-child + headerbar, .maximized separator:first-child + headerbar:backdrop, .tiled separator:first-child + headerbar:backdrop, .maximized headerbar:first-child, .tiled headerbar:first-child, .maximized headerbar:first-child:backdrop, .tiled headerbar:first-child:backdrop {
@ -1088,14 +1091,15 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop, w
opacity: 0.6; }
headerbar entry, .nemo-window .primary-toolbar entry {
min-height: 20px;
color: rgba(40, 32, 32, 0.8);
background-color: white;
background-image: linear-gradient(0deg, #f1f1f1 0%, #fdfdfd 95%, #fefefe 100%); }
headerbar entry image, .nemo-window .primary-toolbar entry image, headerbar entry image:hover, .nemo-window .primary-toolbar entry image:hover {
color: inherit; }
headerbar entry:backdrop, .nemo-window .primary-toolbar entry:backdrop {
opacity: 0.85; }
opacity: 0.85;
box-shadow: none;
background-image: none; }
headerbar entry:focus, .nemo-window .primary-toolbar entry:focus {
box-shadow: 0 0 0 2px #74aaff;
border-color: #74aaff;
@ -1609,16 +1613,13 @@ menu,
.context-menu,
popover.touch-selection,
.csd popover.touch-selection,
popover.background.touch-selection,
.csd popover.background.touch-selection,
.menu {
margin: 0;
padding: 10px 0;
border-radius: 6px;
background-color: rgba(255, 255, 255, 0.95);
border: 1px solid rgba(0, 0, 0, 0.11); }
background-color: rgba(255, 255, 255, 0.95); }
.csd menu, .csd
.context-menu, .csd popover.touch-selection, .csd popover.background.touch-selection, .csd
.context-menu, .csd popover.touch-selection, .csd
.menu {
border-radius: 6px;
background-color: rgba(255, 255, 255, 0.95);
@ -1626,10 +1627,8 @@ popover.background.touch-selection,
menu separator, .csd menu separator,
.context-menu separator,
popover.touch-selection separator,
.csd popover.touch-selection separator,
popover.background.touch-selection separator,
.csd popover.background.touch-selection separator, .csd
.context-menu separator, .csd popover.touch-selection separator, .csd popover.background.touch-selection separator,
.csd popover.touch-selection separator, .csd
.context-menu separator, .csd popover.touch-selection separator,
.menu separator, .csd
.menu separator {
margin: 4px 0;
@ -1640,8 +1639,6 @@ popover.background.touch-selection,
.context-menu menuitem,
popover.touch-selection menuitem,
.csd popover.touch-selection menuitem,
popover.background.touch-selection menuitem,
.csd popover.background.touch-selection menuitem,
.menu menuitem {
min-height: 12px;
min-width: 40px;
@ -1652,7 +1649,6 @@ popover.background.touch-selection,
menu menuitem:hover,
.context-menu menuitem:hover,
popover.touch-selection menuitem:hover,
.csd popover.background.touch-selection menuitem:hover,
.menu menuitem:hover {
color: #ffffff;
background-color: #0e6bff;
@ -1662,22 +1658,18 @@ popover.background.touch-selection,
menu menuitem:hover arrow,
.context-menu menuitem:hover arrow,
popover.touch-selection menuitem:hover arrow,
.csd popover.background.touch-selection menuitem:hover arrow,
.menu menuitem:hover arrow {
color: #ffffff;
-gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); }
menu menuitem:disabled,
.context-menu menuitem:disabled,
popover.touch-selection menuitem:disabled,
.csd popover.background.touch-selection menuitem:disabled,
.menu menuitem:disabled {
color: rgba(36, 36, 36, 0.55); }
menu menuitem arrow,
.context-menu menuitem arrow,
popover.touch-selection menuitem arrow,
.csd popover.touch-selection menuitem arrow,
popover.background.touch-selection menuitem arrow,
.csd popover.background.touch-selection menuitem arrow,
.menu menuitem arrow {
min-height: 16px;
min-width: 16px;
@ -1688,14 +1680,12 @@ popover.background.touch-selection,
menu menuitem arrow:dir(ltr),
.context-menu menuitem arrow:dir(ltr),
popover.touch-selection menuitem arrow:dir(ltr),
.csd popover.background.touch-selection menuitem arrow:dir(ltr),
.menu menuitem arrow:dir(ltr) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
margin-right: 0; }
menu menuitem arrow:dir(rtl),
.context-menu menuitem arrow:dir(rtl),
popover.touch-selection menuitem arrow:dir(rtl),
.csd popover.background.touch-selection menuitem arrow:dir(rtl),
.menu menuitem arrow:dir(rtl) {
-gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
margin-left: 0; }
@ -1714,8 +1704,6 @@ popover.background.touch-selection,
.context-menu > arrow,
popover.touch-selection > arrow,
.csd popover.touch-selection > arrow,
popover.background.touch-selection > arrow,
.csd popover.background.touch-selection > arrow,
.menu > arrow {
min-width: 16px;
min-height: 16px;
@ -1756,31 +1744,29 @@ popover.background.touch-selection,
background-color: transparent;
border-color: transparent; }
popover,
popover.background {
padding: 2px;
border-radius: 5px;
background-color: rgba(255, 255, 255, 0.95); }
.csd popover.background, popover.background {
border-radius: 5px; }
popover {
padding: 2px;
border-radius: 5px;
background-clip: border-box;
background-color: rgba(255, 255, 255, 0.95);
box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.15); }
.csd popover, popover, .csd
popover.background,
popover.background {
.csd popover, popover {
border-radius: 5px;
border: 1px solid rgba(0, 0, 0, 0.11); }
popover separator,
popover.background separator {
popover separator {
background-color: #ffffff; }
popover > list,
popover > .view,
popover > iconview,
popover > toolbar,
popover > .inline-toolbar,
popover.background > list,
popover.background > .view,
popover.background > iconview,
popover.background > toolbar,
popover.background > .inline-toolbar {
popover > .inline-toolbar {
border-style: none;
background-color: transparent; }
@ -3212,9 +3198,7 @@ colorchooser .popover.osd {
background-color: #f7f7f7;
box-shadow: none; }
.context-menu, popover.touch-selection, .csd popover.touch-selection,
popover.background.touch-selection, .csd
popover.background.touch-selection {
.context-menu, popover.touch-selection, .csd popover.touch-selection {
font: initial; }
.monospace {
@ -3478,8 +3462,7 @@ terminal-window notebook > header.top button,
color: #ffffff;
text-shadow: none; }
.nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator,
popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle,
.nautilus-canvas-item.dim-label, label.nautilus-canvas-item.separator, headerbar .nautilus-canvas-item.subtitle,
.titlebar:not(headerbar) .nautilus-canvas-item.subtitle,
.nautilus-list-dim-label {
color: #8d8d8d; }
@ -4430,8 +4413,7 @@ window.background:not(.csd) > widget > button > button {
window.background:not(.csd) > menu,
window.background:not(.csd) .menu {
background-color: #ffffff;
border-radius: 0;
border: none; }
border-radius: 0; }
window.background:not(.csd) > menu .separator:not(label), .csd window.background:not(.csd) > menu .separator:not(label),
window.background:not(.csd) .menu .separator:not(label), .csd
window.background:not(.csd) .menu .separator:not(label) {

View File

@ -1487,7 +1487,7 @@ window.background:not(.csd) {
.menu { // context-menus
background-color: if($variant == 'light', $base_color, lighten($bg_color, 5%));
border-radius: 0;
border: none;
// border: 1px solid $borders_color;
.separator:not(label),
.csd & .separator:not(label) { color: $borders_color; }

View File

@ -1048,6 +1048,15 @@ searchbar {
border-color: $bar_border;
border-width: 0 0 1px;
padding: 3px;
// Close button on searchbar
button.flat {
min-height: 16px;
min-width: 16px;
margin: 4px 6px;
padding: 0 2px;
border-radius: 100px;
}
}
actionbar {
@ -1196,11 +1205,16 @@ headerbar,
headerbar {
@extend %header_widgets;
entry, button, separator {
button, separator {
margin-top: 6px;
margin-bottom: 6px;
}
entry {
margin-top: 5px;
margin-bottom: 5px;
}
// Fixes split headerbars
separator:first-child + &,
&:first-child {
@ -1254,10 +1268,10 @@ headerbar {
// Headerbar Entries
entry {
min-height: if($variant =='light', 20px, 22px);
// min-height: if($variant == 'light', 20px, 22px);
@include entry(header-normal);
&:backdrop { opacity: 0.85; }
&:backdrop { opacity: 0.85; box-shadow: none; background-image: none; }
&:focus {
@include entry(header-focus);
@ -1805,12 +1819,12 @@ menu,
margin: 0;
padding: 10px 0;
border-radius: $wm_radius;
background-color: rgba($_menu_bg, 0.95);
border: 1px solid $borders_color;
background-color: if($transparency == 'true', rgba($_menu_bg, 0.95), $_menu_bg);
// border: 1px solid $borders_color;
.csd & {
border-radius: $wm_radius;
background-color: rgba($_menu_bg, 0.95);
background-color: if($transparency == 'true', rgba($_menu_bg, 0.95), $_menu_bg);
border: 1px solid $borders_color;
}
@ -1909,13 +1923,22 @@ menu,
//
// Popovers
//
popover,
$_popover_bg: if($variant=='light', $base_color, $bg_color);
popover.background {
$_popover_bg: if($variant=='light', $base_color, $bg_color);
padding: 2px;
border-radius: $bt_radius;
background-color: if($transparency == 'true', rgba($_popover_bg, 0.95), $_popover_bg);
.csd &, & { border-radius: $bt_radius; }
}
popover {
padding: 2px;
border-radius: $bt_radius;
background-clip: border-box;
background-color: rgba($_popover_bg, 0.95);
background-color: if($transparency == 'true', rgba($_popover_bg, 0.95), $_popover_bg);
box-shadow: 0 3px 6px 0 if($variant=='light', transparentize(black, 0.85), transparentize(black, 0.85));

View File

@ -1,13 +1,13 @@
// Shadows
$shadow_0: 0px 1px 2px 0px rgba(16, 16, 16, 0.1), 0px 2px 2px 0px rgba(16, 16, 16, 0.05);
$shadow_1: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
$shadow_2: 0px 1px 1px 0px rgba(16, 16, 16, 0.1), 0px 1px 2px 0px rgba(16, 16, 16, 0.05);
$shadow_0: 0px 1px 2px 0px rgba(16, 16, 16, 0.1), 0px 2px 2px 0px rgba(16, 16, 16, 0.05); // Slider hover shadow
$shadow_1: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06); // Header-button shadow
$shadow_2: 0px 1px 1px 0px rgba(16, 16, 16, 0.1), 0px 1px 2px 0px rgba(16, 16, 16, 0.05); // Slider normal shadow
$shadow_3: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); // Normal button shadow
$shadow_4: 0px 2px 3px 0px rgba(16, 16, 16, 0.2), 0px 3px 5px 0px rgba(16, 16, 16, 0.15);
$shadow_5: 0px 1px 2px 0px rgba(16, 16, 16, 0.15), 0px 2px 3px 0px rgba(16, 16, 16, 0.1);
$shadow_4: 0px 2px 3px 0px rgba(16, 16, 16, 0.2), 0px 3px 5px 0px rgba(16, 16, 16, 0.15); // Switch-slider hover shadow
$shadow_5: 0px 1px 2px 0px rgba(16, 16, 16, 0.15), 0px 2px 3px 0px rgba(16, 16, 16, 0.1); // Switch-slider normal shadow
$text_shadow: 0 -1px rgba(#ffffff, 0.04), -1px 0px rgba(#202020, 0.05), 1px 0px rgba(#202020, 0.05),
0px 1px rgba(#202020, 0.3), 0px 2px rgba(#202020, 0.05);
0px 1px rgba(#202020, 0.3), 0px 2px rgba(#202020, 0.05); // text and icon shadow
// Transitions
$ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);