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

lots of little fixes

Browse source
This commit is contained in:
Connor Turland 2014-11-15 17:43:24 -05:00
parent 2cf91d39b4
commit 23d5527adc
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Gemfile
View file

@ -6,8 +6,6 @@ gem 'rails', '3.2.17'
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git' # gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'phantomjs'
gem 'devise' gem 'devise'
gem 'redis' gem 'redis'
gem 'pg' gem 'pg'
@ -19,9 +17,6 @@ gem 'rails3-jquery-autocomplete'
gem 'best_in_place' #in-place editing gem 'best_in_place' #in-place editing
gem 'kaminari' # pagination gem 'kaminari' # pagination
gem 'uservoice-ruby' gem 'uservoice-ruby'
gem 'sidekiq' # worker processes
gem 'sinatra', require: false
gem 'slim'
gem 'paperclip' gem 'paperclip'
gem 'aws-sdk' gem 'aws-sdk'

6
app/assets/javascripts/src/Metamaps.js
View file

@ -1289,7 +1289,7 @@ Metamaps.SynapseCard = {
}); });
}, },
add_drop_down: function (edge, synapse) { add_drop_down: function (edge, synapse) {
var list, i, synapses, l; var list, i, synapses, l, desc;
synapses = edge.getData("synapses"); synapses = edge.getData("synapses");
l = synapses.length; l = synapses.length;
@ -1311,7 +1311,9 @@ Metamaps.SynapseCard = {
list = '<ul id="switchSynapseList">'; list = '<ul id="switchSynapseList">';
for (i = 0; i < l; i++) { for (i = 0; i < l; i++) {
if (synapses[i] !== synapse) { // don't add the current one to the list if (synapses[i] !== synapse) { // don't add the current one to the list
list += '<li data-synapse-index="' + i + '">' + synapses[i].get('desc') + '</li>'; desc = synapses[i].get('desc');
desc = desc === "" || desc === null ? "(no description)" : desc;
list += '<li data-synapse-index="' + i + '">' + desc + '</li>';
} }
} }
list += '</ul>' list += '</ul>'

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

@ -1902,6 +1902,9 @@ and it won't be important on password protected instances */
color: #424242; color: #424242;
text-align: left; text-align: left;
} }
.lightboxContent li {
list-style: none;
}
.openLightbox { .openLightbox {
cursor: pointer; cursor: pointer;
} }

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

@ -732,14 +732,14 @@ font-family: 'din-regular', helvetica, sans-serif;
border-bottom: 1px solid #BBBBBB; border-bottom: 1px solid #BBBBBB;
} }
#switchSynapseList li { #switchSynapseList li {
padding: 8px; padding: 8px 8px 8px 68px;
cursor: pointer; cursor: pointer;
font-family: 'din-regular'; font-family: 'din-regular';
font-size: 14px; font-size: 14px;
line-height: 16px; line-height: 16px;
} }
#switchSynapseList li:hover { #switchSynapseList li:hover {
background: #E0E0E0; background: #DAB539;
} }
#edgeUser { #edgeUser {

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

@ -704,7 +704,7 @@
.mapPage .infoAndHelp, .topicPage .infoAndHelp{ .mapPage .infoAndHelp, .topicPage .infoAndHelp{
right: 70px; right: 70px;
} }
.mapPage .openCheatsheet .tooltipsAbove, .topicPage .openCheatsheat .tooltipsAbove { .mapPage .openCheatsheet .tooltipsAbove, .topicPage .openCheatsheet .tooltipsAbove {
left: 29px; left: 29px;
} }

6
public/404.html
View file

@ -26,14 +26,14 @@
} }
body { body {
background: #d8d9da url(shattered_@2X.png); background: #d8d9da url(/assets/shattered_@2X.png);
font-family: 'din-regular', helvetica, sans-serif; font-family: 'din-regular', helvetica, sans-serif;
color: #424242; color: #424242;
text-align: justify; text-align: justify;
font-size: 18px; font-size: 18px;
line-height: 18px; line-height: 18px;
} }
.title a { .dialog a {
color:#c04f4f; color:#c04f4f;
} }
.title{ .title{
@ -85,7 +85,7 @@
box-shadow: 0px 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24); box-shadow: 0px 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24);
margin: 0 auto; margin: 0 auto;
text-decoration: none; text-decoration: none;
color: #FFFFFF; color: #FFFFFF !important;
cursor: pointer; cursor: pointer;
} }