merge css change from Steve for navtree and listview

This commit is contained in:
jbai 2016-07-01 14:06:42 -07:00
parent 6af54658d6
commit bf36e190f2
4 changed files with 159 additions and 27 deletions

View File

@ -14,8 +14,8 @@
<li><a data-toggle="tab" href="#flowtab">Flows</a></li>
</ul>
<div class="tab-content">
<div>
<input id="filterinput" placeholder="Filter By" style="width:100%;">
<div class="filter">
<input id="filterinput" placeholder="Filter By">
</div>
<div id="filtertab" class="tab-pane">
<div id="datasetlist" class="list-group"></div>

View File

@ -234,9 +234,9 @@ String.prototype.toProperCase = function(){
function renderDatasetListView(nodes, name)
{
var folderTemplate = '<a href="$URL" class="list-group-item"><i class="fa fa-folder" style="margin-right: 5px;"> $NODE_NAME</i></a>';
var datasetTemplate = '<a href="$URL" class="list-group-item"><i class="fa fa-database" style="margin-right: 5px;"> $NODE_NAME</i></a>';
var activeTemplate = '<a href="$URL" class="active list-group-item"><i class="fa fa-database" style="margin-right: 5px;"> $NODE_NAME</i></a>';
var folderTemplate = '<a href="$URL" class="list-group-item"><i class="fa fa-folder"></i> $NODE_NAME</a>';
var datasetTemplate = '<a href="$URL" class="list-group-item"><i class="fa fa-database"></i> $NODE_NAME</a>';
var activeTemplate = '<a href="$URL" class="active list-group-item"><i class="fa fa-database"></i> $NODE_NAME</a>';
var obj = $('#datasetlist');
if (!obj)
return;
@ -272,9 +272,9 @@ function renderDatasetListView(nodes, name)
function renderFlowListView(nodes, flowId)
{
var folderTemplate = '<a href="$URL" class="list-group-item"><i class="fa fa-folder" style="margin-right: 5px;"> $NODE_NAME</i></a>';
var flowTemplate = '<a href="$URL" class="list-group-item"><i class="fa fa-random" style="margin-right: 5px;"> $NODE_NAME</i></a>';
var activeTemplate = '<a href="$URL" class="active list-group-item"><i class="fa fa-random" style="margin-right: 5px;"> $NODE_NAME</i></a>';
var folderTemplate = '<a href="$URL" class="list-group-item"><i class="fa fa-folder"></i> $NODE_NAME</a>';
var flowTemplate = '<a href="$URL" class="list-group-item"><i class="fa fa-random"></i> $NODE_NAME</a>';
var activeTemplate = '<a href="$URL" class="active list-group-item"><i class="fa fa-random"></i> $NODE_NAME</a>';
var obj = $('#flowlist');
if (!obj)
return;

View File

@ -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 {
@ -242,3 +246,129 @@ 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;
}

View File

@ -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;
}