Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KDESKTOP-1484-Fix-background-colors #465

Merged
merged 2 commits into from
Jan 14, 2025
Merged

KDESKTOP-1484-Fix-background-colors #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99ebd6c
KDESKTOP-1484 - Change disclaimer background color according to selec…
ClementKunz Jan 14, 2025
a308656
Merge branch 'develop' into KDESKTOP-1484-Fix-background-colors
ClementKunz Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions resources/styles/stylesheetblack.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ QInputDialog QLabel
qproperty-wordWrap:1;
}

QWidget#disclaimerWidget {
background-color: #1B1B1D;
border-radius: 5px;
}

QFrame#disclaimerWidget {
background-color: #1B1B1D;
border-radius: 5px;
}

/*******************/
/* QProgressDialog */
/*******************/
Expand Down
10 changes: 10 additions & 0 deletions resources/styles/stylesheetwhite.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ QInputDialog QLabel
qproperty-wordWrap:1;
}

QWidget#disclaimerWidget {
background-color: #F4F6FD;
border-radius: 5px;
}

QFrame#disclaimerWidget {
background-color: #F4F6FD;
border-radius: 5px;
}

/*******************/
/* QProgressDialog */
/*******************/
Expand Down
2 changes: 1 addition & 1 deletion src/gui/betaprogramdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ BetaProgramDialog::BetaProgramDialog(const bool isQuit, const bool isStaff, QWid

// Acknowledgment
_acknowledgmentFrame = new QFrame(this);
_acknowledgmentFrame->setStyleSheet("QFrame {border-radius: 8px; background-color: #F4F6FC;}");
_acknowledgmentFrame->setObjectName("disclaimerWidget");
_acknowledgmentFrame->setVisible(!_isStaff);
layout->addWidget(_acknowledgmentFrame);

Expand Down
2 changes: 1 addition & 1 deletion src/gui/fixconflictingfilesdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void FixConflictingFilesDialog::initUi() {
connect(_keepRemoteButton, &CustomRadioButton::toggled, this, &FixConflictingFilesDialog::onKeepRemoteButtonToggled);

_keepRemoteDisclaimerWidget = new QWidget();
_keepRemoteDisclaimerWidget->setStyleSheet("background-color: #F4F6FD; border-radius: 5px;");
_keepRemoteDisclaimerWidget->setObjectName("disclaimerWidget");
const auto keepLocalDisclaimerLayout = new QHBoxLayout(_keepRemoteDisclaimerWidget);
const auto warningIconLabel = new QLabel();
warningIconLabel->setPixmap(
Expand Down
2 changes: 1 addition & 1 deletion src/gui/preferenceswidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ PreferencesWidget::PreferencesWidget(std::shared_ptr<ClientGui> gui, QWidget *pa

// Move file to trash disclaimer
_moveTotrashDisclaimerWidget = new QWidget();
_moveTotrashDisclaimerWidget->setStyleSheet("background-color: #F4F6FD; border-radius: 5px;");
_moveTotrashDisclaimerWidget->setObjectName("disclaimerWidget");
_moveTotrashDisclaimerWidget->setVisible(moveToTrashSwitch->isChecked());
const auto moveToTrashDisclaimerHBox = new QHBoxLayout(_moveTotrashDisclaimerWidget);
moveToTrashDisclaimerHBox->setContentsMargins(boxHMargin, boxVMargin, boxHMargin, boxVMargin);
Expand Down
Loading