[polari] ui: Move border between view and input entry



commit f65e33582804c699cbe5f116b7e9679eef9df665
Author: Florian Müllner <fmuellner gnome org>
Date:   Wed Jul 31 10:25:28 2013 +0200

    ui: Move border between view and input entry
    
    The border is currently implemented as bottom-border on the view;
    however when we'll adapt the selection-mode patter, the room list
    will gain a toolbar at the bottom. As the toolbar is only visible in
    selection mode, the border between room list and toolbar needs to
    be implemented as top-border on the latter. In order to align with
    the border between view and input entry, we need to use a top-border
    in the latter case as well.

 data/resources/application.css |   10 +++++-
 data/resources/main-window.ui  |   63 +++++++++++++++++++++++-----------------
 2 files changed, 44 insertions(+), 29 deletions(-)
---
diff --git a/data/resources/application.css b/data/resources/application.css
index 5122c8d..7f7c4e2 100644
--- a/data/resources/application.css
+++ b/data/resources/application.css
@@ -18,6 +18,13 @@
     border-width: 0 0 1px 1px;
 }
 
+.polari-input-area {
+    background-color: @polari_dark_bg_color;
+    border-color: @borders;
+    border-style: solid;
+    border-width: 1px 0 0 0;
+}
+
 .polari-room-list .room-list-header {
     background-color: @polari_dark_bg_color;
     font-size: smaller;
@@ -49,8 +56,7 @@
 
 .polari-chat-stack {
     background-color: @theme_base_color;
-    border-color: @borders;
-    border-width: 0 0 1px 0;
+    border-width: 0;
 }
 
 .polari-chat-stack:backdrop {
diff --git a/data/resources/main-window.ui b/data/resources/main-window.ui
index 67cb9d5..dfd9057 100644
--- a/data/resources/main-window.ui
+++ b/data/resources/main-window.ui
@@ -291,42 +291,51 @@
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="main_input_area">
+              <object class="GtkFrame" id="main_input_area">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_left">6</property>
-                <property name="margin_right">6</property>
-                <property name="margin_top">6</property>
-                <property name="margin_bottom">6</property>
                 <style>
-                  <class name="linked"/>
+                  <class name="polari-input-area"/>
                 </style>
                 <child>
-                  <object class="GtkEntry" id="nick_entry">
+                  <object class="GtkBox" id="box4">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">6</property>
+                    <property name="margin_right">6</property>
+                    <property name="margin_top">6</property>
+                    <property name="margin_bottom">6</property>
                     <style>
-                      <class name="dim-label"/>
+                      <class name="linked"/>
                     </style>
+                    <child>
+                      <object class="GtkEntry" id="nick_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="message_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="message_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="activates_default">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
               <packing>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]