Merge remote-tracking branch 'upstream/master' into dynamic-effect-dialog-merge_upstream_20230923

This commit is contained in:
Michael Gregorius
2023-09-23 10:18:57 +02:00
57 changed files with 506 additions and 241 deletions

View File

@@ -82,7 +82,6 @@ lmms--gui--TextFloat, lmms--gui--SimpleTextFloat {
QMenu {
border:1px solid #747474;
background-color: #c9c9c9;
font-size:11px;
}
QMenu::separator {
@@ -98,15 +97,12 @@ QMenu::item {
QMenu::item:selected {
color: white;
font-weight:bold;
background-color: #747474;
}
QMenu::item:disabled {
color: #747474;
background-color: #c9c9c9;
font-size:12px;
font-weight: normal;
padding: 4px 32px 4px 20px;
}
@@ -132,7 +128,7 @@ QMenu::indicator:selected {
lmms--gui--FileBrowser QCheckBox
{
font-size: 10px;
font-size: 8pt;
color: white;
}

View File

@@ -9,7 +9,6 @@ QLabel, QTreeWidget, QListWidget, QGroupBox, QMenuBar {
QTreeView {
outline: none;
font-size: 12px;
}
QTreeWidget::item {
@@ -42,7 +41,7 @@ QMdiArea {
lmms--gui--FileBrowser QCheckBox
{
font-size: 10px;
font-size: 8pt;
color: white;
}
@@ -115,7 +114,6 @@ QSplashScreen QLabel {
QMenu {
border-top: 2px solid #08993E;
background-color: #15191c;
font-size: 11px;
}
QMenu::separator {
@@ -133,15 +131,12 @@ QMenu::item {
QMenu::item:selected {
color: #d1d8e4;
font-weight: normal;
background-color: #21272b;
}
QMenu::item:disabled {
color: #515459;
background-color: #262b30;
font-size: 12px;
font-weight: normal;
padding: 4px 32px 4px 20px;
}