Update #215
This commit is contained in:
parent
bb051d7f2b
commit
41d079ddff
10
lib-core.sh
10
lib-core.sh
@ -29,16 +29,6 @@ else
|
||||
GNOME_VERSION="none"
|
||||
fi
|
||||
|
||||
if command -v nautilus &> /dev/null; then
|
||||
if (( $(nautilus --version | cut -d ' ' -f 3 | cut -d . -f 1) >= 40 )); then
|
||||
NAUTILUS_VERSION="new"
|
||||
else
|
||||
NAUTILUS_VERSION="old"
|
||||
fi
|
||||
else
|
||||
NAUTILUS_VERSION="none"
|
||||
fi
|
||||
|
||||
# Program options
|
||||
SASSC_OPT="-M -t expanded"
|
||||
|
||||
|
@ -542,13 +542,6 @@ customize_theme() {
|
||||
rm -rf "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
|
||||
cp -rf "${THEME_SRC_DIR}/sass/_theme-options"{".scss","-temp.scss"}
|
||||
|
||||
# Change common apps style for a specific GNOME Shell version
|
||||
if [[ ${NAUTILUS_VERSION} == "new" ]]; then
|
||||
sed ${SED_OPT} "/\$nautilus_version/s/old/new/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss"
|
||||
elif [[ ${NAUTILUS_VERSION} == "none" ]]; then
|
||||
prompt -w "There's no Nautilus installed, using style for the older gtk theme instead..."
|
||||
fi
|
||||
|
||||
# Change gnome-shell panel transparency
|
||||
if [[ "${panel_opacity}" != 'default' ]]; then
|
||||
prompt -w "Changing panel transparency ..."
|
||||
|
@ -2,9 +2,6 @@
|
||||
// THEME OPTIONS
|
||||
//
|
||||
|
||||
// Nautilus version
|
||||
$nautilus_version: 'old'; // < 3.38/old || 40.0/new
|
||||
|
||||
// Nautilus sidebar sizes (when nautilus_use_colors is false)
|
||||
$sidebar_size: 200px;
|
||||
|
||||
|
@ -109,24 +109,11 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
|
||||
}
|
||||
|
||||
@if $nautilus_style == 'stable' or $nautilus_style == 'default' {
|
||||
@if $nautilus_version == 'new' {
|
||||
$nautilus_header_image: linear-gradient(90deg, rgba($dark_header_bg, 0) $nautilus_sidebar_size,
|
||||
$nautilus_borders_color $nautilus_sidebar_size,
|
||||
$nautilus_borders_color ($nautilus_sidebar_size + 1px),
|
||||
$dark_header_bg ($nautilus_sidebar_size + 1px));
|
||||
} @else {
|
||||
$nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg $nautilus_sidebar_size,
|
||||
$nautilus_borders_color $nautilus_sidebar_size,
|
||||
$nautilus_borders_color ($nautilus_sidebar_size + 1px),
|
||||
$dark_header_bg ($nautilus_sidebar_size + 1px));
|
||||
}
|
||||
}
|
||||
|
||||
@else if $nautilus_style == 'glassy' {
|
||||
@if $nautilus_version == 'new' {
|
||||
$nautilus_bg_image: image(rgba($dark_sidebar_bg, 0));
|
||||
}
|
||||
|
||||
} @else if $nautilus_style == 'glassy' {
|
||||
$nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg ($nautilus_sidebar_size/2),
|
||||
$dark_header_bg 40%);
|
||||
|
||||
@ -143,8 +130,29 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
|
||||
background-image: $nautilus_bg_image;
|
||||
border-radius: $background_radius_style;
|
||||
|
||||
&.unified {
|
||||
&.unified { // >= 40.0
|
||||
border-radius: $wm_radius;
|
||||
|
||||
@if $nautilus_style == 'glassy' {
|
||||
background-image: image(rgba($dark_sidebar_bg, 0));
|
||||
}
|
||||
|
||||
> deck > box.vertical > headerbar.titlebar {
|
||||
@if $nautilus_style == 'stable' or $nautilus_style == 'default' {
|
||||
background-image: linear-gradient(90deg, rgba($dark_header_bg, 0) $nautilus_sidebar_size,
|
||||
$nautilus_borders_color $nautilus_sidebar_size,
|
||||
$nautilus_borders_color ($nautilus_sidebar_size + 1px),
|
||||
$dark_header_bg ($nautilus_sidebar_size + 1px));
|
||||
}
|
||||
|
||||
> .linked > button.disclosure-button { margin-left: $container_padding / 2; }
|
||||
|
||||
> box.horizontal:first-child { // move the search button to right side
|
||||
margin-right: -74px;
|
||||
|
||||
entry.search { margin-left: $container_padding; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
> headerbar.titlebar,
|
||||
@ -166,16 +174,6 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
|
||||
@if $nautilus_style == 'default' or $nautilus_style == 'stable' {
|
||||
> .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - 80px; }
|
||||
}
|
||||
|
||||
@if $nautilus_version == 'new' {
|
||||
> .linked > button.disclosure-button { margin-left: $container_padding / 2; }
|
||||
|
||||
> box.horizontal:first-child { // move the search button to right side
|
||||
margin-right: -74px;
|
||||
|
||||
entry.search { margin-left: $container_padding; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
placessidebar.sidebar {
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user