Merge remote-tracking branch 'origin/develop' into release/2.2.0

2017-06-21 17:20:57 -04:00
parent 3c2b4b1560 9d6cf95cf0
commit 6dfeea1980
9 changed files with 199 additions and 23 deletions
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -94,7 +94,8 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
    m_searchingLabel = new QLabel();
    m_searchingLabel->setText(tr("Searching..."));
    m_searchingLabel->setAlignment(Qt::AlignCenter);
-    m_searchingLabel->setStyleSheet("background-color: rgb(255, 253, 160);"
+    m_searchingLabel->setStyleSheet("color: rgb(0, 0, 0);"
+                                    "background-color: rgb(255, 253, 160);"
                                    "border: 2px solid rgb(190, 190, 190);"
                                    "border-radius: 5px;");