Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into substance_integration

Browse source
This commit is contained in:
Ondřej Samohel 2023-05-03 13:56:37 +02:00 • committed by GitHub
commit 19b3d66f5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 2453 additions and 606 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openpype/style/data.json
View file

@ -48,7 +48,7 @@
"bg-view-selection-hover": "rgba(92, 173, 214, .8)",
"border": "#373D48",
"border-hover": "rgba(168, 175, 189, .3)",
"border-hover": "rgb(92, 99, 111)",
"border-focus": "rgb(92, 173, 214)",
"restart-btn-bg": "#458056",

29
openpype/style/style.css
View file

@ -35,6 +35,11 @@ QWidget:disabled {
color: {color:font-disabled};
}
/* Some DCCs have set borders to solid color */
QScrollArea {
border: none;
}
QLabel {
background: transparent;
}
@ -42,7 +47,7 @@ QLabel {
/* Inputs */
QAbstractSpinBox, QLineEdit, QPlainTextEdit, QTextEdit {
border: 1px solid {color:border};
border-radius: 0.3em;
border-radius: 0.2em;
background: {color:bg-inputs};
padding: 0.1em;
}
@ -227,7 +232,7 @@ QMenu::separator {
/* Combobox */
QComboBox {
border: 1px solid {color:border};
border-radius: 3px;
border-radius: 0.2em;
padding: 1px 3px 1px 3px;
background: {color:bg-inputs};
}
@ -484,7 +489,6 @@ QAbstractItemView:disabled{
}
QAbstractItemView::item:hover {
/* color: {color:bg-view-hover}; */
background: {color:bg-view-hover};
}
@ -753,7 +757,7 @@ OverlayMessageWidget QWidget {
#TypeEditor, #ToolEditor, #NameEditor, #NumberEditor {
background: transparent;
border-radius: 0.3em;
border-radius: 0.2em;
}
#TypeEditor:focus, #ToolEditor:focus, #NameEditor:focus, #NumberEditor:focus {
@ -870,7 +874,13 @@ OverlayMessageWidget QWidget {
background: {color:bg-view-hover};
}
/* New Create/Publish UI */
/* Publisher UI (Create/Publish) */
#PublishWindow QAbstractSpinBox, QLineEdit, QPlainTextEdit, QTextEdit {
padding: 1px;
}
#PublishWindow QComboBox {
padding: 1px 1px 1px 0.2em;
}
PublisherTabsWidget {
background: {color:publisher:tab-bg};
}
@ -954,6 +964,7 @@ PixmapButton:disabled {
border-top-left-radius: 0px;
padding-top: 0.5em;
padding-bottom: 0.5em;
width: 0.5em;
}
#VariantInput[state="new"], #VariantInput[state="new"]:focus, #VariantInput[state="new"]:hover {
border-color: {color:publisher:success};
@ -1082,7 +1093,7 @@ ValidationArtistMessage QLabel {
#AssetNameInputWidget {
background: {color:bg-inputs};
border: 1px solid {color:border};
border-radius: 0.3em;
border-radius: 0.2em;
}
#AssetNameInputWidget QWidget {
@ -1475,6 +1486,12 @@ CreateNextPageOverlay {
}
/* Attribute Definition widgets */
AttributeDefinitionsWidget QAbstractSpinBox, QLineEdit, QPlainTextEdit, QTextEdit {
padding: 1px;
}
AttributeDefinitionsWidget QComboBox {
padding: 1px 1px 1px 0.2em;
}
InViewButton, InViewButton:disabled {
background: transparent;
}