diff --git a/gtk-3.0/apps/_pantheon.scss b/gtk-3.0/apps/_pantheon.scss index 70b51f5..f309849 100755 --- a/gtk-3.0/apps/_pantheon.scss +++ b/gtk-3.0/apps/_pantheon.scss @@ -281,3 +281,25 @@ LibraryWindow { 0 1px 2px transparentize(#000, 0.77); } +/**level bars**/ + +.sidebar .source-list{ + &.view { + &.level-bar { + &,&:selected,&:selected:focus{ + background-color: lighten($_sidebar_color, 15%); + border: 1px solid transparentize(black, 0.86); + box-shadow: 0 1px 0 transparentize(#000, 0.75); + border-radius: 2px; + } + &.fill-block{ + border: none; + } + } + &.fill-block{ + &,&:hover,&:selected,&:selected:focus{ + @include scale-highlight(right); + } + } + } +} \ No newline at end of file diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css index 9ea9bb8..1cea1cd 100755 --- a/gtk-3.0/gtk-dark.css +++ b/gtk-3.0/gtk-dark.css @@ -4017,15 +4017,13 @@ treeview ~ scrollbar.vertical { .sidebar row:selected label { color: #fefefe; } .sidebar.source-list { - background: #181b28; + background: #161925; padding: 4px 0px; } .sidebar.source-list.view, iconview.sidebar.source-list { transition: all .12s ease-in; } .sidebar.source-list.view:selected, iconview.sidebar.source-list:selected { - padding-left: 4px; - background: rgba(238, 238, 238, 0.5); - color: #ACACAC; - border-left: 4px solid #c50ed2; } + background-color: #c50ed2; + color: #fefefe; } .sidebar.source-list.view:selected:active, iconview.sidebar.source-list:selected:active { box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); } .sidebar.source-list.view:selected.has-open-popup, iconview.sidebar.source-list:selected.has-open-popup, .sidebar.source-list.view:selected:hover, iconview.sidebar.source-list:selected:hover { @@ -4033,7 +4031,7 @@ treeview ~ scrollbar.vertical { .sidebar.source-list.view:selected:backdrop, iconview.sidebar.source-list:selected:backdrop { background-color: rgba(197, 14, 210, 0.6); } .sidebar.source-list.view:hover, iconview.sidebar.source-list:hover, .sidebar.source-list.view iconview.source-list:hover, iconview.sidebar.source-list iconview.source-list:hover { - background-color: rgba(22, 25, 37, 0.4); } + background-color: rgba(0, 0, 0, 0.13); } paned .sidebar.left, paned .sidebar.right, paned .sidebar.left:dir(rtl), paned .sidebar:dir(rtl), paned .sidebar:dir(ltr), paned .sidebar { border-style: none; border-color: rgba(12, 14, 21, 0.8); } @@ -5885,6 +5883,19 @@ LibraryWindow .the-button-in-the-combobox { border-radius: 50%; box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05), inset 0 1px 0 0 rgba(255, 255, 255, 0.45), inset 0 -1px 0 0 rgba(255, 255, 255, 0.15), 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.23); } +/**level bars**/ +.sidebar .source-list.view.level-bar, .sidebar iconview.source-list.level-bar, .sidebar .source-list.view.level-bar:selected, .sidebar iconview.source-list.level-bar:selected, .sidebar .source-list.view.level-bar:selected:focus, .sidebar iconview.source-list.level-bar:selected:focus { + background-color: #333955; + border: 1px solid rgba(0, 0, 0, 0.14); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + border-radius: 2px; } + +.sidebar .source-list.view.level-bar.fill-block, .sidebar iconview.source-list.level-bar.fill-block { + border: none; } + +.sidebar .source-list.view.fill-block, .sidebar iconview.source-list.fill-block, .sidebar .source-list.view.fill-block:hover, .sidebar iconview.source-list.fill-block:hover, .sidebar .source-list.view.fill-block:selected, .sidebar iconview.source-list.fill-block:selected, .sidebar .source-list.view.fill-block:selected:focus, .sidebar iconview.source-list.fill-block:selected:focus { + background: linear-gradient(to right, #00f17d, #00f7d2); } + /******** * Unity * *********/ diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 9ea9bb8..1cea1cd 100755 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -4017,15 +4017,13 @@ treeview ~ scrollbar.vertical { .sidebar row:selected label { color: #fefefe; } .sidebar.source-list { - background: #181b28; + background: #161925; padding: 4px 0px; } .sidebar.source-list.view, iconview.sidebar.source-list { transition: all .12s ease-in; } .sidebar.source-list.view:selected, iconview.sidebar.source-list:selected { - padding-left: 4px; - background: rgba(238, 238, 238, 0.5); - color: #ACACAC; - border-left: 4px solid #c50ed2; } + background-color: #c50ed2; + color: #fefefe; } .sidebar.source-list.view:selected:active, iconview.sidebar.source-list:selected:active { box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.5); } .sidebar.source-list.view:selected.has-open-popup, iconview.sidebar.source-list:selected.has-open-popup, .sidebar.source-list.view:selected:hover, iconview.sidebar.source-list:selected:hover { @@ -4033,7 +4031,7 @@ treeview ~ scrollbar.vertical { .sidebar.source-list.view:selected:backdrop, iconview.sidebar.source-list:selected:backdrop { background-color: rgba(197, 14, 210, 0.6); } .sidebar.source-list.view:hover, iconview.sidebar.source-list:hover, .sidebar.source-list.view iconview.source-list:hover, iconview.sidebar.source-list iconview.source-list:hover { - background-color: rgba(22, 25, 37, 0.4); } + background-color: rgba(0, 0, 0, 0.13); } paned .sidebar.left, paned .sidebar.right, paned .sidebar.left:dir(rtl), paned .sidebar:dir(rtl), paned .sidebar:dir(ltr), paned .sidebar { border-style: none; border-color: rgba(12, 14, 21, 0.8); } @@ -5885,6 +5883,19 @@ LibraryWindow .the-button-in-the-combobox { border-radius: 50%; box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.05), inset 0 1px 0 0 rgba(255, 255, 255, 0.45), inset 0 -1px 0 0 rgba(255, 255, 255, 0.15), 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.23); } +/**level bars**/ +.sidebar .source-list.view.level-bar, .sidebar iconview.source-list.level-bar, .sidebar .source-list.view.level-bar:selected, .sidebar iconview.source-list.level-bar:selected, .sidebar .source-list.view.level-bar:selected:focus, .sidebar iconview.source-list.level-bar:selected:focus { + background-color: #333955; + border: 1px solid rgba(0, 0, 0, 0.14); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + border-radius: 2px; } + +.sidebar .source-list.view.level-bar.fill-block, .sidebar iconview.source-list.level-bar.fill-block { + border: none; } + +.sidebar .source-list.view.fill-block, .sidebar iconview.source-list.fill-block, .sidebar .source-list.view.fill-block:hover, .sidebar iconview.source-list.fill-block:hover, .sidebar .source-list.view.fill-block:selected, .sidebar iconview.source-list.fill-block:selected, .sidebar .source-list.view.fill-block:selected:focus, .sidebar iconview.source-list.fill-block:selected:focus { + background: linear-gradient(to right, #00f17d, #00f7d2); } + /******** * Unity * *********/ diff --git a/gtk-3.0/widgets/_sidebar.scss b/gtk-3.0/widgets/_sidebar.scss index 799a0d6..aa3b147 100644 --- a/gtk-3.0/widgets/_sidebar.scss +++ b/gtk-3.0/widgets/_sidebar.scss @@ -58,15 +58,13 @@ //elementary os file manager &.source-list{ - background: $base_color; + background: $_sidebar_color; padding: 4px 0px; &.view{ transition: all .12s ease-in; &:selected { - padding-left: 4px; - background: transparentize(#eee, 0.5); - color: #ACACAC; - border-left: 4px solid $selected_bg_color; + background-color: $selected_bg_color; + color: $selected_fg_color; &:active { box-shadow: inset 0 2px 3px -1px transparentize(black, 0.5); } &.has-open-popup, @@ -75,7 +73,7 @@ &:backdrop { background-color: $backdrop_selected_bg_color; } } &:hover, iconview.source-list:hover { - background-color: if(variant == light, transparentize($bg_color, 0.6), transparentize($bg_color, 0.6)); + background-color: transparentize(black, 0.87); } } }