From 7030f663f5bc71c42aa573758d3996de28fcb52d Mon Sep 17 00:00:00 2001 From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Date: Wed, 30 Jun 2021 15:20:42 -0700 Subject: [PATCH] LYN-4890 | Change all instances of teal blue to correct O3DE branding palette colors (#1672) * 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> --- Code/Editor/AboutDialog.cpp | 2 +- .../UI/Icons/lock_default_hover.svg | 2 +- .../UI/Icons/lock_on_hover.svg | 2 +- .../UI/Icons/visibility_default_hover.svg | 2 +- .../UI/Icons/visibility_on_hover.svg | 2 +- Code/Editor/Style/LayoutConfigDialog.qss | 2 +- .../Components/Widgets/BaseStyleSheet.qss | 4 ++-- .../AzQtComponents/Components/Widgets/Card.qss | 6 +++--- .../AzQtComponents/Components/Widgets/ComboBox.qss | 2 +- .../Components/Widgets/DragAndDrop.cpp | 6 +++--- .../Components/Widgets/DragAndDropConfig.ini | 6 +++--- .../AzQtComponents/Components/Widgets/LineEdit.cpp | 2 +- .../AzQtComponents/Components/Widgets/PushButton.cpp | 2 +- .../Components/Widgets/PushButtonConfig.ini | 2 +- .../AzQtComponents/Components/Widgets/SpinBox.qss | 2 +- .../AzQtComponents/Components/Widgets/Splitter.qss | 2 +- .../AzQtComponents/Components/Widgets/TableView.cpp | 2 +- .../AzQtComponents/Components/Widgets/ToolButton.cpp | 9 +-------- .../AzQtComponents/Gallery/ButtonPage.ui | 12 ++++++++---- .../AzQtComponents/Images/Entity/prefab.svg | 2 +- .../ResourceMappingTool/style/base_style_sheet.qss | 4 ++-- 21 files changed, 36 insertions(+), 39 deletions(-) diff --git a/Code/Editor/AboutDialog.cpp b/Code/Editor/AboutDialog.cpp index a3f76abeb0..88b4d0bdbb 100644 --- a/Code/Editor/AboutDialog.cpp +++ b/Code/Editor/AboutDialog.cpp @@ -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")); diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_hover.svg b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_hover.svg index 36cceef9e3..fdc98bc788 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_hover.svg +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_default_hover.svg @@ -4,6 +4,6 @@ Outliner / vis & lock / lock / Default - hover Created with Sketch. - + diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_hover.svg b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_hover.svg index 410f751568..97580d3462 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_hover.svg +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/lock_on_hover.svg @@ -4,6 +4,6 @@ Outliner / vis & lock /lock / on - hover Created with Sketch. - + diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_hover.svg b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_hover.svg index ae7f899c78..1d5db1ca6b 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_hover.svg +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_default_hover.svg @@ -4,7 +4,7 @@ Outliner / vis & lock /visible / Default - hover Created with Sketch. - + diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_hover.svg b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_hover.svg index a02fd53198..9d453c7eed 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_hover.svg +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Icons/visibility_on_hover.svg @@ -4,7 +4,7 @@ Outliner / vis & lock / visible / on - hover Created with Sketch. - + diff --git a/Code/Editor/Style/LayoutConfigDialog.qss b/Code/Editor/Style/LayoutConfigDialog.qss index 1c79e47451..20dbd2823c 100644 --- a/Code/Editor/Style/LayoutConfigDialog.qss +++ b/Code/Editor/Style/LayoutConfigDialog.qss @@ -5,5 +5,5 @@ #CLayoutConfigDialog QListView::item:selected { - background: #00A1C9; + background: #94D2FF; } diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BaseStyleSheet.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BaseStyleSheet.qss index ed0ae1c043..b50886892c 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BaseStyleSheet.qss +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BaseStyleSheet.qss @@ -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; } diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.qss index 9c9ffa1bbb..3cc6f25c73 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.qss +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Card.qss @@ -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 } diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.qss index 5300e65a6a..169f034dc6 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.qss +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ComboBox.qss @@ -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; } diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDrop.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDrop.cpp index 82723285b9..0c1aff0166 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDrop.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDrop.cpp @@ -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"); diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDropConfig.ini b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDropConfig.ini index 14aca1f9d4..e0dd79b5d4 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDropConfig.ini +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/DragAndDropConfig.ini @@ -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 diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.cpp index b96f4f9002..eefb23e6f5 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/LineEdit.cpp @@ -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; diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.cpp index c8d203034e..381c4101cb 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButton.cpp @@ -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"); diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini index 34c084b0f2..897e894a31 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/PushButtonConfig.ini @@ -45,7 +45,7 @@ Thickness=1 Color=#4B8CEF [IconButton] -ActiveColor=#1E70EB +ActiveColor=#94D2FF DisabledColor=#999999 SelectedColor=#FFFFFF diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.qss index 35d27d6eaa..cec5be14ec 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.qss +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/SpinBox.qss @@ -41,7 +41,7 @@ QDoubleSpinBox:hover QSpinBox:focus, QDoubleSpinBox:focus { - border-color: #00A1C9; + border-color: #94D2FF; background-color: #FFFFFF; } diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Splitter.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Splitter.qss index b032b6bdbe..042693cd25 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Splitter.qss +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Splitter.qss @@ -19,5 +19,5 @@ QSplitter::handle:vertical { QSplitter::handle:hover { - background-color: #00A1C9; + background-color: #1E70EB; } diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp index c57ed22c15..b957ad164a 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp @@ -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"); diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolButton.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolButton.cpp index 0efb5b9f1b..d6e9315c4c 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolButton.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ToolButton.cpp @@ -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; diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.ui b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.ui index 11500dac62..b8870340a1 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.ui +++ b/Code/Framework/AzQtComponents/AzQtComponents/Gallery/ButtonPage.ui @@ -236,8 +236,10 @@ - Hover state -#00A1C9 + + Hover state + #94D2FF + Qt::AlignCenter @@ -247,8 +249,10 @@ - Selected state -#00A1C9 + + Selected state + #1E70EB + Qt::AlignCenter diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/prefab.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/prefab.svg index 324eacf60e..924fb353c8 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/prefab.svg +++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/Entity/prefab.svg @@ -2,6 +2,6 @@ icon / prefab / default - + diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/base_style_sheet.qss b/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/base_style_sheet.qss index 2347272331..5f1de10c9d 100644 --- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/base_style_sheet.qss +++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/style/base_style_sheet.qss @@ -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