client: Convert main composer widgets to use proper CSS names

src/client/composer/composer-box.vala

@@ -14,6 +14,11 @@
  */
 public class Composer.Box : Gtk.Frame, Container {
 
+    static construct {
+        set_css_name("geary-composer-box");
+    }
+
+
     /** {@inheritDoc} */
     public Gtk.ApplicationWindow? top_window {
         get { return get_toplevel() as Gtk.ApplicationWindow; }

src/client/composer/composer-editor.vala

@@ -81,6 +81,11 @@ public class Composer.Editor : Gtk.Grid, Geary.BaseInterface {
         { ACTION_UNDERLINE,                on_action,        null, "false"    },
     };
 
+
+    static construct {
+        set_css_name("geary-composer-editor");
+    }
+
     public static void add_accelerators(Application.Client application) {
         application.add_edit_accelerators(ACTION_CUT, { "<Ctrl>x" } );
         application.add_edit_accelerators(ACTION_PASTE, { "<Ctrl>v" } );

src/client/composer/composer-embed.vala

@@ -17,6 +17,12 @@ public class Composer.Embed : Gtk.EventBox, Container {
 
     private const int MIN_EDITOR_HEIGHT = 200;
 
+
+    static construct {
+        set_css_name("geary-composer-embed");
+    }
+
+
     /** {@inheritDoc} */
     public Gtk.ApplicationWindow? top_window {
         get { return get_toplevel() as Gtk.ApplicationWindow; }

src/client/composer/composer-widget.vala

@@ -157,6 +157,11 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
                                            on_show_extended_headers_toggled },
     };
 
+
+    static construct {
+        set_css_name("geary-composer-widget");
+    }
+
     public static void add_accelerators(Application.Client application) {
         application.add_window_accelerators(ACTION_DISCARD, { "Escape" } );
         application.add_window_accelerators(ACTION_ADD_ATTACHMENT, { "<Ctrl>t" } );

src/client/composer/composer-window.vala

@@ -14,6 +14,10 @@
  */
 public class Composer.Window : Gtk.ApplicationWindow, Container {
 
+    static construct {
+        set_css_name("geary-composer-box");
+    }
+
 
     /** {@inheritDoc} */
     public Gtk.ApplicationWindow? top_window {

ui/composer-editor.ui

@@ -63,9 +63,6 @@
             </child>
           </object>
         </child>
-        <style>
-          <class name="geary-composer-body"/>
-        </style>
       </object>
     </child>
     <child>

ui/geary.css

@@ -42,15 +42,6 @@ geary-conversation-viewer {
   border-bottom-width: 0;
 }
 
-.geary-composer-box > border {
-  border-width: 0px;
-}
-.geary-composer-body > border {
-  border-left-width: 0;
-  border-right-width: 0;
-  border-bottom-width: 0;
-}
-
 .geary-overlay {
   background-color: @theme_base_color;
   padding: 2px 6px;
@@ -239,18 +230,28 @@ grid.geary-message-summary {
 
 /* Composer */
 
-.geary-composer-embed headerbar {
+geary-composer-box > border {
+  border-width: 0px;
+}
+
+geary-composer-editor > frame > border {
+  border-left-width: 0;
+  border-right-width: 0;
+  border-bottom-width: 0;
+}
+
+geary-composer-embed headerbar {
   border-top-left-radius: 8px;
   -gtk-outline-top-left-radius: 7px;
   border-top-right-radius: 8px;
   -gtk-outline-top-right-radius: 7px;
 }
 
-.geary-attachments-box > box > box {
+geary-composer-widget .geary-attachments-box > box > box {
   margin: 6px;
 }
 
-.geary-attachments-box > box > box > label {
+geary-composer-widget .geary-attachments-box > box > box > label {
   margin: 0px 4px;
 }