diff --git a/app/assets/javascripts/Jit/graphsettings.js b/app/assets/javascripts/Jit/graphsettings.js index 1d9f72ed..e26f7691 100644 --- a/app/assets/javascripts/Jit/graphsettings.js +++ b/app/assets/javascripts/Jit/graphsettings.js @@ -451,7 +451,7 @@ function editEdge(edge, e) { $('#edit_synapse').focusout(function() { //in case they cancel -// $('#edit_synapse').hide(); + $('#edit_synapse').hide(); }); //css stuff above moves it, this activates it diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 28109315..c87e17cb 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -83,7 +83,7 @@ a { clear:both; } -.spacer { +.leaveSpace { display:block; height:50px; } @@ -238,8 +238,20 @@ input[type="submit"] { margin:10px; } -.headertop button { - float:left; +.headertop button, .headertop input { + float:left; + height: 30px; + border-radius: 12px; + background: url('black_bg.png'); + color: #FFF; + font-family: 'katarine-web'; + font-size: 18px; + border: 1px solid #000; + cursor: pointer; +} + +.headertop button:hover, .headertop input:hover { + background: #000; } .wrapper { diff --git a/app/assets/stylesheets/maps.css.scss b/app/assets/stylesheets/maps.css.scss index 12eda20b..a4e11a01 100644 --- a/app/assets/stylesheets/maps.css.scss +++ b/app/assets/stylesheets/maps.css.scss @@ -12,7 +12,7 @@ } .saveMapLayout input { - margin-top:2px; + margin-top:0px; } #MapRealtime { diff --git a/app/views/main/home.html.erb b/app/views/main/home.html.erb index eaacfa60..6f3815c7 100644 --- a/app/views/main/home.html.erb +++ b/app/views/main/home.html.erb @@ -22,7 +22,7 @@ <%= render map %> <% end %> -
+ diff --git a/app/views/maps/show.html.erb b/app/views/maps/show.html.erb index 1a53dfbc..b9a90483 100644 --- a/app/views/maps/show.html.erb +++ b/app/views/maps/show.html.erb @@ -23,7 +23,9 @@ -->