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

Merge pull request #1427 from Fenrirthviti/theme-fixes 

UI: Theme fixes
master
Jim 2018-08-17 10:36:29 -07:00 committed by GitHub
parent 5cbc78b0a9 b58f5c7d4b
commit 2f33988aea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 90 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}

4
UI/data/themes/Dark.qss
View File

@ -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 {

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

@ -67,9 +67,9 @@ OBSTheme {
}
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 {
@ -78,6 +78,38 @@ OBSTheme::inactive {
}
/************************/
/* ---- 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 --- */
/**********************/
@ -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;
}