From 3cad78d26b2f46975bd24c638743fbf0e185b7fd Mon Sep 17 00:00:00 2001 From: Jon Lambson Date: Wed, 27 Sep 2017 15:29:35 -0600 Subject: [PATCH] css stuff --- css/styles.css | 38 +++++++++++++++++++++++++--- js/controllers/website-controller.js | 14 +++++----- templates/website.html | 2 +- templates/widgets/filetree.html | 9 +++---- 4 files changed, 46 insertions(+), 17 deletions(-) diff --git a/css/styles.css b/css/styles.css index 443ce94..0d6103b 100644 --- a/css/styles.css +++ b/css/styles.css @@ -351,8 +351,8 @@ label.tree_label:hover { color: #666; } Tree expanded icon */ label.tree_label:before { - background: #000; - color: #fff; + /*background: #000;*/ + color: #000; position: relative; z-index: 1; float: left; @@ -360,7 +360,8 @@ label.tree_label:before { width: 1em; height: 1em; border-radius: 1em; - content: '+'; + font-family: FontAwesome; + content: '\f07b'; text-align: center; line-height: .9em; } @@ -394,8 +395,39 @@ label.tree_label:before { content: ''; } +.tree_label.filez:after { + position: absolute; + font-family: FontAwesome; + top: 0; + left: -1.5em; + display: block; + height: 0.5em; + width: 1em; + border-bottom: 1px solid #777; + border-left: 1px solid #777; + border-radius: 0 0 0 .3em; + content: '\f15c'; +} +label.tree_label:active:before, label.tree_label:hover:before { + position: absolute; + font-family: FontAwesome; + top: 0; + display: block; + height: 0.5em; + width: 1em; + border-bottom: 1px solid #777; + border-left: 1px solid #777; + border-radius: 0 0 0 .3em; + content: '\f07c'; +} +.breadcrumbs-list:last-child { + color: #777; +} label.tree_label:after { border-bottom: 0; } +ul.tree.files-only.ls-none { + margin-left: 30px; +} :checked ~ label.tree_label:after { border-radius: 0 .3em 0 0; border-top: 1px solid #777; diff --git a/js/controllers/website-controller.js b/js/controllers/website-controller.js index 84a92f1..4969c50 100644 --- a/js/controllers/website-controller.js +++ b/js/controllers/website-controller.js @@ -357,10 +357,9 @@ app.controller('websiteCtrl', [ return this; }; - // TODO: finish thissssssss vm.breadcrumbs = ['Root']; vm.breadcrumbsPath = ['/']; - vm.blah = false; + vm.breadcrumbPathClicked = false; vm.Sites.contents = function (r) { vm.siteResults = r; vm.directoryPath = r.newPath; @@ -376,12 +375,11 @@ app.controller('websiteCtrl', [ vm.breadcrumbs.push(path); vm.breadcrumbsPath.push(path); } - if (vm.blah) { + if (vm.breadcrumbPathClicked) { if (path === 'Root') { vm.breadcrumbs = ['Root']; vm.breadcrumbsPath = ['/']; - vm.activePath = 'active' - vm.blah = false; + vm.breadcrumbPathClicked = false; } else { var breadcrumbsPath = vm.breadcrumbsPath; var breadcrumbs = vm.breadcrumbs; @@ -422,11 +420,11 @@ app.controller('websiteCtrl', [ vm.getSiteContents(path, site); }; - vm.doSomething = function (x) { - vm.blah = true; + vm.getDirectoriesFromBreadcrumbs = function (dir) { + vm.breadcrumbPathClicked = true; vm.siteDirectories = []; vm.siteFiles = []; - vm.getSiteContents(x); + vm.getSiteContents(dir); }; vm.Shares = {}; diff --git a/templates/website.html b/templates/website.html index 87f1afd..00d57be 100644 --- a/templates/website.html +++ b/templates/website.html @@ -176,7 +176,7 @@ - +
diff --git a/templates/widgets/filetree.html b/templates/widgets/filetree.html index 2f65687..23c5616 100644 --- a/templates/widgets/filetree.html +++ b/templates/widgets/filetree.html @@ -2,9 +2,8 @@
@@ -15,9 +14,9 @@ -