lots of little fixes
This commit is contained in:
parent
2cf91d39b4
commit
23d5527adc
7 changed files with 14 additions and 14 deletions
5
Gemfile
5
Gemfile
|
@ -6,8 +6,6 @@ gem 'rails', '3.2.17'
|
|||
# Bundle edge Rails instead:
|
||||
# gem 'rails', :git => 'git://github.com/rails/rails.git'
|
||||
|
||||
gem 'phantomjs'
|
||||
|
||||
gem 'devise'
|
||||
gem 'redis'
|
||||
gem 'pg'
|
||||
|
@ -19,9 +17,6 @@ gem 'rails3-jquery-autocomplete'
|
|||
gem 'best_in_place' #in-place editing
|
||||
gem 'kaminari' # pagination
|
||||
gem 'uservoice-ruby'
|
||||
gem 'sidekiq' # worker processes
|
||||
gem 'sinatra', require: false
|
||||
gem 'slim'
|
||||
|
||||
gem 'paperclip'
|
||||
gem 'aws-sdk'
|
||||
|
|
|
@ -1289,7 +1289,7 @@ Metamaps.SynapseCard = {
|
|||
});
|
||||
},
|
||||
add_drop_down: function (edge, synapse) {
|
||||
var list, i, synapses, l;
|
||||
var list, i, synapses, l, desc;
|
||||
|
||||
synapses = edge.getData("synapses");
|
||||
l = synapses.length;
|
||||
|
@ -1311,7 +1311,9 @@ Metamaps.SynapseCard = {
|
|||
list = '<ul id="switchSynapseList">';
|
||||
for (i = 0; i < l; i++) {
|
||||
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>'
|
||||
|
|
|
@ -1902,6 +1902,9 @@ and it won't be important on password protected instances */
|
|||
color: #424242;
|
||||
text-align: left;
|
||||
}
|
||||
.lightboxContent li {
|
||||
list-style: none;
|
||||
}
|
||||
.openLightbox {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
|
|
@ -732,14 +732,14 @@ font-family: 'din-regular', helvetica, sans-serif;
|
|||
border-bottom: 1px solid #BBBBBB;
|
||||
}
|
||||
#switchSynapseList li {
|
||||
padding: 8px;
|
||||
padding: 8px 8px 8px 68px;
|
||||
cursor: pointer;
|
||||
font-family: 'din-regular';
|
||||
font-size: 14px;
|
||||
line-height: 16px;
|
||||
}
|
||||
#switchSynapseList li:hover {
|
||||
background: #E0E0E0;
|
||||
background: #DAB539;
|
||||
}
|
||||
|
||||
#edgeUser {
|
||||
|
|
|
@ -704,7 +704,7 @@
|
|||
.mapPage .infoAndHelp, .topicPage .infoAndHelp{
|
||||
right: 70px;
|
||||
}
|
||||
.mapPage .openCheatsheet .tooltipsAbove, .topicPage .openCheatsheat .tooltipsAbove {
|
||||
.mapPage .openCheatsheet .tooltipsAbove, .topicPage .openCheatsheet .tooltipsAbove {
|
||||
left: 29px;
|
||||
}
|
||||
|
||||
|
|
|
@ -26,14 +26,14 @@
|
|||
}
|
||||
|
||||
body {
|
||||
background: #d8d9da url(shattered_@2X.png);
|
||||
background: #d8d9da url(/assets/shattered_@2X.png);
|
||||
font-family: 'din-regular', helvetica, sans-serif;
|
||||
color: #424242;
|
||||
text-align: justify;
|
||||
font-size: 18px;
|
||||
line-height: 18px;
|
||||
}
|
||||
.title a {
|
||||
.dialog a {
|
||||
color:#c04f4f;
|
||||
}
|
||||
.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);
|
||||
margin: 0 auto;
|
||||
text-decoration: none;
|
||||
color: #FFFFFF;
|
||||
color: #FFFFFF !important;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue