From aeb949161ef85e4f0e53a182e24866314773d824 Mon Sep 17 00:00:00 2001
From: sunny <sunny@loafle.com>
Date: Wed, 25 Apr 2018 18:55:43 +0900
Subject: [PATCH] design

---
 .../noauth/component/list/list.component.html | 12 +++---
 .../component/detail/detail.component.html    | 14 +++----
 src/styles.scss                               | 38 ++++++++++---------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/packages/noauth/component/list/list.component.html b/src/packages/noauth/component/list/list.component.html
index 3acb1a6..94066ca 100644
--- a/src/packages/noauth/component/list/list.component.html
+++ b/src/packages/noauth/component/list/list.component.html
@@ -26,7 +26,7 @@
     <ng-template pTemplate="rowexpansion" let-rowData let-columns="columns">
         <tr>
             <td [attr.colspan]="5">
-                <div class="ui-g ui-fluid" style="font-size:16px;padding:20px">
+                <div class="ui-g ui-g-12">
 
                     <div class="ui-g-12 ui-md-6">
                         <div class="ui-g-12">
@@ -60,15 +60,13 @@
                             </div>
                         </div>
                     </div>
+                    <div class="ui-g-12" dir="rtl">
+                        <button class="ui-button-danger ui-button-width-fit" type="button" label="Deny" icon="ui-icon-close" pButton (click)="onAcceptOrDeny(false, rowData.data)"></button>
+                        <button class=" ui-button-width-fit" type="button" label="Accept" icon="fa-check" pButton (click)="onAcceptOrDeny(true, rowData.data)"></button>            
+                    </div>
                 </div>
             </td>
         </tr>
-        <tr>
-            <td [attr.colspan]="5">
-                <button class="ui-button-danger ui-button-width-fit" type="button" label="Deny" icon="ui-icon-close" pButton (click)="onAcceptOrDeny(false, rowData.data)"></button>
-                <button class=" ui-button-width-fit" type="button" label="Accept" icon="fa-check" pButton (click)="onAcceptOrDeny(true, rowData.data)"></button>
-            </td>
-        </tr>
     </ng-template>
 </p-table>
 <p-confirmDialog header="Confirmation" icon="fa ui-icon-warning" width="425"></p-confirmDialog>
diff --git a/src/packages/probe/component/detail/detail.component.html b/src/packages/probe/component/detail/detail.component.html
index 81dddd3..868f349 100644
--- a/src/packages/probe/component/detail/detail.component.html
+++ b/src/packages/probe/component/detail/detail.component.html
@@ -7,25 +7,25 @@
     <div *ngIf="probe">
 
       <div class="ui-g form-group">
-        <div class="ui-g-12 ui-md-6 ui-lg-4 ui-key-value ui-bottom-border-1 ui-nopad">
+        <div class="ui-g-12 ui-md-6 ui-key-value ui-bottom-border-1 ui-nopad">
           <of-key-value [key]="'Alias'" [value]="probe.displayName"></of-key-value>
         </div>
-        <div class="ui-g-12 ui-md-6 ui-lg-4 ui-key-value ui-bottom-border-1 ui-nopad">
+        <div class="ui-g-12 ui-md-6 ui-key-value ui-bottom-border-1 ui-nopad">
           <of-key-value [key]="'CIDR'" [value]="probe.cidr"></of-key-value>
         </div>
-        <div class="ui-g-12 ui-md-6 ui-lg-4 ui-key-value ui-bottom-border-1 ui-nopad">
+        <div class="ui-g-12 ui-md-6 ui-key-value ui-bottom-border-1 ui-nopad">
           <of-key-value [key]="'Description'" [value]="probe.description"></of-key-value>
         </div>
-        <div class="ui-g-12 ui-md-6 ui-lg-4 ui-key-value ui-bottom-border-1 ui-nopad">
+        <div class="ui-g-12 ui-md-6 ui-key-value ui-bottom-border-1 ui-nopad">
           <of-key-value [key]="'Key'" [value]="probe.probeKey"></of-key-value>
         </div>
-        <div class="ui-g-12 ui-md-6 ui-lg-4 ui-key-value ui-bottom-border-1 ui-nopad">
+        <div class="ui-g-12 ui-md-6 ui-key-value ui-bottom-border-1 ui-nopad">
           <of-key-value [key]="'Authrozied at'" [value]="probe.authorizeDate | date: 'dd/MM/yyyy'"></of-key-value>
         </div>
-        <div class="ui-g-12 ui-md-6 ui-lg-4 ui-key-value ui-bottom-border-1 ui-nopad">
+        <div class="ui-g-12 ui-md-6 ui-key-value ui-bottom-border-1 ui-nopad">
           <of-key-value [key]="'Authrozied by'" [value]="probe.authorizeMember.name"></of-key-value>
         </div>
-        <div class="ui-g-12 ui-md-6 ui-lg-4 ui-key-value ui-bottom-border-1 ui-nopad">
+        <div class="ui-g-12 ui-md-6 ui-key-value ui-nopad">
           <of-key-value [key]="'IP Range'" [value]="IPRange"></of-key-value>
         </div>
       </div>
diff --git a/src/styles.scss b/src/styles.scss
index bdf3c70..60e09ee 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -189,26 +189,28 @@ img.ui-img-profile-responsive {
 .ui-bottom-border-1 {
     border-bottom: #bdbdbd 1px solid;
 }
-.ui-app-noti{
-    li{
-        padding: 10px !important;
-        line-height: 1.2em !important;
-        width: 100% !important;
-        a {
-            .ui-app-noti-title {
-            font-weight: bold !important;
-            float: left !important;
+.ultima-menu li a{
+    .ui-app-noti{
+        li{
             padding: 10px !important;
-            margin: 0 !important;
-            }
-            .ui-app-noti-date{
-                float: right !important;
-                font-size: 0.6em !important;
-                color: gray !important;
-            }
-            .ui-app-noti-content{
+            line-height: 1.2em !important;
+            width: 100% !important;
+            a {
+                .ui-app-noti-title {
+                font-weight: bold !important;
                 float: left !important;
+                padding: 10px !important;
+                margin: 0 !important;
+                }
+                .ui-app-noti-date{
+                    float: right !important;
+                    font-size: 0.6em !important;
+                    color: gray !important;
+                }
+                .ui-app-noti-content{
+                    float: left !important;
+                }
             }
         }
     }
-}
+}
\ No newline at end of file