Merge remote-tracking branch #495 (VENOM-495) into develop

naxuroqa · Feb 18, 2019 · 9c79659 · 9c79659
2 parents f5dd584 + f42935a
commit 9c79659
Show file tree

Hide file tree

Showing 5 changed files with 311 additions and 316 deletions.
diff --git a/src/ui/conference_window.ui b/src/ui/conference_window.ui
@@ -123,8 +123,11 @@ along with Venom.  If not, see <http://www.gnu.org/licenses/>.
     </child>
     <child>
       <object class="GtkBox">
+        <property name="height_request">46</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="border_width">6</property>
+        <property name="spacing">6</property>
         <child>
           <object class="GtkScrolledWindow">
             <property name="visible">True</property>
@@ -140,6 +143,9 @@ along with Venom.  If not, see <http://www.gnu.org/licenses/>.
                 <property name="bottom_margin">6</property>
               </object>
             </child>
+            <style>
+              <class name="frame"/>
+            </style>
           </object>
           <packing>
             <property name="expand">True</property>