Merge branch '1375-replace-white-opacity' into 1375-replace-rgb

# Conflicts: # Nos/Assets/Colors.xcassets/big-action-button-gradient-bottom.colorset/Contents.json
planetary-social · Aug 16, 2024 · bd25915 · bd25915
2 parents 686fc9b + 1e9ef01
commit bd25915
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 25 deletions.
diff --git a/Nos/Assets/Colors.xcassets/big-action-button-gradient-bottom.colorset/Contents.json b/Nos/Assets/Colors.xcassets/big-action-button-gradient-bottom.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.333",
-          "green" : "0.263",
-          "red" : "0.949"
+          "blue" : "0x55",
+          "green" : "0x4E",
+          "red" : "0xF2"
         }
       },
       "idiom" : "universal"

diff --git a/...tion-button-shadow.colorset/Contents.json → ...ssets/light-shadow.colorset/Contents.json b/...tion-button-shadow.colorset/Contents.json → ...ssets/light-shadow.colorset/Contents.json
diff --git a/Nos/Assets/Colors.xcassets/nos-form-section-shadow.colorset/Contents.json b/Nos/Assets/Colors.xcassets/nos-form-section-shadow.colorset/Contents.json
diff --git a/Nos/Views/BigActionButton.swift b/Nos/Views/BigActionButton.swift
@@ -57,7 +57,7 @@ struct BigActionButtonStyle: ButtonStyle {
             .cornerRadius(80)
             .offset(y: 4.5)
             .shadow(
-                color: Color.bigActionButtonShadow,
+                color: Color.lightShadow,
                 radius: 2,
                 x: 0, 
                 y: configuration.isPressed ? 0 : 1

diff --git a/Nos/Views/Form/NosFormSection.swift b/Nos/Views/Form/NosFormSection.swift
@@ -32,7 +32,7 @@ struct NosFormSection<Content: View>: View {
                 .cornerRadius(21)
                 .offset(y: 4.5)
                 .shadow(
-                    color: Color.nosFormSectionShadow, 
+                    color: Color.lightShadow, 
                     radius: 2, 
                     x: 0, 
                     y: 0