Commit 97786d3b authored by Evren Kutar's avatar Evren Kutar

Merge branch 'UI-Improvements-6' into develop

parents 6294c32b b38d37cd
...@@ -367,11 +367,15 @@ select { ...@@ -367,11 +367,15 @@ select {
.manager-view-inner { .manager-view-inner {
height:calc(100% - 41px); height:calc(100% - 41px);
-webkit-height:calc(100% - 41px); -webkit-height:calc(100% - 41px);
width:100%;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
-webkit-flex-direction: column; -webkit-flex-direction: column;
flex-direction: column; flex-direction: column;
-webkit-transition: all .2s;
-moz-transition: all .2s;
-ms-transition: all .2s;
-o-transition: all .2s;
transition: all .2s;
} }
.manager-view-header { .manager-view-header {
...@@ -1159,14 +1163,19 @@ table.dataTable thead .sorting:after { ...@@ -1159,14 +1163,19 @@ table.dataTable thead .sorting:after {
} }
.right-sidebar { .right-sidebar {
width: 300px; width: 0px;
background-color: #FFFFFF; background-color: #FFFFFF;
border-left: 1px solid #ccc; border-left: 1px solid #ccc;
height: calc(100% - 40px); height: calc(100% - 40px);
position: absolute; position: absolute;
top: 0px; top: 0px;
right: 0px; right: 0px;
overflow-y: auto; overflow-y: auto;
-webkit-transition: all .2s;
-moz-transition: all .2s;
-ms-transition: all .2s;
-o-transition: all .2s;
transition: all .2s;
} }
.right-sidebar-box { .right-sidebar-box {
......
<div ng-app="ulakbus.dashboard" class="dashboard"> <div ng-app="ulakbus.dashboard" class="dashboard">
<div class="starter-template" style="width: calc(100% - 300px);"> <div class="starter-template">
<div class="dashboard-main-search clearfix"> <div class="dashboard-main-search clearfix">
......
<div class="manager-view-header" style="{{style}}"> <div class="manager-view-header">
<div class="clearfix"> <div class="clearfix">
<header-breadcrumb></header-breadcrumb> <header-breadcrumb></header-breadcrumb>
<loaderdiv><div></div></loaderdiv> <loaderdiv><div></div></loaderdiv>
......
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