1
0
mirror of https://github.com/SomboChea/ui synced 2024-11-05 06:04:28 +07:00

Merge branch 'master' into master

This commit is contained in:
Juan Picado @jotadeveloper 2019-08-10 21:39:16 +02:00 committed by GitHub
commit cfb0caf2bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 53 additions and 14 deletions

28
.github/workflows/nodejs.yml vendored Normal file
View File

@ -0,0 +1,28 @@
name: Node CI
on: [push]
jobs:
ci:
name: Test on node ${{ matrix.node_version }} and ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
node_version: [8, 10, 12]
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node_version }}
uses: actions/setup-node@v1
with:
version: ${{ matrix.node_version }}
- name: Use Yarn 1.17.2
run: |
npm install -g yarn@1.17.2
- name: yarn build
run: |
yarn install
yarn lint
yarn build

View File

@ -1,10 +1,11 @@
import styled from 'react-emotion';
import ListItem from '@material-ui/core/ListItem';
import Typography from '@material-ui/core/Typography';
import { fontWeight } from '../../utils/styles/sizes';
export const Heading = styled(Typography)({
'&&': {
fontWeight: 700,
fontWeight: fontWeight.bold,
textTransform: 'capitalize',
},
});

View File

@ -2,6 +2,7 @@ import styled from 'react-emotion';
import Card from '@material-ui/core/Card';
import Typography from '@material-ui/core/Typography';
import Chip from '@material-ui/core/Chip';
import { fontWeight } from '../../utils/styles/sizes';
export const CardWrap = styled(Card)({
'&&': {
@ -11,7 +12,7 @@ export const CardWrap = styled(Card)({
export const Heading = styled(Typography)({
'&&': {
fontWeight: 700,
fontWeight: fontWeight.bold,
textTransform: 'capitalize',
},
});

View File

@ -2,6 +2,7 @@ import styled from 'react-emotion';
import Typography from '@material-ui/core/Typography';
import { default as MuiFab } from '@material-ui/core/Fab';
import colors from '../../utils/styles/colors';
import { fontWeight } from '../../utils/styles/sizes';
export const Details = styled('span')({
display: 'flex',
@ -20,7 +21,7 @@ export const Content = styled('div')({
export const Heading = styled(Typography)({
'&&': {
fontWeight: 700,
fontWeight: fontWeight.bold,
marginBottom: '10px',
textTransform: 'capitalize',
},

View File

@ -5,10 +5,11 @@ import ListItem from '@material-ui/core/ListItem';
import Typography from '@material-ui/core/Typography';
import colors from '../../utils/styles/colors';
import { fontWeight } from '../../utils/styles/sizes';
export const Heading = styled(Typography)({
'&&': {
fontWeight: 700,
fontWeight: fontWeight.bold,
textTransform: 'capitalize',
},
});

View File

@ -1,10 +1,11 @@
import styled from 'react-emotion';
import ListItem from '@material-ui/core/ListItem';
import Typography from '@material-ui/core/Typography';
import { fontWeight } from '../../utils/styles/sizes';
export const Heading = styled(Typography)({
'&&': {
fontWeight: 700,
fontWeight: fontWeight.bold,
textTransform: 'capitalize',
},
});

View File

@ -49,7 +49,7 @@ export const InnerMobileNavBar = styled('div')({
backgroundColor: colors.greyLight,
color: colors.white,
width: '100%',
padding: '0px 5px',
padding: '0 5px',
margin: '0 10px 0 0',
},
});

View File

@ -2,10 +2,11 @@ import Avatar from '@material-ui/core/Avatar';
import ListItem from '@material-ui/core/ListItem';
import Typography from '@material-ui/core/Typography';
import styled from 'react-emotion';
import { fontWeight } from '../../utils/styles/sizes';
export const Heading = styled(Typography)({
'&&': {
fontWeight: 700,
fontWeight: fontWeight.bold,
textTransform: 'capitalize',
},
});

View File

@ -1,8 +1,9 @@
import styled, { css } from 'react-emotion';
import colors from '../../utils/styles/colors';
export const Content = styled('div')({
'&&': {
backgroundColor: '#ffffff',
backgroundColor: colors.white,
flex: 1,
display: 'flex',
position: 'relative',

View File

@ -13,6 +13,7 @@ import { breakpoints } from '../../utils/styles/media';
import Ico from '../Icon';
import Label from '../Label';
import colors from '../../utils/styles/colors';
import { fontWeight } from '../../utils/styles/sizes';
export const OverviewItem = styled('span')`
&& {
@ -36,7 +37,7 @@ export const OverviewItem = styled('span')`
export const Icon = styled(Ico)({
'&&': {
margin: '2px 10px 0px 0',
margin: '2px 10px 0 0',
fill: colors.greyLight2,
},
});
@ -44,7 +45,7 @@ export const Icon = styled(Ico)({
export const Published = styled('span')({
'&&': {
color: colors.greyLight2,
margin: '0px 5px 0px 0px',
margin: '0 5px 0 0',
},
});
@ -52,7 +53,7 @@ export const Published = styled('span')({
export const Text = styled(Label)({
'&&': {
fontSize: '12px',
fontWeight: 500,
fontWeight: fontWeight.semiBold,
color: colors.greyLight2,
},
});

View File

@ -5,10 +5,11 @@ import Typography from '@material-ui/core/Typography';
import Github from '../../icons/GitHub';
import colors from '../../utils/styles/colors';
import { fontWeight } from '../../utils/styles/sizes';
export const Heading = styled(Typography)({
'&&': {
fontWeight: 700,
fontWeight: fontWeight.bold,
textTransform: 'capitalize',
},
});

View File

@ -1,10 +1,11 @@
import styled from 'react-emotion';
import Typography from '@material-ui/core/Typography';
import { default as MuiListItemText } from '@material-ui/core/ListItemText';
import { fontWeight } from '../../utils/styles/sizes';
export const Heading = styled(Typography)({
'&&': {
fontWeight: 700,
fontWeight: fontWeight.bold,
},
});

View File

@ -1,10 +1,11 @@
import styled from 'react-emotion';
import Typography from '@material-ui/core/Typography';
import { default as MuiListItemText } from '@material-ui/core/ListItemText';
import { fontWeight } from '../../utils/styles/sizes';
export const Heading = styled(Typography)({
'&&': {
fontWeight: 700,
fontWeight: fontWeight.bold,
},
});