Merge branch 'develop' into feature/OP-2361_Store-settings-by-OpenPype-version

This commit is contained in:
Jakub Trllo 2022-02-01 11:04:21 +01:00
commit 773d3aa176
113 changed files with 1697 additions and 358 deletions

View file

@ -1093,16 +1093,16 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
#ExpandLabel[state="modified"]:hover, #SettingsLabel[state="modified"]:hover {
color: {color:settings:modified-light};
}
#ExpandLabel[state="overriden-modified"], #SettingsLabel[state="overriden-modified"] {
#ExpandLabel[state="overridden-modified"], #SettingsLabel[state="overridden-modified"] {
color: {color:settings:modified-mid};
}
#ExpandLabel[state="overriden-modified"]:hover, #SettingsLabel[state="overriden-modified"]:hover {
#ExpandLabel[state="overridden-modified"]:hover, #SettingsLabel[state="overridden-modified"]:hover {
color: {color:settings:modified-light};
}
#ExpandLabel[state="overriden"], #SettingsLabel[state="overriden"] {
#ExpandLabel[state="overridden"], #SettingsLabel[state="overridden"] {
color: {color:settings:project-mid};
}
#ExpandLabel[state="overriden"]:hover, #SettingsLabel[state="overriden"]:hover {
#ExpandLabel[state="overridden"]:hover, #SettingsLabel[state="overridden"]:hover {
color: {color:settings:project-light};
}
#ExpandLabel[state="invalid"], #SettingsLabel[state="invalid"] {
@ -1130,10 +1130,10 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
#SettingsMainWidget QWidget[input-state="modified"] {
border-color: {color:settings:modified-mid};
}
#SettingsMainWidget QWidget[input-state="overriden-modified"] {
#SettingsMainWidget QWidget[input-state="overridden-modified"] {
border-color: {color:settings:modified-mid};
}
#SettingsMainWidget QWidget[input-state="overriden"] {
#SettingsMainWidget QWidget[input-state="overridden"] {
border-color: {color:settings:project-mid};
}
#SettingsMainWidget QWidget[input-state="invalid"] {
@ -1159,8 +1159,8 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
#ContentWidget {
background-color: transparent;
}
#ContentWidget[content_state="hightlighted"] {
background-color: {color:settings:content-hightlighted};
#ContentWidget[content_state="highlighted"] {
background-color: {color:settings:content-highlighted};
}
#SideLineWidget {
@ -1186,11 +1186,11 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
#SideLineWidget[state="child-invalid"] {border-color: {color:settings:invalid-dark};}
#SideLineWidget[state="child-invalid"]:hover {border-color: {color:settings:invalid-light};}
#SideLineWidget[state="child-overriden"] {border-color: {color:settings:project-dark};}
#SideLineWidget[state="child-overriden"]:hover {border-color: {color:settings:project-mid};}
#SideLineWidget[state="child-overridden"] {border-color: {color:settings:project-dark};}
#SideLineWidget[state="child-overridden"]:hover {border-color: {color:settings:project-mid};}
#SideLineWidget[state="child-overriden-modified"] {border-color: {color:settings:modified-dark};}
#SideLineWidget[state="child-overriden-modified"]:hover {border-color: {color:settings:modified-mid};}
#SideLineWidget[state="child-overridden-modified"] {border-color: {color:settings:modified-dark};}
#SideLineWidget[state="child-overridden-modified"]:hover {border-color: {color:settings:modified-mid};}
#DictAsWidgetBody {
background: transparent;