Merge commit '48e77f6106979c9d2b602534e6bccebcbb1aadad' into develop

# Conflicts:
#	apps/OpenSpace/main.cpp
This commit is contained in:
Alexander Bock
2017-02-13 16:17:49 -05:00

View File

@@ -82,14 +82,14 @@ QCheckBox::indicator {
}
QCheckBox::indicator::unchecked {
border: 1px solid #5A5A5A;
background: transparent;
background: #a10000;
}
QCheckBox::indicator:unchecked:hover {
border: 1px solid #DDDDDD;
}
QCheckBox::indicator::checked {
border: 1px solid #AAAAAA;
background: #666666;
border: 1px solid #5A5A5A;
background: #8dc73f;
}
QCheckBox::indicator:checked:hover {
border: 1px solid #DDDDDD;