Skip to content

Commit a46816e

Browse files
wegisweswegiswes
authored
Merge pull request #99 from mendix/develop
Merge develop into release
2 parents 64b249f + 1462f73 commit a46816e

22 files changed

+543
-321
lines changed

‎index-rtl.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99

1010
{{themecss}}
1111
{{appicons}}
12-
12+
{{manifest}}
13+
{{startupimages}}
14+
1315
</head>
1416
<body dir="rtl">
1517
<div id="content"></div>

‎index.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99

1010
{{themecss}}
1111
{{appicons}}
12-
13-
<!-- STARTUP IMAGES -->
14-
<!-- <link href="resources/ios/startup/apple-touch-startup-image-1496x2048.png" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" rel="apple-touch-startup-image"> -->
12+
{{manifest}}
13+
{{startupimages}}
1514

1615
</head>
1716
<body dir="ltr">

‎login-with-sso.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
<meta name="apple-mobile-web-app-capable" content="yes" />
99

1010
{{themecss}}
11+
{{appicons}}
12+
{{manifest}}
13+
{{startupimages}}
1114

1215
</head>
1316

‎login.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
<meta name="apple-mobile-web-app-capable" content="yes" />
99

1010
{{themecss}}
11+
{{appicons}}
12+
{{manifest}}
13+
{{startupimages}}
14+
1115
</head>
1216

1317
<body>

‎manifest-overrides.webmanifest‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"background_color": "#FFFFFF"
3+
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
"react-native-device-info": "^5.5.3"
2424
},
2525
"dependencies": {}
26-
}
26+
}

‎styles/native/js/app/custom-variables.js‎

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,11 @@ export const input = {
152152
labelColorDisabled: font.labelColorDisabled,
153153
borderColor: contrast.lower,
154154
backgroundColor: background.primary,
155-
backgroundColorDisabled: background.secondary,
155+
backgroundColorDisabled: contrast.lowest,
156156
selectionColor: contrast.lower,
157157
placeholderTextColor: contrast.regular,
158158
underlineColorAndroid: "transparent",
159+
inputContainerUnderlayColor: `rgba(${anyColorToRgbString(contrast.low)},0.4)`,
159160
// Sizes
160161
fontSize: font.size,
161162
fontFamily: font.family,
@@ -201,6 +202,34 @@ export const navigation = {
201202
},
202203
};
203204
//
205+
// Badge Styles
206+
export const badge = {
207+
fontWeight: font.weightBold,
208+
borderRadius: 30,
209+
paddingVertical: 3,
210+
paddingHorizontal: spacing.smaller,
211+
default: {
212+
color: contrast.higher,
213+
backgroundColor: contrast.lower,
214+
},
215+
primary: {
216+
color: brand.primary,
217+
backgroundColor: brand.primaryLight,
218+
},
219+
success: {
220+
color: brand.success,
221+
backgroundColor: brand.successLight,
222+
},
223+
warning: {
224+
color: brand.warning,
225+
backgroundColor: brand.warningLight,
226+
},
227+
danger: {
228+
color: brand.danger,
229+
backgroundColor: brand.dangerLight,
230+
},
231+
};
232+
//
204233
// Tabcontainer Styles
205234
export const tabContainer = {
206235
tabBar: {
@@ -221,6 +250,18 @@ export const tabContainer = {
221250
fontWeight: font.weightBold,
222251
textTransform: "uppercase",
223252
},
253+
badgeContainer: {
254+
borderRadius: badge.borderRadius,
255+
backgroundColor: badge.default.backgroundColor,
256+
paddingVertical: badge.paddingVertical,
257+
paddingHorizontal: badge.paddingHorizontal,
258+
marginLeft: 8
259+
},
260+
badgeCaption: {
261+
fontSize: font.size,
262+
color: badge.default.color,
263+
fontWeight: badge.fontWeight,
264+
}
224265
};
225266
//
226267
// ListView Styles
@@ -235,34 +276,3 @@ export const listView = {
235276
export const layoutGrid = {
236277
gutterSize: 15,
237278
};
238-
//
239-
//
240-
//== Pluggable Widgets
241-
//-------------------------------------------------------------------------------------------------------------------//
242-
// Badge Styles
243-
export const badge = {
244-
fontWeight: font.weightBold,
245-
borderRadius: 30,
246-
paddingVertical: 3,
247-
paddingHorizontal: spacing.smaller,
248-
default: {
249-
color: contrast.higher,
250-
backgroundColor: contrast.lower,
251-
},
252-
primary: {
253-
color: brand.primary,
254-
backgroundColor: brand.primaryLight,
255-
},
256-
success: {
257-
color: brand.success,
258-
backgroundColor: brand.successLight,
259-
},
260-
warning: {
261-
color: brand.warning,
262-
backgroundColor: brand.warningLight,
263-
},
264-
danger: {
265-
color: brand.danger,
266-
backgroundColor: brand.dangerLight,
267-
},
268-
};

‎styles/native/js/core/variables.js‎

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ let input = {
156156
selectionColor: contrast.lower,
157157
placeholderTextColor: contrast.regular,
158158
underlineColorAndroid: "transparent",
159+
inputContainerUnderlayColor: `rgba(${anyColorToRgbString(contrast.low)},0.4)`,
159160
// Sizes
160161
fontSize: font.size,
161162
fontFamily: font.family,
@@ -203,6 +204,35 @@ let navigation = {
203204
};
204205
navigation = merge(navigation, custom.navigation || {});
205206
//
207+
// Badge Styles
208+
let badge = {
209+
fontWeight: font.weightBold,
210+
borderRadius: 30,
211+
paddingVertical: 3,
212+
paddingHorizontal: spacing.smaller,
213+
default: {
214+
color: contrast.higher,
215+
backgroundColor: contrast.lower,
216+
},
217+
primary: {
218+
color: brand.primary,
219+
backgroundColor: brand.primaryLight,
220+
},
221+
success: {
222+
color: brand.success,
223+
backgroundColor: brand.successLight,
224+
},
225+
warning: {
226+
color: brand.warning,
227+
backgroundColor: brand.warningLight,
228+
},
229+
danger: {
230+
color: brand.danger,
231+
backgroundColor: brand.dangerLight,
232+
},
233+
};
234+
badge = merge(badge, custom.badge || {});
235+
//
206236
// Tabcontainer Styles
207237
let tabContainer = {
208238
tabBar: {
@@ -223,6 +253,18 @@ let tabContainer = {
223253
fontWeight: font.weightBold,
224254
textTransform: "uppercase",
225255
},
256+
badgeContainer: {
257+
borderRadius: badge.borderRadius,
258+
backgroundColor: badge.default.backgroundColor,
259+
paddingVertical: badge.paddingVertical,
260+
paddingHorizontal: badge.paddingHorizontal,
261+
marginLeft: 8
262+
},
263+
badgeCaption: {
264+
fontSize: font.size,
265+
color: badge.default.color,
266+
fontWeight: badge.fontWeight,
267+
}
226268
};
227269
tabContainer = merge(tabContainer, custom.tabContainer || {});
228270
//
@@ -241,35 +283,4 @@ let layoutGrid = {
241283
};
242284
layoutGrid = merge(layoutGrid, custom.layoutGrid || {});
243285
//
244-
//## Pluggable Widgets
245-
//-------------------------------------------------------------------------------------------------------------------//
246-
// Badge Styles
247-
let badge = {
248-
fontWeight: font.weightBold,
249-
borderRadius: 30,
250-
paddingVertical: 3,
251-
paddingHorizontal: spacing.smaller,
252-
default: {
253-
color: contrast.higher,
254-
backgroundColor: contrast.lower,
255-
},
256-
primary: {
257-
color: brand.primary,
258-
backgroundColor: brand.primaryLight,
259-
},
260-
success: {
261-
color: brand.success,
262-
backgroundColor: brand.successLight,
263-
},
264-
warning: {
265-
color: brand.warning,
266-
backgroundColor: brand.warningLight,
267-
},
268-
danger: {
269-
color: brand.danger,
270-
backgroundColor: brand.dangerLight,
271-
},
272-
};
273-
badge = merge(badge, custom.badge || {});
274-
//
275286
export { brand, background, border, contrast, font, spacing, button, input, navigation, tabContainer, listView, layoutGrid, badge, };

‎styles/native/js/core/widgets/dropdown.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const DropDown = {
5252
},
5353
/* New dropdown styles start */
5454
valueContainer: {
55-
// All ViewStyle properties & rippleColor are allowed
55+
// All ViewStyle properties & rippleColor & activeOpacity & underlayColor are allowed
5656
},
5757
valueContainerDisabled: {
5858
// All ViewStyle properties are allowed
@@ -64,13 +64,15 @@ export const DropDown = {
6464
shadowOpacity: 0.2,
6565
shadowRadius: 10,
6666
elevation: 16,
67+
backgroundColor: input.backgroundColor,
6768
},
6869
itemContainer: {
69-
// All ViewStyle properties are allowed
70+
// All ViewStyle properties & rippleColor & activeOpacity & underlayColor are allowed
7071
maxWidth: 500,
7172
paddingVertical: 6,
7273
paddingHorizontal: 16,
7374
backgroundColor: input.backgroundColor,
75+
underlayColor: input.inputContainerUnderlayColor,
7476
},
7577
item: {
7678
// All TextStlye properties are allowed

0 commit comments

Comments
 (0)