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

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

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

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

@ -19,11 +19,12 @@
#center-container { #center-container {
position:relative; position:relative;
height:100%; height:100%;
width:100%; width:100%;
/* background-color:#031924; */
color:#444; /* background-color:#031924; */
color:#444;
} }
.showcard { .showcard {
@ -121,18 +122,18 @@
.CardOnGraph .best_in_place_desc textarea { .CardOnGraph .best_in_place_desc textarea {
font-size: 13px; font-size: 13px;
line-height:15px; line-height:15px;
font-family: helvetica, sans-serif; font-family: helvetica, sans-serif;
color: #424242; color: #424242;
padding: 0; padding: 0;
width: 100%; width: 100%;
margin: 0; margin: 0;
border: 0; border: 0;
outline: none; outline: none;
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 15px;
background: none; background: none;
resize: none; resize: none;
} }
.CardOnGraph .desc h3 { .CardOnGraph .desc h3 {
@ -219,11 +220,11 @@ resize: none;
margin-left: -32px; margin-left: -32px;
} }
.contributor div:after { .contributor div:before {
content: ''; content: '';
position: absolute; position: absolute;
top: 128%; top: 128%;
left: 39%; left: 13px;
margin-top: -30px; margin-top: -30px;
width: 0; width: 0;
height: 0; height: 0;
@ -768,18 +769,32 @@ font-family: 'din-regular', helvetica, sans-serif;
display:block; display:block;
} }
#edgeUser .tip { #edgeUser .tip {
background: none repeat scroll 0 0 #000000; display: none;
border-radius: 4px; position: absolute;
color: #FFFFFF; background: black;
display: none; text-align: center;
font-size: 15px !important; text-transform: none;
line-height: 17px; color: white;
padding: 3px 5px 2px; border-radius: 2px;
position: absolute; font-family: din-regular;
left: 0; line-height: 15px;
text-align: center; font-size: 12px;
top: 23px; padding: 3px 5px 2px;
z-index: 100; 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 { #edit_synapse .mapPerm {