[gnome-contacts] Fix up styling to look more like mockups

[Alexander Larsson <alexl src gnome org>]

commit 9f7bb19a9b00c9756e03ce5c0be3563881d701c5
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Jan 18 19:29:22 2012 +0100

    Fix up styling to look more like mockups

 data/gnome-contacts.css     |   34 ++++++++++++++++++++++++++++++----
 src/contacts-app.vala       |    1 +
 src/contacts-list-pane.vala |    2 +-
 3 files changed, 32 insertions(+), 5 deletions(-)
---
diff --git a/data/gnome-contacts.css b/data/gnome-contacts.css
index b0f2ed5..ccfa619 100644
--- a/data/gnome-contacts.css
+++ b/data/gnome-contacts.css
@@ -1,20 +1,46 @@
+/* Copied from adwaita */
+ define-color borders #a7aba7;
+
+/* Line at top in contacts pane, similar to .documents-scrolledwin.frame */
 .contacts-content.frame {
     border-width: 1 0 0 0;
     border-radius: 0;
 }
 
+/* Background color in contacts pane, similar to .documents-main-view.view */
 .contacts-main-view.view {
     background-color: #f1f2f1;
 }
 
-ContactsListPane {
-    border-style: solid;
+/* Border on the right in the left menu toolbar */
+.contacts-left-toolbar.toolbar.menubar {
     border-width: 0 1 0 0;
-    border-color: #878787;
+    border-style: solid;
+    border-color: @borders;
+}
+
+/* Sidebar with line at top and the left */
+ContactsWindow .sidebar.frame {
+    border-width: 1 1 0 0;
+    border-style: solid;
+    border-color: @borders;
     border-image: none;
-    padding: 0 1 1 1;
+    border-radius: 0;
+    padding: 0;
+}
+
+/* Primary toolbar with no line at top to avoid conflicts with frame border */
+ContactsWindow .primary-toolbar.toolbar {
+    border-width: 0 0 1 0;
 }
 
+ContactsWindow .sidebar,
+ContactsWindow .sidebar.view {
+    background-color: #ebebeb;
+}
+
+
+
 .contact-button:active {
     border-color: #000000;
     border-image: none;
diff --git a/src/contacts-app.vala b/src/contacts-app.vala
index a000041..6b2e04f 100644
--- a/src/contacts-app.vala
+++ b/src/contacts-app.vala
@@ -257,6 +257,7 @@ public class Contacts.App : Gtk.Application {
     var toolbar = new Toolbar ();
     toolbar.set_icon_size (IconSize.MENU);
     toolbar.get_style_context ().add_class (STYLE_CLASS_MENUBAR);
+    toolbar.get_style_context ().add_class ("contacts-left-toolbar");
     toolbar.set_vexpand (false);
     toolbar.set_hexpand (true);
     grid.attach (toolbar, 0, 0, 1, 1);
diff --git a/src/contacts-list-pane.vala b/src/contacts-list-pane.vala
index 4f0ec43..80d6913 100644
--- a/src/contacts-list-pane.vala
+++ b/src/contacts-list-pane.vala
@@ -72,6 +72,7 @@ public class Contacts.ListPane : Frame {
   }
 
   public ListPane (Store contacts_store) {
+    this.get_style_context ().add_class (STYLE_CLASS_SIDEBAR);
     this.contacts_store = contacts_store;
     this.contacts_view = new View (contacts_store);
     var toolbar = new Toolbar ();
@@ -105,7 +106,6 @@ public class Contacts.ListPane : Frame {
     scrolled.set_vexpand (true);
     scrolled.set_hexpand (true);
     scrolled.set_shadow_type (ShadowType.NONE);
-    scrolled.get_style_context ().set_junction_sides (JunctionSides.RIGHT | JunctionSides.LEFT | JunctionSides.TOP);
 
     var grid = new Grid ();
     grid.set_orientation (Orientation.VERTICAL);