chore: merge branch 'dev'

mydearxym · mydearxym · commit f20cb46ed1de · 2019-02-07T16:54:15.000+08:00
diff --git a/components/ContentBanner/styles/index.js b/components/ContentBanner/styles/index.js
@@ -9,9 +9,10 @@ export const BaseBanner = styled.nav`
   min-height: 140px;
   background: ${theme('banner.bg')};
   border-bottom: ${theme('banner.spliter')};
-  @media (max-height: 800px) {
-    min-height: 130px;
-  }
+
+  ${cs.media.mobile`
+    min-height: 100px;
+  `};
 `
 export const BaseBannerContent = styled.div`
   ${cs.flex()};
diff --git a/components/JobItem/JobInfo.js b/components/JobItem/JobInfo.js
@@ -19,6 +19,7 @@ import {
   TagsWrapper,
   Degree,
   Exp,
+  ExpLabel,
   ExpDivider,
   Extra,
   PublishInfo,
@@ -53,7 +54,10 @@ const JobInfo = ({
       <Background>
         <Degree>{education}</Degree>
         <ExpDivider>&</ExpDivider>
-        <Exp>经验 {exp}</Exp>
+        <Exp>
+          <ExpLabel>经验 </ExpLabel>
+          {exp}
+        </Exp>
       </Background>
       <TagsWrapper>
         <InlineTags data={tags} />
diff --git a/components/JobItem/styles/job_info.js b/components/JobItem/styles/job_info.js
@@ -30,7 +30,7 @@ export const Title = styled.div`
   font-size: 1rem;
   ${cs.media.mobile`
     ${cs.truncate('150px')};
-  `};
+`};
 `
 export const CommunitiesWrapper = styled.div`
   margin-left: 5px;
@@ -57,6 +57,9 @@ export const Background = styled.div`
 `
 export const Degree = styled.div``
 export const Exp = styled.div``
+export const ExpLabel = styled.span`
+  ${cs.media.tablet`display: none`};
+`
 
 export const Extra = styled.div`
   ${cs.flex('align-center')};
@@ -72,8 +75,8 @@ export const ExpDivider = styled.div`
 export const PublishInfo = styled.div`
   ${cs.flex('align-center')};
   ${cs.media.tablet`
-    display: none;
-  `};
+display: none;
+`};
 
   &:hover {
     cursor: pointer;
diff --git a/components/RepoItem/Header.js b/components/RepoItem/Header.js
@@ -17,6 +17,7 @@ import {
   TagsWrapper,
   StatusInfo,
   StatusSection,
+  ForkSection,
   StarIcon,
   StatusNum,
   ForkIcon,
@@ -44,10 +45,10 @@ const Header = ({ entry, onPreview }) => (
         <StatusNum>{numberWithCommas(entry.starCount)}</StatusNum>
       </StatusSection>
       <Space right="3px" />
-      <StatusSection>
+      <ForkSection>
         <ForkIcon src={`${ICON_CMD}/repo_fork.svg`} />
         <StatusNum>{numberWithCommas(entry.forkCount)}</StatusNum>
-      </StatusSection>
+      </ForkSection>
     </StatusInfo>
   </Wrapper>
 )
diff --git a/components/RepoItem/styles/footer.js b/components/RepoItem/styles/footer.js
@@ -12,6 +12,11 @@ export const Wrapper = styled.div`
 
 export const Contributors = styled.div`
   ${cs.flexGrow()};
+
+  ${cs.media.mobile`
+    max-width: 60%;
+    ${cs.truncate('160px')};
+  `};
 `
 export const Builder = styled.div``
 
diff --git a/components/RepoItem/styles/header.js b/components/RepoItem/styles/header.js
@@ -43,7 +43,7 @@ export const RepoName = styled.div`
   }
   ${cs.media.mobile`
     ${cs.truncate('80px')};
-  `};
+`};
 `
 export const TagsWrapper = styled.div`
   margin-top: 4px;
@@ -57,6 +57,12 @@ export const StatusSection = styled.div`
   ${cs.flex()};
   margin-right: 6px;
 `
+export const ForkSection = styled(StatusSection)`
+  ${cs.media.mobile`
+    display: none;
+  `};
+`
+
 export const StatusNum = styled.div`
   color: ${theme('thread.articleDigest')};
 `
diff --git a/containers/ArticleBanner/JobMiddleInfo.js b/containers/ArticleBanner/JobMiddleInfo.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 
 import DotDivider from 'components/DotDivider'
 import CityList from './CityList'
-import { Wrapper, Salary, Text } from './styles/job_middle_info'
+import { Wrapper, Salary, Text, ExpLabel } from './styles/job_middle_info'
 
 const JobMiddleInfo = ({ data }) => (
   <Wrapper>
@@ -12,7 +12,7 @@ const JobMiddleInfo = ({ data }) => (
     <Text>{data.education}</Text>
     <DotDivider />
     <Text>
-      经验
+      <ExpLabel>经验 </ExpLabel>
       {data.exp}
     </Text>
     <DotDivider />
diff --git a/containers/ArticleBanner/styles/index.js b/containers/ArticleBanner/styles/index.js
@@ -12,14 +12,15 @@ export const Wrapper = styled.nav`
   padding-top: 10px;
   padding-bottom: 10px;
 
-  @media (max-height: 800px) {
-    min-height: 130px;
-  }
+  ${cs.media.mobile`
+    min-height: 100px;
+  `};
 `
 export const BannerContent = styled.div`
   ${cs.flex()};
   margin-left: 8%;
   margin-right: 8%;
+
   ${cs.media.mobile`
     margin-left: 4%;
     margin-right: 3%;
diff --git a/containers/ArticleBanner/styles/job_middle_info.js b/containers/ArticleBanner/styles/job_middle_info.js
@@ -15,3 +15,7 @@ export const Text = styled.div`
   color: ${theme('thread.articleDigest')};
   font-size: 1rem;
 `
+
+export const ExpLabel = styled.span`
+  ${cs.media.tablet`display: none`};
+`
diff --git a/containers/Footer/BottomInfo.js b/containers/Footer/BottomInfo.js
@@ -2,11 +2,12 @@ import React from 'react'
 
 // import { ICON_CMD } from 'config'
 import { Wrapper, Copyrights, Thanks, ThxTitle } from './styles/bottom_info'
+import { toggleBusBanner } from './logic'
 
 const BottomInfo = () => (
   <Wrapper>
     <Copyrights>©2018 All Rights Reserved</Copyrights>
-    <Thanks>
+    <Thanks onClick={toggleBusBanner}>
       <ThxTitle>特别鸣谢： (求赞助)</ThxTitle>
     </Thanks>
   </Wrapper>
diff --git a/containers/Footer/styles/bottom_info.js b/containers/Footer/styles/bottom_info.js
@@ -18,5 +18,8 @@ export const Copyrights = styled.div`
 `
 export const Thanks = styled.div`
   color: ${theme('thread.articleDigest')};
+  &:hover {
+    cursor: pointer;
+  }
 `
 export const ThxTitle = styled.div``
diff --git a/containers/JobContent/styles/index.js b/containers/JobContent/styles/index.js
@@ -31,7 +31,8 @@ export const ArticleWrapper = styled.div`
 
   ${cs.media.tablet`
     padding: 30px 20px;
-`};
+    min-height: 40vh;
+  `};
 `
 export const BodyHeaderWrapper = styled.div`
   margin-top: -18px;
@@ -41,16 +42,16 @@ export const CommentsWrapper = styled.div`
   margin-top: 30px;
   margin: 25px;
   ${cs.media.tablet`
-    margin: 10px;
-  `};
+margin: 10px;
+`};
 `
 
 export const MobileWrapper = styled.div`
   margin-top: 10px;
   ${cs.flexColumn('align-center')};
   display: none;
   ${cs.media.tablet`
-    ${cs.flex()};
+${cs.flex()};
   `};
 `
 export const MobileContentCard = styled.div`
diff --git a/containers/PostContent/styles/index.js b/containers/PostContent/styles/index.js
@@ -31,6 +31,7 @@ export const ArticleWrapper = styled.div`
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.04);
   ${cs.media.mobile`
     padding: 30px 20px;
+    min-height: 20vh;
   `};
 `
 
@@ -43,8 +44,8 @@ export const CommentsWrapper = styled.div`
   margin-top: 30px;
   margin: 25px;
   ${cs.media.mobile`
-    margin: 10px;
-  `};
+margin: 10px;
+`};
 `
 
 export const MobileWrapper = styled.div`
@@ -54,6 +55,6 @@ export const MobileWrapper = styled.div`
   display: none;
 
   ${cs.media.tablet`
-    ${cs.flex('justify-center')};
+${cs.flex('justify-center')};
   `};
 `
diff --git a/containers/RepoContent/styles/index.js b/containers/RepoContent/styles/index.js
@@ -30,23 +30,24 @@ export const ArticleWrapper = styled.div`
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.04);
   ${cs.media.tablet`
     padding: 30px 20px;
-`};
+    min-height: 30vh;
+  `};
 `
 
 export const CommentsWrapper = styled.div`
   margin-top: 30px;
   margin: 25px;
   ${cs.media.tablet`
-    margin: 10px;
-  `};
+margin: 10px;
+`};
 `
 
 export const MobileWrapper = styled.div`
   margin-top: 10px;
   ${cs.flexColumn('align-center')};
   display: none;
   ${cs.media.tablet`
-    display: flex;
+display: flex;
   `};
 `
 export const MobileContentCard = styled.div`
diff --git a/containers/VideoContent/styles/index.js b/containers/VideoContent/styles/index.js
@@ -29,7 +29,7 @@ export const ArticleWrapper = styled.div`
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.04);
   ${cs.media.tablet`
     padding: 30px 20px;
-`};
+  `};
 `
 export const BodyHeaderWrapper = styled.div`
   margin-top: -18px;

Original file line number	Diff line number	Diff line change
@@ -43,7 +43,7 @@ export const RepoName = styled.div`
`43`	`43`	`}`
`44`	`44`	${cs.media.mobile`
`45`	`45`	`${cs.truncate('80px')};`
`46`		- `};
	`46`	+`};
`47`	`47`	`
`48`	`48`	export const TagsWrapper = styled.div`
`49`	`49`	`margin-top: 4px;`
@@ -57,6 +57,12 @@ export const StatusSection = styled.div`
`57`	`57`	`${cs.flex()};`
`58`	`58`	`margin-right: 6px;`
`59`	`59`	`
	`60`	+export const ForkSection = styled(StatusSection)`
	`61`	+ ${cs.media.mobile`
	`62`	`+ display: none;`
	`63`	+ `};
	`64`	+`
	`65`	`+`
`60`	`66`	export const StatusNum = styled.div`
`61`	`67`	`color: ${theme('thread.articleDigest')};`
`62`	`68`	`
Original file line number	Diff line number	Diff line change
@@ -15,3 +15,7 @@ export const Text = styled.div`
`15`	`15`	`color: ${theme('thread.articleDigest')};`
`16`	`16`	`font-size: 1rem;`
`17`	`17`	`
	`18`	`+`
	`19`	+export const ExpLabel = styled.span`
	`20`	+ ${cs.media.tablet`display: none`};
	`21`	+`