diff --git a/frontend-js/src/main/css/global.css b/frontend-js/src/main/css/global.css index c3aff63b455bd0f342e607e10087058d1108faed..229baa2e02b741251a90800687be2f68e289673f 100644 --- a/frontend-js/src/main/css/global.css +++ b/frontend-js/src/main/css/global.css @@ -676,7 +676,7 @@ error report dialog style } .report-dialog span.ui-icon-info { - float: left; + float: right; } .report-dialog #report-comment { @@ -686,6 +686,13 @@ error report dialog style height: 60px; } +#report-comment { + white-space: pre-wrap; + overflow-wrap: break-word; + border: 1px solid #dddddd; + background-color: initial; +} + .report-dialog-warning { color: #cb5454; } @@ -987,3 +994,77 @@ https://www.w3schools.com/css/tryit.asp?filename=trycss_tooltip .pileup-root .controls input[type="text"] { width: 180px; } + + +/** OLD CSS */ + +/*form format*/ + +input[type=file] { + width: 280px; + top: 15px; +} + + +.ui-inputtext, .ui-password, .ui-autocomplete-input { + background-color: #21BDF1; + color: #ffffff; + width: 210px; + box-shadow: none; + -moz-box-shadow: none; + -webkit-box-shadow: none; + font-size: 14px; + font-weight: 900; + padding: 8px; + font-family: Lato; + margin: 0; + border: none; +} + +.ui-widget-content textarea, .ui-widget-content select { + background-color: #21BDF1; + color: #ffffff; + box-shadow: none; + -moz-box-shadow: none; + -webkit-box-shadow: none; + font-size: 14px; + font-weight: 900; + padding: 8px; + font-family: Lato; + margin: 0; +} + + +.ui-widget-content textarea { + width: 90%; + border: none +} + +.ui-selectonemenu-label { + box-shadow: none; + -moz-box-shadow: none; + -webkit-box-shadow: none; + background-color: #21BDF1; + color: #ffffff; + font-size: 14px; + font-weight: 900; + padding: 8px; + font-family: Lato; + margin: 0; +} + +.ui-selectonemenu-trigger .ui-icon.ui-icon-triangle-1-s { + margin-top: 8px; +} + +/* Button */ +.ui-button { + display: inline-block; + position: relative; + margin-right: .1em; + text-decoration: none; + cursor: pointer; + text-align: center; + zoom: 1; + overflow: visible; /* the overflow property removes extra width in IE */ +} diff --git a/web/src/main/java/lcsb/mapviewer/web/config/WebAppInitializer.java b/web/src/main/java/lcsb/mapviewer/web/config/WebAppInitializer.java index d2dafd2f38b997fcf1a868f0a6a581e2e9acae58..931e9b49b0741ad8dd2066cecee2618e881ac464 100644 --- a/web/src/main/java/lcsb/mapviewer/web/config/WebAppInitializer.java +++ b/web/src/main/java/lcsb/mapviewer/web/config/WebAppInitializer.java @@ -60,7 +60,7 @@ public class WebAppInitializer implements WebApplicationInitializer { container.setSessionTrackingModes(new HashSet<>(Arrays.asList(SessionTrackingMode.COOKIE))); assert container.setInitParameter("com.sun.faces.enableMissingResourceLibraryDetection", "true"); - assert container.setInitParameter("primefaces.THEME", "home"); + assert container.setInitParameter("primefaces.THEME", "none"); assert container.setInitParameter("javax.faces.FACELETS_BUFFER_SIZE", "65535"); assert container.setInitParameter("facelets.BUFFER_SIZE", "65535"); assert container.setInitParameter("javax.faces.FACELETS_LIBRARIES", "/WEB-INF/springsecurity.taglib.xml"); diff --git a/web/src/main/webapp/resources/css/style.css b/web/src/main/webapp/resources/css/style.css index d585d8bf6be7ebaf2ec745e4df5941debdfb038c..e9035b56281e3bc7b209922031c89d838d86c114 100644 --- a/web/src/main/webapp/resources/css/style.css +++ b/web/src/main/webapp/resources/css/style.css @@ -54,9 +54,6 @@ html,body { background:#919191; background:-moz-linear-gradient(top,#B0B0B0,#6B6B6B); background:-webkit-gradient(linear,left top,left bottom,from(#B0B0B0),to(#6B6B6B)); font-weight:normal;color:#ffffff;} .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited{color:#ffffff;text-decoration:none;} -.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus{border:none; -background:#919191; background:-moz-linear-gradient(top,#2DCAFF,#0098CA); background:-webkit-gradient(linear,left top,left bottom,from(#2DCAFF),to(#0098CA)); -font-weight:normal;color:#ffffff;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;} .ui-state-hover a, .ui-state-hover a:hover{color:#ffffff;text-decoration:none;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;} .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active{border:none;background:#0098CA; background:-moz-linear-gradient(top,#2DCAFF,#0098CA); background:-webkit-gradient(linear,left top,left bottom,from(#2DCAFF),to(#0098CA)); font-weight:normal;color:#ffffff;} @@ -72,10 +69,6 @@ font-weight:normal;color:#ffffff;} .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary{font-weight:bold;} .ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal;} .ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none;} -.ui-state-default .ui-icon{background-image:url("#{request.contextPath}/javax.faces.resource/images/ui-icons_ededed_256x240.png.xhtml?ln=primefaces-home");} -.ui-state-hover .ui-icon, .ui-state-focus .ui-icon{background-image:url("#{request.contextPath}/javax.faces.resource/images/ui-icons_ffffff_256x240.png.xhtml?ln=primefaces-home");} -.ui-state-active .ui-icon{background-image:url("#{request.contextPath}/javax.faces.resource/images/ui-icons_ffffff_256x240.png.xhtml?ln=primefaces-home");} -.ui-state-highlight .ui-icon{background-image:url("#{request.contextPath}/javax.faces.resource/images/ui-icons_4ca300_256x240.png.xhtml?ln=primefaces-home");} /* positioning */.ui-icon-carat-1-n{background-position:0 0;} .ui-icon-carat-1-ne{background-position:-16px 0;} .ui-icon-carat-1-e{background-position:-32px 0;} @@ -269,7 +262,6 @@ font-weight:normal;color:#ffffff;} .ui-corner-bottom{-moz-border-radius-bottomleft:0px;-webkit-border-bottom-left-radius:0px;border-bottom-left-radius:0px;-moz-border-radius-bottomright:0px;-webkit-border-bottom-right-radius:0px;border-bottom-right-radius:0px;} .ui-corner-right{-moz-border-radius-topright:0px;-webkit-border-top-right-radius:0px;border-top-right-radius:0px;-moz-border-radius-bottomright:0px;-webkit-border-bottom-right-radius:0px;border-bottom-right-radius:0px;} .ui-corner-left{-moz-border-radius-topleft:0px;-webkit-border-top-left-radius:0px;border-top-left-radius:0px;-moz-border-radius-bottomleft:0px;-webkit-border-bottom-left-radius:0px;border-bottom-left-radius:0px;} -.ui-corner-all{-moz-border-radius:0px !important;-webkit-border-radius:0px !important;border-radius:0px !important; border-top:none; border-left:none;border-right:none; border-bottom:1px solid #FFFFFF; padding:0; margin:0;} .ui-tabs-nav.ui-corner-all {border-bottom:none !important;} @@ -370,7 +362,6 @@ font-weight:normal;color:#ffffff;} .ui-accordion{width:100%;} .ui-accordion .ui-accordion-header{cursor:pointer;position:relative;margin-top:1px;zoom:1;} .ui-accordion .ui-accordion-header a{display:block;font-size:1em;padding:.5em .5em .5em 2.2em;} -.ui-accordion .ui-accordion-header .ui-icon{position:absolute;left:.5em;top:50%;margin-top:-8px;} .ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;margin-top:-2px;position:relative;top:1px;margin-bottom:2px;overflow:auto;zoom:1;} .ui-accordion .ui-accordion-header.ui-state-disabled, .ui-accordion .ui-accordion-header.ui-state-disabled a{cursor:default;} /** RTL **/.ui-accordion.ui-accordion-rtl{direction:rtl;} @@ -554,7 +545,6 @@ ui-overlay-visible *{visibility:visible !important;} .ui-selectonemenu-panel .ui-selectonemenu-filter-container{position:relative;margin:0;padding:0.4em;display:inline-block;} .ui-selectonemenu-panel .ui-selectonemenu-filter-container .ui-icon{position:absolute;top:10px;right:10px;} .ui-state-disabled a{outline:none;} -/* Button */.ui-button{display:inline-block;position:relative;padding:0;margin-right:.1em;text-decoration:none !important;cursor:pointer;text-align:center;zoom:1;overflow:visible;/* the overflow property removes extra width in IE */} .ui-button-icon-only{width:2.4em;} /*button text element */.ui-button .ui-button-text{display:block;line-height:1.4;} .ui-button-text-only .ui-button-text{padding:.3em 1em;} @@ -943,48 +933,4 @@ ui-overlay-visible *{visibility:visible !important;} .ui-galleria-filmstrip {background-color:#21BDF1; padding:2px; height:68px; margin-top:0;} .ui-galleria-frame {border:1px solid #cccccc; height:34px !important;} .ui-galleria-frame-image {height:34px !important;} -.ui-galleria-panel {border-bottom:1px solid #e1e1e1;} - - -/*form format*/ - -input[type=file] {width:280px !important; top:15px !important;} - - -.ui-inputtext, .ui-password, .ui-autocomplete-input{ - background-color:#21BDF1 !important; - color:#ffffff !important; - width:210px !important; - box-shadow:none !important; - -moz-box-shadow:none !important; - -webkit-box-shadow:none !important; - font-size:14px !important; - font-weight:900 !important; - padding:8px !important; - font-family:Lato !important; - margin:0 !important; - border:none !important -} - -.ui-widget-content textarea, .ui-widget-content select{ - background-color:#21BDF1 !important; - color:#ffffff !important; - box-shadow:none !important; - -moz-box-shadow:none !important; - -webkit-box-shadow:none !important; - font-size:14px !important; - font-weight:900 !important; - padding:8px !important; - font-family:Lato !important; - margin:0 !important -} - - -.ui-widget-content textarea { - width:90% !important; - border:none !important -} - -.ui-selectonemenu-label {box-shadow:none !important;-moz-box-shadow:none !important;-webkit-box-shadow:none !important; background-color:#21BDF1 !important; color:#ffffff !important; font-size:14px !important; font-weight:900 !important; padding:8px !important; font-family:Lato !important; margin:0 !important} -.ui-selectonemenu-trigger .ui-icon.ui-icon-triangle-1-s {margin-top:8px !important;} -/*.ui-inputfield*/ +.ui-galleria-panel {border-bottom:1px solid #e1e1e1;} \ No newline at end of file diff --git a/web/src/main/webapp/resources/primefaces/primefaces.css b/web/src/main/webapp/resources/primefaces/primefaces.css new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391