ui-dashboard merge

app/app.css

@@ -371,7 +371,8 @@ select {
 }
 
 .manager-view-content {
-    padding:5px 40px;
+	width: calc(100% - 300px);
+    padding:25px 40px;
     overflow:auto;
     -webkit-flex-grow: 1;
     flex-grow: 1;
@@ -1048,15 +1049,16 @@ table.dataTable thead .sorting:after {
 	color:#fff;
 }
 
-.dashboard-main-search {
-	width: calc(100% - 300px);
+.dashboard-main-search .panel-default {
+	padding-bottom:25px;
 }
 
 .dashboard-main-search .dashboard-student-search h3, 
 .dashboard-main-search .dashboard-personnel-search h3 {
-	font-family: 'robotoblack';
+	font-family: 'robotolight';
     color: #5A5A5A;
     letter-spacing: 1px;
+	font-size:16px;
 }
 
 .dashboard-main-search input {
@@ -1167,7 +1169,6 @@ table.dataTable thead .sorting:after {
     margin: 0;
     font-size: 16px;
     color: #666;
-    font-weight: bold;
     font-family: 'robotobold';
 	text-transform: uppercase;
 	line-height:normal;
@@ -1279,6 +1280,51 @@ table.dataTable thead .sorting:after {
 	background-color:#f5f5f5;
 }
 
+.dashboard .user-pic {
+	width:150px;
+	height:150px;	
+}
+
+.dashboard .panel-default > .panel-heading {
+	background-color:#fff;
+	border-color:#F2F2F2;
+	font-family:'robotomedium';
+	color: rgb(93, 93, 93);
+	text-align:center;
+}
+
+.dashboard .panel-default > .panel-heading .panel-title {
+	font-size:18px;
+}
+
+.dashboard .user-info .user-name {
+	font-family:'robotomedium';
+	padding-top:15px;	
+}
+
+.dashboard .quick-links .panel-default {
+	height:	274px;
+}
+
+.dashboard .quick-links .panel-body,
+.dashboard .quick-links .link-buttons {
+	padding:0;
+}
+
+.dashboard .quick-links .link-buttons a {
+	padding:15px;
+	display:block;
+	color:#333;
+	text-decoration:none;
+	border-bottom: 1px solid #EFEFEF;
+	border-right: 1px solid #efefef;
+}
+
+.dashboard .quick-links .link-buttons a:hover {
+	background-color:#efefef;
+}
+
+
 /* END OF DASHBOARD */
 
 

app/components/dashboard/dashboard.html

 <div ng-app="ulakbus.dashboard" class="dashboard">
     <div class="starter-template">
-
-        <div class="dashboard-main-search clearfix">
-
-            <div class="row">
+    
+    
+    	<div class="row">
+    
+            <div class="col-md-6 user-info">
                 <div class="panel panel-default">
                     <div class="panel-heading">
                         <div class="panel-title">Giriş Yapan Kullanıcı Bilgileri</div>
                     </div>
                     <div class="panel-body">
                         <div class="col-md-4 col-md-offset-4 text-center">
-                            <img class="img-circle img-responsive" src="{{$root.current_user.avatar}}"
-                                 alt="{{$root.current_user.username}}">
-                            <p>{{$root.current_user.name}} {{$root.current_user.surname}}</p>
+                            <img class="img-circle user-pic" src="{{$root.current_user.avatar}}" alt="{{$root.current_user.username}}">
+                            <p class="user-name">{{$root.current_user.name}} {{$root.current_user.surname}}</p>
                         </div>
                     </div>
                 </div>
             </div>
+    
+        	<div class="col-md-6 quick-links">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <div class="panel-title">Hızlı İşlemler</div>
+                    </div>
+                    <div class="panel-body">
+                        <div class="col-md-6 text-center link-buttons" ng-repeat="menu in $root.quick_menu">
+                            <a ng-href="#/{{menu[0].wf}}/{{menu[0].model}}?{{menu[0].param}}={{selectedUser.key}}">
+                                {{menu[0].text}} 
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            
+        </div>
+		<!-- end of row -->
+        
+        <div class="dashboard-main-search clearfix">
+            
             <div class="row" ng-if="$root.current_user.is_staff">
-
+				<div class="col-md-12">
                 <div class="panel panel-default">
                     <div class="panel-heading">
                         <div class="panel-title">Arama</div>
@@ -73,21 +94,8 @@
                     </div>
                 </div>
             </div>
-
-            <div class="row">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <div class="panel-title">Hızlı İşlemler</div>
-                    </div>
-                    <div class="panel-body">
-                        <div class="col-md-6 text-center" ng-repeat="menu in $root.quick_menu">
-                            <a ng-href="#/{{menu[0].wf}}/{{menu[0].model}}?{{menu[0].param}}={{selectedUser.key}}">
-                                {{menu[0].text}} <i class="fa fa-connectdevelop"></i>
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </div>
+			</div>
+            
         </div>
         <!-- end of dashboard-main-search -->