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

…istency More Yami consistency and cleanups
obsproject · Aug 24, 2022 · 2ca0e7c · 2ca0e7c
2 parents 2bb0818 + 20892a1
commit 2ca0e7c
Show file tree

Hide file tree

Showing 5 changed files with 153 additions and 68 deletions.
diff --git a/UI/data/themes/Acri.qss b/UI/data/themes/Acri.qss
@@ -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;
 }

diff --git a/UI/data/themes/Grey.qss b/UI/data/themes/Grey.qss
@@ -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;
 }