Merge pull request #7174 from Expensify/OSBotify-cherry-pick-staging-…

…7154
Expensify · Jan 12, 2022 · 14c6889 · 14c6889
2 parents 0b22229 + be17e57
commit 14c6889
Show file tree

Hide file tree

Showing 12 changed files with 5,457 additions and 4,702 deletions.
diff --git a/.storybook/main.js b/.storybook/main.js
@@ -7,4 +7,7 @@ module.exports = {
         '@storybook/addon-essentials',
         '@storybook/addon-a11y',
     ],
+    staticDirs: [
+        './public',
+    ],
 };
diff --git a/.storybook/manager-head.html b/.storybook/manager-head.html
@@ -0,0 +1,2 @@
+<link rel="icon" type="image/png" href="logo.png" />
+<link rel="stylesheet" type="text/css" href="index.css" />
diff --git a/.storybook/manager.js b/.storybook/manager.js
@@ -0,0 +1,6 @@
+import {addons} from '@storybook/addons';
+import theme from './theme';
+
+addons.setConfig({
+    theme,
+});
diff --git a/.storybook/public/index.css b/.storybook/public/index.css
@@ -0,0 +1,20 @@
+.search-field *, .sidebar-item, .search-result-item--label {
+    color: #fff !important;
+}
+
+.sidebar-subheading *, .search-result-item {
+    color: #fff;
+}
+
+a.sidebar-item > svg {
+    color: #03d47c;
+}
+
+.search-result-item--label span {
+    color: #ffffffaa !important;
+}
+
+#panel-tab-content :is(input:checked ~ span:last-of-type, input:not(:checked) ~ span:first-of-type) {
+    background: #ff7101;
+    color: #fff;
+}
diff --git a/.storybook/public/logo.png b/.storybook/public/logo.png
diff --git a/.storybook/public/logomark.svg b/.storybook/public/logomark.svg
diff --git a/.storybook/theme.js b/.storybook/theme.js
@@ -0,0 +1,15 @@
+import {create} from '@storybook/theming';
+import colors from '../src/styles/colors';
+
+export default create({
+    appBg: colors.dark,
+    barSelectedColor: colors.blue,
+    base: 'light',
+    brandTitle: 'Expensify UI Docs',
+    brandImage: 'logomark.svg',
+    colorPrimary: colors.dark,
+    colorSecondary: colors.orange,
+    fontBase: 'GTAmericaExp-Regular',
+    fontCode: 'monospace',
+    textInverseColor: colors.black,
+});
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -149,8 +149,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001012900
-        versionName "1.1.29-0"
+        versionCode 1001012901
+        versionName "1.1.29-1"
     }
     splits {
         abi {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.29.0</string>
+	<string>1.1.29.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.29.0</string>
+	<string>1.1.29.1</string>
 </dict>
 </plist>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<link rel="icon" type="image/png" href="logo.png" />
		<link rel="stylesheet" type="text/css" href="index.css" />