1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr730'

This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-12 17:37:51 +01:00
commit 941c9af348
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -18,16 +18,6 @@ QListWidget
background: white;
}
QScrollArea
{
background: white;
}
QGroupBox
{
background: white;
}
QMessageBox
{
background: white;
@ -44,23 +34,6 @@ QSpinBox
background: white;
}
QSlider::groove:horizontal
{
border: 1px solid #999999;
height: 8px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
background: white;
margin: 2px 0;
}
QSlider::handle:horizontal
{
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #b4b4b4, stop:1 #8f8f8f);
border: 1px solid #5c5c5c;
width: 18px;
margin: -2px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
}
QPushButton
{
background: white;
@ -71,6 +44,9 @@ QGroupBox
color: black;
background-color: white;
font: @bigBold;
border: 2px solid gray;
border-radius: 5px;
margin-top: 2ex; /* leave space at the top for the title */
}
QComboBox
@ -101,10 +77,6 @@ QTabBar
QScrollArea
{
background-color: white;
}
QScrollArea
{
background: transparent;
}