Skip to content

Update main button UI #364

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

Open
metsma wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update main button UI #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 4 additions & 29 deletions src/ui/dark.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,11 @@ background-color: #232325;
color: white;
}
QPushButton {
border-color: #4E4E53;
background-color: #4E4E53;
}
QPushButton::disabled {
border-color: #27272A;
background-color: #27272A;
}
QPushButton::hover {
background-color: #76767B;
border-color: #76767B;
}
QPushButton::focus {
background-color: #76767B;
border-color: #DEDEDE;
}
QPushButton:default {
background-color: #113F8E;
border-color: #113F8E;
color: #FF5C79;
border-color: #FF5C79;
}
QPushButton:default::disabled {
background-color: #15213E;
border-color: #15213E;
}
QPushButton:default::hover {
background-color: #008EEA;
border-color: #008EEA;
}
QPushButton:default::focus {
background-color: #008EEA;
border-color: #DEDEDE;
QPushButton:hover, QPushButton:pressed {
background-color: #232325;
}
#langButton {
color: #FFFFFF;
Expand Down
77 changes: 28 additions & 49 deletions src/ui/dialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,43 +27,32 @@ font-family: "Roboto";
color: black;
}
QPushButton {
font-size: 17px;
border: 3px solid #EFEFEF;
border-radius: 3px;
height: 39px;
padding-left: 17px;
padding-right: 17px;
min-width: 30px;
background-color: #EFEFEF;
}
QPushButton::disabled {
background-color: #FAFAFA;
border-color: #FAFAFA;
color: #AD2A45;
border: 1px solid #AD2A45;
border-radius: 4px;
padding: 11px 12px;
font-family: Roboto, Helvetica;
font-size: 14px;
font-weight: 700;
}
QPushButton::hover {
background-color: #DEDEDE;
border-color: #DEDEDE;
QPushButton:hover {
background-color: #F5EBED;
}
QPushButton::focus {
background-color: #DEDEDE;
border-color: #76767B;
QPushButton:pressed {
background-color: #E1C1C6;
}
QPushButton:default {
QPushButton::default, #helpButton {
color: white;
background-color: #113F8E;
border-color: #113F8E;
}
QPushButton:default::disabled {
background-color: #B7C5DD;
border-color: #B7C5DD;
border-color: #2F70B6;
background-color: #2F70B6;
}
QPushButton:default::hover {
background-color: #003168;
border-color: #003168
QPushButton::default:hover, #helpButton:hover {
border-color: #2B66A6;
background-color: #2B66A6;
}
QPushButton:default::focus {
background-color: #003168;
border-color: #008EEA;
QPushButton::default:pressed, #helpButton:pressed {
border-color: #215081;
background-color: #215081;
}
#langButton {
color: #003168;
Expand Down Expand Up @@ -166,9 +155,6 @@ border-radius: 3px;
#fatalErrorLabel, #aboutAlert {
color: #CD2541;
}
#helpButton {
color: #003168;
}
#aboutVersion {
color: #76767B;
}
Expand Down Expand Up @@ -896,21 +882,24 @@ border-radius: 4px;</string>
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
<string>Help</string>
</property>
<property name="icon">
<iconset resource="web-eid-resources.qrc">
<normaloff>:/images/help.svg</normaloff>:/images/help.svg</iconset>
<normaloff>:/images/link.svg</normaloff>:/images/link.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>30</width>
<height>26</height>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="autoDefault">
<bool>false</bool>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
Expand All @@ -922,16 +911,6 @@ border-radius: 4px;</string>
<property name="text">
<string>Confirm</string>
</property>
<property name="icon">
<iconset resource="web-eid-resources.qrc">
<normaloff>:/images/arrow.svg</normaloff>:/images/arrow.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>16</height>
</size>
</property>
<property name="default">
<bool>true</bool>
</property>
Expand Down
4 changes: 0 additions & 4 deletions src/ui/images/arrow.svg
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/ui/images/help.svg
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/ui/images/help_dark.svg
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions src/ui/images/link.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/ui/webeiddialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ WebEidDialog::WebEidDialog(QWidget* parent) : WebEidUI(parent), ui(new Private)
ui->cardChipIcon->setPixmap(pixmap("no-id-card"_L1));
ui->fatalErrorIcon->setPixmap(pixmap("fatal"_L1));
ui->aboutIcon->setPixmap(pixmap("fatal"_L1));
ui->helpButton->setIcon(QIcon(QStringLiteral(":/images/help_dark.svg")));
}
}
setWindowFlag(Qt::CustomizeWindowHint);
Expand Down