Commit f661e39d authored by Evren Kutar's avatar Evren Kutar

logo to header

sidebar nav height css fix
parent f89734b4
...@@ -1449,7 +1449,7 @@ table.dataTable thead .sorting:after { ...@@ -1449,7 +1449,7 @@ table.dataTable thead .sorting:after {
overflow-y: auto; overflow-y: auto;
position: absolute; position: absolute;
width: 100%; width: 100%;
max-height: calc(85% - 139px); max-height: calc(100% - 139px);
} }
footer { footer {
......
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
<!--<li><a href="">Ayarlar</a></li>--> <!--<li><a href="">Ayarlar</a></li>-->
<!--</ul>--> <!--</ul>-->
<div class="navbar-header"> <div class="navbar-header">
<div class="brand"> <div class="brand">
<a href="#/dashboard" class="logo"><img src="/img/brand-logo.png" /></a> <a href="#/dashboard" ng-click="$root.breadcrumbLinks = ['Panel']" class="logo"><img src="/img/brand-logo.png" /></a>
</div> </div>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
......
...@@ -45,6 +45,9 @@ ...@@ -45,6 +45,9 @@
<!--<li><a href="">Ayarlar</a></li>--> <!--<li><a href="">Ayarlar</a></li>-->
<!--</ul>--> <!--</ul>-->
<div class="navbar-header"> <div class="navbar-header">
<div class="brand">
<a href="#/dashboard" ng-click="$root.breadcrumbLinks = ['Panel']" class="logo"><img src="/img/brand-logo.png" /></a>
</div>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
......
This diff is collapsed.
...@@ -104,19 +104,33 @@ button.brand-bg:hover { ...@@ -104,19 +104,33 @@ button.brand-bg:hover {
} }
.brand { .brand {
height:98px; position: absolute;
border-bottom:1px solid #ccc; width: 120px;
margin-left: auto;
margin-right: auto;
left: 0;
right: 0;
} }
.logo { a.logo {
height: 42px;
display: block;
text-align: center;
line-height: 38px;
opacity: 0.8;
-webkit-transition: all .2s;
-moz-transition: all .2s;
-ms-transition: all .2s;
-o-transition: all .2s;
transition: all .2s;
}
a.logo:hover {
opacity:1;
} }
.logo img { .logo img {
width: 80%; width: 100px;
margin-left: 8%;
margin-top: 22px;
margin-bottom: 22px;
} }
/** END OF BRAND **/ /** END OF BRAND **/
...@@ -353,7 +367,7 @@ select { ...@@ -353,7 +367,7 @@ select {
} }
.manager-view-content { .manager-view-content {
padding:35px 40px; padding:5px 40px;
overflow:auto; overflow:auto;
-webkit-flex-grow: 1; -webkit-flex-grow: 1;
flex-grow: 1; flex-grow: 1;
...@@ -1049,6 +1063,7 @@ table.dataTable thead .sorting:after { ...@@ -1049,6 +1063,7 @@ table.dataTable thead .sorting:after {
border-right: none; border-right: none;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
margin-right: -5px;
} }
.dashboard-main-search .fa { .dashboard-main-search .fa {
...@@ -1447,7 +1462,7 @@ table.dataTable thead .sorting:after { ...@@ -1447,7 +1462,7 @@ table.dataTable thead .sorting:after {
overflow-y: auto; overflow-y: auto;
position: absolute; position: absolute;
width: 100%; width: 100%;
max-height: calc(85% - 139px); max-height: calc(100% - 139px);
} }
footer { footer {
......
dist/img/brand-logo.png

10.5 KB | W: | H:

dist/img/brand-logo.png

13.5 KB | W: | H:

dist/img/brand-logo.png
dist/img/brand-logo.png
dist/img/brand-logo.png
dist/img/brand-logo.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -30,6 +30,9 @@ ...@@ -30,6 +30,9 @@
<!--<li><a href="">Ayarlar</a></li>--> <!--<li><a href="">Ayarlar</a></li>-->
<!--</ul>--> <!--</ul>-->
<div class="navbar-header"> <div class="navbar-header">
<div class="brand">
<a href="#/dashboard" ng-click="$root.breadcrumbLinks = ['Panel']" class="logo"><img src="/img/brand-logo.png" /></a>
</div>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
......
...@@ -116,7 +116,7 @@ angular.module("components/crud/templates/filter.html", []).run(["$templateCache ...@@ -116,7 +116,7 @@ angular.module("components/crud/templates/filter.html", []).run(["$templateCache
angular.module("components/crud/templates/form.html", []).run(["$templateCache", function($templateCache) { angular.module("components/crud/templates/form.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("components/crud/templates/form.html", $templateCache.put("components/crud/templates/form.html",
"<div class=\"container\">\n" + "<div>\n" +
" <h3>{{ schema.title }}</h3>\n" + " <h3>{{ schema.title }}</h3>\n" +
"\n" + "\n" +
" <div class=\"buttons-on-top\"></div>\n" + " <div class=\"buttons-on-top\"></div>\n" +
...@@ -1189,9 +1189,6 @@ angular.module("shared/templates/directives/sidebar-search.html", []).run(["$tem ...@@ -1189,9 +1189,6 @@ angular.module("shared/templates/directives/sidebar-search.html", []).run(["$tem
angular.module("shared/templates/directives/sidebar.html", []).run(["$templateCache", function($templateCache) { angular.module("shared/templates/directives/sidebar.html", []).run(["$templateCache", function($templateCache) {
$templateCache.put("shared/templates/directives/sidebar.html", $templateCache.put("shared/templates/directives/sidebar.html",
"<div class=\"navbar-default sidebar\" role=\"navigation\" ng-mouseenter=\"openSidebar()\" ng-mouseleave=\"closeSidebar()\">\n" + "<div class=\"navbar-default sidebar\" role=\"navigation\" ng-mouseenter=\"openSidebar()\" ng-mouseleave=\"closeSidebar()\">\n" +
" <div class=\"brand\">\n" +
" <a href=\"#/dashboard\" class=\"logo\"><img src=\"/img/brand-logo.png\" /></a>\n" +
" </div>\n" +
"\n" + "\n" +
" <div class=\"sidebar-nav navbar-collapse\">\n" + " <div class=\"sidebar-nav navbar-collapse\">\n" +
" <ul class=\"nav in\" id=\"side-menu\" ng-class=\"{hidden: $root.loggedInUser != true}\" data-step=\"1\"\n" + " <ul class=\"nav in\" id=\"side-menu\" ng-class=\"{hidden: $root.loggedInUser != true}\" data-step=\"1\"\n" +
......
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