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

Add noHovering and Card.Grid #6748

Merged
merged 4 commits into from
Jul 7, 2017
Merged

Add noHovering and Card.Grid #6748

merged 4 commits into from
Jul 7, 2017

Conversation

afc163
Copy link
Member

@afc163 afc163 commented Jul 6, 2017

  <Card title="卡片标题" noHovering bodyStyle={{ padding: 0 }}>
    <Card.Grid style={gridStyle}>卡片内容</Card.Grid>
    <Card.Grid style={gridStyle}>卡片内容</Card.Grid>
    <Card.Grid style={gridStyle}>卡片内容</Card.Grid>
    <Card.Grid style={gridStyle}>卡片内容</Card.Grid>
    <Card.Grid style={gridStyle}>卡片内容</Card.Grid>
    <Card.Grid style={gridStyle}>卡片内容</Card.Grid>
    <Card.Grid style={gridStyle}>卡片内容</Card.Grid>
  </Card>

image

Send to master because 2.12 will be released at this week.

@mention-bot
Copy link

@afc163, thanks for your PR! By analyzing the history of the files in this pull request, we identified @megawac, @benjycui and @superRaytin to be potential reviewers.

@afc163 afc163 changed the title Feat card grid Add noHovering and Card.Grid Jul 6, 2017
@codecov
Copy link

codecov bot commented Jul 6, 2017

Codecov Report

Merging #6748 into master will increase coverage by 0.08%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6748      +/-   ##
==========================================
+ Coverage   84.01%   84.09%   +0.08%     
==========================================
  Files         224      225       +1     
  Lines        4811     4848      +37     
  Branches     1389     1407      +18     
==========================================
+ Hits         4042     4077      +35     
- Misses        769      771       +2
Impacted Files Coverage Δ
components/card/index.tsx 94.73% <100%> (+0.61%) ⬆️
components/card/Grid.tsx 100% <100%> (ø)
components/input/Input.tsx 88.7% <0%> (+1.08%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 883f821...7459948. Read the comment docs.

border-radius: 0;
border: 0;
box-shadow: 0 0 0 0.5px @border-color-split, 0 0 0 0.5px @border-color-split inset;
width: 25%;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

默认值?
上面demo里也有写

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

对。。我改成 33.3% 好了。

@ddcat1115 ddcat1115 merged commit a4648fd into master Jul 7, 2017
@afc163 afc163 deleted the feat-card-grid branch August 27, 2017 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants