From a6a25bbe08818675a11d3ccf5a9aa9d9edffb075 Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Tue, 13 Mar 2018 16:33:48 +0100
Subject: [PATCH 1/2] add floating alert message

---
 app/assets/javascripts/application.js.erb     |  4 ---
 app/assets/javascripts/navigation.js          |  3 +-
 .../javascripts/sitewide/url_handling.js      |  1 -
 .../stylesheets/themes/main_navigation.scss   | 27 +++++++++++++++++
 app/assets/stylesheets/themes/scinote.scss    | 29 -------------------
 app/views/layouts/application.html.erb        |  2 +-
 6 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
index f5051cee4..ec2825632 100644
--- a/app/assets/javascripts/application.js.erb
+++ b/app/assets/javascripts/application.js.erb
@@ -198,9 +198,6 @@ var HelperModule = (function(){
       window.setTimeout(function () {
         flash.fadeTo(500, 0).slideUp(500, function () {
           $(this).remove();
-          if($('.alert').length <= 0) {
-            $('#content-wrapper').removeClass('alert-shown');
-          }
         });
       }, 5000);
     }
@@ -234,7 +231,6 @@ var HelperModule = (function(){
                           '</div>' +
                         '</div>';
     $('#notifications').html(htmlSnippet);
-    $('#content-wrapper').addClass('alert-shown');
     helpers.hideFlashMsg();
   }
 
diff --git a/app/assets/javascripts/navigation.js b/app/assets/javascripts/navigation.js
index 1ec0a7ea9..621a6be75 100644
--- a/app/assets/javascripts/navigation.js
+++ b/app/assets/javascripts/navigation.js
@@ -134,8 +134,7 @@
     function notificationAlertClose() {
       $('#notifications .alert').on('closed.bs.alert', function() {
         $('#content-wrapper')
-          .addClass('alert-hidden')
-          .removeClass('alert-shown');
+          .addClass('alert-hidden');
       });
     }
   }
diff --git a/app/assets/javascripts/sitewide/url_handling.js b/app/assets/javascripts/sitewide/url_handling.js
index db6eaf43a..2e7631c7f 100644
--- a/app/assets/javascripts/sitewide/url_handling.js
+++ b/app/assets/javascripts/sitewide/url_handling.js
@@ -36,7 +36,6 @@ $(document).ready(function () {
   $("#hide-alert").click(function(ev) {
     $(this).closest("div.alert").addClass("alert-hidden");
     $("#content-wrapper").addClass("alert-hidden");
-    $("#content-wrapper").removeClass("alert-shown");
 
     ev.preventDefault();
     ev.stopPropagation();
diff --git a/app/assets/stylesheets/themes/main_navigation.scss b/app/assets/stylesheets/themes/main_navigation.scss
index ea3f3bc6f..f1883ea8e 100644
--- a/app/assets/stylesheets/themes/main_navigation.scss
+++ b/app/assets/stylesheets/themes/main_navigation.scss
@@ -367,6 +367,33 @@
   }
 }
 
+// Alert
+.alert {
+  border-radius: 0;
+  margin-bottom: 0;
+  opacity: .86;
+  width: 100%;
+
+  &.alert-hidden {
+    display: none;
+  }
+
+  a#hide-alert {
+    margin-left: 15px;
+  }
+
+  &.alert-floating {
+    position: fixed;
+    top: 50px;
+    z-index: 1000;
+  }
+}
+
+#content-wrapper {
+  margin-top: 50px;
+}
+
+
 // reset margins on small screens
 @media (max-width: 1188px) {
   #nav-team-switch {
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index dfa01c117..aad6d2bfe 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -59,14 +59,6 @@ table {
   margin-right: 0.5em;
 }
 
-#content-wrapper {
-  margin-top: 50px;
-
-  &.alert-shown {
-    margin-top: 102px;
-  }
-}
-
 .center-block-narrow {
   max-width: 400px;
 }
@@ -117,27 +109,6 @@ a {
   background-color: inherit;
 }
 
-.alert {
-  border-radius: 0;
-  margin-bottom: 0;
-  opacity: 1;
-  width: 100%;
-
-  &.alert-hidden {
-    display: none;
-  }
-
-  a#hide-alert {
-    margin-left: 15px;
-  }
-
-  &.alert-floating {
-    position: fixed;
-    top: 50px;
-    z-index: 1000;
-  }
-}
-
 .badge {
   background-color: $color-theme-primary;
   font-size: 11px;
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index ec1165f14..54311e306 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -80,7 +80,7 @@
       <% end %>
     </div>
 
-    <div id="content-wrapper" class="<%= "alert-shown" if flash[:success] || flash[:error] || notice || alert %>">
+    <div id="content-wrapper">
       <%= yield :content %>
     </div>
 

From a9dfcd9681b86c5c0c46306a086db9a6b4bae100 Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Fri, 16 Mar 2018 16:38:59 +0100
Subject: [PATCH 2/2] refactor

---
 app/assets/stylesheets/themes/main_navigation.scss | 5 +++--
 app/assets/stylesheets/themes/scinote.scss         | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/themes/main_navigation.scss b/app/assets/stylesheets/themes/main_navigation.scss
index 11062c2f1..f13fbf895 100644
--- a/app/assets/stylesheets/themes/main_navigation.scss
+++ b/app/assets/stylesheets/themes/main_navigation.scss
@@ -175,11 +175,11 @@
 /** Search */
 .nav-search {
   li.disabled {
-    opacity: 0.8;
+    opacity: .8;
 
     .badge {
       background-color: $color-emperor;
-      opacity: 0.8;
+      opacity: .8;
     }
 
   }
@@ -382,6 +382,7 @@
 
 // reset margins on small screens
 @media (max-width: 1188px) {
+
   #nav-team-switch {
     margin-left: 0;
   }
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index d61cc0b21..39ae3b334 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -1,7 +1,7 @@
 @import 'constants';
 @import "mixins";
-@import 'main_navigation';
-@import 'buttons';
+@import "main_navigation";
+@import "buttons";
 
 /** Layout **/