Commit b6a8bbae authored by Evren Kutar's avatar Evren Kutar

Merge branch 'footer'

parents dee87179 3f3a1525
...@@ -68,6 +68,7 @@ button.brand-bg:hover { ...@@ -68,6 +68,7 @@ button.brand-bg:hover {
} }
.brand { .brand {
height:98px;
border-bottom:1px solid #ccc; border-bottom:1px solid #ccc;
} }
...@@ -773,6 +774,10 @@ table.dataTable thead .sorting:after { ...@@ -773,6 +774,10 @@ table.dataTable thead .sorting:after {
font-family: 'robotolight'; font-family: 'robotolight';
} }
.dashboard .major-buttons a button:focus {
color:#fff;
}
/* END OF DASHBOARD */ /* END OF DASHBOARD */
...@@ -931,6 +936,28 @@ table.dataTable thead .sorting:after { ...@@ -931,6 +936,28 @@ table.dataTable thead .sorting:after {
.manager-view { .manager-view {
height:100%; height:100%;
} }
.sidebar .sidebar-nav.navbar-collapse {
overflow-x: visible;
overflow-y: scroll;
position: absolute;
width: 100%;
max-height: calc(85% - 139px);
border-bottom: 2px solid #ccc;
}
footer {
position: absolute;
bottom: 35px;
padding: 15px;
width:100%;
text-align:center;
}
footer span {
font-family:'robotobold';
color:#777;
}
} }
@media (max-width: 767px) { @media (max-width: 767px) {
...@@ -1062,10 +1089,4 @@ table.dataTable thead .sorting:after { ...@@ -1062,10 +1089,4 @@ table.dataTable thead .sorting:after {
position:absolute; position:absolute;
right:0; right:0;
top:auto; top:auto;
} }
\ No newline at end of file
.sidebarscroll{
overflow-x: visible;
overflow-y: scroll;
height: 700px;
}
<div ng-app="ulakbus.dashboard"> <div ng-app="ulakbus.dashboard" class="dashboard">
<div class="starter-template"> <div class="starter-template">
<div class="row"> <div class="row">
......
<div class="navbar-default sidebar" role="navigation"> <div class="navbar-default sidebar" role="navigation">
<div class="brand">
<a href="" class="logo"><img src="/img/brand-logo.png" /></a>
</div>
<div class="sidebar-nav navbar-collapse"> <div class="sidebar-nav navbar-collapse">
<div class="brand"> <ul class="nav in" id="side-menu" ng-class="{hidden: $root.loggedInUser != true}">
<a href="" class="logo"><img src="/img/brand-logo.png" /></a>
</div>
<ul class="nav in sidebarscroll" id="side-menu" ng-class="{hidden: $root.loggedInUser != true}">
<!--<sidebar-search></sidebar-search>--> <!--<sidebar-search></sidebar-search>-->
<li ui-sref-active="active"> <li ui-sref-active="active">
<a href="#/dashboard" ng-click="breadcrumb(['Panel'])"><i class="fa fa-dashboard fa-fw"></i> <a href="#/dashboard" ng-click="breadcrumb(['Panel'])"><i class="fa fa-dashboard fa-fw"></i>
...@@ -20,4 +20,7 @@ ...@@ -20,4 +20,7 @@
</ul> </ul>
</div> </div>
<!-- /.sidebar-collapse --> <!-- /.sidebar-collapse -->
<footer>
<span>v 0.0.3 ® Lorem Ipsum</span>
</footer>
</div> </div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment