general UI fixes

SUSE · Oct 5, 2014 · e3cf754 · e3cf754
1 parent ece53c6
commit e3cf754
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/app/assets/javascripts/GPS.js b/app/assets/javascripts/GPS.js
@@ -1,4 +1,6 @@
 // GPS menu
+var GPSisOpen = false;
+
 $(document).on("ready", function(){
 	$("#gps-menu").hide();
 	$(".menu-btn-mainMenu").on("click", openGPS);
@@ -7,7 +9,7 @@ $(document).on("ready", function(){
 
 $(document).keyup(function(e) {
 	//if ESC key is pressed
-  if (e.keyCode == 27) {
+  if (e.keyCode == 27 && GPSisOpen == true) {
   	closeGPS();
   }
 });
@@ -16,6 +18,7 @@ function openGPS() {
   $("#gps-menu").fadeIn(400, function() {
     $(".menu-gps").flashScreen();	
   });
+  GPSisOpen = true;
 }
 
 function closeGPS() {

diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss
@@ -81,6 +81,11 @@ hr {
   min-width: 900px;
   padding: 0;
 }  
+
+.modal-backdrop {
+  z-index: 90;
+}
+
 .scrollbar {
   overflow: hidden;
 }

diff --git a/app/assets/stylesheets/menues.css.scss b/app/assets/stylesheets/menues.css.scss
@@ -257,7 +257,7 @@
       border-radius: 4px;
       margin-left: auto;
       margin-right: auto;
-      margin-top: 45px;
+      margin-top: 55px;
       &:hover {
         color: $orange;
       }

diff --git a/app/views/announcements/_announcement.html.haml b/app/views/announcements/_announcement.html.haml
@@ -1,5 +1,4 @@
 .media
-  = image_tag  "pin.png", :class => "media-object pull-left"
   = render :partial => "announcements/file_buttons", :locals => {:announcement => announcement }
   .media-body
     %h4.media-heading

diff --git a/app/views/announcements/index.html.haml b/app/views/announcements/index.html.haml
@@ -2,7 +2,7 @@
   Announcements
   = "(#{@announcements.length})"
 
-.col-sm-12
+.col-sm-12.text-left
   %h2
     Announcements
   - @announcements.each do |announcement|

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -96,7 +96,7 @@
         %span.close-gps clic here
       .menu-gps
         .circle.news
-          = link_to 'news', announcements_path
+          = link_to 'News', announcements_path
         .circle.photos
           = link_to 'Photos', gallery_path
         .circle.about