From 9c12b515e5e9fd925de367e2c12f57d3684c7d01 Mon Sep 17 00:00:00 2001 From: Piotr Gawron <piotr.gawron@uni.lu> Date: Wed, 28 Mar 2018 17:42:54 +0200 Subject: [PATCH] unused css removed --- frontend-js/package-lock.json | 54 ++++++------- frontend-js/src/main/css/global.css | 34 ++++++++ frontend-js/src/main/js/minerva.js | 4 +- web/src/main/webapp/login.xhtml | 7 +- web/src/main/webapp/resources/css/admin.css | 79 ------------------- .../main/webapp/resources/css/chemical.css | 55 ------------- web/src/main/webapp/resources/css/drug.css | 55 ------------- web/src/main/webapp/resources/css/export.css | 14 ---- web/src/main/webapp/resources/css/genomes.css | 1 - web/src/main/webapp/resources/css/info.css | 17 ---- web/src/main/webapp/resources/css/layouts.css | 44 ----------- web/src/main/webapp/resources/css/login.css | 20 ----- web/src/main/webapp/resources/css/miRNA.css | 55 ------------- web/src/main/webapp/resources/css/profile.css | 13 --- .../main/webapp/resources/css/projects.css | 21 ----- web/src/main/webapp/resources/css/search.css | 54 ------------- web/src/main/webapp/resources/css/submap.css | 13 --- 17 files changed, 67 insertions(+), 473 deletions(-) delete mode 100644 web/src/main/webapp/resources/css/admin.css delete mode 100644 web/src/main/webapp/resources/css/chemical.css delete mode 100644 web/src/main/webapp/resources/css/drug.css delete mode 100644 web/src/main/webapp/resources/css/export.css delete mode 100644 web/src/main/webapp/resources/css/genomes.css delete mode 100644 web/src/main/webapp/resources/css/info.css delete mode 100644 web/src/main/webapp/resources/css/layouts.css delete mode 100644 web/src/main/webapp/resources/css/login.css delete mode 100644 web/src/main/webapp/resources/css/miRNA.css delete mode 100644 web/src/main/webapp/resources/css/profile.css delete mode 100644 web/src/main/webapp/resources/css/projects.css delete mode 100644 web/src/main/webapp/resources/css/search.css delete mode 100644 web/src/main/webapp/resources/css/submap.css diff --git a/frontend-js/package-lock.json b/frontend-js/package-lock.json index 378ebd3885..29898ad842 100644 --- a/frontend-js/package-lock.json +++ b/frontend-js/package-lock.json @@ -45,38 +45,30 @@ "litemol": "github:dsehnal/LiteMol#a5419c696faa84530dd93acd55b747cf8136902b" }, "dependencies": { - "ProtVista": { - "version": "git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e", - "dev": true, - "requires": { - "d3": "3.5.17", - "file-saver": "1.3.3", - "jquery": "2.2.4", - "jszip": "3.1.4", - "underscore": "1.8.3" - }, - "dependencies": { - "jquery": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz", - "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=", - "dev": true - } - } - }, "jquery": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==", "dev": true - }, - "litemol": { - "version": "github:dsehnal/LiteMol#a5419c696faa84530dd93acd55b747cf8136902b", - "dev": true, - "requires": { - "@types/react": "15.6.14", - "@types/react-dom": "15.5.7" - } + } + } + }, + "ProtVista": { + "version": "git://github.com/davidhoksza/protvista.git#4e4bb737ba1e183291505bd25f8bae2e651ce21e", + "dev": true, + "requires": { + "d3": "3.5.17", + "file-saver": "1.3.3", + "jquery": "2.2.4", + "jszip": "3.1.4", + "underscore": "1.8.3" + }, + "dependencies": { + "jquery": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz", + "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=", + "dev": true } } }, @@ -2058,6 +2050,14 @@ "immediate": "3.0.6" } }, + "litemol": { + "version": "github:dsehnal/LiteMol#a5419c696faa84530dd93acd55b747cf8136902b", + "dev": true, + "requires": { + "@types/react": "15.6.14", + "@types/react-dom": "15.5.7" + } + }, "lodash": { "version": "4.17.4", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", diff --git a/frontend-js/src/main/css/global.css b/frontend-js/src/main/css/global.css index 251cea095a..df8125d176 100644 --- a/frontend-js/src/main/css/global.css +++ b/frontend-js/src/main/css/global.css @@ -663,3 +663,37 @@ table.dataTable tbody td.no_padding, table.dataTable thead th.no_padding { button:disabled { color: graytext; } + +a.adminLink:link, a.adminLink:visited { + font-size: 11px; + font-weight: 900; + text-decoration: none; + color: #666666 +} + +a.adminLink:hover { + color: #000000; +} + +.minerva-login-form { + height: 100%; + background-color:#FFFFFF; + box-shadow:0 3px 30px #B9B9B9; + width:320px; + padding:20px; + margin:20px auto; + color:#666666; + font-size:13px; + font-weight:900; +} + +.minerva-login-form-title { + font-weight: 900; + padding-bottom: 20px; + font-size: 19px; +} + +.labelText { + font-size: 13px; + font-weight: 900 +} \ No newline at end of file diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js index a06cd21a49..7f0a8f6e64 100644 --- a/frontend-js/src/main/js/minerva.js +++ b/frontend-js/src/main/js/minerva.js @@ -408,11 +408,11 @@ function createLoginDiv(params) { var loggedIn = false; var result = functions.createElement({type: "center"}); - var resultDiv = functions.createElement({type: "div", className: "loginPanel", style: "text-align:left"}); + var resultDiv = functions.createElement({type: "div", className: "minerva-login-form", style: "text-align:left"}); result.appendChild(resultDiv); resultDiv.appendChild(functions.createElement({ type: "div", - className: "headerFormTitle", + className: "minerva-login-form-title", content: "AUTHORIZATION FORM" })); var guiUtils = new GuiUtils(); diff --git a/web/src/main/webapp/login.xhtml b/web/src/main/webapp/login.xhtml index 6c2573dba2..af2062f2a1 100644 --- a/web/src/main/webapp/login.xhtml +++ b/web/src/main/webapp/login.xhtml @@ -27,8 +27,8 @@ <h:outputStylesheet library="css" name="style.css" /> <h:outputStylesheet library="css" name="minerva.css" /> - <h:outputStylesheet library="css" name="admin.css" /> - <link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"/> + <link rel="stylesheet" type="text/css" + href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css" /> <script type="text/javascript"> @@ -47,7 +47,8 @@ </h:head> -<h:body onload="init();"> +<h:body onload="init();" + style="background-color: #EBEBEB; overflow:hidden"> <div id="minervaAppDiv" /> </h:body> </html> \ No newline at end of file diff --git a/web/src/main/webapp/resources/css/admin.css b/web/src/main/webapp/resources/css/admin.css deleted file mode 100644 index 5696f73ff0..0000000000 --- a/web/src/main/webapp/resources/css/admin.css +++ /dev/null @@ -1,79 +0,0 @@ -html, body {margin:0 !important; padding:0 !important; background-color:#EBEBEB;} - -.ui-menu { - background:#919191 !important; background:-moz-linear-gradient(top,#B0B0B0,#6B6B6B); background:-webkit-gradient(linear,left top,left bottom,from(#B0B0B0),to(#6B6B6B)); - padding:0 !important; margin:0 !important; height:56px !important; -} - -.ui-menuitem-link {line-height:40px !important; margin:0 !important; border:none !important; top:0 !important} -.ui-menuitem-text {font-size:13px !important; font-weight:900 !important; color:#ffffff !important; padding:0 6px !important; text-transform:uppercase;} - -.ui-menuitem.ui-widget{padding:0 !important; margin:0 !important;top:0 !important} - - -.loginPanel { - height: 100%; - margin: 0; - background-color:#FFFFFF; - box-shadow:0 3px 30px #B9B9B9; - width:320px; - padding:20px; - margin:20px auto; - color:#666666; - font-size:13px; - font-weight:900; -} - -.ui-widget-content {padding:0 !important; margin:0 !important;} - -#content {padding:20px 30px 20px 30px !important} -#content td {font-size:13px !important; color:#666666} -#content td a {font-size:13px !important; color:#666666} - -.ui-layout-pane-south {height:70px !important;} -#south-resizer {display:none !important;} - -h1 {font-size:22px; color:#999999; text-align:center; padding-bottom:10px; font-weight:400;} - -.ui-dialog-content {padding:20px !important} -.ui-dialog-content td {font-size:13px; color:#666666; font-weight:600} - -.ui-dialog-content select {border:none} - - -.addButton {background:none !important; color:#666666 !important; font-size:13px !important; font-weight:900 !important; text-transform:uppercase; text-align:left; width:140px; margin:0px 5px 10px 5px; transition: color 0.4s ease-in-out 0s; } -.addButton:before{font-family:FontAwesome; font-style:normal; font-weight:normal !important; content:"\f0fe"; float:left; display:inline; font-size:17px !important;font-weight:300 !improtant; width:20px; padding-top:4px; } -.addButton:hover {color:#999999 !important; transition:color 0.4s ease-in-out 0s; } - - -.ui-icon-search { background:url(images/icons/search_small2.png.xhtml) 50% 50% no-repeat !important; } -.ui-icon-refresh { background:url(images/icons/refresh.png.xhtml) 50% 50% no-repeat !important; } -.ui-icon-disk { background:url(images/icons/disk.png.xhtml) 50% 50% no-repeat !important; } -.ui-icon-document { background:url(images/icons/document.png.xhtml) 50% 50% no-repeat !important; } -.ui-icon-trash { background:url(images/icons/trash.png.xhtml) 50% 50% no-repeat !important; } -.ui-icon-close { background:url(images/icons/close.png.xhtml) 50% 50% no-repeat !important; } - -.ui-tabs-nav.ui-helper-reset.ui-helper-clearfix.ui-widget-header {text-align:center; font-weight:900 !important; font-size:13px !important; text-transform:uppercase !important; height:30px;} -.ui-tabs-nav.ui-helper-reset.ui-helper-clearfix.ui-widget-header li {text-align:center; font-weight:900 !important; font-size:13px !important; text-transform:uppercase !important; height:30px;} - -.ui-tabs .ui-tabs-nav li {width:auto; padding:0 8px !important; font-weight:900 !important;text-transform: uppercase;} - -textarea {border:none} - -.ui-blockui-content { padding:10px !important;} - -.text {font-weight:900; color:#333333; line-height:30px; text-transform:uppercase} -.textBigger {font-size:120%} -.textLighter {font-weight:900; color:#666666; line-height:30px; text-transform:uppercase} -.bold {font-weight:900} -.imgMiddle {vertical-align: middle;} - -.welcomeBox {width:300px; margin:100px auto; text-align:center} -.welcomeBigText {color:#666666; font-size:24px;} -.welcomeAdditionlInfo {color:#999999; font-size:18px; margin:20px 0} -.welcomeIcon {color:#66CC33; font-size:32px;} - -a.adminLink:link, a.adminLink:visited {font-size:11px; font-weight:900; text-decoration:none; color: #666666} -a.adminLink:hover {color:#000000;} -.headerFormTitle {font-size:13px; font-weight:900; padding-bottom:20px; font-size:19px;} -.labelText {font-size:13px; font-weight:900} \ No newline at end of file diff --git a/web/src/main/webapp/resources/css/chemical.css b/web/src/main/webapp/resources/css/chemical.css deleted file mode 100644 index 3aad67ee6f..0000000000 --- a/web/src/main/webapp/resources/css/chemical.css +++ /dev/null @@ -1,55 +0,0 @@ -.chemicalPanel { - height: 100%; - margin: 0; - background-color: #FFFFFF; - box-shadow: 0 3px 30px #B9B9B9; - width: 80%; - padding: 15px; - margin: 20px auto; - color: #666666; - font-size: 13px; - line-height: 19px; -} - -.chemicalResultsDivClass { - position: absolute; - left: 0px; - top: 240px; - bottom: 0px; - right: 0px; - bottom: 0px; - background: #ffffff; - vertical-align: top; -} - -.chemicalResultsDivClass .ui-tabs .ui-tabs-nav li { - width: auto; - padding: 0 8px !important; - font-weight: 900 !important; - text-transform: uppercase; -} - -.ui-scrollpanel { - padding: 0 8px !important; -} - -// -.ui-datalist-data { - display: block !important; - height: auto !important; - width: auto !important -} - -.chemicalResultsDivClass2 { - background-color: #ffffff; - position: absolute; - left: 0px; - top: 0px; - bottom: 0px; - right: 0px; - height: 100%; -} - -.chemicalResultsDivClass table td { - border: 1px solid #e1e1e1 !important; -} \ No newline at end of file diff --git a/web/src/main/webapp/resources/css/drug.css b/web/src/main/webapp/resources/css/drug.css deleted file mode 100644 index 6c5bc83eed..0000000000 --- a/web/src/main/webapp/resources/css/drug.css +++ /dev/null @@ -1,55 +0,0 @@ -.drugPanel { - height: 100%; - margin: 0; - background-color: #FFFFFF; - box-shadow: 0 3px 30px #B9B9B9; - width: 80%; - padding: 15px; - margin: 20px auto; - color: #666666; - font-size: 13px; - line-height: 19px; -} - -.drugResultsDivClass { - position: absolute; - left: 0px; - top: 240px; - bottom: 0px; - right: 0px; - bottom: 0px; - background: #ffffff; - vertical-align: top; -} - -.drugResultsDivClass .ui-tabs .ui-tabs-nav li { - width: auto; - padding: 0 8px !important; - font-weight: 900 !important; - text-transform: uppercase; -} - -.ui-scrollpanel { - padding: 0 8px !important; -} - -// -.ui-datalist-data { - display: block !important; - height: auto !important; - width: auto !important -} - -.drugResultsDivClass2 { - background-color: #ffffff; - position: absolute; - left: 0px; - top: 0px; - bottom: 0px; - right: 0px; - height: 100%; -} - -.drugResultsDivClass table td { - border: 1px solid #e1e1e1 !important; -} \ No newline at end of file diff --git a/web/src/main/webapp/resources/css/export.css b/web/src/main/webapp/resources/css/export.css deleted file mode 100644 index a4d7948d14..0000000000 --- a/web/src/main/webapp/resources/css/export.css +++ /dev/null @@ -1,14 +0,0 @@ -.ui-tabs .ui-tabs-nav{margin:0 !important; padding:0 !important; background-color:#878787;} -.ui-tabs .ui-tabs-nav li{list-style:none; float:left; position:relative; margin:0 !important; padding:0 20px !important; white-space:nowrap; width:auto; border-right:1px solid #A3A3A3; border-top:none; font-size:13px; font-weight:900; text-transform:uppercase; top:0 !important;} -.ui-tabs .ui-tabs-nav li a{float:left;padding:8px 0 8px 0 !important;text-decoration:none; margin:0 !important; width:100%;} - - -.topAligned{vertical-align: top;} -.topAligned label{ text-transform:uppercase;} -label {font-size:13px; font-weight:900; color:#666666; min-width:110px; } - -.ui-picklist-caption.ui-widget-header {font-size:13px; font-weight:900;text-transform:uppercase;} -.ui-picklist-item {font-size:12px} -.ui-widget-content.ui-picklist-list {height:160px} - -td {border-bottom:1px solid #e1e1e1} \ No newline at end of file diff --git a/web/src/main/webapp/resources/css/genomes.css b/web/src/main/webapp/resources/css/genomes.css deleted file mode 100644 index d3f5a12faa..0000000000 --- a/web/src/main/webapp/resources/css/genomes.css +++ /dev/null @@ -1 +0,0 @@ - diff --git a/web/src/main/webapp/resources/css/info.css b/web/src/main/webapp/resources/css/info.css deleted file mode 100644 index 33c366a744..0000000000 --- a/web/src/main/webapp/resources/css/info.css +++ /dev/null @@ -1,17 +0,0 @@ -.infoPanel { - height: 100%; - margin: 0; - background-color:#FFFFFF; - box-shadow:0 3px 30px #B9B9B9; - width:80%; - padding:15px; - margin:20px auto; - color:#666666; - font-size:13px; - line-height:19px; -} - -.infoPanelData td { - vertical-align: top; - padding: 6px 2px; -} diff --git a/web/src/main/webapp/resources/css/layouts.css b/web/src/main/webapp/resources/css/layouts.css deleted file mode 100644 index 13d8a133e1..0000000000 --- a/web/src/main/webapp/resources/css/layouts.css +++ /dev/null @@ -1,44 +0,0 @@ -.layoutSelectedRow .highlightedColumn { - background: #EBEBEB; -} - -.layoutSelectedRow .standardColumn { - -} - -.layoutPanel { - position: absolute; - left:0px; - top:82px; - bottom: 0px; - right:0px; - bottom:0px; - background:#ffffff; - vertical-align:top; -} - -.layoutSubPanel { - margin: 0; - background-color:#FFFFFF; - box-shadow:0 3px 30px #B9B9B9; - width:80%; - padding:15px; - margin:20px auto; - color:#666666; - font-size:13px; - line-height:19px; -} - - -.title {font-size:13px; font-weight:900; text-transform:uppercase; margin-top:0px;} - -.ui-panel-titlebar.ui-widget-header {font-size:13px; background:none; font-weight:900; color:#666666; padding-left:0; border-bottom:1px solid #e1e1e1;} - -.ui-panel-content.ui-widget-content {padding:0 !important} -.ui-panel-titlebar.ui-widget-header {padding-left:0 !important} - -.smallBoldText {font-size:11px;font-weight:900; color:#666666;line-height:12px;} -.mediumBoldText {font-size:13px;font-weight:900;} - -.greenText {color:#66CC33; font-weight:900; font-size:13px;} -.redText {color:#CC3300; font-weight:900; font-size:13px;} diff --git a/web/src/main/webapp/resources/css/login.css b/web/src/main/webapp/resources/css/login.css deleted file mode 100644 index b7aeb305ac..0000000000 --- a/web/src/main/webapp/resources/css/login.css +++ /dev/null @@ -1,20 +0,0 @@ -.loginPanel { -height: 100%; - margin: 0; - background-color:#FFFFFF; - box-shadow:0 3px 30px #B9B9B9; - width:80%; - padding:15px; - margin:20px auto; - color:#666666; - font-size:13px; - line-height:19px; -} - -.headerText {font-size:13px; font-weight:900} -.tdText{font-size:11px; font-weight:900; width:90px !important; color:#666666 !important; line-height:40px;} - -a.adminLink:link, a.adminLink:visited {font-size:11px; font-weight:900; text-decoration:none; color: #666666} -a.adminLink:hover {color:#000000;} - -.submitFix {font-size:13px; font-weight:900 !important; margin-left:90px; padding:0px 20px; margin-top:5px} \ No newline at end of file diff --git a/web/src/main/webapp/resources/css/miRNA.css b/web/src/main/webapp/resources/css/miRNA.css deleted file mode 100644 index 7ab9f2eb36..0000000000 --- a/web/src/main/webapp/resources/css/miRNA.css +++ /dev/null @@ -1,55 +0,0 @@ -.miRNAPanel { - height: 100%; - margin: 0; - background-color: #FFFFFF; - box-shadow: 0 3px 30px #B9B9B9; - width: 80%; - padding: 15px; - margin: 20px auto; - color: #666666; - font-size: 13px; - line-height: 19px; -} - -.miRNAResultsDivClass { - position: absolute; - left: 0px; - top: 240px; - bottom: 0px; - right: 0px; - bottom: 0px; - background: #ffffff; - vertical-align: top; -} - -.miRNAResultsDivClass .ui-tabs .ui-tabs-nav li { - width: auto; - padding: 0 8px !important; - font-weight: 900 !important; - text-transform: uppercase; -} - -.ui-scrollpanel { - padding: 0 8px !important; -} - -// -.ui-datalist-data { - display: block !important; - height: auto !important; - width: auto !important -} - -.miRNAResultsDivClass2 { - background-color: #ffffff; - position: absolute; - left: 0px; - top: 0px; - bottom: 0px; - right: 0px; - height: 100%; -} - -.miRNAResultsDivClass table td { - border: 1px solid #e1e1e1 !important; -} \ No newline at end of file diff --git a/web/src/main/webapp/resources/css/profile.css b/web/src/main/webapp/resources/css/profile.css deleted file mode 100644 index 7096ea8c43..0000000000 --- a/web/src/main/webapp/resources/css/profile.css +++ /dev/null @@ -1,13 +0,0 @@ -.profilePanel { -height: 100%; - margin: 0; - background-color:#FFFFFF; - box-shadow:0 3px 30px #B9B9B9; - width:80%; - padding:15px; - margin:20px auto; - color:#666666; - font-size:13px; - line-height:19px; -} - diff --git a/web/src/main/webapp/resources/css/projects.css b/web/src/main/webapp/resources/css/projects.css deleted file mode 100644 index 7fcb9ff8b4..0000000000 --- a/web/src/main/webapp/resources/css/projects.css +++ /dev/null @@ -1,21 +0,0 @@ -.projectsAdvancedCheckbox { - vertical-align: middle; -} -.projectsAnnotatorCaption { - font-size: 200%; -} - -.projectsAnnotatorGridFirstColumn { - vertical-align: top; - width: 350px; -} - -.projectsAnnotatorGridSecondColumn { - vertical-align: top; - width: 450px; -} - -.projectValueField { - font-weight: bold; -} - diff --git a/web/src/main/webapp/resources/css/search.css b/web/src/main/webapp/resources/css/search.css deleted file mode 100644 index b96ebd2589..0000000000 --- a/web/src/main/webapp/resources/css/search.css +++ /dev/null @@ -1,54 +0,0 @@ -.searchElementSubmodelLink { - color: green; -} - -a.searchElementSubmodelLink { - color: green; -} - -.searchResultsDivClass { - position: absolute; - left: 0px; - top: 260px; - bottom: 0px; - right: 0px; - background: #ffffff; -} - -.searchResultsDivClass .ui-tabs .ui-tabs-nav li { - width: auto; - padding: 0 8px !important; - font-weight: 900 !important; - text-transform: uppercase; -} - -.ui-scrollpanel { - padding: 0 8px !important; -} - -// -.ui-datalist-data { // - display: block !important; // - height: auto !important; // - width: auto !important// -} - -.searchResultsDivClass2 { - background-color: #ffffff; - position: absolute; - left: 0px; - top: 0px; - bottom: 0px; - right: 0px; - height: 100%; -} - -.searchResultsClass { - position: relative; - left: 0px; - top: 0px; - bottom: 0px; - right: 0px; - background: #ffffff; -} - diff --git a/web/src/main/webapp/resources/css/submap.css b/web/src/main/webapp/resources/css/submap.css deleted file mode 100644 index 10b5dd23ba..0000000000 --- a/web/src/main/webapp/resources/css/submap.css +++ /dev/null @@ -1,13 +0,0 @@ -.submapPanel { -height: 100%; - margin: 0; - background-color:#FFFFFF; - box-shadow:0 3px 30px #B9B9B9; - width:80%; - padding:15px; - margin:20px auto; - color:#666666; - font-size:13px; - line-height:19px; -} - -- GitLab