merged upstream changes

This commit is contained in:
Cameron Moon
2013-02-11 10:06:40 +11:00
12 changed files with 283 additions and 48 deletions

View File

@ -227,6 +227,11 @@ summary {
z-index: 3001;
}
#chat .invisibleseparator {
color: rgba(8, 48, 78, 0.0);
overflow: hidden;
width: 0px;
}
#chatinput span {
@ -372,11 +377,16 @@ h3 {
.mods {
margin-bottom: 1px;
margin-top: 5px;
height: 75px;
}
.mods span {
background: #313131;
display: inline-block;
/* cant use inline-block because Webkits implementation is buggy and
* introduces additional margins in random cases. No clear necessary,
* as thats solved by setting height on .mods. */
display: block;
float:left;
height: 63.7px;
margin-left: 4px;
overflow: hidden;
@ -384,6 +394,7 @@ h3 {
text-align: center;
width: 63.7px;
cursor:help;
border: 1px solid #666;
}
.mods span[title=""] {
@ -445,6 +456,7 @@ aside:nth-child(odd) span {
/* resonators */
#resodetails {
white-space: nowrap;
margin: 16px 0;
-moz-column-gap: 10px;
-moz-column-width: 141px;
@ -497,6 +509,7 @@ aside:nth-child(odd) span {
.linkdetails {
text-align: center;
margin-bottom: 10px;
}
.linkdetails aside {
margin: 0 4px;
@ -508,6 +521,10 @@ aside:nth-child(odd) span {
font-size:90%;
}
#toolbox > a {
padding: 5px;
}
#spacer {
/* cheap hack to prevent sidebar content being overlayed by the map
* status box */