glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Connor Turland 2014-11-19 13:02:02 -05:00
parent 604b01ba7d 0d709cecac
commit 2fe33f0f57
2 changed files with 61 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/assets/stylesheets/application.css
View file

@ -1137,6 +1137,7 @@ h3.realtimeBoxTitle {
left: 0;
border-radius: 14px;
}
.littleJuntoIcon {
width: 24px;
height:24px;
@ -1643,20 +1644,23 @@ float: left;
.infoStatIcon .tip {
display: none;
position: absolute;
background: black;
background: #202020;
min-width: 180px;
max-width: 250px;
min-height: 44px;
max-height: 188px;
text-align: center;
color: black;
border-radius: 4px;
font-size: 15px !important;
line-height: 17px;
padding: 3px 10px 2px;
padding: 6px 8px 6px 8px;
z-index: 100;
}
.mapContributors .tip {
top: 45px;
left: 6px;
left: -10px;
}
.mapContributors .tip li {
@ -1664,7 +1668,7 @@ float: left;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
padding: 11px 36px;
padding: 12px 40px;
display: block;
height: 14px;
font-family: 'din-regular', helvetica, sans-serif;
@ -1678,17 +1682,21 @@ float: left;
.mapContributors div:after {
content: '';
position: absolute;
margin-top: -115px;
left: inherit;
margin-top: -124px;
left: 21px;
width: 0;
height: 0;
border-bottom: 4px solid #000000;
border-bottom: 4px solid #202020;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
}
.mapContributors .tip img {
border: 2px solid #424242
border: 2px solid #bdbdbd;
position: absolute;
top: 4px;
left: 4px;
border-radius: 14px;
}
.mapInfoBox .mapPermission .tip {

37
app/assets/stylesheets/base.css
View file

@ -22,6 +22,7 @@
position:relative;
height:100%;
width:100%;
/* background-color:#031924; */
color:#444;
}
@ -219,11 +220,11 @@ resize: none;
margin-left: -32px;
}
.contributor div:after {
.contributor div:before {
content: '';
position: absolute;
top: 128%;
left: 39%;
left: 13px;
margin-top: -30px;
width: 0;
height: 0;
@ -768,18 +769,32 @@ font-family: 'din-regular', helvetica, sans-serif;
display:block;
}
#edgeUser .tip {
background: none repeat scroll 0 0 #000000;
border-radius: 4px;
color: #FFFFFF;
display: none;
font-size: 15px !important;
line-height: 17px;
padding: 3px 5px 2px;
position: absolute;
left: 0;
background: black;
text-align: center;
top: 23px;
z-index: 100;
text-transform: none;
color: white;
border-radius: 2px;
font-family: din-regular;
line-height: 15px;
font-size: 12px;
padding: 3px 5px 2px;
white-space: nowrap;
margin-top: 9px;
font-style: normal;
}
#edgeUser:hover div:before{
content: '';
position: absolute;
margin-top: -7px;
margin-left: 2px;
width: 0;
height: 0;
border-bottom: 4px solid #000000;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
}
#edit_synapse .mapPerm {