diff --git a/forms/ChatPage.ui b/forms/ChatPage.ui index 1a49ffca..3fe664bd 100644 --- a/forms/ChatPage.ui +++ b/forms/ChatPage.ui @@ -20,7 +20,7 @@ Form - background-color: #171919; + background-color: #f8fbfe; @@ -90,7 +90,7 @@ - background-color: #2D3F3D; + background-color: #d6dde3; color: #ebebeb; diff --git a/forms/MainWindow.ui b/forms/MainWindow.ui index 7035b213..4408cc3a 100644 --- a/forms/MainWindow.ui +++ b/forms/MainWindow.ui @@ -29,7 +29,7 @@ - nheko - Matrix Desktop Client + Nheko background-color: #f9f9f9 diff --git a/forms/RoomList.ui b/forms/RoomList.ui index 0d65fbf5..b56a75ab 100644 --- a/forms/RoomList.ui +++ b/forms/RoomList.ui @@ -27,20 +27,20 @@ QWidget { -background-color: #171919; +background-color: #f8fbfe; color: #ebebeb; } -QScrollBar:vertical { - background-color: #171919; - width: 10px; +QScrollBar:vertical { + background-color: #f8fbfe; + width: 8px; border-radius: 20px; margin: 0px 2px 0 2px; } QScrollBar::handle:vertical { border-radius: 50px; - background-color: #1c3133; + background-color: #d6dde3; } QScrollBar::add-line:vertical { diff --git a/src/HistoryViewItem.cc b/src/HistoryViewItem.cc index 83d3cf85..39965e03 100644 --- a/src/HistoryViewItem.cc +++ b/src/HistoryViewItem.cc @@ -65,7 +65,7 @@ void HistoryViewItem::generateBody(const QString &body) "" "" "" - " " + " " " %1" " " "" @@ -89,7 +89,7 @@ void HistoryViewItem::generateBody(const QString &userid, const QString &color, " " " %2" " " - " " + " " " %3" " " "" diff --git a/src/HistoryViewManager.cc b/src/HistoryViewManager.cc index 706a42f1..a6cb3f6d 100644 --- a/src/HistoryViewManager.cc +++ b/src/HistoryViewManager.cc @@ -30,9 +30,9 @@ HistoryViewManager::HistoryViewManager(QSharedPointer client, QWid , client_(client) { setStyleSheet( - "QWidget {background: #171919; color: #ebebeb;}" - "QScrollBar:vertical { background-color: #171919; width: 10px; border-radius: 20px; margin: 0px 2px 0 2px; }" - "QScrollBar::handle:vertical { border-radius : 50px; background-color : #1c3133; }" + "QWidget {background: #f8fbfe; color: #e8e8e8; border: none;}" + "QScrollBar:vertical { background-color: #f8fbfe; width: 8px; border-radius: 20px; margin: 0px 2px 0 2px; }" + "QScrollBar::handle:vertical { border-radius : 50px; background-color : #d6dde3; }" "QScrollBar::add-line:vertical { border: none; background: none; }" "QScrollBar::sub-line:vertical { border: none; background: none; }"); diff --git a/src/LoginPage.cc b/src/LoginPage.cc index 4195eda7..306b190a 100644 --- a/src/LoginPage.cc +++ b/src/LoginPage.cc @@ -66,13 +66,13 @@ LoginPage::LoginPage(QSharedPointer client, QWidget *parent) matrixid_input_ = new TextField(); matrixid_input_->setLabel("Matrix ID"); - matrixid_input_->setInkColor("#577275"); + matrixid_input_->setInkColor("#555459"); matrixid_input_->setBackgroundColor("#f9f9f9"); matrixid_input_->setPlaceholderText("e.g @joe:matrix.org"); password_input_ = new TextField(); password_input_->setLabel("Password"); - password_input_->setInkColor("#577275"); + password_input_->setInkColor("#555459"); password_input_->setBackgroundColor("#f9f9f9"); password_input_->setEchoMode(QLineEdit::Password); @@ -84,8 +84,8 @@ LoginPage::LoginPage(QSharedPointer client, QWidget *parent) button_layout_->setContentsMargins(0, 0, 0, 50); login_button_ = new RaisedButton("LOGIN", this); - login_button_->setBackgroundColor(QColor("#171919")); - login_button_->setForegroundColor(QColor("#ebebeb")); + login_button_->setBackgroundColor(QColor("#acc7dc")); + login_button_->setForegroundColor(QColor("black")); login_button_->setMinimumSize(350, 65); login_button_->setCursor(QCursor(Qt::PointingHandCursor)); login_button_->setFontSize(17); diff --git a/src/RegisterPage.cc b/src/RegisterPage.cc index f992f6ac..e9cdbcd7 100644 --- a/src/RegisterPage.cc +++ b/src/RegisterPage.cc @@ -66,24 +66,24 @@ RegisterPage::RegisterPage(QSharedPointer client, QWidget *parent) username_input_ = new TextField(); username_input_->setLabel("Username"); - username_input_->setInkColor("#577275"); + username_input_->setInkColor("#555459"); username_input_->setBackgroundColor("#f9f9f9"); password_input_ = new TextField(); password_input_->setLabel("Password"); - password_input_->setInkColor("#577275"); + password_input_->setInkColor("#555459"); password_input_->setBackgroundColor("#f9f9f9"); password_input_->setEchoMode(QLineEdit::Password); password_confirmation_ = new TextField(); password_confirmation_->setLabel("Password confirmation"); - password_confirmation_->setInkColor("#577275"); + password_confirmation_->setInkColor("#555459"); password_confirmation_->setBackgroundColor("#f9f9f9"); password_confirmation_->setEchoMode(QLineEdit::Password); server_input_ = new TextField(); server_input_->setLabel("Home Server"); - server_input_->setInkColor("#577275"); + server_input_->setInkColor("#555459"); server_input_->setBackgroundColor("#f9f9f9"); form_layout_->addWidget(username_input_, Qt::AlignHCenter, 0); @@ -99,8 +99,8 @@ RegisterPage::RegisterPage(QSharedPointer client, QWidget *parent) error_label_->setStyleSheet("margin-bottom: 20px; color: #E22826; font-size: 11pt;"); register_button_ = new RaisedButton("REGISTER", this); - register_button_->setBackgroundColor(QColor("#171919")); - register_button_->setForegroundColor(QColor("#ebebeb")); + register_button_->setBackgroundColor(QColor("#acc7dc")); + register_button_->setForegroundColor(QColor("black")); register_button_->setMinimumSize(350, 65); register_button_->setCursor(QCursor(Qt::PointingHandCursor)); register_button_->setFontSize(17); diff --git a/src/RoomInfoListItem.cc b/src/RoomInfoListItem.cc index f028a031..ddb3ba55 100644 --- a/src/RoomInfoListItem.cc +++ b/src/RoomInfoListItem.cc @@ -29,12 +29,11 @@ RoomInfoListItem::RoomInfoListItem(RoomInfo info, QWidget *parent) , max_height_(60) { normal_style_ = - "QWidget { color: #ebebeb; background-color: #232626; border-bottom: 1px solid #171919;}" + "QWidget { color: black; background-color: #f8fbfe}" "QLabel { border: none; }"; pressed_style_ = - "QWidget { background-color: #577275; color: #ebebeb;" - "border-bottom: 1px solid #171919;}" + "QWidget { background-color: #acc7dc; color: black;}" "QLabel { border: none; }"; setStyleSheet(normal_style_); @@ -62,6 +61,8 @@ RoomInfoListItem::RoomInfoListItem(RoomInfo info, QWidget *parent) roomAvatar_ = new Avatar(avatarWidget_); roomAvatar_->setLetter(QChar(info_.name()[0])); roomAvatar_->setSize(max_height_ - 20); + roomAvatar_->setTextColor("#555459"); + roomAvatar_->setBackgroundColor("#d6dde3"); avatarLayout_->addWidget(roomAvatar_); roomName_ = new QLabel(info_.name(), textWidget_); @@ -71,7 +72,7 @@ RoomInfoListItem::RoomInfoListItem(RoomInfo info, QWidget *parent) roomTopic_ = new QLabel(info_.topic(), textWidget_); roomTopic_->setMaximumSize(parent->width() - 10, 20); - roomTopic_->setStyleSheet("color: #c9c9c9; font-size: 12px"); + roomTopic_->setStyleSheet("color: #171919; font-size: 12px"); roomTopic_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); textLayout_->addWidget(roomName_); @@ -117,7 +118,7 @@ void RoomInfoListItem::mousePressEvent(QMouseEvent *event) Ripple *ripple = new Ripple(pos); ripple->setRadiusEndValue(radiusEndValue); - ripple->setOpacityStartValue(0.35); + ripple->setOpacityStartValue(0.15); ripple->setColor(QColor("#171919")); ripple->radiusAnimation()->setDuration(300); ripple->opacityAnimation()->setDuration(500); diff --git a/src/RoomList.cc b/src/RoomList.cc index 379b5223..f483a798 100644 --- a/src/RoomList.cc +++ b/src/RoomList.cc @@ -34,6 +34,8 @@ RoomList::RoomList(QSharedPointer client, QWidget *parent) ui->setupUi(this); ui->scrollVerticalLayout->addStretch(1); + setStyleSheet("border-top: none"); + connect(client_.data(), SIGNAL(roomAvatarRetrieved(const QString &, const QPixmap &)), this, diff --git a/src/TextInputWidget.cc b/src/TextInputWidget.cc index dedd3a81..d0deee7b 100644 --- a/src/TextInputWidget.cc +++ b/src/TextInputWidget.cc @@ -26,7 +26,7 @@ TextInputWidget::TextInputWidget(QWidget *parent) { setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); setCursor(Qt::ArrowCursor); - setStyleSheet("background-color: #171919; height: 45px;"); + setStyleSheet("background-color: #f8fbfe; height: 45px;"); top_layout_ = new QHBoxLayout(); top_layout_->setSpacing(6); @@ -37,17 +37,17 @@ TextInputWidget::TextInputWidget(QWidget *parent) QIcon send_file_icon; send_file_icon.addFile(":/icons/icons/clip-dark.png", QSize(), QIcon::Normal, QIcon::Off); - send_file_button_->setForegroundColor(QColor("#577275")); + send_file_button_->setForegroundColor(QColor("#acc7dc")); send_file_button_->setIcon(send_file_icon); send_file_button_->setIconSize(QSize(24, 24)); input_ = new QLineEdit(this); input_->setPlaceholderText("Write a message..."); - input_->setStyleSheet("color: #ebebeb; font-size: 10pt; border-radius: 0; padding: 2px; margin-bottom: 4px;"); + input_->setStyleSheet("color: black; font-size: 10pt; border-radius: 0; padding: 2px; margin-bottom: 4px;"); send_message_button_ = new FlatButton(this); send_message_button_->setCursor(Qt::PointingHandCursor); - send_message_button_->setForegroundColor(QColor("#577275")); + send_message_button_->setForegroundColor(QColor("#acc7dc")); QIcon send_message_icon; send_message_icon.addFile(":/icons/icons/share-dark.png", QSize(), QIcon::Normal, QIcon::Off); diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cc index 9e30c499..b35291cb 100644 --- a/src/TopRoomBar.cc +++ b/src/TopRoomBar.cc @@ -24,7 +24,7 @@ TopRoomBar::TopRoomBar(QWidget *parent) { setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); setMinimumSize(QSize(0, 65)); - setStyleSheet("background-color: #232626; color: #ebebeb;"); + setStyleSheet("background-color: #f8fbfe; color: #171919;"); top_layout_ = new QHBoxLayout(); top_layout_->setSpacing(10); @@ -32,7 +32,8 @@ TopRoomBar::TopRoomBar(QWidget *parent) avatar_ = new Avatar(this); avatar_->setLetter(QChar('?')); - avatar_->setBackgroundColor(QColor("#ebebeb")); + avatar_->setBackgroundColor(QColor("#d6dde3")); + avatar_->setTextColor(QColor("#555459")); avatar_->setSize(35); text_layout_ = new QVBoxLayout(); @@ -49,7 +50,7 @@ TopRoomBar::TopRoomBar(QWidget *parent) text_layout_->addWidget(topic_label_); settings_button_ = new FlatButton(this); - settings_button_->setForegroundColor(QColor("#ebebeb")); + settings_button_->setForegroundColor(QColor("#acc7dc")); settings_button_->setCursor(QCursor(Qt::PointingHandCursor)); settings_button_->setStyleSheet("width: 30px; height: 30px;"); @@ -59,7 +60,7 @@ TopRoomBar::TopRoomBar(QWidget *parent) settings_button_->setIconSize(QSize(16, 16)); search_button_ = new FlatButton(this); - search_button_->setForegroundColor(QColor("#ebebeb")); + search_button_->setForegroundColor(QColor("#acc7dc")); search_button_->setCursor(QCursor(Qt::PointingHandCursor)); search_button_->setStyleSheet("width: 30px; height: 30px;"); diff --git a/src/UserInfoWidget.cc b/src/UserInfoWidget.cc index 2b83fc4a..9a50145d 100644 --- a/src/UserInfoWidget.cc +++ b/src/UserInfoWidget.cc @@ -42,7 +42,7 @@ UserInfoWidget::UserInfoWidget(QWidget *parent) displayNameLabel_ = new QLabel(this); displayNameLabel_->setStyleSheet( "padding: 0 9px;" - "color: #ebebeb;" + "color: #171919;" "font-size: 14px;" "font-weight: 500;" "margin-bottom: -10px;"); @@ -51,7 +51,7 @@ UserInfoWidget::UserInfoWidget(QWidget *parent) userIdLabel_ = new QLabel(this); userIdLabel_->setStyleSheet( "padding: 0 8px 8px 8px;" - "color: #d4d2d1;" + "color: #555459;" "font-size: 13px"); userIdLabel_->setAlignment(Qt::AlignLeading | Qt::AlignLeft | Qt::AlignVCenter); @@ -66,7 +66,7 @@ UserInfoWidget::UserInfoWidget(QWidget *parent) buttonLayout_ = new QHBoxLayout(); logoutButton_ = new FlatButton(this); - logoutButton_->setForegroundColor(QColor("#ebebeb")); + logoutButton_->setForegroundColor(QColor("#555459")); logoutButton_->setCursor(QCursor(Qt::PointingHandCursor)); logoutButton_->setStyleSheet("width: 30px; height: 30px;"); diff --git a/src/WelcomePage.cc b/src/WelcomePage.cc index 2220fad7..5f1fc1e1 100644 --- a/src/WelcomePage.cc +++ b/src/WelcomePage.cc @@ -30,7 +30,7 @@ WelcomePage::WelcomePage(QWidget *parent) top_layout_->setMargin(0); intro_banner_ = new QLabel(this); - intro_banner_->setStyleSheet("background-color: #1c3133;"); + intro_banner_->setStyleSheet("background-color: #d6dde3;"); intro_banner_->setAlignment(Qt::AlignCenter); intro_text_ = new QLabel(this); @@ -59,16 +59,16 @@ WelcomePage::WelcomePage(QWidget *parent) button_layout_->setContentsMargins(0, 20, 0, 80); register_button_ = new RaisedButton("REGISTER", this); - register_button_->setBackgroundColor(QColor("#171919")); - register_button_->setForegroundColor(QColor("#ebebeb")); + register_button_->setBackgroundColor(QColor("#acc7dc")); + register_button_->setForegroundColor(QColor("#171919")); register_button_->setMinimumSize(240, 60); register_button_->setCursor(QCursor(Qt::PointingHandCursor)); register_button_->setFontSize(14); register_button_->setCornerRadius(3); login_button_ = new RaisedButton("LOGIN", this); - login_button_->setBackgroundColor(QColor("#171919")); - login_button_->setForegroundColor(QColor("#ebebeb")); + login_button_->setBackgroundColor(QColor("#acc7dc")); + login_button_->setForegroundColor(QColor("#171919")); login_button_->setMinimumSize(240, 60); login_button_->setCursor(QCursor(Qt::PointingHandCursor)); login_button_->setFontSize(14);