merge the tree view style change

This commit is contained in:
jbai 2016-06-27 16:55:52 -07:00
parent 161c3fce16
commit 4fe1467932
3 changed files with 4120 additions and 3 deletions

View File

@ -11,6 +11,7 @@
<link rel="stylesheet" media="screen" href="@routes.Assets.at("vendors/bootstrap/dist/css/bootstrap.min.css")">
<link rel="stylesheet" media="screen" href="@routes.Assets.at("vendors/bootstrap3-editable/css/bootstrap-editable.css")">
<link rel="stylesheet" media="screen" href="@routes.Assets.at("vendors/fancytree/src/skin-win8/ui.fancytree.css")">
<link rel="stylesheet" media="screen" href="@routes.Assets.at("vendors/fancytree/src/skin-wherehows/ui.wherehows.css")">
<link rel="stylesheet" media="screen" href="@routes.Assets.at("vendors/json.human.js-master/css/json.human.css")">
<link rel="stylesheet" media="screen" href="@routes.Assets.at("vendors/jquery.treegrid/css/jquery.treegrid.css")">
<link rel="stylesheet" media="screen" href="@routes.Assets.at("vendors/toastr/toastr.css")">
@ -25,7 +26,7 @@
<script src="@routes.Assets.at("vendors/bootstrap3-editable/js/bootstrap-editable.js")" type="text/javascript"></script>
<script src="@routes.Assets.at("vendors/bootstrap-validator-master/dist/validator.js")" type="text/javascript"></script>
<script src="@routes.Assets.at("vendors/jquery.splitter-1.6/jquery.splitter.js")" type="text/javascript"></script>
<script src="@routes.Assets.at("vendors/fancytree/src/jquery.fancytree.js")" type="text/javascript"></script>
<script src="@routes.Assets.at("vendors/fancytree/src/jquery.fancytree.wherehows.js")" type="text/javascript"></script>
<script src="@routes.Assets.at("vendors/fancytree/src/jquery.fancytree.filter.js")" type="text/javascript"></script>
<script src="@routes.Assets.at("vendors/jquery.scrollTo-1.4.14/jquery.scrollTo.min.js")" type="text/javascript"></script>
<script src="@routes.Assets.at("vendors/jquery.treegrid/js/jquery.treegrid.js")" type="text/javascript"></script>

View File

@ -20,7 +20,7 @@
a.navbar-brand {
letter-spacing: 0.2em;
text-shadow: none;
margin-left: 63px;
/*margin-left: 63px;*/
margin-top: 4px;
font-size: 1.2em;
}
@ -93,10 +93,11 @@ a.dropdown-toggle:hover {
}
.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 {

File diff suppressed because it is too large Load Diff