Skip to content

U
ulakbus-ui
Commit 8a2cad76 authored by Evren Kutar's avatar Evren Kutar
Browse files
Options

Merge branch 'UI-Improvements-5' into develop

parents 6c149d9c 7eb58ea6
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 96 deletions
app/app.css
View file @ 8a2cad76
......@@ -1162,7 +1162,6 @@ table.dataTable thead .sorting:after {
width: 300px;
background-color: #FFFFFF;
border-left: 1px solid #ccc;
/*height: calc(100% - 140px);*/
height: calc(100% - 40px);
position: absolute;
top: 0px;
......@@ -1342,6 +1341,63 @@ table.dataTable thead .sorting:after {
/* END OF DASHBOARD */
/* SELECTED PERSON FIELD */
.selected-person-field .right-sidebar-header {
height:43px;
width:100%;
}
.selected-person-field .right-sidebar-header .bar-title {
margin-left: 10px;
height: 43px;
line-height: 43px;
font-family: 'robotomedium';
font-size: 15px;
}
.selected-person-field .right-sidebar-header .unselect-person {
height: 43px;
width: 43px;
font-size: 24px;
line-height: 43px;
float: right;
text-align: center;
cursor:pointer;
-webkit-transition: all .2s;
-moz-transition: all .2s;
-ms-transition: all .2s;
-o-transition: all .2s;
transition: all .2s;
}
.selected-person-field .right-sidebar-header .unselect-person:hover > i{
color:#333;
}
.selected-person-field .right-sidebar-header .unselect-person i {
color:#999;
}
.selected-person-field img.selected-person-img {
width:150px;
height:150px;
border-radius:100%;
margin-top:5px;
margin-left:75px;
margin-right:75px;
}
.selected-person-field .selected-person-info .selected-person-name {
width:100%;
padding:15px 20px;
text-align:center;
font-family:'robotomedium';
font-size:18px;
}
/* END OF SELECTED PERSON FIELD */
/* PERSONNEL INFO */
......
app/components/dashboard/dashboard.html
View file @ 8a2cad76
......@@ -125,104 +125,19 @@
</div>
<!-- end of dashboard-main-anouncement -->
<div class="right-sidebar">
<div class="right-sidebar selected-person-field">
<div class="right-sidebar-box" data-step="4"
data-intro="mesajlar, yapılan görevlerin son durumları, duyurular ve son yapılan işlemleri buradan takip edebilirsiniz.">
<div class="right-sidebar-messages">
<div class="right-sidebar-title clearfix">
<h3>Mesajlar</h3>
<span><a role="button">Tüm Mesajlar</a></span>
</div>
<!-- end of right-sidebar-title -->
<p ng-show="notifications[2].length === 0" class="text-center">Görüntülenecek içerik yok.</p>
<div class="right-sidebar-message-block" ng-repeat="notify in notifications[2] | limitTo:5">
<a class="clearfix" ng-click="markAsRead(notify)">
<img src="../../../img/sample-profile-pic.jpg">
<div class="right-sidebar-message-content">
<div>{{notify.title}}</div>
<div>{{notify.body}}</div>
<div>16:05</div>
</div>
<!-- end of right-sidebar-message-content -->
</a>
</div>
<!-- end of right-sidebar-message-block -->
</div>
<!-- end of right-sidebar-messages -->
</div>
<!-- end of right-sidebar-box -->
<div class="right-sidebar-box">
<div class="right-sidebar-tasks">
<div class="right-sidebar-title clearfix">
<h3>Görevler</h3>
<span><a role="button">Tüm Görevler</a></span>
</div>
<p ng-show="notifications[1].length === 0" class="text-center">Görüntülenecek içerik yok.</p>
<div class="right-sidebar-task-block">
<!--<div class="task-type">Onay Bekleyen Görevler</div>-->
<a ng-click="markAsRead(notify)" ng-repeat="notify in notifications[1] | limitTo:5">
<div class="task-title">{{notify.title}}</div>
</a>
</div>
<!-- end of right-sidebar-task-block -->
</div>
<!-- end of right-sidebar-tasks -->
</div>
<!-- end of right-sidebar-box -->
<!--<div class="right-sidebar-box">-->
<!--<div class="right-sidebar-announcements">-->
<!--<div class="right-sidebar-title clearfix">-->
<!--<h3>Duyurular</h3>-->
<!--<span><a role="button">Tüm Duyurular</a></span>-->
<!--</div>-->
<!--&lt;!&ndash; end of right-sidebar-title &ndash;&gt;-->
<!--<div class="right-sidebar-announcement-block">-->
<!--<a ng-click="markAsRead(notify)"-->
<!--ng-repeat="notify in notifications[3] | limitTo:5">{{notify-->
<!--.body}}</a>-->
<!--</div>-->
<!--&lt;!&ndash; end of right-sidebar-status-block &ndash;&gt;-->
<!--</div>-->
<!--&lt;!&ndash; end of right-sidebar-status &ndash;&gt;-->
<!--</div>-->
<!-- end of right-sidebar-box -->
<div class="right-sidebar-box">
<div class="right-sidebar-last-actions">
<div class="right-sidebar-title clearfix">
<h3>Son İşlemler</h3>
<span><a role="button">Tüm İşlemler</a></span>
</div>
<p class="text-center">Görüntülenecek içerik yok.</p>
<div class="right-sidebar-task-block">
<a>
<div class="task-title"></div>
</a>
<div class="right-sidebar-header">
<span class="bar-title">Kişi seçildi</span>
<span class="unselect-person"><i class="fa fa-times"></i></span>
</div>
<!-- end of right-sidebaer-header -->
<div class="selected-person-info">
<img src="../../img/sample-profile-pic.jpg" class="selected-person-img">
<div class="selected-person-name">Erkan Öğümsöğütlü</div>
</div>
<!-- end of right-sidebar-status -->
</div>
<!-- end of right-sidebar-box -->
<!-- end of selected-person-info -->
</div>
<!-- end of right-sidebar -->
......
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