Skip to content
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

frontend: Unify appearance of menus #11567

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

frontend: Unify appearance of menus #11567

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
34 changes: 29 additions & 5 deletions frontend/data/themes/Yami.obt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,12 +465,16 @@ QToolTip {

/* Context Menu */

QMenu::indicator {
left: var(--padding_large);
}

QMenu::icon {
left: 4px;
left: var(--padding_xlarge);
}

QMenu::separator {
background: var(--button_bg);
background: var(--border_color);
height: 1px;
margin: var(--spacing_base) var(--spacing_large);
}
Expand Down Expand Up @@ -509,6 +513,10 @@ SourceTree {
padding: var(--spacing_base);
}

QMenu {
border: 1px solid var(--border_color);
}

QListWidget::item,
SourceTreeItem,
SceneTree::item {
Expand All @@ -517,9 +525,6 @@ SceneTree::item {

QMenu::item {
padding: var(--padding_large) var(--padding_menu);
}

QMenu::item {
padding-right: 20px;
}

Expand Down Expand Up @@ -918,6 +923,16 @@ QDateTimeEdit {
padding-left: 10px;
}

QComboBox QAbstractItemView {
padding: var(--spacing_base) var(--spacing_large);
border: 1px solid var(--border_color);
outline: none;
}

QComboBox QAbstractItemView::item {
padding: var(--padding_large) var(--padding_xlarge);
}

QComboBox QAbstractItemView::item:selected,
QComboBox QAbstractItemView::item:hover {
background-color: var(--list_item_bg_selected);
Expand All @@ -930,6 +945,11 @@ QDateTimeEdit:selected {
border-color: var(--input_border_hover);
}

QComboBox:on {
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px;
}

QComboBox::drop-down,
QDateTimeEdit::drop-down {
border: none;
Expand Down Expand Up @@ -1726,6 +1746,10 @@ OBSHotkeyWidget QPushButton {

/* Source Icons */

.source-icon {
margin-right: var(--spacing_large);
}

OBSBasic {
qproperty-imageIcon: url(theme:Dark/sources/image.svg);
qproperty-colorIcon: url(theme:Dark/sources/brush.svg);
Expand Down
Loading