Skip to content

Commit

Permalink
Merge branch 'feat/withStyles' of github.com:SAP/fundamental-react in…
Browse files Browse the repository at this point in the history
…to feat/withStyles
  • Loading branch information
jbadan committed Oct 1, 2019
2 parents 1ac5bbd + d2b1200 commit 62c1bc9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
4 changes: 4 additions & 0 deletions src/_playground/_content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@
transition: background-color 0.25s;
}

&__example {
padding: 10px 15px;
}

&__separator {
display: block;
margin: 2rem 0;
Expand Down
6 changes: 6 additions & 0 deletions src/_playground/_properties.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@
width: 40%;
padding-right: 0;
}

&.fd-table__cell {
>p {
margin: 0;
}
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/_playground/documentation/DocsTile/DocsTile.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class DocsTile extends Component {
'frDocs-Content__tile-background': !hideBackground
});

const innerDivClasses = classnames('fd-tile__content', {
const innerDivClasses = classnames('frDocs-Content__example', {
'frDocs-tile__centered': centered
});

Expand Down

0 comments on commit 62c1bc9

Please sign in to comment.