From 0cdd8fab328ba44f34e3ca5a912610e5e8db1ff0 Mon Sep 17 00:00:00 2001 From: Joel Bethke Date: Thu, 16 Aug 2018 16:19:06 -0500 Subject: [PATCH 1/3] UI: Update Rachni theme Fixes a few small issues with the new SourceTree, warning/error labels, and properties view colors. --- UI/data/themes/Rachni.qss | 112 ++++++++++++++++++++++++-------------- 1 file changed, 71 insertions(+), 41 deletions(-) diff --git a/UI/data/themes/Rachni.qss b/UI/data/themes/Rachni.qss index f3f53e5d3..e5a836283 100644 --- a/UI/data/themes/Rachni.qss +++ b/UI/data/themes/Rachni.qss @@ -45,39 +45,71 @@ /************************/ OBSTheme { - window: rgb(49, 54, 59); /* Blue-gray */ - windowText: rgb(239, 240, 241); /* White */ - base: rgb(0, 139, 163); /* Dark Cyan (Primary Dark) */ - alternateBase: rgb(186, 45, 101); /* Dark Pink (Secondary Dark) */ - text: rgb(239, 240, 241); /* White */ - button: rgb(0, 188, 212); /* Cyan (Primary) */ - buttonText: rgb(239, 240, 241); /* White */ - brightText: rgb(255, 148, 194); /* Light Pink (Secondary Light) */ + window: rgb(49, 54, 59); /* Blue-gray */ + windowText: rgb(239, 240, 241); /* White */ + base: rgb(0, 139, 163); /* Dark Cyan (Primary Dark) */ + alternateBase: rgb(186, 45, 101); /* Dark Pink (Secondary Dark) */ + text: rgb(239, 240, 241); /* White */ + button: rgb(0, 188, 212); /* Cyan (Primary) */ + buttonText: rgb(239, 240, 241); /* White */ + brightText: rgb(255, 148, 194); /* Light Pink (Secondary Light) */ - light: rgb(162, 161, 162); /* Lighter Gray */ - mid: rgb(118, 121, 124); /* Light Grey */ - dark: rgb(84, 87, 91); /* Gray */ - shadow: rgb(35, 38, 41); /* Dark Gray */ + light: rgb(162, 161, 162); /* Lighter Gray */ + mid: rgb(118, 121, 124); /* Light Grey */ + dark: rgb(84, 87, 91); /* Gray */ + shadow: rgb(35, 38, 41); /* Dark Gray */ - highlight: rgb(98, 238, 255); /* Light Cyan (Primary Light) */ - highlightText: rgb(0,0,0); + highlight: rgb(98, 238, 255); /* Light Cyan (Primary Light) */ + highlightText: rgb(0,0,0); - link: rgb(98, 238, 255); /* Light Cyan (Primary Light) */ - linkVisited: rgb(98, 238, 255); /* Light Cyan (Primary Light) */ + link: rgb(98, 238, 255); /* Light Cyan (Primary Light) */ + linkVisited: rgb(98, 238, 255); /* Light Cyan (Primary Light) */ } OBSTheme::disabled { - text: rgb(255, 148, 194); /* Light Pink (Secondary Light) */ - buttonText: rgb(255, 148, 194); /* Light Pink (Secondary Light) */ - brightText: rgb(255, 148, 194); /* Light Pink (Secondary Light) */ + text: rgb(118, 121, 124); /* Light Gray */ + buttonText: rgb(118, 121, 124); /* Light Gray */ + brightText: rgb(118, 121, 124); /* Light Gray */ } OBSTheme::inactive { - highlight: rgb(0, 188, 212); /* Cyan (Primary) */ - highlightText: rgb(239, 240, 241); /* White */ + highlight: rgb(0, 188, 212); /* Cyan (Primary) */ + highlightText: rgb(239, 240, 241); /* White */ } +/************************/ +/* ---- SourceTree ---- */ +/************************/ + +SourceTree::item:selected:!active { + color: rgb(239, 240, 241); /* White */ + background-color: rgba(255, 148, 194, 0.25); /* Light Pink (Secondary Light) */ + border: none; +} + +SourceTree::item:selected { + background-color: rgba(240, 98, 146, 0.5); /* Pink (Secondary) */ + border: none; +} + +SourceTree::item:hover, +SourceTree::item:disabled:hover, +SourceTree::item:hover:!active { + background-color: rgb(0, 188, 212); /* Cyan (Primary) */ + color: rgb(239, 240, 241); /* White */ + border: none; +} + +SourceTree QLineEdit { + padding-top: 0; + padding-bottom: 0; + padding-right: 0; + padding-left: 2px; + border: none; + border-radius: none; +} + /*************************/ /* --- General style --- */ /*************************/ @@ -573,16 +605,6 @@ QLineEdit { color: rgb(239, 240, 241); /* White */ } -QListWidget QLineEdit { - padding-top: 0; - padding-bottom: 0; - padding-right: 0; - padding-left: 2px; - border: none; - border-radius: none; -} - - /**********************/ /* --- Checkboxes --- */ /**********************/ @@ -744,23 +766,23 @@ MuteCheckBox::indicator:unchecked:disabled { /****************************/ SourceTreeSubItemCheckBox { - background: transparent; - outline: none; + background: transparent; + outline: none; } SourceTreeSubItemCheckBox::indicator { - width: 10px; - height: 10px; + width: 10px; + height: 10px; } SourceTreeSubItemCheckBox::indicator:checked, SourceTreeSubItemCheckBox::indicator:checked:hover { - image: url(./Dark/expand.png); + image: url(./Dark/expand.png); } SourceTreeSubItemCheckBox::indicator:unchecked, SourceTreeSubItemCheckBox::indicator:unchecked:hover { - image: url(./Dark/collapse.png); + image: url(./Dark/collapse.png); } /*************************/ @@ -837,10 +859,10 @@ QPushButton:disabled { } QPushButton::menu-indicator { - image: url(./Rachni/down_arrow.png); - subcontrol-position: right; - subcontrol-origin: padding; - width: 25px; + image: url(./Rachni/down_arrow.png); + subcontrol-position: right; + subcontrol-origin: padding; + width: 25px; } /******************************/ @@ -1171,6 +1193,14 @@ QFrame[frameShape="0"] { /* Misc style tweaks for dark themes */ +* [themeID="error"] { + color: rgb(255, 89, 76); /* Red Error */ +} + +* [themeID="warning"] { + color: rgb(255, 148, 194); /* Light Pink (Secondary Light) */ +} + QStatusBar::item { border: none; } From 98b9f7036d21f1beeb6c7917e4d373e34661ee60 Mon Sep 17 00:00:00 2001 From: Joel Bethke Date: Thu, 16 Aug 2018 16:24:52 -0500 Subject: [PATCH 2/3] UI: Fix dark theme link color --- UI/data/themes/Dark.qss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UI/data/themes/Dark.qss b/UI/data/themes/Dark.qss index d83d95310..934706a42 100644 --- a/UI/data/themes/Dark.qss +++ b/UI/data/themes/Dark.qss @@ -50,8 +50,8 @@ OBSTheme { highlight: rgb(42,130,218); /* blue */ highlightText: rgb(0,0,0); - link: rgb(42,130,218); /* blue */ - linkVisited: rgb(42,130,218); /* blue */ + link: rgb(114, 162, 255); /* OBS blue */ + linkVisited: rgb(114, 162, 255); /* OBS blue */ } OBSTheme::disabled { From b58f5c7d4b86c64bda87b80380f49b57f8ff27fa Mon Sep 17 00:00:00 2001 From: Joel Bethke Date: Fri, 17 Aug 2018 12:16:20 -0500 Subject: [PATCH 3/3] UI: Update Acri theme --- UI/data/themes/Acri.qss | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/UI/data/themes/Acri.qss b/UI/data/themes/Acri.qss index bce32d1fb..ca9637ee5 100644 --- a/UI/data/themes/Acri.qss +++ b/UI/data/themes/Acri.qss @@ -43,6 +43,7 @@ QWidget { font-family: "Open Sans", "Tahoma", "Arial", sans-serif; font-size: 12px; padding: 4px; + overflow: auto; } #menubar { @@ -79,6 +80,14 @@ QWidget::disabled { color: #484848; } +* [themeID="error"] { + color: #d91740; +} + +* [themeID="warning"] { + color: #d9af17; +} + /* Dropdown menus, Scenes box, Sources box */ QAbstractItemView { background-color: #181819; @@ -502,10 +511,12 @@ QPushButton { QPushButton::flat { background-color: rgb(24,24,25); + border: none; } QPushButton:checked { - background-color: #202b52; + background-color: #581624; + border-color: #84162d; } QPushButton:hover { @@ -522,6 +533,11 @@ QPushButton:disabled { background-color: #1a1a1b; } +QPushButton::flat:hover, +QPushButton::flat:disabled { + border: none; +} + /* Progress Bar */ QProgressBar { @@ -835,13 +851,6 @@ FocusList::item { padding: 0px 2px; } -#transitionsContainer QPushButton, -#mixerDock QPushButton, -#effectWidget QPushButton, -#asyncWidget QPushButton { - border: none; -} - #fpsTypes { padding: 0px; }