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>
2021-06-30 15:20:42 -07:00
parent 85a648049b
commit 7030f663f5
21 changed files with 36 additions and 39 deletions
@@ -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;
 }

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

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

@@ -45,7 +45,7 @@ Thickness=1
 Color=#4B8CEF

 [IconButton]
-ActiveColor=#1E70EB
+ActiveColor=#94D2FF
 DisabledColor=#999999
 SelectedColor=#FFFFFF

@@ -41,7 +41,7 @@ QDoubleSpinBox:hover
 QSpinBox:focus,
 QDoubleSpinBox:focus
 {
-    border-color: #00A1C9;
+    border-color: #94D2FF;
    background-color: #FFFFFF;
 }

@@ -19,5 +19,5 @@ QSplitter::handle:vertical {

 QSplitter::handle:hover
 {
-    background-color: #00A1C9;
+    background-color: #1E70EB;
 }
@@ -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");

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