From 68534bea9dddf041083ea4f793f41dd30b8d7327 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 25 Jul 2017 14:23:36 +0200
Subject: [PATCH] alignment of checkboxes in top menu
---
frontend-js/src/main/css/global.css | 28 +++++++++++++++++++
.../src/main/js/gui/topMenu/TopMenu.js | 2 +-
web/src/main/webapp/index.xhtml | 2 +-
web/src/main/webapp/resources/css/style.css | 4 ---
4 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/frontend-js/src/main/css/global.css b/frontend-js/src/main/css/global.css
index bc22c5c2e8..6cee8f3c60 100644
--- a/frontend-js/src/main/css/global.css
+++ b/frontend-js/src/main/css/global.css
@@ -440,4 +440,32 @@ table.minerva-window-drug-table, table.minerva-window-drug-table th,
.minerva-overview-button:hover {
background-color: #01536D;
transition: background-color 0.4s ease-in-out 0s;
+}
+
+.minerva-top-checkbox-div {
+ height: 36px;
+ vertical-align: top;
+ font-size: 13px;
+ font-weight: 900;
+ color: #ffffff;
+ display: inline;
+ width: auto;
+ float: left;
+ text-align: left;
+ padding: 0 0 0 15px;
+ margin: 0;
+}
+
+.minerva-top-checkbox-div label {
+ padding: 0 15px 0 5px;
+ font-size: 11px;
+ line-height: 35px;
+ display: inline;
+ float: left;
+}
+
+.minerva-top-checkbox-div input {
+ margin-top: 12px;
+ display: inline;
+ float: left;
}
\ No newline at end of file
diff --git a/frontend-js/src/main/js/gui/topMenu/TopMenu.js b/frontend-js/src/main/js/gui/topMenu/TopMenu.js
index 42684cd585..523dd15c9a 100644
--- a/frontend-js/src/main/js/gui/topMenu/TopMenu.js
+++ b/frontend-js/src/main/js/gui/topMenu/TopMenu.js
@@ -85,7 +85,7 @@ TopMenu.prototype._createGui = function() {
var div4checkboxes = Functions.createElement({
type : "div",
- className : "div4checkboxes",
+ className : "minerva-top-checkbox-div",
});
rightHeaderMenuDiv.appendChild(div4checkboxes);
diff --git a/web/src/main/webapp/index.xhtml b/web/src/main/webapp/index.xhtml
index f950f192d1..086a2b1b27 100644
--- a/web/src/main/webapp/index.xhtml
+++ b/web/src/main/webapp/index.xhtml
@@ -47,10 +47,10 @@ function initMap(){
</script>
</h:head>
<h:body onload="initMap();" >
+<h:outputStylesheet library="css" name="bootstrap.min.css"/>
<h:outputStylesheet library="css" name="style.css"/>
<h:outputStylesheet library="css" name="minerva.css" />
<h:outputStylesheet library="css" name="pileup.css"/>
-<h:outputStylesheet library="css" name="bootstrap.min.css"/>
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<div id="minervaAppDiv" style="height: 100%;width: 100%;margin: 0;"/>
diff --git a/web/src/main/webapp/resources/css/style.css b/web/src/main/webapp/resources/css/style.css
index 5a7de0ce36..5b9d8758dc 100644
--- a/web/src/main/webapp/resources/css/style.css
+++ b/web/src/main/webapp/resources/css/style.css
@@ -1017,10 +1017,6 @@ ui-overlay-visible *{visibility:visible !important;}
.ui-wizard-step-title{font-size:18px;margin:0 3px 0 0;padding:0.4em;float:left;}
.rightHeaderMenu{height:36px; line-height:35px; font-size:13px; font-weight:900; color:#ffffff; display:inline; width:auto; float:right}
-.div4checkboxes {height:36px; vertical-align:top; font-size:13px; font-weight:900; color:#ffffff; display:inline; width:auto; float:left; text-align:left; padding:0 0 0 15px; margin:0;}
-.div4checkboxes label {padding:0 15px 0 5px; font-size:11px; line-height:35px; display:inline; float:left;}
-.div4checkboxes input {margin-top:12px; display:inline; float:left;}
-
.ui-galleria-filmstrip {background-color:#21BDF1; padding:2px; height:68px; margin-top:0;}
.ui-galleria-frame {border:1px solid #cccccc; height:34px !important;}
--
GitLab