Skip to content

Commit

Permalink
Merge branch 'master' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
Tomas Kirda committed Mar 29, 2015
2 parents 5865f78 + f533e3c commit 40a8bfd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion content/css/demo.css
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ p .icon-db {
border-radius: 4px;
display: inline-block;
vertical-align: top;
margin-top: -2px;
margin-top: -1px;
color: #CE2B27;
}

Expand Down
2 changes: 1 addition & 1 deletion content/scss/site/_all.scss
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ p {
border-radius: $border-radius;
display: inline-block;
vertical-align: top;
margin-top: -2px;
margin-top: -1px;
color: $red;
}
}

0 comments on commit 40a8bfd

Please sign in to comment.