Merge branch 'pr938'

src/mainwindow.ui

@@ -1034,7 +1034,7 @@ QSplitter:handle{
              <x>0</x>
              <y>0</y>
              <width>284</width>
-             <height>401</height>
+             <height>399</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_5"/>
@@ -1665,7 +1665,7 @@ QSplitter:handle{
           <property name="minimumSize">
            <size>
             <width>0</width>
-            <height>57</height>
+            <height>0</height>
            </size>
           </property>
           <property name="maximumSize">
@@ -1775,7 +1775,7 @@ QSplitter:handle{
      <x>0</x>
      <y>0</y>
      <width>775</width>
-     <height>19</height>
+     <height>21</height>
     </rect>
    </property>
   </widget>

src/widget/form/genericchatform.cpp

@@ -52,10 +52,13 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
     nameLabel->setEditable(true);
 
     avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
-    QHBoxLayout *headLayout = new QHBoxLayout(), *mainFootLayout = new QHBoxLayout();
-    headTextLayout = new QVBoxLayout();
-    QVBoxLayout *mainLayout = new QVBoxLayout();
-    QVBoxLayout *footButtonsSmall = new QVBoxLayout(), *volMicLayout = new QVBoxLayout();
+    QHBoxLayout *headLayout = new QHBoxLayout(),
+                *mainFootLayout = new QHBoxLayout();
+    
+    QVBoxLayout *mainLayout = new QVBoxLayout(),
+                *footButtonsSmall = new QVBoxLayout(),
+                *volMicLayout = new QVBoxLayout();
+    headTextLayout = new QVBoxLayout();    
 
     chatWidget = new ChatAreaWidget();
 
@@ -76,10 +79,10 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
     videoButton->setFixedSize(50,40);
     videoButton->setToolTip(tr("Video call: RED means you're on a call"));
     volButton = new QPushButton();
-    volButton->setFixedSize(25,20);
+    //volButton->setFixedSize(25,20);
     volButton->setToolTip(tr("Toggle speakers volume: RED is OFF"));
     micButton = new QPushButton();
-    micButton->setFixedSize(25,20);
+   // micButton->setFixedSize(25,20);
     micButton->setToolTip(tr("Toggle microphone: RED is OFF"));
 
     footButtonsSmall->setSpacing(2);
@@ -119,6 +122,13 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
     mainFootLayout->addSpacing(5);
     mainFootLayout->addWidget(sendButton);
     mainFootLayout->setSpacing(0);
+    
+    headTextLayout->addStretch();
+    headTextLayout->addWidget(nameLabel);
+        
+    volMicLayout->addWidget(micButton, Qt::AlignTop);
+    volMicLayout->addSpacing(2);
+    volMicLayout->addWidget(volButton, Qt::AlignBottom);
 
     headWidget->setLayout(headLayout);
     headLayout->addWidget(avatar);
@@ -130,16 +140,6 @@ GenericChatForm::GenericChatForm(QWidget *parent) :
     headLayout->addWidget(videoButton);
     headLayout->setSpacing(0);
 
-    volMicLayout->addStretch();
-    volMicLayout->addSpacing(1);
-    volMicLayout->addWidget(micButton);
-    volMicLayout->addSpacing(2);
-    volMicLayout->addWidget(volButton);
-    volMicLayout->addStretch();
-
-    headTextLayout->addStretch();
-    headTextLayout->addWidget(nameLabel);
-
     //Fix for incorrect layouts on OS X as per
     //https://bugreports.qt-project.org/browse/QTBUG-14591
     sendButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);

ui/chatArea/chatHead.css

@@ -1,3 +1,9 @@
+QLineEdit {
+  color: @black;
+  background: white;
+  border: 0px;
+}
+
 #nameLabel {
   color: @black;
   font: @mediumBold;

ui/volButton/volButton.css

@@ -5,7 +5,7 @@ QPushButton#green
     background-repeat: none;
     border: none;
     width: 25px;
-    height: 20px;
+    height: 18px;
 }
 
 QPushButton#green:hover
@@ -20,7 +20,7 @@ QPushButton#red
     background-repeat: none; 
     border: none;
     width: 25px;
-    height: 20px;
+    height: 18px;
 }
 
 QPushButton:focus {