scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #520 from rschamp/bugfix/splash-formatting

Browse source 
Fix line height and wrapping on splash components
This commit is contained in:
Ray Schamp 2016-05-27 11:51:43 -04:00
commit 623773b39e
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/activity/activity.scss
View file

@ -30,6 +30,7 @@
display: block; display: block;
margin: 0; margin: 0;
padding: 0; padding: 0;
line-height: normal;
white-space: nowrap; white-space: nowrap;
font-size: .9rem; font-size: .9rem;

13
src/components/news/news.jsx
View file

@ -31,9 +31,16 @@ var News = React.createClass({
return ( return (
<li key={item.id}> <li key={item.id}>
<a href={item.url}> <a href={item.url}>
<img src={item.image} width="53" height="53" alt="" /> <img src={item.image}
<h4>{item.headline}</h4> className="news-image"
<p>{item.copy}</p> width="53"
height="53"
alt=""
/>
<div className="news-description">
<h4>{item.headline}</h4>
<p>{item.copy}</p>
</div>
</a> </a>
</li> </li>
); );

8
src/components/news/news.scss
View file

@ -17,8 +17,10 @@
min-height: 53px; min-height: 53px;
a { a {
display: block; display: flex;
text-decoration: none; text-decoration: none;
flex-wrap: nowrap;
flex-direction: row;
&:hover { &:hover {
text-decoration: none; text-decoration: none;
@ -26,9 +28,8 @@
} }
img { img {
display: block;
float: left;
margin-right: 12px; margin-right: 12px;
width: initial;
} }
h4 { h4 {
@ -42,6 +43,7 @@
display: block; display: block;
margin: 0; margin: 0;
padding: 0; padding: 0;
line-height: normal;
color: $type-gray; color: $type-gray;
font-size: .85rem; font-size: .85rem;