birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LYN-4890 | Change all instances of teal blue to correct O3DE branding palette colors (#1672)

Browse Source 
* Replace old teal color with correct palette colors from the O3DE branding.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix hyperlink color in O3DE About Us dialog to improve visibility.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
This commit is contained in:
Danilo Aimini
2021-06-30 15:20:42 -07:00
committed by GitHub
parent 85a648049b
commit 7030f663f5
21 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/AboutDialog.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ CAboutDialog::CAboutDialog(QString versionText, QString richTextCopyrightNotice,
m_ui->m_transparentAgreement->setObjectName("link");
setStyleSheet( "CAboutDialog > QLabel#copyrightNotice { color: #AAAAAA; font-size: 9px; }\
CAboutDialog > QLabel#link { text-decoration: underline; color: #00A1C9; }");
CAboutDialog > QLabel#link { text-decoration: underline; color: #94D2FF; }");
// Prepare background image
QImage backgroundImage(QStringLiteral(":/StartupLogoDialog/splashscreen_background_gradient.jpg"));
Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_hover.svg
+1 -1
View File
@@ -4,6 +4,6 @@
<title>Outliner / vis &amp; lock / lock / Default - hover</title>
<desc>Created with Sketch.</desc>
<g id="Outliner-/-vis-&amp;-lock-/-lock-/-Default---hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M7.62646385,1.48235749 C9.42626113,1.48235749 10.8852851,2.94138146 10.8852851,4.74117875 L10.8843498,7.34735749 L12.8405779,7.34823575 L12.8405779,14.5176425 L2.41234985,14.5176425 L2.41234985,7.34823575 L9.58134985,7.34735749 L9.5817566,4.74117875 C9.5817566,3.66130038 8.70634222,2.78588599 7.62646385,2.78588599 C7.21874475,2.78588599 6.62971236,2.90054702 6.14480925,3.34844343 C6.01584142,3.46756874 5.88452781,3.71832946 5.75086844,4.10072562 L4.38428828,4.10072562 C4.43323512,3.87757947 4.47506118,3.7202004 4.50976646,3.62858842 C4.59003595,3.41669999 4.80061604,3.0404071 4.86756375,2.94801197 C5.78155489,1.68660458 6.73091609,1.48235749 7.62646385,1.48235749 Z M11.5370494,8.65176425 L3.71587835,8.65176425 L3.71587835,13.214114 L11.5370494,13.214114 L11.5370494,8.65176425 Z M8.2782281,9.95529275 L8.2782281,11.9105855 L6.9746996,11.9105855 L6.9746996,9.95529275 L8.2782281,9.95529275 Z" id="Combined-Shape-Copy-4" fill="#17A3CD"></path>
<path d="M7.62646385,1.48235749 C9.42626113,1.48235749 10.8852851,2.94138146 10.8852851,4.74117875 L10.8843498,7.34735749 L12.8405779,7.34823575 L12.8405779,14.5176425 L2.41234985,14.5176425 L2.41234985,7.34823575 L9.58134985,7.34735749 L9.5817566,4.74117875 C9.5817566,3.66130038 8.70634222,2.78588599 7.62646385,2.78588599 C7.21874475,2.78588599 6.62971236,2.90054702 6.14480925,3.34844343 C6.01584142,3.46756874 5.88452781,3.71832946 5.75086844,4.10072562 L4.38428828,4.10072562 C4.43323512,3.87757947 4.47506118,3.7202004 4.50976646,3.62858842 C4.59003595,3.41669999 4.80061604,3.0404071 4.86756375,2.94801197 C5.78155489,1.68660458 6.73091609,1.48235749 7.62646385,1.48235749 Z M11.5370494,8.65176425 L3.71587835,8.65176425 L3.71587835,13.214114 L11.5370494,13.214114 L11.5370494,8.65176425 Z M8.2782281,9.95529275 L8.2782281,11.9105855 L6.9746996,11.9105855 L6.9746996,9.95529275 L8.2782281,9.95529275 Z" id="Combined-Shape-Copy-4" fill="#94D2FF"></path>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_hover.svg
+1 -1
View File
@@ -4,6 +4,6 @@
<title>Outliner / vis &amp; lock /lock / on - hover</title>
<desc>Created with Sketch.</desc>
<g id="Outliner-/-vis-&amp;-lock-/lock-/-on---hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M8,1.53182564 C9.78613703,1.53182564 11.2340872,2.97977579 11.2340872,4.76591282 L11.2340872,7.35318256 L13.1745395,7.35318256 L13.1745395,14.4681744 L2.82546052,14.4681744 L2.82546052,7.35318256 L4.76591282,7.35318256 L4.76591282,4.76591282 C4.76591282,2.97977579 6.21386297,1.53182564 8,1.53182564 Z M8.64681744,9.94045231 L7.35318256,9.94045231 L7.35318256,11.8809046 L8.64681744,11.8809046 L8.64681744,9.94045231 Z M8,2.82546052 C6.92831778,2.82546052 6.05954769,3.69423061 6.05954769,4.76591282 L6.05954769,4.76591282 L6.05954769,7.35318256 L9.94045231,7.35318256 L9.94045231,4.76591282 C9.94045231,3.69423061 9.07168222,2.82546052 8,2.82546052 Z" id="Combined-Shape" fill="#17A3CD"></path>
<path d="M8,1.53182564 C9.78613703,1.53182564 11.2340872,2.97977579 11.2340872,4.76591282 L11.2340872,7.35318256 L13.1745395,7.35318256 L13.1745395,14.4681744 L2.82546052,14.4681744 L2.82546052,7.35318256 L4.76591282,7.35318256 L4.76591282,4.76591282 C4.76591282,2.97977579 6.21386297,1.53182564 8,1.53182564 Z M8.64681744,9.94045231 L7.35318256,9.94045231 L7.35318256,11.8809046 L8.64681744,11.8809046 L8.64681744,9.94045231 Z M8,2.82546052 C6.92831778,2.82546052 6.05954769,3.69423061 6.05954769,4.76591282 L6.05954769,4.76591282 L6.05954769,7.35318256 L9.94045231,7.35318256 L9.94045231,4.76591282 C9.94045231,3.69423061 9.07168222,2.82546052 8,2.82546052 Z" id="Combined-Shape" fill="#94D2FF"></path>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_hover.svg
+1 -1
View File
@@ -4,7 +4,7 @@
<title>Outliner / vis &amp; lock /visible / Default - hover</title>
<desc>Created with Sketch.</desc>
<g id="Outliner-/-vis-&amp;-lock-/visible-/-Default---hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group-9" transform="translate(0.500000, 3.500000)" fill="#17A3CD">
<g id="Group-9" transform="translate(0.500000, 3.500000)" fill="#94D2FF">
<path d="M7.31366902,0.423140577 C8.81176272,0.423140577 11.0671071,1.77422153 14.0797023,4.47638343 C11.0671071,7.17854533 8.81176272,8.52962629 7.31366902,8.52962629 C5.81557532,8.52962629 3.56731657,7.17854533 0.568892758,4.47638343 C3.56731657,1.77422153 5.81557532,0.423140577 7.31366902,0.423140577 Z M7.32429752,1.43645129 C5.64538935,1.43645129 4.28436537,2.79747527 4.28436537,4.47638343 C4.28436537,6.15529159 5.64538935,7.51631557 7.32429752,7.51631557 C9.00320568,7.51631557 10.3642297,6.15529159 10.3642297,4.47638343 C10.3642297,2.79747527 9.00320568,1.43645129 7.32429752,1.43645129 Z M7.32429752,2.449762 C8.44356962,2.449762 9.35091894,3.35711132 9.35091894,4.47638343 C9.35091894,5.59565554 8.44356962,6.50300486 7.32429752,6.50300486 C6.20502541,6.50300486 5.29767609,5.59565554 5.29767609,4.47638343 C5.29767609,3.35711132 6.20502541,2.449762 7.32429752,2.449762 Z" id="Combined-Shape-Copy-2"></path>
</g>
</g>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_hover.svg
+1 -1
View File
@@ -4,7 +4,7 @@
<title>Outliner / vis &amp; lock / visible / on - hover</title>
<desc>Created with Sketch.</desc>
<g id="Outliner-/-vis-&amp;-lock-/-visible-/-on---hover" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Sky-Icon-/-System-/-View" fill="#17A3CD">
<g id="Sky-Icon-/-System-/-View" fill="#94D2FF">
<path d="M12.0662207,5.86712992 C12.858042,6.44428281 13.7248573,7.1552395 14.6666667,8 C11.6936446,10.6666667 9.46792606,12 7.98951112,12 C7.51688042,12 6.96858989,11.8637332 6.34463953,11.5911997 L7.07876759,10.8559032 C7.36903278,10.9494633 7.67861466,11 8,11 C9.65685425,11 11,9.65685425 11,8 C11,7.67861466 10.9494633,7.36903278 10.8559032,7.07876759 Z M7.98951112,4 C8.76679076,4 9.75063645,4.36855358 10.9410482,5.10566074 L10.1454186,5.90305312 C9.60073119,5.34585444 8.84075491,5 8,5 C6.34314575,5 5,6.34314575 5,8 C5,8.84036125 5.34553064,9.60001949 5.90227058,10.1446534 L5.11233104,10.9366587 C4.02637979,10.2706404 2.76671388,9.29175412 1.33333333,8 C4.29237025,5.33333333 6.51109618,4 7.98951112,4 Z M10.0073333,7.926 L10.0102404,8 C10.0102404,9.1045695 9.1125175,10 8.00512019,10 C7.98181012,10 7.95859295,9.99960325 7.9354751,9.99881616 L10.0073333,7.926 Z M8.00512019,6 C8.5686887,6 9.07795318,6.23190942 9.44222587,6.60527205 L6.6105304,9.43702678 C6.23403952,9.07344399 6,8.56398363 6,8 C6,6.8954305 6.89772289,6 8.00512019,6 Z" id="Combined-Shape"></path>
<polygon id="Rectangle-25" transform="translate(7.522750, 7.541445) rotate(45.000000) translate(-7.522750, -7.541445) " points="6.80375237 0.92856205 8.2417471 0.925883489 8.2197393 14.1570058 6.80375237 14.1278886"></polygon>
</g>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Code/Editor/Style/LayoutConfigDialog.qss
+1 -1
View File
@@ -5,5 +5,5 @@
#CLayoutConfigDialog QListView::item:selected
{
background: #00A1C9;
background: #94D2FF;
}
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BaseStyleSheet.qss
+2 -2
View File
@@ -53,7 +53,7 @@ QMainWindow:separator
QMainWindow::separator:hover
{
background-color: #00A1C9;
background-color: #1E70EB;
}
QMainWindow,
@@ -107,7 +107,7 @@ QPlainTextEdit:focus
{
margin: 1px;
border-width: 1px;
border-color: #00A1C9;
border-color: #94D2FF;
background-color: #FFFFFF;
}
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.qss
+3 -3
View File
@@ -33,7 +33,7 @@ AzQtComponents--Card #contentContainer
AzQtComponents--Card[selected="true"] > #contentContainer
{
border: 1px solid #00A1C9;
border: 1px solid #94D2FF;
border-top: none;
}
@@ -99,7 +99,7 @@ AzQtComponents--CardHeader #Background
AzQtComponents--Card[selected="true"] > AzQtComponents--CardHeader #Background
{
border: 1px solid #00A1C9;
border: 1px solid #94D2FF;
border-bottom: none;
border-top-left-radius: 2px;
border-top-right-radius: 2px;
@@ -107,7 +107,7 @@ AzQtComponents--Card[selected="true"] > AzQtComponents--CardHeader #Background
AzQtComponents--Card[selected="true"][expanded="false"] > AzQtComponents--CardHeader #Background
{
border: 1px solid #00A1C9;
border: 1px solid #94D2FF;
border-radius: 2px
}
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.qss
+1 -1
View File
@@ -35,7 +35,7 @@ QComboBox[HasPopupOpen=true][HasPopupOpen=true]
border-width: 1px;
border-style: solid;
border-radius: 3px;
border-color: #00A1C9;
border-color: #94D2FF;
background-color: #FFFFFF;
}
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDrop.cpp
+3 -3
View File
@@ -47,10 +47,10 @@ namespace AzQtComponents
config.dropIndicator.ballDiameter = 5;
config.dropIndicator.ballOutlineWidth = 1;
config.dropIndicator.rectOutlineColor = QColor("#00A1C9");
config.dropIndicator.lineSeparatorColor = QColor("#00A1C9");
config.dropIndicator.rectOutlineColor = QColor("#94D2FF");
config.dropIndicator.lineSeparatorColor = QColor("#94D2FF");
config.dropIndicator.ballFillColor = QColor("#444444");
config.dropIndicator.ballOutlineColor = QColor("#00A1C9");
config.dropIndicator.ballOutlineColor = QColor("#94D2FF");
config.dragIndicator.rectBorderRadius = 2;
config.dragIndicator.rectFillColor = QColor("#888888");
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDropConfig.ini
+3 -3
View File
@@ -1,9 +1,9 @@
[DropIndicator]
rectOutlineWidth=1
rectOutlineColor=#00A1C9
rectOutlineColor=#94D2FF
ballFillColor=#0x444444
ballOutlineColor=#00A1C9
lineSeparatorColor=#00A1C9
ballOutlineColor=#94D2FF
lineSeparatorColor=#94D2FF
lineSeparatorOutlineWidth=1
ballDiameter=5
ballOutlineWidth=1
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.cpp
+1 -1
View File
@@ -471,7 +471,7 @@ namespace AzQtComponents
config.hoverBackgroundColor = QColor("#FFFFFF");
config.hoverBorderColor = QColor("#222222");
config.hoverLineWidth = 1;
config.focusedBorderColor = QColor("#00A1C9");
config.focusedBorderColor = QColor("#94D2FF");
config.focusedLineWidth = 1;
config.errorBorderColor = QColor("#E25243");
config.errorLineWidth = 2;
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.cpp
+1 -1
View File
@@ -442,7 +442,7 @@ PushButton::Config PushButton::defaultConfig()
config.smallIcon.width = 24;
config.smallIcon.arrowWidth = 10;
config.iconButton.activeColor = QColor("#00A1C9");
config.iconButton.activeColor = QColor("#94D2FF");
config.iconButton.disabledColor = QColor("#999999");
config.iconButton.selectedColor = QColor("#FFFFFF");
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini
+1 -1
View File
@@ -45,7 +45,7 @@ Thickness=1
Color=#4B8CEF
[IconButton]
ActiveColor=#1E70EB
ActiveColor=#94D2FF
DisabledColor=#999999
SelectedColor=#FFFFFF
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.qss
+1 -1
View File
@@ -41,7 +41,7 @@ QDoubleSpinBox:hover
QSpinBox:focus,
QDoubleSpinBox:focus
{
border-color: #00A1C9;
border-color: #94D2FF;
background-color: #FFFFFF;
}
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Splitter.qss
+1 -1
View File
@@ -19,5 +19,5 @@ QSplitter::handle:vertical {
QSplitter::handle:hover
{
background-color: #00A1C9;
background-color: #1E70EB;
}
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ namespace AzQtComponents
config.borderWidth = 1;
config.borderColor = QStringLiteral("#dddddd");
config.focusBorderWidth = 1;
config.focusBorderColor = QStringLiteral("#00a1c9");
config.focusBorderColor = QStringLiteral("#94D2FF");
config.focusFillColor = QStringLiteral("#10ffffff");
config.headerFillColor = QStringLiteral("#2d2d2d");
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolButton.cpp
+1 -8
View File
@@ -42,7 +42,7 @@ ToolButton::Config ToolButton::defaultConfig()
config.buttonIconSize = 16;
config.defaultButtonMargin = 1;
config.menuIndicatorWidth = 10;
config.checkedStateBackgroundColor = QStringLiteral("#00A1C9");
config.checkedStateBackgroundColor = QStringLiteral("#1E70EB");
config.menuIndicatorIcon = QStringLiteral(":/stylesheet/img/UI20/menu-indicator.svg");
config.menuIndicatorIconSize = QSize(6, 3);
@@ -200,13 +200,6 @@ bool ToolButton::drawToolButton(const Style* style, const QStyleOptionComplex* o
const QRect highlightRect = buttonOption->rect;
painter->drawRect(highlightRect);
if (buttonOption->state & QStyle::State_MouseOver)
{
// If a checkable QToolButton is checked, don't use the Active icon
// color - it is the same as the background color.
label.state.setFlag(QStyle::State_MouseOver, false);
}
}
label.rect = buttonRect;
Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.ui
+8 -4
View File
@@ -236,8 +236,10 @@
<item row="1" column="1">
<widget class="QLabel" name="toolButtonHoverLabel">
<property name="text">
<string>Hover state
#00A1C9</string>
<string>
Hover state
#94D2FF
</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -247,8 +249,10 @@
<item row="1" column="3">
<widget class="QLabel" name="toolButtonSelectedLabel">
<property name="text">
<string>Selected state
#00A1C9</string>
<string>
Selected state
#1E70EB
</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/prefab.svg
+1 -1
View File
@@ -2,6 +2,6 @@
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon / prefab / default</title>
<g id="icon-/-prefab-/-default" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M9.01093446,0.257293069 L14.9911739,3.62370791 C15.3058938,3.80087098 15.5006326,4.13396751 15.5006326,4.49512584 L15.5006328,11.4931225 C15.5006328,11.8624338 15.2970852,12.2016805 14.9712226,12.3754746 L8.48752208,15.8334626 C8.19400447,15.990006 7.84185823,15.9903446 7.54804013,15.8343659 L1.03174045,12.3750698 C0.70493456,12.2015789 0.500632643,11.861816 0.500632639,11.4918144 L0.500632563,4.49769236 C0.500632559,4.13516649 0.696835902,3.80103179 1.01342467,3.62440633 L7.05543612,0.253556938 C7.66348099,-0.0856724221 8.40419027,-0.0842572398 9.01093446,0.257293069 Z M8.44349404,1.4553223 L8.44349404,3.95766864 L11.5129336,5.75047713 L8.11643669,7.55905296 L4.48837667,5.75047713 L7.67766332,3.95766864 L7.67766332,1.4553223 L1.898437,4.60740364 L1.898437,10.8388369 L4.13088856,9.66309228 L4.13088856,6.24729579 L7.67766332,8.22739656 L7.67766332,11.8739531 L4.48837667,10.3290206 L2.15275043,11.4618665 L8.01645,14.6038628 L13.831895,11.4618665 L11.5129336,10.3290206 L8.44349404,11.8739531 L8.44349404,8.22739656 L11.8791162,6.24729579 L11.8791162,9.66309228 L14.134463,10.8388369 L14.134463,4.60740364 L8.44349404,1.4553223 Z" id="Combined-Shape-Copy" fill="#4A90E2"></path>
<path d="M9.01093446,0.257293069 L14.9911739,3.62370791 C15.3058938,3.80087098 15.5006326,4.13396751 15.5006326,4.49512584 L15.5006328,11.4931225 C15.5006328,11.8624338 15.2970852,12.2016805 14.9712226,12.3754746 L8.48752208,15.8334626 C8.19400447,15.990006 7.84185823,15.9903446 7.54804013,15.8343659 L1.03174045,12.3750698 C0.70493456,12.2015789 0.500632643,11.861816 0.500632639,11.4918144 L0.500632563,4.49769236 C0.500632559,4.13516649 0.696835902,3.80103179 1.01342467,3.62440633 L7.05543612,0.253556938 C7.66348099,-0.0856724221 8.40419027,-0.0842572398 9.01093446,0.257293069 Z M8.44349404,1.4553223 L8.44349404,3.95766864 L11.5129336,5.75047713 L8.11643669,7.55905296 L4.48837667,5.75047713 L7.67766332,3.95766864 L7.67766332,1.4553223 L1.898437,4.60740364 L1.898437,10.8388369 L4.13088856,9.66309228 L4.13088856,6.24729579 L7.67766332,8.22739656 L7.67766332,11.8739531 L4.48837667,10.3290206 L2.15275043,11.4618665 L8.01645,14.6038628 L13.831895,11.4618665 L11.5129336,10.3290206 L8.44349404,11.8739531 L8.44349404,8.22739656 L11.8791162,6.24729579 L11.8791162,9.66309228 L14.134463,10.8388369 L14.134463,4.60740364 L8.44349404,1.4553223 Z" id="Combined-Shape-Copy" fill="#1E70EB"></path>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Gems/AWSCore/Code/Tools/ResourceMappingTool/style/base_style_sheet.qss
+2 -2
View File
@@ -136,13 +136,13 @@ QPushButton#Primary
QPushButton#Primary:hover
{
background-color: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #44BAFF, stop:1 #4AB2F8);
border: 1px solid #00A1C9;
border: 1px solid #94D2FF;
}
QPushButton#Primary:pressed
{
background-color: #0073BB;
border: 1px solid #00A1C9;
border: 1px solid #1E70EB;
}
QPushButton#Primary:disabled