Fixing the background of the disabled button on light themes and dark themes

Merge remote-tracking branch 'origin/development_of_the_nord_theme' into development_of_the_nord_theme
# Conflicts: # mastodon/src/main/res/values/colors.xml
2022-12-23 12:03:17 -03:00 · 2022-12-23 11:55:22 -03:00 · 2022-12-23 11:54:49 -03:00 · 2022-12-23 11:54:47 -03:00 · 2022-12-23 11:46:11 -03:00 · 2022-12-23 15:41:28 +01:00
2 changed files with 14 additions and 14 deletions
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 73
-		versionName "1.1.4+fork.73.moshinda"
+		versionCode 72
+		versionName "1.1.4+fork.72.moshinda"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "nl-rNL", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
 	}
--- a/mastodon/src/main/res/values/colors.xml
+++ b/mastodon/src/main/res/values/colors.xml
@@ -295,24 +295,24 @@

 	<color name="nord_primary_25">#fafaff</color>
 	<color name="nord_primary_50">#eff0ff</color>
-	<color name="nord_primary_100">#dfe1f2</color>
-	<color name="nord_primary_200">#c3c6d6</color>
-	<color name="nord_primary_300">#a8aaba</color>
-	<color name="nord_primary_400">#8f909f</color>
-	<color name="nord_primary_500">#727584</color>
-	<color name="nord_primary_600">#5b5e6c</color>
-	<color name="nord_primary_700">#434654</color>
-	<color name="nord_primary_800">#2d303d</color>
-	<color name="nord_primary_900">#181b27</color>
+	<color name="nord_primary_100">#eceff4</color>
+	<color name="nord_primary_200">#e5e9f0</color>
+	<color name="nord_primary_300">#d8dee9</color>
+	<color name="nord_primary_400">#88c0d0</color>
+	<color name="nord_primary_500">#4c566a</color>
+	<color name="nord_primary_600">#4c566a</color>
+	<color name="nord_primary_700">#81a1c1</color>
+	<color name="nord_primary_800">#3b4252</color>
+	<color name="nord_primary_900">#2e3440</color>

-	<color name="nord_gray_900">#110c10</color>
+	<color name="nord_gray_900">#3B4252</color>
 	<color name="nord_gray_800t">#cc2D343F</color>
 	<color name="nord_gray_800">#2D343F</color>
 	<color name="nord_gray_700">#3A4250</color>
 	<color name="nord_gray_600">#404C5C</color>
-	<color name="nord_gray_500">#495668</color>
+	<color name="nord_gray_500">#8C96B4</color>

-	<color name="nord_gray_400">#c5c6d0</color>
+	<color name="nord_gray_400">#8C96B4</color>
 	<color name="nord_gray_300">#c5c6d0</color>
 	<color name="nord_gray_200">#D5DCE6</color>
 	<color name="nord_gray_100">#E2E7EE</color>
Author	SHA1	Message	Date
LucasGGamerM	770fde7aac	Fixing the background of the disabled button on light themes and dark themes	2022-12-23 12:03:17 -03:00
LucasGGamerM	29b8cedc7c	Merge remote-tracking branch 'origin/development_of_the_nord_theme' into development_of_the_nord_theme # Conflicts: # mastodon/src/main/res/values/colors.xml	2022-12-23 11:55:22 -03:00
LucasGGamerM	33b65c3bf3	Merge pull request #9 from FineFindus/development_of_the_nord_theme feat(theme/nord): change popup color	2022-12-23 11:54:49 -03:00
LucasGGamerM	34ab1bcd9c	Change the accent color back to default	2022-12-23 11:54:47 -03:00
LucasGGamerM	20086d76ce	Fixing the accent color for the nord theme	2022-12-23 11:46:11 -03:00
FineFindus	1ca4fb5c37	feat(theme/nord): change popup color	2022-12-23 15:41:28 +01:00
LucasGGamerM	1604c067fd	Fixing up the nord theme	2022-12-23 10:59:12 -03:00
LucasGGamerM	0c7419e2b3	Its less broken, but I still found some bugs	2022-12-23 10:37:14 -03:00
LucasGGamerM	7cf30ccb98	Maybe fixing the nord theme. Still a lot of work that needs to be done	2022-12-23 08:29:01 -03:00