Commit 4c6b3bae authored by Daniel W Bond's avatar Daniel W Bond

oh yay, merge conflicts

parents 20e1a68c c8d63967
......@@ -93,7 +93,7 @@ a[name] {
.project-icon {
text-align:center;
display: block;
font-size:130px;
font-size:100px;
margin:0 auto;
padding-bottom: 10px;
}
......@@ -110,7 +110,7 @@ a[name] {
outline:0;
}
.project-icon-stacked {
font-size:65px;
font-size:55px;
}
.project-role {
width: 150px;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment