From bf36e190f2678586580b17c687783c78f57fb706 Mon Sep 17 00:00:00 2001 From: jbai Date: Fri, 1 Jul 2016 14:06:42 -0700 Subject: [PATCH] merge css change from Steve for navtree and listview --- web/app/views/index.scala.html | 4 +- web/public/javascripts/main.js | 12 +- web/public/stylesheets/wherehows.css | 144 +++++++++++++++++- .../src/skin-wherehows/ui.wherehows.css | 26 ++-- 4 files changed, 159 insertions(+), 27 deletions(-) diff --git a/web/app/views/index.scala.html b/web/app/views/index.scala.html index b1ca01cd42..933e141161 100644 --- a/web/app/views/index.scala.html +++ b/web/app/views/index.scala.html @@ -14,8 +14,8 @@
  • Flows
    • -
    - +
    +
    diff --git a/web/public/javascripts/main.js b/web/public/javascripts/main.js index 6c4f1ad0e5..3c89ba6fb0 100644 --- a/web/public/javascripts/main.js +++ b/web/public/javascripts/main.js @@ -234,9 +234,9 @@ String.prototype.toProperCase = function(){ function renderDatasetListView(nodes, name) { - var folderTemplate = ' $NODE_NAME'; - var datasetTemplate = ' $NODE_NAME'; - var activeTemplate = ' $NODE_NAME'; + var folderTemplate = ' $NODE_NAME'; + var datasetTemplate = ' $NODE_NAME'; + var activeTemplate = ' $NODE_NAME'; var obj = $('#datasetlist'); if (!obj) return; @@ -272,9 +272,9 @@ function renderDatasetListView(nodes, name) function renderFlowListView(nodes, flowId) { - var folderTemplate = ' $NODE_NAME'; - var flowTemplate = ' $NODE_NAME'; - var activeTemplate = ' $NODE_NAME'; + var folderTemplate = ' $NODE_NAME'; + var flowTemplate = ' $NODE_NAME'; + var activeTemplate = ' $NODE_NAME'; var obj = $('#flowlist'); if (!obj) return; diff --git a/web/public/stylesheets/wherehows.css b/web/public/stylesheets/wherehows.css index 346091a0cd..97421b8f00 100644 --- a/web/public/stylesheets/wherehows.css +++ b/web/public/stylesheets/wherehows.css @@ -1,4 +1,8 @@ -/* WhereHows Top Navbar _____________________________________ */ + + +/*------------------------------------------------------------------------------ + * WhereHows Top Navbar + *----------------------------------------------------------------------------*/ .navbar-inverse { background-color: #008cc9; @@ -92,13 +96,13 @@ a.dropdown-toggle:hover { color: inherit; } +/* Uncomment when ready to replace logo .navbar-header:before { - /*content: url(/assets/images/icons/logo-white.png); + content: url(/assets/images/icons/logo-white.png); position: absolute; margin-top: 13px; margin-left: 20px; - */ -} +}*/ .navbar-inverse .navbar-nav li { margin-right: 10px; @@ -107,7 +111,7 @@ a.dropdown-toggle:hover { .navbar-inverse .navbar-nav .active a { background: none !important; color: white !important; - border-bottom: 9px solid white; + border-bottom: 7px solid rgba(255,255,255,.3); height: 61px; } @@ -118,7 +122,7 @@ a.dropdown-toggle:hover { .navbar-inverse .navbar-nav a:hover { color: white; - border-bottom: 9px solid rgba(255,255,255,.4); + border-bottom: 7px solid rgba(255,255,255,.3); } /* Search Bar */ @@ -201,7 +205,7 @@ ul.dropdown-menu li.active { border-radius: 0; height: 32px; font-size: 14px; - color: #545454; + color: #0176a9; } .keyword-search { @@ -241,4 +245,130 @@ ul.ui-autocomplete b { div.btn-group { border-top-left-radius: 0; border-top-right-radius: 0; +} + +/*------------------------------------------------------------------------------ + * Metadata sub-nav bar + *----------------------------------------------------------------------------*/ +#metaBar { + width: 110%; + height: 55px; + background-color: #f5f5f5; +} + +/*------------------------------------------------------------------------------ + * Content : Filter + *----------------------------------------------------------------------------*/ +#contentSplitter .btn-group.filterby { + border: 1px #e4e4e4 solid; +} + +.tab-content #filterinput { + width: 93%; + -webkit-font-smoothing: antialiased; + padding: 7px 10px; + border-radius: 5px; + border: 2px #e4e4e4 solid; + margin: 10px 0 10px 8px; +} + +/*------------------------------------------------------------------------------ + * Nav Tree : List view + *----------------------------------------------------------------------------*/ + +#tabSplitter { + overflow-x: hidden; +} + +#tabSplitter .btn-group { + border-radius: 4px; + margin: 10px 0 0 8px; + -webkit-font-smoothing: antialiased; +} + +#tabSplitter #button.btn { + border: 1px solid #008cc9; +} + +#tabSplitter .btn-group .btn-primary { + color: rgba(255,255,255,.8); + background-color: #008cc9; + letter-spacing: .03em; + border-color: #008cc9 +} + +#tabSplitter .btn-group .btn-default { + color: #017bb1; + border-color: #008cc9 +} + +#tabSplitter .btn-group .btn-default:hover { + color: #5d5b5b; + border-color: #008cc9; +} + +#tabSplitter .btn-group .btn-primary:hover { + background-color: #017bb1; + border-color: #008cc9; +} + +.list-group { + min-width: 300px; +} + +.list-group-item, +.list-group-item:first-child { + border: none; +} + +a.list-group-item { + color: rgba(1,1,1,.4); + font-size: 14px; + white-space: nowrap; + letter-spacing: .02em; + border-radius: 0; + border-top: 1px #efefef solid; + -webkit-font-smoothing: antialiased; + padding-top: 12px; + padding-bottom: 12px; + text-transform: capitalize; +} + +.list-group-item.active { + border-radius: 0; +} + +a.list-group-item:hover { + text-decoration: none; + background-color: #e7f6fd; + border-color: #e7f6fd; + cursor: pointer; +} + +.list-group i { + margin-right: 7px; +} + +.list-group .fa { + float: left; + color: rgba(1,1,1,.29); + line-height: 19px; + font-size: 13px; +} + +.fa-folder:before { + content: "\e117"; + font-family: 'Glyphicons Halflings'; +} + +/*------------------------------------------------------------------------------ + * Breadcrumbs + *----------------------------------------------------------------------------*/ + +ul.breadcrumbs { + color: #9e9e9e; +} + +ul.breadcrumbs a { + color: #008cc9; } \ No newline at end of file diff --git a/web/public/vendors/fancytree/src/skin-wherehows/ui.wherehows.css b/web/public/vendors/fancytree/src/skin-wherehows/ui.wherehows.css index 6a39097ebe..eed1945327 100644 --- a/web/public/vendors/fancytree/src/skin-wherehows/ui.wherehows.css +++ b/web/public/vendors/fancytree/src/skin-wherehows/ui.wherehows.css @@ -16,7 +16,8 @@ ul.fancytree-container { ul.fancytree-container ul { padding: 0; } -ul.fancytree-container li.fancytree-lastsib { +ul.fancytree-container li.fancytree-lastsib, +ul.fancytree-container li:first-child span { border: none; } @@ -27,14 +28,23 @@ span.fancytree-node { padding-top: 12px; padding-bottom: 12px; border-top: 1px #efefef solid; + color: rgba(1,1,1,.4); +} + +span.fancytree-node:hover { + background-color: #e7f6fd; + border-color: #e7f6fd; + cursor: pointer; + color: rgba(0,140,201,.8); + color: #555; } span.fancytree-title { - color: #939597; - color: #b0b1b1; - font-size: 13px; + color: inherit; + font-size: 14px; letter-spacing: .02em; font-weight: normal; + -webkit-font-smoothing: antialiased; } span.fancytree-node.fancytree-active { @@ -43,18 +53,10 @@ span.fancytree-node.fancytree-active { } span.fancytree-active .fancytree-title { - color: #57869c; color: rgba(0,140,201,.8); font-weight: bold; } -span.fancytree-node:hover { - background-color: #e7f6fd; - border-color: #e7f6fd; - cursor: pointer; - color: color: rgba(0,140,201,.8); -} - span.fancytree-node.level1 { padding-left: 8px; }