Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Setting): styling issue in settings app for mobile layout #200

Merged
merged 5 commits into from
Nov 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# [4.0.0](https://github.com/BlueBaseJS/plugin-settings-app/compare/v3.1.1...v4.0.0) (2020-10-11)

### Features

- New Desktop Layout ([#185](https://github.com/BlueBaseJS/plugin-settings-app/issues/185)) ([d133c9a](https://github.com/BlueBaseJS/plugin-settings-app/commit/d133c9a8c986d6c053549734dacb03f206a7e680))

### BREAKING CHANGES

- The desktop layout is changed.

## [3.1.1](https://github.com/BlueBaseJS/plugin-settings-app/compare/v3.1.0...v3.1.1) (2020-09-30)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@bluebase/plugin-settings-app",
"description": "A settings app for the BlueBase framework!",
"author": "BlueEast Team <code@blueeast.com>",
"version": "3.1.1",
"version": "4.0.0",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"module": "dist/index.js",
Expand Down
15 changes: 6 additions & 9 deletions src/layouts/SettingsPageItem/SettingsPageItemMobile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export interface SettingsPageItemMobileStyles {
descriptionStyles: TextStyle;
root: ViewStyle;
header: ViewStyle;
titleStyles: TextStyle;
}

export interface SettingsPageItemMobileProps extends SettingsPageItemProps {
Expand All @@ -33,9 +32,7 @@ const defaultStyles = (theme: Theme): SettingsPageItemMobileStyles => ({
paddingVertical: theme.spacing.unit,
},

titleStyles: {
paddingHorizontal: 0,
},

});

export const SettingsPageItemMobile = (props: SettingsPageItemMobileProps) => {
Expand All @@ -47,17 +44,17 @@ export const SettingsPageItemMobile = (props: SettingsPageItemMobileProps) => {

const titleNode =
typeof title === 'string' ? (
<List.Subheader style={[styles.titleStyles, titleStyle]}>{__(title)}</List.Subheader>
<List.Subheader style={[titleStyle]}>{__(title)}</List.Subheader>
) : (
title
);
title
);

const descNode =
typeof description === 'string' ? (
<Caption style={[styles.descriptionStyles, descriptionStyle]}>{__(description)}</Caption>
) : (
description
);
description
);

return (
<View style={styles.root}>
Expand Down
4 changes: 2 additions & 2 deletions src/version.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// THIS IS AN AUTO GENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
export const VERSION = '3.1.1';
export const VERSION_NUMBER = 301001000;
export const VERSION = '4.0.0';
export const VERSION_NUMBER = 400000000;