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

Merge branch 'develop' into rails4

Browse source
This commit is contained in:
Devin Howard 2015-09-15 20:37:47 +08:00
parent a8cef723a2 6767771d7d
commit a31a92b321
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/lib/embedly.js
View file

File diff suppressed because one or more lines are too long

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

@ -736,7 +736,9 @@ font-family: 'din-regular', helvetica, sans-serif;
.CardOnGraph .embeds {
position: relative;
overflow: hidden;
}
#linkremove {
background-image: url(/assets/remove.png);
background-repeat: no-repeat;