Merge remote-tracking branch 'raywan/feature/border-radius' into raymazing

Meh, merging generated/minified files is lame.

Conflicts:
	alchemy/static/css/style.css
main
Alan Orth 2014-10-30 16:45:34 +03:00
commit 44977f33f3
3 changed files with 109 additions and 103 deletions

File diff suppressed because one or more lines are too long

View File

@ -29,6 +29,10 @@ samp {
font-family: @monospace;
}
pre {
border: none;
}
a {
.transition(color 0.2s ease-in-out);
color: #2e2e2e;
@ -38,6 +42,10 @@ a {
}
}
.container {
max-width: 970px;
}
.header {
background-color: #efefef;
border-bottom: 1px solid #ddd;
@ -84,8 +92,8 @@ a {
.post {
font-size: 16px;
&.mini-post {
padding: 30px 0;
border-bottom: 1px solid #ddd;
padding: 30px 0;
&:last-child {
border-bottom: none;
}
@ -100,9 +108,16 @@ a {
font-size: 18px;
}
}
&.full-post {
* img {
max-width: 940px;
.post-content {
img {
display: block;
height: auto;
max-width: 100%;
width: 100% \9;
}
pre,
img {
.border-radius(4px);
}
}
.post-content {
@ -115,16 +130,7 @@ a {
}
}
// .highlight {
// width: 600px;
// margin-left: 50px;
// margin-bottom: 20px;
// overflow: auto;
// border: 1px solid grey;
// border-radius: 5px;
// }
.separator {
margin-top: 30px;
margin-bottom: 30px;
margin-top: 30px;
}