From d70f8f40927dcdb42d06dc7259df0d84005938be Mon Sep 17 00:00:00 2001 From: Piotr Gawron <piotr.gawron@uni.lu> Date: Tue, 25 Jul 2017 14:09:15 +0200 Subject: [PATCH] show overview font fixed --- frontend-js/src/main/css/global.css | 20 +++++++++++++++++++ .../src/main/js/gui/topMenu/TopMenu.js | 4 ++-- web/src/main/webapp/resources/css/style.css | 3 --- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/frontend-js/src/main/css/global.css b/frontend-js/src/main/css/global.css index bbcfa98af5..bc22c5c2e8 100644 --- a/frontend-js/src/main/css/global.css +++ b/frontend-js/src/main/css/global.css @@ -420,4 +420,24 @@ table.minerva-window-drug-table, table.minerva-window-drug-table th, .minerva-annotation-row-even { padding: 5px; background-color: #ffffff; +} + +.minerva-overview-button { + color: #FFFFFF; + height: 36px; + line-height: 35px; + padding: 0 18px; + margin: 0; + border: none; + background-color: #017DA7; + font-size: 13px; + font-weight: 900; + border-right: 1px solid #9DE1F8; + cursor: pointer; + transition: background-color 0.4s ease-in-out 0s; +} + +.minerva-overview-button:hover { + background-color: #01536D; + transition: background-color 0.4s ease-in-out 0s; } \ 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 af684e2a40..42684cd585 100644 --- a/frontend-js/src/main/js/gui/topMenu/TopMenu.js +++ b/frontend-js/src/main/js/gui/topMenu/TopMenu.js @@ -69,9 +69,9 @@ TopMenu.prototype._createGui = function() { var showOverviewButton = Functions.createElement({ type : "button", - className : "overview_button", + className : "minerva-overview-button", name : "showOverviewButton", - content : "<i class='fa fa-sitemap' style='font-size:18px; font-weight:400; padding-right:10px;'/>SHOW OVERVIEW", + content : "<i class='fa fa-sitemap' style='font-size:18px; font-weight:400; padding-right:10px;'></i><span >SHOW OVERVIEW</span>", style : "display:none", }); showOverviewDiv.appendChild(showOverviewButton); diff --git a/web/src/main/webapp/resources/css/style.css b/web/src/main/webapp/resources/css/style.css index a47422dfd5..5a7de0ce36 100644 --- a/web/src/main/webapp/resources/css/style.css +++ b/web/src/main/webapp/resources/css/style.css @@ -1016,9 +1016,6 @@ ui-overlay-visible *{visibility:visible !important;} .ui-wizard-nav-next{float:right;} .ui-wizard-step-title{font-size:18px;margin:0 3px 0 0;padding:0.4em;float:left;} -.overview_button {color:#FFFFFF; height:36px; line-height:35px; padding:0 18px; margin:0; border:none; background-color:#017DA7; font-size:13px; font-weight:900; border-right:1px solid #9DE1F8; cursor:pointer; transition: background-color 0.4s ease-in-out 0s; } -.overview_button:hover {background-color:#01536D; transition: background-color 0.4s ease-in-out 0s; } - .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;} -- GitLab