From f6e41d4b45b58f69df6441a6dae4c0b99f6da7b6 Mon Sep 17 00:00:00 2001 From: billchurch Date: Fri, 9 Feb 2018 09:06:56 -0500 Subject: [PATCH] updating styling --- public/client-full.htm | 25 ++-------- public/client-min.htm | 21 +------- public/webssh2.bundle.js | 86 +++++++++++--------------------- public/webssh2.css | 103 ++++++--------------------------------- src/client-full.htm | 25 ++-------- src/client-min.htm | 21 +------- src/css/style.css | 103 ++++++--------------------------------- src/js/index.js | 42 ++++------------ 8 files changed, 82 insertions(+), 344 deletions(-) diff --git a/public/client-full.htm b/public/client-full.htm index 50ca2a3..f230b0b 100644 --- a/public/client-full.htm +++ b/public/client-full.htm @@ -10,34 +10,17 @@
- - diff --git a/public/client-min.htm b/public/client-min.htm index 507423b..bdc8223 100644 --- a/public/client-min.htm +++ b/public/client-min.htm @@ -12,9 +12,8 @@ @@ -22,22 +21,6 @@
- - diff --git a/public/webssh2.bundle.js b/public/webssh2.bundle.js index 9535f81..d5add14 100644 --- a/public/webssh2.bundle.js +++ b/public/webssh2.bundle.js @@ -78,24 +78,14 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__fortawesome_fontawesome__ = __webpack_require__(4); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__fortawesome_fontawesome_free_solid_faBars__ = __webpack_require__(6); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__fortawesome_fontawesome_free_solid_faBars___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4__fortawesome_fontawesome_free_solid_faBars__); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__fortawesome_fontawesome_free_solid_faQuestion__ = __webpack_require__(7); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__fortawesome_fontawesome_free_solid_faQuestion___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5__fortawesome_fontawesome_free_solid_faQuestion__); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__fortawesome_fontawesome_free_solid_faClipboard__ = __webpack_require__(8); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__fortawesome_fontawesome_free_solid_faClipboard___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_6__fortawesome_fontawesome_free_solid_faClipboard__); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__fortawesome_fontawesome_free_solid_faDownload__ = __webpack_require__(9); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__fortawesome_fontawesome_free_solid_faDownload___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7__fortawesome_fontawesome_free_solid_faDownload__); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__fortawesome_fontawesome_free_solid_faKey__ = __webpack_require__(10); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__fortawesome_fontawesome_free_solid_faKey___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_8__fortawesome_fontawesome_free_solid_faKey__); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__fortawesome_fontawesome_free_solid_faCog__ = __webpack_require__(11); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__fortawesome_fontawesome_free_solid_faCog___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_9__fortawesome_fontawesome_free_solid_faCog__); - - - - - -// import 'font-awesome/css/font-awesome.css' -// -// import '@fortawesome/fontawesome/styles.css' +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__fortawesome_fontawesome_free_solid_faClipboard__ = __webpack_require__(7); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__fortawesome_fontawesome_free_solid_faClipboard___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5__fortawesome_fontawesome_free_solid_faClipboard__); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__fortawesome_fontawesome_free_solid_faDownload__ = __webpack_require__(8); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__fortawesome_fontawesome_free_solid_faDownload___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_6__fortawesome_fontawesome_free_solid_faDownload__); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__fortawesome_fontawesome_free_solid_faKey__ = __webpack_require__(9); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__fortawesome_fontawesome_free_solid_faKey___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7__fortawesome_fontawesome_free_solid_faKey__); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__fortawesome_fontawesome_free_solid_faCog__ = __webpack_require__(10); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__fortawesome_fontawesome_free_solid_faCog___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_8__fortawesome_fontawesome_free_solid_faCog__); @@ -103,15 +93,20 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); +// import faQuestion from '@fortawesome/fontawesome-free-solid/faQuestion' -__WEBPACK_IMPORTED_MODULE_3__fortawesome_fontawesome__["a" /* default */].library.add(__WEBPACK_IMPORTED_MODULE_4__fortawesome_fontawesome_free_solid_faBars___default.a, __WEBPACK_IMPORTED_MODULE_5__fortawesome_fontawesome_free_solid_faQuestion___default.a, __WEBPACK_IMPORTED_MODULE_6__fortawesome_fontawesome_free_solid_faClipboard___default.a, __WEBPACK_IMPORTED_MODULE_7__fortawesome_fontawesome_free_solid_faDownload___default.a, __WEBPACK_IMPORTED_MODULE_8__fortawesome_fontawesome_free_solid_faKey___default.a, __WEBPACK_IMPORTED_MODULE_9__fortawesome_fontawesome_free_solid_faCog___default.a) + + + + +__WEBPACK_IMPORTED_MODULE_3__fortawesome_fontawesome__["a" /* default */].library.add(__WEBPACK_IMPORTED_MODULE_4__fortawesome_fontawesome_free_solid_faBars___default.a, __WEBPACK_IMPORTED_MODULE_5__fortawesome_fontawesome_free_solid_faClipboard___default.a, __WEBPACK_IMPORTED_MODULE_6__fortawesome_fontawesome_free_solid_faDownload___default.a, __WEBPACK_IMPORTED_MODULE_7__fortawesome_fontawesome_free_solid_faKey___default.a, __WEBPACK_IMPORTED_MODULE_8__fortawesome_fontawesome_free_solid_faCog___default.a) __WEBPACK_IMPORTED_MODULE_3__fortawesome_fontawesome__["a" /* default */].config.searchPseudoElements = true __WEBPACK_IMPORTED_MODULE_3__fortawesome_fontawesome__["a" /* default */].dom.i2svg() +__webpack_require__(11) __webpack_require__(12) -__webpack_require__(13) __WEBPACK_IMPORTED_MODULE_1__node_modules_xterm_dist_xterm__["applyAddon"](__WEBPACK_IMPORTED_MODULE_2__node_modules_xterm_dist_addons_fit_fit__) @@ -121,14 +116,13 @@ var sessionLogEnable = false var loggedData = false var sessionLog, sessionFooter, logDate, currentDate, myFile, errorExists -var downloadLogButton = document.getElementById('downloadLog') +var downloadLogBtn = document.getElementById('downloadLogBtn') var credentialsBtn = document.getElementById('credentialsBtn') -var toggleLogButton = document.getElementById('toggleLog') +var logBtn = document.getElementById('logBtn') -toggleLogButton.addEventListener('click', toggleLog) +logBtn.addEventListener('click', toggleLog) -downloadLogButton.style.color = '#666' -credentialsBtn.style.color = '#666' +logBtn.style.color = '#000' var terminalContainer = document.getElementById('terminal-container') @@ -203,24 +197,6 @@ socket.on('title', function (data) { } }) -// About Modal Stuff -var aboutModal = document.getElementById('aboutModal') -var aboutBtn = document.getElementById('aboutBtn') -var aboutClose = document.getElementsByClassName('aboutClose')[0] -aboutBtn.onclick = function () { - aboutModal.style.display = 'block' -} -aboutClose.onclick = function () { - aboutModal.style.display = 'none' - term.focus() -} -window.onclick = function (event) { - if (event.target == aboutModal) { - aboutModal.style.display = 'none' - term.focus() - } -} - // replay password to server, requires function replayCredentials () { // eslint-disable-line socket.emit('control', 'replayCredentials') @@ -235,7 +211,7 @@ function toggleLog () { // eslint-disable-line if (sessionLogEnable === true) { sessionLogEnable = false loggedData = true - toggleLogButton.innerHTML = ' Start Log' + logBtn.innerHTML = ' Start Log' console.log('stopping log, ' + sessionLogEnable) currentDate = new Date() sessionLog = sessionLog + '\r\n\r\nLog End for ' + sessionFooter + ': ' + @@ -248,9 +224,9 @@ function toggleLog () { // eslint-disable-line } else { sessionLogEnable = true loggedData = true - toggleLogButton.innerHTML = ' Stop Log' - downloadLogButton.style.color = '#000' - downloadLogButton.addEventListener('click', downloadLog) + logBtn.innerHTML = ' Stop Log' + downloadLogBtn.style.color = '#000' + downloadLogBtn.addEventListener('click', downloadLog) console.log('starting log, ' + sessionLogEnable) currentDate = new Date() sessionLog = 'Log Start for ' + sessionFooter + ': ' + @@ -8604,31 +8580,31 @@ module.exports = { prefix: 'fas', iconName: 'bars', icon: [448, 512, [], "f0c9", /* 7 */ /***/ (function(module, exports) { -module.exports = { prefix: 'fas', iconName: 'question', icon: [384, 512, [], "f128", "M202.021 0C122.202 0 70.503 32.703 29.914 91.026c-7.363 10.58-5.093 25.086 5.178 32.874l43.138 32.709c10.373 7.865 25.132 6.026 33.253-4.148 25.049-31.381 43.63-49.449 82.757-49.449 30.764 0 68.816 19.799 68.816 49.631 0 22.552-18.617 34.134-48.993 51.164-35.423 19.86-82.299 44.576-82.299 106.405V320c0 13.255 10.745 24 24 24h72.471c13.255 0 24-10.745 24-24v-5.773c0-42.86 125.268-44.645 125.268-160.627C377.504 66.256 286.902 0 202.021 0zM192 373.459c-38.196 0-69.271 31.075-69.271 69.271 0 38.195 31.075 69.27 69.271 69.27s69.271-31.075 69.271-69.271-31.075-69.27-69.271-69.27z"] }; +module.exports = { prefix: 'fas', iconName: 'clipboard', icon: [384, 512, [], "f328", "M384 112v352c0 26.51-21.49 48-48 48H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h80c0-35.29 28.71-64 64-64s64 28.71 64 64h80c26.51 0 48 21.49 48 48zM192 40c-13.255 0-24 10.745-24 24s10.745 24 24 24 24-10.745 24-24-10.745-24-24-24m96 114v-20a6 6 0 0 0-6-6H102a6 6 0 0 0-6 6v20a6 6 0 0 0 6 6h180a6 6 0 0 0 6-6z"] }; /***/ }), /* 8 */ /***/ (function(module, exports) { -module.exports = { prefix: 'fas', iconName: 'clipboard', icon: [384, 512, [], "f328", "M384 112v352c0 26.51-21.49 48-48 48H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h80c0-35.29 28.71-64 64-64s64 28.71 64 64h80c26.51 0 48 21.49 48 48zM192 40c-13.255 0-24 10.745-24 24s10.745 24 24 24 24-10.745 24-24-10.745-24-24-24m96 114v-20a6 6 0 0 0-6-6H102a6 6 0 0 0-6 6v20a6 6 0 0 0 6 6h180a6 6 0 0 0 6-6z"] }; +module.exports = { prefix: 'fas', iconName: 'download', icon: [512, 512, [], "f019", "M216 0h80c13.3 0 24 10.7 24 24v168h87.7c17.8 0 26.7 21.5 14.1 34.1L269.7 378.3c-7.5 7.5-19.8 7.5-27.3 0L90.1 226.1c-12.6-12.6-3.7-34.1 14.1-34.1H192V24c0-13.3 10.7-24 24-24zm296 376v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h146.7l49 49c20.1 20.1 52.5 20.1 72.6 0l49-49H488c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z"] }; /***/ }), /* 9 */ /***/ (function(module, exports) { -module.exports = { prefix: 'fas', iconName: 'download', icon: [512, 512, [], "f019", "M216 0h80c13.3 0 24 10.7 24 24v168h87.7c17.8 0 26.7 21.5 14.1 34.1L269.7 378.3c-7.5 7.5-19.8 7.5-27.3 0L90.1 226.1c-12.6-12.6-3.7-34.1 14.1-34.1H192V24c0-13.3 10.7-24 24-24zm296 376v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h146.7l49 49c20.1 20.1 52.5 20.1 72.6 0l49-49H488c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z"] }; +module.exports = { prefix: 'fas', iconName: 'key', icon: [512, 512, [], "f084", "M512 176.001C512 273.203 433.202 352 336 352c-11.22 0-22.19-1.062-32.827-3.069l-24.012 27.014A23.999 23.999 0 0 1 261.223 384H224v40c0 13.255-10.745 24-24 24h-40v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24v-78.059c0-6.365 2.529-12.47 7.029-16.971l161.802-161.802C163.108 213.814 160 195.271 160 176 160 78.798 238.797.001 335.999 0 433.488-.001 512 78.511 512 176.001zM336 128c0 26.51 21.49 48 48 48s48-21.49 48-48-21.49-48-48-48-48 21.49-48 48z"] }; /***/ }), /* 10 */ /***/ (function(module, exports) { -module.exports = { prefix: 'fas', iconName: 'key', icon: [512, 512, [], "f084", "M512 176.001C512 273.203 433.202 352 336 352c-11.22 0-22.19-1.062-32.827-3.069l-24.012 27.014A23.999 23.999 0 0 1 261.223 384H224v40c0 13.255-10.745 24-24 24h-40v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24v-78.059c0-6.365 2.529-12.47 7.029-16.971l161.802-161.802C163.108 213.814 160 195.271 160 176 160 78.798 238.797.001 335.999 0 433.488-.001 512 78.511 512 176.001zM336 128c0 26.51 21.49 48 48 48s48-21.49 48-48-21.49-48-48-48-48 21.49-48 48z"] }; +module.exports = { prefix: 'fas', iconName: 'cog', icon: [512, 512, [], "f013", "M444.788 291.1l42.616 24.599c4.867 2.809 7.126 8.618 5.459 13.985-11.07 35.642-29.97 67.842-54.689 94.586a12.016 12.016 0 0 1-14.832 2.254l-42.584-24.595a191.577 191.577 0 0 1-60.759 35.13v49.182a12.01 12.01 0 0 1-9.377 11.718c-34.956 7.85-72.499 8.256-109.219.007-5.49-1.233-9.403-6.096-9.403-11.723v-49.184a191.555 191.555 0 0 1-60.759-35.13l-42.584 24.595a12.016 12.016 0 0 1-14.832-2.254c-24.718-26.744-43.619-58.944-54.689-94.586-1.667-5.366.592-11.175 5.459-13.985L67.212 291.1a193.48 193.48 0 0 1 0-70.199l-42.616-24.599c-4.867-2.809-7.126-8.618-5.459-13.985 11.07-35.642 29.97-67.842 54.689-94.586a12.016 12.016 0 0 1 14.832-2.254l42.584 24.595a191.577 191.577 0 0 1 60.759-35.13V25.759a12.01 12.01 0 0 1 9.377-11.718c34.956-7.85 72.499-8.256 109.219-.007 5.49 1.233 9.403 6.096 9.403 11.723v49.184a191.555 191.555 0 0 1 60.759 35.13l42.584-24.595a12.016 12.016 0 0 1 14.832 2.254c24.718 26.744 43.619 58.944 54.689 94.586 1.667 5.366-.592 11.175-5.459 13.985L444.788 220.9a193.485 193.485 0 0 1 0 70.2zM336 256c0-44.112-35.888-80-80-80s-80 35.888-80 80 35.888 80 80 80 80-35.888 80-80z"] }; /***/ }), /* 11 */ /***/ (function(module, exports) { -module.exports = { prefix: 'fas', iconName: 'cog', icon: [512, 512, [], "f013", "M444.788 291.1l42.616 24.599c4.867 2.809 7.126 8.618 5.459 13.985-11.07 35.642-29.97 67.842-54.689 94.586a12.016 12.016 0 0 1-14.832 2.254l-42.584-24.595a191.577 191.577 0 0 1-60.759 35.13v49.182a12.01 12.01 0 0 1-9.377 11.718c-34.956 7.85-72.499 8.256-109.219.007-5.49-1.233-9.403-6.096-9.403-11.723v-49.184a191.555 191.555 0 0 1-60.759-35.13l-42.584 24.595a12.016 12.016 0 0 1-14.832-2.254c-24.718-26.744-43.619-58.944-54.689-94.586-1.667-5.366.592-11.175 5.459-13.985L67.212 291.1a193.48 193.48 0 0 1 0-70.199l-42.616-24.599c-4.867-2.809-7.126-8.618-5.459-13.985 11.07-35.642 29.97-67.842 54.689-94.586a12.016 12.016 0 0 1 14.832-2.254l42.584 24.595a191.577 191.577 0 0 1 60.759-35.13V25.759a12.01 12.01 0 0 1 9.377-11.718c34.956-7.85 72.499-8.256 109.219-.007 5.49 1.233 9.403 6.096 9.403 11.723v49.184a191.555 191.555 0 0 1 60.759 35.13l42.584-24.595a12.016 12.016 0 0 1 14.832 2.254c24.718 26.744 43.619 58.944 54.689 94.586 1.667 5.366-.592 11.175-5.459 13.985L444.788 220.9a193.485 193.485 0 0 1 0 70.2zM336 256c0-44.112-35.888-80-80-80s-80 35.888-80 80 35.888 80 80 80 80-35.888 80-80z"] }; +// removed by extract-text-webpack-plugin /***/ }), /* 12 */ @@ -8636,11 +8612,5 @@ module.exports = { prefix: 'fas', iconName: 'cog', icon: [512, 512, [], "f013", // removed by extract-text-webpack-plugin -/***/ }), -/* 13 */ -/***/ (function(module, exports) { - -// removed by extract-text-webpack-plugin - /***/ }) /******/ ]); \ No newline at end of file diff --git a/public/webssh2.css b/public/webssh2.css index 1d0cdae..6702550 100644 --- a/public/webssh2.css +++ b/public/webssh2.css @@ -177,18 +177,6 @@ body { flex: 0 1 30px; } -#menu { - display: inline-block; - font-size:16px; - color: rgb(255, 255, 255); - padding-left: 10px; - z-index: 100; -} - -#menu:hover .dropup-content { - display: block; -} - #footer { display: inline-block; color: rgb(240, 240, 240); @@ -214,6 +202,18 @@ body { z-index: 100; } +#menu { + display: inline-block; + font-size:16px; + color: rgb(255, 255, 255); + padding-left: 10px; + z-index: 100; +} + +#menu:hover .dropup-content { + display: block; +} + .dropup { position: relative; display: inline-block; @@ -223,13 +223,14 @@ body { display: none; position: absolute; background-color: #f1f1f1; + font-size:16px; min-width: 160px; - bottom:16px; - z-index: 1; + bottom:18px; + z-index: 101; } .dropup-content a { - color: black; + color: #777; padding: 12px 16px; text-decoration: none; display: block; @@ -248,75 +249,3 @@ body { .dropup:hover .dropbtn { background-color: #3e8e41; } - -/* The Modal (background) */ -.modal { - display: none; /* Hidden by default */ - position: fixed; /* Stay in place */ - z-index: 100; /* Sit on top */ - padding-top: 100px; /* Location of the box */ - left: 0; - top: 0; - width: 100%; /* Full width */ - height: 100%; /* Full height */ - overflow: auto; /* Enable scroll if needed */ - background-color: rgb(128,128,128); /* Fallback color */ - background-color: rgba(128,128,128,0.4); /* Black w/ opacity */ -} - -/* Modal Content */ -.modal-content { - position: relative; - background-color: #fefefe; - color: #000; - margin: auto; - padding: 0; - border: 1px solid #888; - width: 80%; - box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19); - -webkit-animation-name: animatetop; - -webkit-animation-duration: 0.4s; - animation-name: animatetop; - animation-duration: 0.4s -} - -/* Add Animation */ -@-webkit-keyframes animatetop { - from {top:-300px; opacity:0} - to {top:0; opacity:1} -} - -@keyframes animatetop { - from {top:-300px; opacity:0} - to {top:0; opacity:1} -} - -/* The Close Button */ -.aboutClose { - color: white; - float: right; - font-size: 28px; - font-weight: bold; -} - -.aboutClose:hover, -.aboutClose:focus { - color: #000; - text-decoration: none; - cursor: pointer; -} - -.modal-header { - padding: 2px 16px; - background-color: #5cb85c; - color: white; -} - -.modal-body {padding: 2px 16px;} - -.modal-footer { - padding: 2px 16px; - background-color: #5cb85c; - color: white; - font-style: italic; -} diff --git a/src/client-full.htm b/src/client-full.htm index 50ca2a3..f230b0b 100644 --- a/src/client-full.htm +++ b/src/client-full.htm @@ -10,34 +10,17 @@
- - diff --git a/src/client-min.htm b/src/client-min.htm index 507423b..bdc8223 100644 --- a/src/client-min.htm +++ b/src/client-min.htm @@ -12,9 +12,8 @@ @@ -22,22 +21,6 @@
- - diff --git a/src/css/style.css b/src/css/style.css index c5d4bb9..c7513ea 100644 --- a/src/css/style.css +++ b/src/css/style.css @@ -53,18 +53,6 @@ body { flex: 0 1 30px; } -#menu { - display: inline-block; - font-size:16px; - color: rgb(255, 255, 255); - padding-left: 10px; - z-index: 100; -} - -#menu:hover .dropup-content { - display: block; -} - #footer { display: inline-block; color: rgb(240, 240, 240); @@ -90,6 +78,18 @@ body { z-index: 100; } +#menu { + display: inline-block; + font-size:16px; + color: rgb(255, 255, 255); + padding-left: 10px; + z-index: 100; +} + +#menu:hover .dropup-content { + display: block; +} + .dropup { position: relative; display: inline-block; @@ -99,13 +99,14 @@ body { display: none; position: absolute; background-color: #f1f1f1; + font-size:16px; min-width: 160px; - bottom:16px; - z-index: 1; + bottom:18px; + z-index: 101; } .dropup-content a { - color: black; + color: #777; padding: 12px 16px; text-decoration: none; display: block; @@ -124,75 +125,3 @@ body { .dropup:hover .dropbtn { background-color: #3e8e41; } - -/* The Modal (background) */ -.modal { - display: none; /* Hidden by default */ - position: fixed; /* Stay in place */ - z-index: 100; /* Sit on top */ - padding-top: 100px; /* Location of the box */ - left: 0; - top: 0; - width: 100%; /* Full width */ - height: 100%; /* Full height */ - overflow: auto; /* Enable scroll if needed */ - background-color: rgb(128,128,128); /* Fallback color */ - background-color: rgba(128,128,128,0.4); /* Black w/ opacity */ -} - -/* Modal Content */ -.modal-content { - position: relative; - background-color: #fefefe; - color: #000; - margin: auto; - padding: 0; - border: 1px solid #888; - width: 80%; - box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19); - -webkit-animation-name: animatetop; - -webkit-animation-duration: 0.4s; - animation-name: animatetop; - animation-duration: 0.4s -} - -/* Add Animation */ -@-webkit-keyframes animatetop { - from {top:-300px; opacity:0} - to {top:0; opacity:1} -} - -@keyframes animatetop { - from {top:-300px; opacity:0} - to {top:0; opacity:1} -} - -/* The Close Button */ -.aboutClose { - color: white; - float: right; - font-size: 28px; - font-weight: bold; -} - -.aboutClose:hover, -.aboutClose:focus { - color: #000; - text-decoration: none; - cursor: pointer; -} - -.modal-header { - padding: 2px 16px; - background-color: #5cb85c; - color: white; -} - -.modal-body {padding: 2px 16px;} - -.modal-footer { - padding: 2px 16px; - background-color: #5cb85c; - color: white; - font-style: italic; -} diff --git a/src/js/index.js b/src/js/index.js index 05ed363..883edda 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -3,18 +3,15 @@ import * as io from '../../node_modules/socket.io-client/dist/socket.io.js' import * as Terminal from '../../node_modules/xterm/dist/xterm' import * as fit from '../../node_modules/xterm/dist/addons/fit/fit' -// import 'font-awesome/css/font-awesome.css' -// -// import '@fortawesome/fontawesome/styles.css' import fontawesome from '@fortawesome/fontawesome' import faBars from '@fortawesome/fontawesome-free-solid/faBars' -import faQuestion from '@fortawesome/fontawesome-free-solid/faQuestion' +// import faQuestion from '@fortawesome/fontawesome-free-solid/faQuestion' import faClipboard from '@fortawesome/fontawesome-free-solid/faClipboard' import faDownload from '@fortawesome/fontawesome-free-solid/faDownload' import faKey from '@fortawesome/fontawesome-free-solid/faKey' import faCog from '@fortawesome/fontawesome-free-solid/faCog' -fontawesome.library.add(faBars, faQuestion, faClipboard, faDownload, faKey, faCog) +fontawesome.library.add(faBars, faClipboard, faDownload, faKey, faCog) fontawesome.config.searchPseudoElements = true @@ -31,14 +28,13 @@ var sessionLogEnable = false var loggedData = false var sessionLog, sessionFooter, logDate, currentDate, myFile, errorExists -var downloadLogButton = document.getElementById('downloadLog') +var downloadLogBtn = document.getElementById('downloadLogBtn') var credentialsBtn = document.getElementById('credentialsBtn') -var toggleLogButton = document.getElementById('toggleLog') +var logBtn = document.getElementById('logBtn') -toggleLogButton.addEventListener('click', toggleLog) +logBtn.addEventListener('click', toggleLog) -downloadLogButton.style.color = '#666' -credentialsBtn.style.color = '#666' +logBtn.style.color = '#000' var terminalContainer = document.getElementById('terminal-container') @@ -113,24 +109,6 @@ socket.on('title', function (data) { } }) -// About Modal Stuff -var aboutModal = document.getElementById('aboutModal') -var aboutBtn = document.getElementById('aboutBtn') -var aboutClose = document.getElementsByClassName('aboutClose')[0] -aboutBtn.onclick = function () { - aboutModal.style.display = 'block' -} -aboutClose.onclick = function () { - aboutModal.style.display = 'none' - term.focus() -} -window.onclick = function (event) { - if (event.target == aboutModal) { - aboutModal.style.display = 'none' - term.focus() - } -} - // replay password to server, requires function replayCredentials () { // eslint-disable-line socket.emit('control', 'replayCredentials') @@ -145,7 +123,7 @@ function toggleLog () { // eslint-disable-line if (sessionLogEnable === true) { sessionLogEnable = false loggedData = true - toggleLogButton.innerHTML = ' Start Log' + logBtn.innerHTML = ' Start Log' console.log('stopping log, ' + sessionLogEnable) currentDate = new Date() sessionLog = sessionLog + '\r\n\r\nLog End for ' + sessionFooter + ': ' + @@ -158,9 +136,9 @@ function toggleLog () { // eslint-disable-line } else { sessionLogEnable = true loggedData = true - toggleLogButton.innerHTML = ' Stop Log' - downloadLogButton.style.color = '#000' - downloadLogButton.addEventListener('click', downloadLog) + logBtn.innerHTML = ' Stop Log' + downloadLogBtn.style.color = '#000' + downloadLogBtn.addEventListener('click', downloadLog) console.log('starting log, ' + sessionLogEnable) currentDate = new Date() sessionLog = 'Log Start for ' + sessionFooter + ': ' +