Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit e557db7

Browse files
committed
chore: Merge branch 'dev'
2 parents cbe43ba + 060230a commit e557db7

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ before_install:
1414

1515
install:
1616
# web related
17-
- npm install > /dev/null
17+
- npm install
1818
# - npm install -g codecov
1919
- commitlint-travis
2020
# elixir/phoenix env

config/next_seo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export default {
44
cannotical: 'https://coderplanets.com',
55
openGraph: {
66
type: 'website',
7-
locale: 'en_IE',
7+
locale: 'zh_cn',
88
url: 'https://coderplanets.com',
99
site_name: 'coderplanets',
1010
description: 'the sexiest community for developers, ever.',

containers/Banner/styles/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ export const BaseBanner = styled.nav`
1717

1818
export const BaseBannerContent = styled.div`
1919
${cs.flex()};
20-
margin-left: 8%;
21-
margin-right: 8%;
2220
${cs.media.mobile`
2321
margin-left: 4%;
2422
margin-right: 3%;
@@ -29,7 +27,7 @@ export const BaseTabber = styled.div`
2927
${cs.flex()};
3028
position: absolute;
3129
bottom: -16px;
32-
width: 80vw;
30+
width: 100%;
3331
${cs.media.mobile`width: 100%`};
3432
overflow-y: scroll;
3533
`

containers/Cashier/schema.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,21 @@ const createBill = gql`
55
$paymentMethod: PaymentMethodEnum!
66
$paymentUsage: PaymentUsageEnum!
77
$amount: Float!
8+
$note: String
89
) {
910
createBill(
1011
paymentMethod: $paymentMethod
1112
paymentUsage: $paymentUsage
1213
amount: $amount
14+
note: $note
1315
) {
1416
id
1517
state
1618
amount
1719
hashId
1820
paymentUsage
1921
paymentMethod
22+
note
2023
}
2124
}
2225
`
@@ -30,6 +33,7 @@ const pagedBillRecords = gql`
3033
hashId
3134
paymentUsage
3235
paymentMethod
36+
note
3337
}
3438
totalPages
3539
totalCount

containers/CommunityBanner/styles/brief_view.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,27 @@ export const Wrapper = styled(BaseBanner)`
88
`
99
export const BaseBannerContent = styled.div`
1010
${cs.flex()};
11-
margin-left: 8%;
12-
margin-right: 8%;
1311
`
1412
export const BannerContainer = styled(BaseBanner)``
1513

1614
export const TabberWrapper = styled.div`
1715
${cs.flex()};
18-
width: 80vw;
19-
margin-left: 250px;
16+
max-width: ${cs.MAX_CONTENT_WIDTH};
2017
margin-top: 4px;
18+
width: 100%;
19+
padding: 0 15vw;
2120
22-
@media (min-width: 1600px) {
23-
margin-left: 270px;
24-
}
21+
${cs.media.desktop`
22+
padding: 0 18vw;
23+
`};
2524
2625
${cs.media.mobile`
2726
width: 55vw;
2827
overflow: scroll;
2928
margin-left: 45vw;
3029
`};
3130
`
32-
export const BannerContentWrapper = styled(BaseBannerContent)``
31+
export const BannerContentWrapper = styled(BaseBannerContent)`
32+
width: 100%;
33+
${cs.flex('justify-center')};
34+
`

0 commit comments

Comments
 (0)