Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop

This commit is contained in:
Connor Turland 2014-10-22 21:09:08 -04:00
commit 6af8a13c6f

View file

@ -1183,15 +1183,16 @@ h3.realtimeBoxTitle {
width: 24px; width: 24px;
height: 24px; height: 24px;
} }
.rightclickmenu .rc-delete .rc-icon { .rightclickmenu .rc-hide .rc-icon {
background-position: 0 -48px; background-position: 0 0;
} }
.rightclickmenu .rc-remove .rc-icon { .rightclickmenu .rc-remove .rc-icon {
background-position: 0 -24px; background-position: 0 -24px;
} }
.rightclickmenu .rc-hide .rc-icon { .rightclickmenu .rc-delete .rc-icon {
background-position: 0 0; background-position: 0 -48px;
} }
.rightclickmenu .rc-center .rc-icon { .rightclickmenu .rc-center .rc-icon {
} }
@ -2737,4 +2738,4 @@ and it won't be important on password protected instances */
script.data-gratipay-username { script.data-gratipay-username {
display: inline; display: inline;
float: left; float: left;
} }