diff --git a/UI/data/themes/Dark.qss b/UI/data/themes/Dark.qss index 890f084dd..ae917d8ea 100644 --- a/UI/data/themes/Dark.qss +++ b/UI/data/themes/Dark.qss @@ -357,11 +357,6 @@ QLineEdit, QTextEdit, QPlainTextEdit { padding: 2px 2px 3px 7px; } -OBSHotkeyWidget QLineEdit { - margin: 0px 3px 0px 0px; -} - - /* Spinbox and doubleSpinbox */ QSpinBox, QDoubleSpinBox { @@ -459,10 +454,6 @@ QPushButton::menu-indicator { width: 25px; } -QPushButton[themeID="hotkeyButtons"] { - margin: 1px 2px; -} - /* Sliders */ QSlider::groove:horizontal { diff --git a/UI/data/themes/Rachni.qss b/UI/data/themes/Rachni.qss index 28cdbb0c3..ce1f29cfa 100644 --- a/UI/data/themes/Rachni.qss +++ b/UI/data/themes/Rachni.qss @@ -969,6 +969,8 @@ QPushButton:checked#exitButton { QPushButton[themeID="addIconSmall"], QPushButton[themeID="removeIconSmall"], QPushButton[themeID="configIconSmall"], +QPushButton[themeID="trashIcon"], +QPushButton[themeID="revertIcon"], QPushButton#transitionRemove, QPushButton#moveAsyncFilterUp, QPushButton#moveAsyncFilterDown, @@ -982,6 +984,8 @@ QPushButton#moveEffectFilterUp { QPushButton:hover[themeID="addIconSmall"], QPushButton:hover[themeID="removeIconSmall"], QPushButton:hover[themeID="configIconSmall"], +QPushButton:hover[themeID="trashIcon"], +QPushButton:hover[themeID="revertIcon"], QPushButton:hover#transitionRemove, QPushButton:hover#moveAsyncFilterUp, QPushButton:hover#moveAsyncFilterDown, @@ -995,39 +999,6 @@ QPushButton:hover#moveEffectFilterUp { outline: none; } -/******************************/ -/* --- Hotkey Buttons --- */ -/******************************/ -/* Fix for the hotkey buttons */ -/* looking terrible with my */ -/* color choices. */ -/******************************/ - -QPushButton[themeID="hotkeyButtons"] { - background-color: rgb(58, 64, 69); /* Light Blue-gray */ - color: rgb(239, 240, 241); /* White */ - border-radius: 2px; - border: none; - margin: 4px; - padding-top: 6px; - padding-bottom: 6px; -} - -QPushButton:hover[themeID="hotkeyButtons"] { - background-color: rgba(240, 98, 146, 0.5); /* Pink (Secondary) */ - border: 1px solid rgba(240, 98, 146, 0.5); /* Pink (Secondary) */ -} - -QPushButton:pressed[themeID="hotkeyButtons"] { - background-color: rgb(240, 98, 146); /* Pink (Secondary) */ - border: 1px solid rgb(240, 98, 146); /* Pink (Secondary) */ -} - -QPushButton:disabled[themeID="hotkeyButtons"] { - background-color: rgb(58, 64, 69); /* Light Blue-gray */ - color: rgb(162, 161, 162); /* Lighter Gray */ -} - /******************/ /* --- Labels --- */ /******************/ diff --git a/UI/hotkey-edit.cpp b/UI/hotkey-edit.cpp index 9bb3ca6bd..30af64a05 100644 --- a/UI/hotkey-edit.cpp +++ b/UI/hotkey-edit.cpp @@ -324,6 +324,7 @@ void OBSHotkeyWidget::AddEdit(obs_key_combination combo, int idx) }); QHBoxLayout *subLayout = new QHBoxLayout; + subLayout->setContentsMargins(0, 4, 0, 0); subLayout->addWidget(edit); subLayout->addWidget(revert); subLayout->addWidget(clear);