From 90cd79a21bda88599dde2f55d5bf6676bde2f9a3 Mon Sep 17 00:00:00 2001
From: iRouge <bfavreault@inverse.ca>
Date: Sat, 7 Mar 2015 22:37:21 -0500
Subject: [PATCH] Adjust Contact view (center card in right container)

---
 UI/Templates/ContactsUI/UIxContactFoldersView.wox          | 2 +-
 UI/WebServerResources/js/Common/ui.js                      | 1 -
 UI/WebServerResources/scss/components/card/card.scss       | 1 -
 UI/WebServerResources/scss/components/toolbar/toolbar.scss | 3 +--
 UI/WebServerResources/scss/views/ContactsUI.scss           | 6 +++++-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 2d2b4e718..55790cd80 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -272,7 +272,7 @@
             </md-item>
           </md-list>
         </md-content>
-        <md-content class="md-padding md-flex" ui-view="card"><!-- card view --></md-content>
+        <md-content class="md-padding md-flex" ui-view="card" layout="row" layout-align="center start"><!-- card view --></md-content>
       </div>
 
     </section>
diff --git a/UI/WebServerResources/js/Common/ui.js b/UI/WebServerResources/js/Common/ui.js
index 291a5b402..4dd4ef699 100644
--- a/UI/WebServerResources/js/Common/ui.js
+++ b/UI/WebServerResources/js/Common/ui.js
@@ -122,4 +122,3 @@
       });
 
 })();
-
diff --git a/UI/WebServerResources/scss/components/card/card.scss b/UI/WebServerResources/scss/components/card/card.scss
index 77c884a6f..7c033e33c 100644
--- a/UI/WebServerResources/scss/components/card/card.scss
+++ b/UI/WebServerResources/scss/components/card/card.scss
@@ -18,6 +18,5 @@ md-card {
 
   md-card-content {
     order: 1;
-    margin: $card-margin;
   }
 }
diff --git a/UI/WebServerResources/scss/components/toolbar/toolbar.scss b/UI/WebServerResources/scss/components/toolbar/toolbar.scss
index 257ad4132..73a744e05 100644
--- a/UI/WebServerResources/scss/components/toolbar/toolbar.scss
+++ b/UI/WebServerResources/scss/components/toolbar/toolbar.scss
@@ -28,12 +28,11 @@ hgroup {
 }
 .sg-icon-bar {
   font-size: $sg-font-size-3;
-  color: $colorGray;
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: space-between;
-  margin: 0 0 $mg $mg;
+  margin: 0 0 0 $mg;
     }
 .sg-icon-bar *.button {
   display: block;
diff --git a/UI/WebServerResources/scss/views/ContactsUI.scss b/UI/WebServerResources/scss/views/ContactsUI.scss
index bbda53fa5..c8a4a5eab 100644
--- a/UI/WebServerResources/scss/views/ContactsUI.scss
+++ b/UI/WebServerResources/scss/views/ContactsUI.scss
@@ -9,9 +9,13 @@
 }
 // md is overqualifying, we have to do the same to override
 md-content[ui-view="card"] {
- flex: 0 0 $detailView-width;
   background-color: sg-color($sogoPaper, 200);
 }
 
+// md is overqualifying, we have to do the same to override
+md-card.viewer {
+  width: $detailView-width;
+}
+
 // Contact editor
 // ----------------------------------------------------------------------------