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-09 22:10:21 -05:00
parent 44923eb660 0058002e02
commit 4adf0081b8
4 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/synapse32padded.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 423 B

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

@ -519,19 +519,19 @@ input[type="submit"]:active {
#new_topic .twitter-typeahead { #new_topic .twitter-typeahead {
position: absolute !important; position: absolute !important;
top: 40px; top: 45px;
left: 35px; left: 41px;
z-index: 9999; z-index: 9999;
width: 270px; width: 256px;
height: 42px; height: 42px;
} }
.new_topic #topic_name, .new_topic #topic_name,
.new_topic .tt-hint { .new_topic .tt-hint {
width: 254px; width: 244px;
background: #FFFFFF; background: #FFFFFF;
height: 14px; height: 14px;
margin: 0; margin: 0;
padding: 14px 8px; padding: 10px 6px;
border: none; border: none;
border-radius: 2px; border-radius: 2px;
outline: none; outline: none;
@ -581,11 +581,11 @@ input[type="submit"]:active {
} }
.new_synapse #synapse_desc, .new_synapse #synapse_desc,
.new_synapse .tt-hint { .new_synapse .tt-hint {
width: 254px; width: 244px;
background: #FFFFFF; background: #FFFFFF;
height: 14px; height: 14px;
margin: 0; margin: 0;
padding: 14px 8px; padding: 10px 6px;
border: none; border: none;
border-radius: 2px; border-radius: 2px;
outline: none; outline: none;
@ -1170,8 +1170,9 @@ h3.realtimeBoxTitle {
.rightclickmenu { .rightclickmenu {
position: absolute; position: absolute;
width: 300px; width: 260px;
background: #FFFFFF; background: #FFFFFF;
padding: 6px 0px 6px 0px;
z-index: 20; z-index: 20;
border-radius: 2px; border-radius: 2px;
color: black; color: black;
@ -1184,8 +1185,8 @@ h3.realtimeBoxTitle {
list-style: none; list-style: none;
padding: 6px 10px 6px 32px; padding: 6px 10px 6px 32px;
font-family: helvetica, sans-serif; font-family: helvetica, sans-serif;
font-size: 12px; font-size: 13px;
line-height: 12px; line-height: 15px;
position: relative; position: relative;
} }
.rightclickmenu li:hover { .rightclickmenu li:hover {
@ -1337,7 +1338,7 @@ float: left;
#new_topic .tt-suggestion, #new_topic .tt-suggestion,
#new_synapse .tt-suggestion { #new_synapse .tt-suggestion {
background: #F5F5F5; background: #F5F5F5;
width: 270px; width: 256px;
position: relative; position: relative;
} }
#new_topic .autocompleteSection { #new_topic .autocompleteSection {
@ -1606,7 +1607,7 @@ float: left;
background-position: 13px center; background-position: 13px center;
} }
.mapSynapses { .mapSynapses {
background-image: url(synapse32.png); background-image: url(synapse32padded.png);
background-position: 13px center; background-position: 13px center;
} }
.mapInfoBox .mapPermission { .mapInfoBox .mapPermission {
@ -1671,7 +1672,7 @@ float: left;
.mapInfoBox .mapInfoDesc { .mapInfoBox .mapInfoDesc {
font-family: helvetica, sans-serif; font-family: helvetica, sans-serif;
color: #E0E0E0; color: #E0E0E0;
margin: 8px; margin: 16px;
padding-right: 16px; padding-right: 16px;
height: 115px; height: 115px;
font-size: 14px; font-size: 14px;

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

@ -110,7 +110,7 @@
display:block; display:block;
padding: 8px 0 8px 16px; padding: 8px 0 8px 16px;
height: 152px; height: 152px;
font-size: 12px; font-size: 13px;
line-height:15px; line-height:15px;
font-family: helvetica, sans-serif; font-family: helvetica, sans-serif;
overflow-y: auto; overflow-y: auto;
@ -120,7 +120,7 @@
} }
.CardOnGraph .best_in_place_desc textarea { .CardOnGraph .best_in_place_desc textarea {
font-size: 12px; font-size: 13px;
line-height:15px; line-height:15px;
font-family: helvetica, sans-serif; font-family: helvetica, sans-serif;
color: #424242; color: #424242;
@ -170,8 +170,8 @@ resize: none;
z-index: 1; z-index: 1;
position: relative; position: relative;
color: #424242; color: #424242;
font-size: 12px; font-size: 14px;
line-height:12px; line-height:14px;
height:12px; height:12px;
padding:17px 0; padding:17px 0;
} }
@ -187,9 +187,9 @@ resize: none;
height: 48px; height: 48px;
} }
.linkItem.contributor { .linkItem.contributor {
margin-left:32px; margin-left:40px;
z-index:1; z-index:1;
padding:17px 16px 17px 32px; padding:17px 16px 17px 30px;
position: relative; position: relative;
} }
.contributor .contributorIcon { .contributor .contributorIcon {
@ -202,8 +202,9 @@ resize: none;
display:none; display:none;
} }
.linkItem.mapCount { .linkItem.mapCount {
margin-left: 12px;
width: 24px; width: 24px;
padding:17px 0 17px 35px; padding:17px 0 17px 36px;
} }
.linkItem.mapCount .mapCountIcon { .linkItem.mapCount .mapCountIcon {
position: absolute; position: absolute;
@ -219,8 +220,9 @@ resize: none;
background-position: 0 -32px; background-position: 0 -32px;
} }
.linkItem.synapseCount { .linkItem.synapseCount {
margin-left: 2px;
width: 24px; width: 24px;
padding:17px 0 17px 35px; padding:17px 0 17px 32px;
} }
.linkItem.synapseCount .synapseCountIcon { .linkItem.synapseCount .synapseCountIcon {
position: absolute; position: absolute;
@ -241,6 +243,7 @@ resize: none;
padding: 0; padding: 0;
min-width: 32px; min-width: 32px;
margin-top: 8px; margin-top: 8px;
margin-left: 8px;
background-image: url(permissions32_sprite.png); background-image: url(permissions32_sprite.png);
background-position: 0 0; background-position: 0 0;
} }
@ -507,6 +510,8 @@ background-color: #E0E0E0;
width: 268px; width: 268px;
padding: 8px 16px 8px 16px; padding: 8px 16px 8px 16px;
position: relative; position: relative;
border: none;
line-height: 14px;
} }
#addLinkInput input{ #addLinkInput input{

6
app/assets/stylesheets/clean.css
View file

@ -191,7 +191,7 @@
.explorePage .sidebarSearchField, .explorePage .sidebarSearchField,
.explorePage .sidebarSearch .tt-hint { .explorePage .sidebarSearch .tt-hint {
width: 380px; width: 380px;
padding: 7px 10px 3px 10px; padding: 5px 10px 5px 10px;
} }
.sidebarSearchField { .sidebarSearchField {
@ -207,7 +207,7 @@
border-bottom: 1px solid #BDBDBD; border-bottom: 1px solid #BDBDBD;
border-left: none; border-left: none;
border-right: none; border-right: none;
padding: 7px 0 3px 0; padding: 5px 0 5px 0;
width: 0px; width: 0px;
margin: 0; margin: 0;
outline: none; outline: none;
@ -218,7 +218,7 @@
} }
.sidebarSearch .tt-dropdown-menu { .sidebarSearch .tt-dropdown-menu {
top: 40px !important; top: 40px !important;
background: #FFF; background: #F5F5F5;
width: 472px; width: 472px;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;