diff options
21 files changed, 91 insertions, 167 deletions
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 d517da9..045156a 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -2870,9 +2870,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; } 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 5807b72..4518bea 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -2873,9 +2873,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; } 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 3f285b3..1c6b21c 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 @@ -2870,9 +2870,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; } 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 77b03c7..f1e2442 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 @@ -2873,9 +2873,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; } 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 b2e0fb3..efbb45c 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -2873,9 +2873,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; } diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 95c55a3..8bf0a38 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -2873,9 +2873,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; } diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss index 5e72a0f..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,64 +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 EelEditableLabel.entry { transition: none; } // Workaround for invisible text in rename entry - -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/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index 5be0640..6a53747 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -2779,9 +2779,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; } 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 1ad218b..edcbf1f 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -2782,9 +2782,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; } 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 58c110a..bb77b82 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 @@ -2779,9 +2779,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; } 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 141c53e..0f65278 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 @@ -2782,9 +2782,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; } 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 eeb6087..ce42f9d 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -2782,9 +2782,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; } diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 673c251..872230e 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -2782,9 +2782,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; } diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss index fe13fbc..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,50 +137,47 @@ $disk_space_free: darken($bg_color, 3%); // // Nemo // -NemoIconViewContainer { @extend NautilusCanvasViewContainer.view } - -NemoWindow EelEditableLabel.entry { transition: none; } // Workaround for invisible text in rename entry - -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.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css index 80047ff..6bf471c 100644 --- a/common/gtk-3.0/3.18/gtk-contained-dark.css +++ b/common/gtk-3.0/3.18/gtk-contained-dark.css @@ -2971,9 +2971,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; } 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 6f35c8c..3bb233b 100644 --- a/common/gtk-3.0/3.18/gtk-contained-darker.css +++ b/common/gtk-3.0/3.18/gtk-contained-darker.css @@ -2974,9 +2974,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; } 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 886abaa..931c3a2 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 @@ -2971,9 +2971,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; } 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 1f40739..8cc8ae0 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 @@ -2974,9 +2974,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; } 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 9368c7b..59e60d1 100644 --- a/common/gtk-3.0/3.18/gtk-contained-solid.css +++ b/common/gtk-3.0/3.18/gtk-contained-solid.css @@ -2978,9 +2978,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; } diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css index 0980d32..0170217 100644 --- a/common/gtk-3.0/3.18/gtk-contained.css +++ b/common/gtk-3.0/3.18/gtk-contained.css @@ -2978,9 +2978,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; } diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss index cf69117..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,52 +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 EelEditableLabel.entry { transition: none; } // Workaround for invisible text in rename entry +NemoWindow { -NemoWindow .sidebar .frame { - border-width: 0; -} + EelEditableLabel.entry { transition: none; } // Workaround for invisible text in rename entry -NemoWindow GtkSeparator.separator.horizontal { - color: $borders_color; -} + .sidebar .frame { border-width: 0; } -.nemo-desktop.nemo-canvas-item { - @extend .nautilus-desktop.nautilus-canvas-item; -} + GtkSeparator.separator.horizontal { color: $borders_color; } -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button { + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button { - @include button(header-hover); + @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); } -} + &: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) > .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; -} + .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; + } -NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) { + .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) { - $_linked_separator_color: $header_button_border; + $_linked_separator_color: $header_button_border; - > .button:hover:not(:checked):not(:active):not(:only-child) { + > .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; } + &: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; } + } } } |