Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc Altmann committed Dec 1, 2015
2 parents 9f0d1eb + 163a60e commit 654172c
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion app/assets/stylesheets/modules/_content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Styleguide Contents
h2 {
clear: both;
margin-top: 2em;
margin-bottom: 1em;
margin-bottom: 0.5em;
font-size: 1.2em;
font-weight: bold;
}
Expand All @@ -29,6 +29,10 @@ Styleguide Contents
font-weight: bold;
}

p {
margin: 0.5em 0;
}

// Provide responsiveness for large images
overflow-x: auto;

Expand Down

0 comments on commit 654172c

Please sign in to comment.