jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7112 from GeorgesStavracas/gbsneto/more-yami-consistency 

More Yami consistency and cleanups
master
Jim 2022-08-24 08:31:18 -07:00 committed by GitHub
parent 2bb0818fb4 20892a172d
commit 2ca0e7cc1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 153 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
UI/data/themes/Acri.qss
View File

@ -149,14 +149,26 @@ QToolTip {
}
/* Context Menu */
QMenu::item:disabled {
color: rgb(153,153,153);
QMenu::icon {
left: 4px;
}
QMenu::separator {
background: rgb(42,42,44);
height: 1px;
margin: 3px 6px;
}
QMenu::item:disabled {
color: rgb(153,153,153);
background: transparent;
}
QMenu::right-arrow {
image: url(./Dark/expand.svg);
}
/* Top Menu Bar Items */
QMenuBar::item {
background-color: transparent;
@ -171,11 +183,13 @@ QListWidget::item {
color: palette(text);
}
QMenu,
SceneTree,
SourceTree {
padding: 3px;
}
QMenu::item,
SceneTree::item,
SourceTree::item {
border-radius: 4px;
@ -184,15 +198,18 @@ SourceTree::item {
border: 0px solid transparent;
}
QMenu::item:selected,
QListWidget::item:selected,
SceneTree::item:selected,
SourceTree::item:selected {
background-color: rgb(19,26,48);
}
QMenu::item:hover,
QListWidget::item:hover,
SceneTree::item:hover,
SourceTree::item:hover,
QMenu::item:selected:hover,
QListWidget::item:selected:hover,
SceneTree::item:selected:hover,
SourceTree::item:selected:hover {
@ -213,7 +230,7 @@ SourceTree QLineEdit {
padding-bottom: 2px;
margin: 0px;
border: 1px solid #FFF;
border-radius: 2px;
border-radius: 4px;
}
QListWidget QLineEdit:focus,
@ -320,8 +337,8 @@ QGroupBox {
QGroupBox::title {
subcontrol-origin: margin;
left: 4px;
top: 4px;
left: 8px;
top: 8px;
}
@ -430,7 +447,7 @@ QToolButton:disabled {
background-color: palette(base);
padding: 4px 6px;
margin: 0px 2px;
border-radius: 2px;
border-radius: 4px;
}
QPushButton[toolButton="true"]:last-child,
@ -574,7 +591,7 @@ QDateTimeEdit {
background-color: rgb(40,40,42);
border-style: solid;
border: 1px;
border-radius: 3px;
border-radius: 4px;
border-color: rgb(40,40,42);
padding: 4px;
padding-left: 10px;
@ -612,8 +629,8 @@ QComboBox:editable:hover {
QComboBox::drop-down:editable,
QDateTimeEdit::drop-down:editable {
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
QComboBox::down-arrow:editable,
@ -628,7 +645,7 @@ QDateTimeEdit::down-arrow:editable {
QLineEdit, QTextEdit, QPlainTextEdit {
background-color: rgb(40,40,42);
border: none;
border-radius: 3px;
border-radius: 4px;
padding: 5px 2px 5px 7px;
border: 2px solid transparent;
}
@ -1384,7 +1401,7 @@ OBSYoutubeActions {
color: palette(text);
background-color: rgb(40,40,42);
border: none;
border-radius: 3px;
border-radius: 4px;
padding: 4px 20px;
}
@ -1423,7 +1440,7 @@ QCalendarWidget QWidget#qt_calendar_navigationbar {
QCalendarWidget QToolButton {
background-color: palette(base);
padding: 2px 16px;
border-radius: 3px;
border-radius: 4px;
margin: 2px;
}
@ -1450,7 +1467,7 @@ QCalendarWidget #qt_calendar_nextmonth {
QCalendarWidget QToolButton:hover {
background-color: rgb(42,58,117);
border-radius: 3px;
border-radius: 4px;
}
QCalendarWidget QToolButton:pressed {
@ -1465,7 +1482,7 @@ QCalendarWidget QMenu {
QCalendarWidget QSpinBox {
background-color: rgb(22,31,65);
border: none;
border-radius: 3px;
border-radius: 4px;
margin: 0px 3px 0px 0px;
padding: 4px 16px;
}

45
UI/data/themes/Grey.qss
View File

@ -149,14 +149,26 @@ QToolTip {
}
/* Context Menu */
QMenu::item:disabled {
color: rgb(153,153,153);
QMenu::icon {
left: 4px;
}
QMenu::separator {
background: palette(button);
height: 1px;
margin: 3px 6px;
}
QMenu::item:disabled {
color: rgb(153,153,153);
background: transparent;
}
QMenu::right-arrow {
image: url(./Dark/expand.svg);
}
/* Top Menu Bar Items */
QMenuBar::item {
background-color: transparent;
@ -171,11 +183,13 @@ QListWidget::item {
color: palette(text);
}
QMenu,
SceneTree,
SourceTree {
padding: 3px;
}
QMenu::item,
SceneTree::item,
SourceTree::item {
border-radius: 4px;
@ -184,15 +198,18 @@ SourceTree::item {
border: 0px solid transparent;
}
QMenu::item:selected,
QListWidget::item:selected,
SceneTree::item:selected,
SourceTree::item:selected {
background-color: rgb(40,76,184);
}
QMenu::item:hover,
QListWidget::item:hover,
SceneTree::item:hover,
SourceTree::item:hover,
QMenu::item:selected:hover,
QListWidget::item:selected:hover,
SceneTree::item:selected:hover,
SourceTree::item:selected:hover {
@ -213,7 +230,7 @@ SourceTree QLineEdit {
padding-bottom: 2px;
margin: 0px;
border: 1px solid #FFF;
border-radius: 2px;
border-radius: 4px;
}
QListWidget QLineEdit:focus,
@ -320,8 +337,8 @@ QGroupBox {
QGroupBox::title {
subcontrol-origin: margin;
left: 4px;
top: 4px;
left: 8px;
top: 8px;
}
@ -428,7 +445,7 @@ QToolButton {
background-color: rgb(67,67,67);
padding: 4px 6px;
margin: 0px 2px;
border-radius: 2px;
border-radius: 4px;
}
QPushButton[toolButton="true"]:last-child,
@ -572,7 +589,7 @@ QDateTimeEdit {
background-color: rgb(67,67,67);
border-style: solid;
border: 1px;
border-radius: 3px;
border-radius: 4px;
border-color: rgb(67,67,67);
padding: 4px;
padding-left: 10px;
@ -610,8 +627,8 @@ QComboBox:editable:hover {
QComboBox::drop-down:editable,
QDateTimeEdit::drop-down:editable {
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
QComboBox::down-arrow:editable,
@ -626,7 +643,7 @@ QDateTimeEdit::down-arrow:editable {
QLineEdit, QTextEdit, QPlainTextEdit {
background-color: palette(button);
border: none;
border-radius: 3px;
border-radius: 4px;
padding: 5px 2px 5px 7px;
border: 2px solid transparent;
}
@ -1373,7 +1390,7 @@ OBSYoutubeActions {
color: palette(text);
background-color: palette(button);
border: none;
border-radius: 3px;
border-radius: 4px;
padding: 4px 20px;
}
@ -1412,7 +1429,7 @@ QCalendarWidget QWidget#qt_calendar_navigationbar {
QCalendarWidget QToolButton {
background-color: palette(button);
padding: 2px 16px;
border-radius: 3px;
border-radius: 4px;
margin: 2px;
}
@ -1439,7 +1456,7 @@ QCalendarWidget #qt_calendar_nextmonth {
QCalendarWidget QToolButton:hover {
background-color: rgb(89,89,89);
border-radius: 3px;
border-radius: 4px;
}
QCalendarWidget QToolButton:pressed {
@ -1454,7 +1471,7 @@ QCalendarWidget QMenu {
QCalendarWidget QSpinBox {
background-color: rgb(28,28,28);
border: none;
border-radius: 3px;
border-radius: 4px;
margin: 0px 3px 0px 0px;
padding: 4px 16px;
}

41
UI/data/themes/Light.qss
View File

@ -149,14 +149,26 @@ QToolTip {
}
/* Context Menu */
QMenu::item:disabled {
color: rgb(74,74,74);
QMenu::icon {
left: 4px;
}
QMenu::separator {
background: rgb(192,192,192);
height: 1px;
margin: 3px 6px;
}
QMenu::item:disabled {
color: rgb(74,74,74);
background: transparent;
}
QMenu::right-arrow {
image: url(./Light/expand.svg);
}
/* Top Menu Bar Items */
QMenuBar::item {
background-color: transparent;
@ -171,11 +183,13 @@ QListWidget::item {
color: palette(text);
}
QMenu,
SceneTree,
SourceTree {
padding: 3px;
}
QMenu::item,
SceneTree::item,
SourceTree::item {
border-radius: 4px;
@ -184,15 +198,18 @@ SourceTree::item {
border: 0px solid transparent;
}
QMenu::item:selected,
QListWidget::item:selected,
SceneTree::item:selected,
SourceTree::item:selected {
background-color: rgb(140,181,255);
}
QMenu::item:hover,
QListWidget::item:hover,
SceneTree::item:hover,
SourceTree::item:hover,
QMenu::item:selected:hover,
QListWidget::item:selected:hover,
SceneTree::item:selected:hover,
SourceTree::item:selected:hover {
@ -213,7 +230,7 @@ SourceTree QLineEdit {
padding-bottom: 2px;
margin: 0px;
border: 1px solid #FFF;
border-radius: 2px;
border-radius: 4px;
}
QListWidget QLineEdit:focus,
@ -320,8 +337,8 @@ QGroupBox {
QGroupBox::title {
subcontrol-origin: margin;
left: 4px;
top: 4px;
left: 8px;
top: 8px;
}
@ -428,7 +445,7 @@ QToolButton {
background-color: rgb(243,243,243);
padding: 4px 6px;
margin: 0px 2px;
border-radius: 2px;
border-radius: 4px;
}
QPushButton[toolButton="true"]:last-child,
@ -572,7 +589,7 @@ QDateTimeEdit {
background-color: rgb(243,243,243);
border-style: solid;
border: 1px;
border-radius: 3px;
border-radius: 4px;
border-color: rgb(243,243,243);
padding: 4px;
padding-left: 10px;
@ -626,7 +643,7 @@ QDateTimeEdit::down-arrow:editable {
QLineEdit, QTextEdit, QPlainTextEdit {
background-color: palette(button);
border: none;
border-radius: 3px;
border-radius: 4px;
padding: 5px 2px 5px 7px;
border: 2px solid transparent;
}
@ -1373,7 +1390,7 @@ OBSYoutubeActions {
color: palette(text);
background-color: palette(button);
border: none;
border-radius: 3px;
border-radius: 4px;
padding: 4px 20px;
}
@ -1412,7 +1429,7 @@ QCalendarWidget QWidget#qt_calendar_navigationbar {
QCalendarWidget QToolButton {
background-color: palette(button);
padding: 2px 16px;
border-radius: 3px;
border-radius: 4px;
margin: 2px;
}
@ -1439,7 +1456,7 @@ QCalendarWidget #qt_calendar_nextmonth {
QCalendarWidget QToolButton:hover {
background-color: rgb(254,254,255);
border-radius: 3px;
border-radius: 4px;
}
QCalendarWidget QToolButton:pressed {
@ -1454,7 +1471,7 @@ QCalendarWidget QMenu {
QCalendarWidget QSpinBox {
background-color: rgb(193,193,193);
border: none;
border-radius: 3px;
border-radius: 4px;
margin: 0px 3px 0px 0px;
padding: 4px 16px;
}

45
UI/data/themes/Rachni.qss
View File

@ -151,14 +151,26 @@ QToolTip {
}
/* Context Menu */
QMenu::item:disabled {
color: rgb(153,153,153);
QMenu::icon {
left: 4px;
}
QMenu::separator {
background: palette(light);
height: 1px;
margin: 3px 6px;
}
QMenu::item:disabled {
color: rgb(153,153,153);
background: transparent;
}
QMenu::right-arrow {
image: url(./Dark/expand.svg);
}
/* Top Menu Bar Items */
QMenuBar::item {
background-color: transparent;
@ -173,11 +185,13 @@ QListWidget::item {
color: palette(text);
}
QMenu,
SceneTree,
SourceTree {
padding: 3px;
}
QMenu::item,
SceneTree::item,
SourceTree::item {
border-radius: 4px;
@ -186,15 +200,18 @@ SourceTree::item {
border: 0px solid transparent;
}
QMenu::item:selected,
QListWidget::item:selected,
SceneTree::item:selected,
SourceTree::item:selected {
background-color: rgb(89,66,79);
}
QMenu::item:hover,
QListWidget::item:hover,
SceneTree::item:hover,
SourceTree::item:hover,
QMenu::item:selected:hover,
QListWidget::item:selected:hover,
SceneTree::item:selected:hover,
SourceTree::item:selected:hover {
@ -215,7 +232,7 @@ SourceTree QLineEdit {
padding-bottom: 2px;
margin: 0px;
border: 1px solid #FFF;
border-radius: 2px;
border-radius: 4px;
}
QListWidget QLineEdit:focus,
@ -323,8 +340,8 @@ QGroupBox {
QGroupBox::title {
color: rgb(240,98,146);
subcontrol-origin: margin;
left: 4px;
top: 4px;
left: 8px;
top: 8px;
}
@ -431,7 +448,7 @@ QToolButton {
background-color: rgb(49,54,59);
padding: 4px 6px;
margin: 0px 2px;
border-radius: 2px;
border-radius: 4px;
}
QPushButton[toolButton="true"]:disabled,
@ -579,7 +596,7 @@ QComboBox,
QDateTimeEdit {
background-color: palette(base);
border: 2px solid rgb(118,121,124);
border-radius: 3px;
border-radius: 4px;
padding: 4px;
padding-left: 10px;
}
@ -617,8 +634,8 @@ QComboBox:editable:hover {
QComboBox::drop-down:editable,
QDateTimeEdit::drop-down:editable {
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
QComboBox::down-arrow:editable,
@ -632,7 +649,7 @@ QDateTimeEdit::down-arrow:editable {
QLineEdit, QTextEdit, QPlainTextEdit {
background-color: palette(base);
border-radius: 3px;
border-radius: 4px;
padding: 5px 2px 5px 7px;
border: 2px solid rgb(118,121,124);
}
@ -1377,7 +1394,7 @@ OBSYoutubeActions {
color: palette(text);
background-color: palette(base);
border: none;
border-radius: 3px;
border-radius: 4px;
padding: 4px 20px;
}
@ -1416,7 +1433,7 @@ QCalendarWidget QWidget#qt_calendar_navigationbar {
QCalendarWidget QToolButton {
background-color: palette(button);
padding: 2px 16px;
border-radius: 3px;
border-radius: 4px;
margin: 2px;
}
@ -1443,7 +1460,7 @@ QCalendarWidget #qt_calendar_nextmonth {
QCalendarWidget QToolButton:hover {
background-color: rgb(145,76,103);
border-radius: 3px;
border-radius: 4px;
}
QCalendarWidget QToolButton:pressed {
@ -1458,7 +1475,7 @@ QCalendarWidget QMenu {
QCalendarWidget QSpinBox {
background-color: rgb(25,27,38);
border: none;
border-radius: 3px;
border-radius: 4px;
margin: 0px 3px 0px 0px;
padding: 4px 16px;
}

45
UI/data/themes/Yami.qss
View File

@ -149,14 +149,26 @@ QToolTip {
}
/* Context Menu */
QMenu::item:disabled {
color: rgb(153,153,153);
QMenu::icon {
left: 4px;
}
QMenu::separator {
background: palette(button);
height: 1px;
margin: 3px 6px;
}
QMenu::item:disabled {
color: rgb(153,153,153);
background: transparent;
}
QMenu::right-arrow {
image: url(./Dark/expand.svg);
}
/* Top Menu Bar Items */
QMenuBar::item {
background-color: transparent;
@ -171,11 +183,13 @@ QListWidget::item {
color: palette(text);
}
QMenu,
SceneTree,
SourceTree {
padding: 3px;
}
QMenu::item,
SceneTree::item,
SourceTree::item {
border-radius: 4px;
@ -184,15 +198,18 @@ SourceTree::item {
border: 0px solid transparent;
}
QMenu::item:selected,
QListWidget::item:selected,
SceneTree::item:selected,
SourceTree::item:selected {
background-color: rgb(40,76,184);
}
QMenu::item:hover,
QListWidget::item:hover,
SceneTree::item:hover,
SourceTree::item:hover,
QMenu::item:selected:hover,
QListWidget::item:selected:hover,
SceneTree::item:selected:hover,
SourceTree::item:selected:hover {
@ -217,7 +234,7 @@ SourceTree QLineEdit {
padding-bottom: 2px;
margin: 0px;
border: 1px solid #FFF;
border-radius: 2px;
border-radius: 4px;
}
QListWidget QLineEdit:focus,
@ -324,8 +341,8 @@ QGroupBox {
QGroupBox::title {
subcontrol-origin: margin;
left: 4px;
top: 4px;
left: 8px;
top: 8px;
}
@ -432,7 +449,7 @@ QToolButton {
background-color: rgb(60,64,75);
padding: 4px 6px;
margin: 0px 2px;
border-radius: 2px;
border-radius: 4px;
}
QPushButton[toolButton="true"]:last-child,
@ -576,7 +593,7 @@ QDateTimeEdit {
background-color: rgb(60,64,75);
border-style: solid;
border: 1px;
border-radius: 3px;
border-radius: 4px;
border-color: rgb(60,64,75);
padding: 4px;
padding-left: 10px;
@ -614,8 +631,8 @@ QComboBox:editable:hover {
QComboBox::drop-down:editable,
QDateTimeEdit::drop-down:editable {
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
QComboBox::down-arrow:editable,
@ -630,7 +647,7 @@ QDateTimeEdit::down-arrow:editable {
QLineEdit, QTextEdit, QPlainTextEdit {
background-color: palette(button);
border: none;
border-radius: 3px;
border-radius: 4px;
padding: 5px 2px 5px 7px;
border: 2px solid transparent;
}
@ -1377,7 +1394,7 @@ OBSYoutubeActions {
color: palette(text);
background-color: palette(button);
border: none;
border-radius: 3px;
border-radius: 4px;
padding: 4px 20px;
}
@ -1416,7 +1433,7 @@ QCalendarWidget QWidget#qt_calendar_navigationbar {
QCalendarWidget QToolButton {
background-color: palette(button);
padding: 2px 16px;
border-radius: 3px;
border-radius: 4px;
margin: 2px;
}
@ -1443,7 +1460,7 @@ QCalendarWidget #qt_calendar_nextmonth {
QCalendarWidget QToolButton:hover {
background-color: rgb(79,83,94);
border-radius: 3px;
border-radius: 4px;
}
QCalendarWidget QToolButton:pressed {
@ -1458,7 +1475,7 @@ QCalendarWidget QMenu {
QCalendarWidget QSpinBox {
background-color: rgb(25,27,38);
border: none;
border-radius: 3px;
border-radius: 4px;
margin: 0px 3px 0px 0px;
padding: 4px 16px;
}