diff --git a/wise-webapp/src/main/webapp/css/editor.less b/wise-webapp/src/main/webapp/css/editor.less index 5d159ee3..e0b729aa 100644 --- a/wise-webapp/src/main/webapp/css/editor.less +++ b/wise-webapp/src/main/webapp/css/editor.less @@ -37,8 +37,6 @@ div#small_error_icon { background-color: #dfcf3c; padding: 5px 15px; color: #666666; -/*font-weight: bold;*/ -/*width: 100px;*/ font-size: 13px; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -50,8 +48,6 @@ div#small_error_icon { background-color: #dfcf3c; padding: 5px 15px; color: #666666; -/*font-weight: bold;*/ -/*width: 100px;*/ font-size: 13px; -moz-border-radius: 3px; -webkit-border-radius: 3px; diff --git a/wise-webapp/src/main/webapp/css/header.less b/wise-webapp/src/main/webapp/css/header.less index b6413046..a85b7889 100644 --- a/wise-webapp/src/main/webapp/css/header.less +++ b/wise-webapp/src/main/webapp/css/header.less @@ -82,27 +82,4 @@ div#headerNotifier { /*right: 5px;*/ } -@import "toolbar.less"; - -/* FIXME: duplicate in mindmapList - ---------------------------- Scrollbar --------------------------------- */ -::-webkit-scrollbar { - width: 8px; - direction:rtl; - text-align: left; - position: relative; - left: 10px; -} -::-webkit-scrollbar-track { - border-radius: 10px; - background-color: #eaeaea; - border-left: 1px solid #ccc; -} -::-webkit-scrollbar-thumb { - border-radius: 10px; - background-color: #c6c6c6; -} -::-webkit-scrollbar-thumb:hover { - background-color: #08c; -} - +@import "toolbar.less"; \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/pageHeaders.css b/wise-webapp/src/main/webapp/css/pageHeaders.css deleted file mode 100644 index e78a82ab..00000000 --- a/wise-webapp/src/main/webapp/css/pageHeaders.css +++ /dev/null @@ -1,128 +0,0 @@ -/* HEADER STYLES */ - -html,body { - margin: 0; - padding: 0; - height: 100%; -} - -#header { - margin-top: 0; - height: 78px; - width: 100%; - background: white; - border-bottom: 1px solid #bbb4d6; - position: absolute; - top: 0; - left: 0; -} - -#headerToolbar { - height: 35px; - width: 100%; - background-color: #171a17; - border-top: 1px solid #999999; - border-bottom: 1px solid #424141; - color: white; -} - -#headerContent { - width: 800px; - height: 78px; - position: relative; - top: 0; - left: 0; - margin: auto; -} - -#headerLogo { - margin-top: 23px; - height: 80px; - width: 160px; - background: url("../images/logo-medium.png") no-repeat; - position: absolute; - top: 0; - left: -50px; -} - -#headerSlogan { - position: absolute; - border-left: 1px dashed gray; - margin-top: 8px; - height: 1em; - width: 100px; - top: 40px; - left: 137px; - white-space: nowrap; - padding-left: 7px; - font-weight: bold; - vertical-align: middle; - font-size: 20px; -} - -#headerButtons { - position: absolute; - top: 65px; - left: 150px; -} - -#aboutLink, #faqLink, #feedbackLink, #logoutLink { - float: right; - z-index: 300; -} - -div#headerButtons a { - float: left; - color: #6F6F6F; - padding: 0 10px; - text-decoration: none; - font-weight: bold; - font-size: 120%; - white-space: nowrap; -} - -div#headerTitle { - float: left; - font-weight: bold; - font-size: 15px; - margin-right: 5px; - margin-left: 5px; -} - -span#headerSubTitle { - font-weight: lighter; - font-size: 12px; -} - -div#headerButtons a:hover { - /*text-decoration: underline;*/ - color: #7e72ad; -} - -div#headerButtons activelink a, div#headerButtons activelink a:hover { - text-decoration: none; - border-top: 0; - border-bottom: 0; -} - - -#headerLogo { - cursor: pointer; -} - -div#headerActions { - padding-right: 8px; - padding-top: 4px; - position: absolute; - right: 0; - z-index: 50; - -} - -#headerActions span { - border-bottom: 3px solid #F7C931; -} - -div#headerActions a:hover, div#headerActions a:active, div#headerActions a:link, div#headerActions a:visited { - color: white; -} diff --git a/wise-webapp/src/main/webapp/css/pageTemplate.css b/wise-webapp/src/main/webapp/css/pageTemplate.css deleted file mode 100644 index 1d2206d1..00000000 --- a/wise-webapp/src/main/webapp/css/pageTemplate.css +++ /dev/null @@ -1,60 +0,0 @@ -@import "../bootstrap/css/bootstrap.min.css"; -@import "pageHeaders.css"; - -div#register { - margin: 20px auto; - text-align: center; - white-space: nowrap; -} - -div#register a { - color: #003399; - font-weight: bold; -} - -div#pageContainer { - position: relative; - min-height: 100%; -} - -#footerContainer { - padding-top: 10px; - border-top: 1px black solid; - position: absolute; - bottom: 0; - left: 0; - width: 100%; - height: 65px; /* Height of the footer */ - background: #ffffff; -} - -/*-- End Main Page Style -- */ - - -/* Reduce styles */ -.jumbotron > h1 { - font-size: 30px; - color: #00008b; -} - -.jumbotron p { - font-size: 15px; -} - -#login h1 { - font-size: 25px; - color: #00008b; -} - -#loginPanel { - padding: 0 60px; - background: #ffffff; - margin-top: 40px; - background: #F7C931; - color: #ffffff; -} - -#loginPanel h1 { - color: #00008b; -} - diff --git a/wise-webapp/src/main/webapp/css/toolbar.less b/wise-webapp/src/main/webapp/css/toolbar.less index 88abc787..5d156716 100644 --- a/wise-webapp/src/main/webapp/css/toolbar.less +++ b/wise-webapp/src/main/webapp/css/toolbar.less @@ -2,13 +2,6 @@ div#toolbar { width: 100%; height: @header-toolbar-height; background-color: rgb(229, 227, 209); - background-image: linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%); - background-image: -o-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%); - background-image: -moz-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%); - background-image: -webkit-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%); - background-image: -ms-linear-gradient(bottom, rgb(229, 227, 209) 47%, rgb(252, 250, 237) 87%); - - background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.47, rgb(229, 227, 209)), color-stop(0.87, rgb(252, 250, 237))); border-bottom: 3px double rgb(190, 190, 190); border-top: 1px solid rgb(190, 190, 190); padding: 0px 15px; diff --git a/wise-webapp/src/main/webapp/css/widget/colorPalette.css b/wise-webapp/src/main/webapp/css/widget/colorPalette.css deleted file mode 100644 index 0a3d2919..00000000 --- a/wise-webapp/src/main/webapp/css/widget/colorPalette.css +++ /dev/null @@ -1,75 +0,0 @@ -.palette-panel { - cursor: default; - font: normal 13px "Helvetica Neue", Helvetica, Arial, sans-serif; - margin: 0; - outline: none; - padding: 4px 0; - z-index: 20000; - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - -.palette { - cursor: default; - outline: none; -} - -.palette-table { - border: 1px solid #666; - border-collapse: collapse; - margin: 5px; -} - -tbody { - display: table-row-group; - vertical-align: middle; - border-color: inherit; -} - -.palette-table { - border-collapse: collapse; -} - -tr { - display: table-row; - vertical-align: inherit; - border-color: inherit; -} - -.palette-cell { - border: 0; - border-right: 1px solid #666; - cursor: pointer; - height: 18px; - margin: 0; - text-align: center; - vertical-align: middle; - width: 18px; -} - -.palette-cell .palette-colorswatch { - border: none; - font-size: x-small; - height: 18px; - position: relative; - width: 18px; -} - -.palette-cell-selected .palette-colorswatch { - background: url(../../images/editortoolbar.png) no-repeat -368px 0; - border: 1px solid #333; - color: white; - font-weight: bold; - height: 16px; - width: 16px; -} - -.palette-colorswatch:hover { - border: 1px solid white; - height: 16px; - width: 16px; -} \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/widget/colorPalette.html b/wise-webapp/src/main/webapp/css/widget/colorPalette.html deleted file mode 100644 index 76939590..00000000 --- a/wise-webapp/src/main/webapp/css/widget/colorPalette.html +++ /dev/null @@ -1,450 +0,0 @@ - diff --git a/wise-webapp/src/main/webapp/css/widget/skin2.less b/wise-webapp/src/main/webapp/css/widget/skin2.less deleted file mode 100644 index 57e8771a..00000000 --- a/wise-webapp/src/main/webapp/css/widget/skin2.less +++ /dev/null @@ -1,3 +0,0 @@ -@header-height : 75px; -@header-toolbar-height : 35px; -@header-info-height : @header-height - @header-toolbar-height; \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/images/help-icon.svg b/wise-webapp/src/main/webapp/images/help-icon.svg new file mode 100644 index 00000000..17f3f529 --- /dev/null +++ b/wise-webapp/src/main/webapp/images/help-icon.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index 0890fa79..2fefb1f6 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -44,11 +44,11 @@ , ${principal.firstname} | | - | | "> + <%-- This is the try page toolbar --%> | |