diff --git a/gui/src/spinbox_a.cpp b/gui/src/spinbox_a.cpp index 2e35a3725..60e4bf4d4 100644 --- a/gui/src/spinbox_a.cpp +++ b/gui/src/spinbox_a.cpp @@ -72,6 +72,8 @@ SpinBoxA::SpinBoxA(QWidget *parent) connect(ui->SBA_DownButton, SIGNAL(clicked()), SLOT(onDownButtonPressed())); int size = Style::getDimension(json::global::unit_3); + Style::setStyle(ui->SBA_Combobox, style::properties::widget::noBorder); + ui->SBA_UpButton->setIcon( Style::getPixmap(":/gui/icons/plus.svg", Style::getColor(json::theme::content_inverse))); Style::setStyle(ui->SBA_UpButton, style::properties::button::spinboxButton, true, true); diff --git a/gui/src/stylehelper.cpp b/gui/src/stylehelper.cpp index 1ae05cabf..5f7019d75 100644 --- a/gui/src/stylehelper.cpp +++ b/gui/src/stylehelper.cpp @@ -249,7 +249,7 @@ void StyleHelper::MenuControlButton(QPushButton *btn, QString objectName, bool c void StyleHelper::MenuControlWidget(QWidget *w, QColor color, QString objectName) { - QString style = "scopy--MenuControlButton {background-color: &&background_primary&&; border-radius: 4px;}" + QString style = "scopy--MenuControlButton {background-color: &&background_primary&&;}" "scopy--MenuControlButton[selected=true] { background-color:&&colorname&&;}"; style.replace("&&colorname&&", color.name()); style.replace("&&background_primary&&", StyleHelper::getColor("background_primary")); diff --git a/gui/src/widgets/menuspinbox.cpp b/gui/src/widgets/menuspinbox.cpp index 0186528c7..6493ab370 100644 --- a/gui/src/widgets/menuspinbox.cpp +++ b/gui/src/widgets/menuspinbox.cpp @@ -122,6 +122,7 @@ void MenuSpinbox::layoutVertically(bool left) } Style::setStyle(m_label, style::properties::label::subtle); + Style::setStyle(m_scaleCb, style::properties::widget::noBorder); int size = Style::getDimension(json::global::unit_2_5); m_plus->setIcon(Style::getPixmap(":/gui/icons/plus.svg", Style::getColor(json::theme::content_inverse))); diff --git a/gui/style/json/Scopy.json b/gui/style/json/Scopy.json index d78507055..43dbdf778 100644 --- a/gui/style/json/Scopy.json +++ b/gui/style/json/Scopy.json @@ -34,7 +34,7 @@ "svg_arrow_down": ":/gui/icons/handle_down_arrow_dark.svg", "sba_cmb_box_arrow_right": ":/gui/icons/scopy-default/icons/sba_cmb_box_arrow_right.svg", "sba_cmb_box_arrow": ":/gui/icons/scopy-default/icons/sba_cmb_box_arrow.svg", -"font_family": "Open Sans", +"font_family": "Arial", "radius_1": "2", "radius_2": "6", "padding_1": "6", diff --git a/gui/style/qss/properties/widget/noBorder.qss b/gui/style/qss/properties/widget/noBorder.qss new file mode 100644 index 000000000..162c4c640 --- /dev/null +++ b/gui/style/qss/properties/widget/noBorder.qss @@ -0,0 +1,3 @@ +*[&&property&&=true] { + border: none; +} diff --git a/plugins/test/src/styletool.cpp b/plugins/test/src/styletool.cpp index f47bf65c4..565089f6b 100644 --- a/plugins/test/src/styletool.cpp +++ b/plugins/test/src/styletool.cpp @@ -158,7 +158,6 @@ QWidget *StyleTool::buildStylePage() Style::setStyle(layout->itemAt(i++)->widget()->layout()->itemAt(1)->widget(), style::properties::label::menuMedium, true, true); - // Set the layout to the container widget containerWidget->setLayout(layout);