Skip to content

Commit

Permalink
Fixed issues
Browse files Browse the repository at this point in the history
  • Loading branch information
vinceliuice committed Sep 30, 2023
1 parent 913eb45 commit e695bec
Show file tree
Hide file tree
Showing 8 changed files with 322 additions and 214 deletions.
36 changes: 18 additions & 18 deletions src/_sass/gtk/_common-4.0.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3929,42 +3929,42 @@ colorchooser .popover.osd {
**********************/
window {
border: none;
outline: none;
transition: none;

&.csd {
border-radius: $windows_radius;
box-shadow: $shadow_4, 0 2px 2px transparent, 0 3px 3px transparent;
box-shadow: $shadow_4, 0 0 36px transparent;
margin: 0;
outline: none;
transition: none;

&:backdrop {
box-shadow: $shadow_2, 0 10px 16px transparent, 0 6px 10px transparent;
box-shadow: $shadow_2, 0 0 36px transparent;
transition: $shadow_transition;
}

// &.dialog.message {
// border-radius: $windows_radius;
// }
&.maximized,
&.fullscreen,
&.tiled,
&.tiled-top,
&.tiled-right,
&.tiled-bottom,
&.tiled-left { border-radius: 0; }

&.maximized,
&.fullscreen { box-shadow: none; }
}

&.maximized,
&.fullscreen,
&.tiled,
&.tiled-top,
&.tiled-right,
&.tiled-bottom,
&.tiled-left { border-radius: 0; }

&.maximized,
&.fullscreen { box-shadow: none; }

&.solid-csd {
margin: 0;
border: none;
border-radius: 0;
box-shadow: inset 0 1px $highlight_color;
background-color: $titlebar_bg_color;
}

&.ssd {
box-shadow: none;
}
}

/*****************
Expand Down
20 changes: 16 additions & 4 deletions src/_sass/gtk/apps-4.0/_gnome.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $header-icon: if($titlebar == 'dark' and $variant == 'light',
-gtk-scaled(url('assets/header-icon.png'), url('assets/[email protected]')));

.nautilus-window.background.csd {
&, .sidebar-pane {
&:not(.view), .sidebar-pane {
background-image: $theme_image;
background-size: 48px auto;
background-position: left bottom;
Expand All @@ -30,6 +30,18 @@ $header-icon: if($titlebar == 'dark' and $variant == 'light',
// > revealer > button { @extend %circular_button; } // Make operations button circular
}

.background {
.top-bar headerbar {
box-shadow: none;
}

list.navigation-sidebar {
background-color: transparent;

> row { border-radius: 0; }
}
}

.nautilus-grid-view {
&, gridview.view {
background-color: transparent;
Expand Down Expand Up @@ -61,20 +73,20 @@ $header-icon: if($titlebar == 'dark' and $variant == 'light',
}

flap.unfolded > placessidebar,
toolbarview > placessidebar {
.sidebar-pane > toolbarview > placessidebar {
background: none;
margin-right: 6px;

list.navigation-sidebar {
background: none;
background-color: transparent;

> row {
padding-left: 6px;

&, &:hover, &:selected, &:active, &:selected:hover, &:selected:active, &:focus {
transition: none;
animation: none;
background: none;
background-color: transparent;
box-shadow: none;
}

Expand Down
80 changes: 48 additions & 32 deletions src/gtk/4.0/gtk-Dark-Solid.css
Original file line number Diff line number Diff line change
Expand Up @@ -3965,29 +3965,29 @@ stacksidebar row > label {
* File chooser *
****************/
.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:selected button.sidebar-button,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:selected button.sidebar-button {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:selected button.sidebar-button {
color: rgba(86, 87, 245, 0.75);
}

.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:hover,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:hover, .nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:active,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:active {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:hover, .nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:active,
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:active {
color: #5657f5;
}

.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:disabled,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:disabled {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:disabled {
color: rgba(86, 87, 245, 0.35);
}

.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:checked,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:checked {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:checked {
background-color: rgba(86, 87, 245, 0.1);
color: #5657f5;
}

.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:checked:disabled,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:checked:disabled {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:selected button.sidebar-button:checked:disabled {
background-color: rgba(86, 87, 245, 0.05);
color: rgba(86, 87, 245, 0.55);
}
Expand Down Expand Up @@ -4320,26 +4320,26 @@ colorchooser .popover.osd:backdrop {
**********************/
window {
border: none;
outline: none;
transition: none;
}

window.csd {
border-radius: 11px;
box-shadow: 0 10px 16px rgba(0, 0, 0, 0.25), 0 6px 10px rgba(0, 0, 0, 0.16), 0 2px 2px transparent, 0 3px 3px transparent;
box-shadow: 0 10px 16px rgba(0, 0, 0, 0.25), 0 6px 10px rgba(0, 0, 0, 0.16), 0 0 36px transparent;
margin: 0;
outline: none;
transition: none;
}

window.csd:backdrop {
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.12), 0 3px 3px rgba(0, 0, 0, 0.06), 0 10px 16px transparent, 0 6px 10px transparent;
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.12), 0 3px 3px rgba(0, 0, 0, 0.06), 0 0 36px transparent;
transition: box-shadow 100ms cubic-bezier(0, 0, 0.2, 1);
}

window.maximized, window.fullscreen, window.tiled, window.tiled-top, window.tiled-right, window.tiled-bottom, window.tiled-left {
window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled-top, window.csd.tiled-right, window.csd.tiled-bottom, window.csd.tiled-left {
border-radius: 0;
}

window.maximized, window.fullscreen {
window.csd.maximized, window.csd.fullscreen {
box-shadow: none;
}

Expand All @@ -4351,6 +4351,10 @@ window.solid-csd {
background-color: #31313a;
}

window.ssd {
box-shadow: none;
}

/*****************
* Title buttons *
*****************/
Expand Down Expand Up @@ -4595,7 +4599,7 @@ statusbar {
/************
* Nautilus *
************/
.nautilus-window.background.csd, .nautilus-window.background.csd .sidebar-pane {
.nautilus-window.background.csd:not(.view), .nautilus-window.background.csd .sidebar-pane {
background-image: linear-gradient(to bottom, #6C6AF2, #4648FB);
background-size: 48px auto;
background-position: left bottom;
Expand All @@ -4615,6 +4619,18 @@ statusbar {
border: none;
}

.nautilus-window.background.csd .background .top-bar headerbar {
box-shadow: none;
}

.nautilus-window.background.csd .background list.navigation-sidebar {
background-color: transparent;
}

.nautilus-window.background.csd .background list.navigation-sidebar > row {
border-radius: 0;
}

.nautilus-window.background.csd .nautilus-grid-view, .nautilus-window.background.csd .nautilus-grid-view gridview.view {
background-color: transparent;
}
Expand Down Expand Up @@ -4644,71 +4660,71 @@ statusbar {
}

.nautilus-window.background.csd flap.unfolded > placessidebar,
.nautilus-window.background.csd toolbarview > placessidebar {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar {
background: none;
margin-right: 6px;
}

.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar {
background: none;
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar {
background-color: transparent;
}

.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row {
padding-left: 6px;
}

.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row, .nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:hover, .nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:selected, .nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:active, .nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:selected:hover, .nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:selected:active, .nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:focus,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:hover,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:selected,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:active,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:selected:hover,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:selected:active,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:focus {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row,
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:hover,
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:selected,
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:active,
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:selected:hover,
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:selected:active,
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:focus {
transition: none;
animation: none;
background: none;
background-color: transparent;
box-shadow: none;
}

.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row image.sidebar-icon,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row image.sidebar-icon {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row image.sidebar-icon {
color: rgba(255, 255, 255, 0.7);
margin-right: 6px;
}

.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row label.sidebar-label,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row label.sidebar-label {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row label.sidebar-label {
padding-left: 18px;
color: rgba(255, 255, 255, 0.7);
border-radius: 0 7px 7px 0;
}

.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:hover label.sidebar-label,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:hover label.sidebar-label {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:hover label.sidebar-label {
background-color: rgba(255, 255, 255, 0.03);
}

.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:backdrop,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:backdrop {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:backdrop {
opacity: 0.85;
}

.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:selected label.sidebar-label,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:selected label.sidebar-label {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:selected label.sidebar-label {
color: #9e9ff9;
background-color: rgba(255, 255, 255, 0.06);
}

.nautilus-window.background.csd flap.unfolded > placessidebar list.navigation-sidebar > row:selected image.sidebar-icon,
.nautilus-window.background.csd toolbarview > placessidebar list.navigation-sidebar > row:selected image.sidebar-icon {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar list.navigation-sidebar > row:selected image.sidebar-icon {
color: #FFFFFF;
}

.nautilus-window.background.csd flap.unfolded > placessidebar separator,
.nautilus-window.background.csd toolbarview > placessidebar separator {
.nautilus-window.background.csd .sidebar-pane > toolbarview > placessidebar separator {
background-color: transparent;
}

Expand Down
Loading

0 comments on commit e695bec

Please sign in to comment.