Merge remote-tracking branch 'upstream/master'

Conflicts:
	web/css/style.css
This commit is contained in:
Lukas Domnick
2013-03-30 21:51:05 +01:00
22 changed files with 1093 additions and 243 deletions

View File

@@ -161,30 +161,33 @@
}
.readme-view {
border: 1px solid @treeHeaderBorder;
}
.md-view {
width: 100%;
margin-bottom: @baseLineHeight;
border: 1px solid @treeHeaderBorder;
}
.readme-header {
padding: 8px;
line-height: @baseLineHeight;
text-align: left;
vertical-align: bottom;
#gradient > .vertical(@treeHeaderHighlight, @treeHeader);
border-bottom: 1px solid lighten(@treeHeaderBorder, 5%);
font-weight: bold;
color: @gray;
text-shadow: 1px 1px 1px rgba(255,255,255,1);
height:28px;
.meta {
float: left;
padding: 4px 0;
font-size: 14px;
}
}
#readme-content {
padding: 30px;
color: @black;
.md-header {
padding: 8px;
line-height: @baseLineHeight;
text-align: left;
vertical-align: bottom;
#gradient > .vertical(@treeHeaderHighlight, @treeHeader);
border-bottom: 1px solid lighten(@treeHeaderBorder, 5%);
font-weight: bold;
color: @gray;
text-shadow: 1px 1px 1px rgba(255,255,255,1);
height:28px;
.meta {
float: left;
padding: 4px 0;
font-size: 14px;
}
}
#md-content {
padding: 30px;
color: @black;
}