From 5b96679109f0cbcef2b002003388c3ec9cb7469d Mon Sep 17 00:00:00 2001 From: sD Date: Thu, 26 Dec 2019 21:21:41 +0100 Subject: change button css to look like a button --- webAO/client.css | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/webAO/client.css b/webAO/client.css index 8b19f1b..84af5d5 100644 --- a/webAO/client.css +++ b/webAO/client.css @@ -445,8 +445,18 @@ img { } .client_button { - padding: 1px; + margin: 1px; + padding: 2px 15px; cursor: pointer; + text-align: center; + font-weight: bold; + color: white; + background-color: #7b2900; + border-radius: 3px; + border-style: solid; + border-width: 1px; + border-color: #fffbf1; + box-shadow: 1px inset; } .client_button.hover_button.inactive { @@ -454,18 +464,6 @@ img { } .client_button.hover_button:hover { - margin: -2px; - border-radius: 5px; - border-style: dashed; - border-width: 2px; - border-color: #FFD081; -} - -.client_button.hover_button:hover { - margin: -2px; - border-radius: 5px; - border-style: dashed; - border-width: 2px; border-color: #FFD081; } -- cgit From d00ad88daca6628d4685ccd594f5736e99cd5ab0 Mon Sep 17 00:00:00 2001 From: sD Date: Thu, 26 Dec 2019 22:03:43 +0100 Subject: add a trapzoid-y looking button --- webAO/client.css | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/webAO/client.css b/webAO/client.css index 84af5d5..fdf9ceb 100644 --- a/webAO/client.css +++ b/webAO/client.css @@ -459,6 +459,29 @@ img { box-shadow: 1px inset; } +.trapezoid_button { + color: white; + text-align: center; + background: #7b2900; + display: inline-block; + height: 30px; + margin-left: 20px; + margin-top: 55px; + position: relative; + width: 100px; + } + .trapezoid_button:before { + border-bottom: 15px solid #7b2900; + border-left: 50px solid transparent; + border-right: 50px solid transparent; + content: ""; + height: 0; + left: 0; + position: absolute; + top: -15px; + width: 0; + } + .client_button.hover_button.inactive { display: none; } -- cgit From 456b68ad07fd780e677c62c98402affa05eec83b Mon Sep 17 00:00:00 2001 From: sD Date: Thu, 26 Dec 2019 22:03:53 +0100 Subject: replace images with buttons --- webAO/client.html | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/webAO/client.html b/webAO/client.html index 64078e6..c7195f2 100644 --- a/webAO/client.html +++ b/webAO/client.html @@ -54,9 +54,9 @@
- Hold it! - OBJECTION! - Take That! + + +

@@ -71,9 +71,9 @@

- Flip - Flash - Shake + + +
Actions @@ -177,8 +177,8 @@

- Change +
@@ -205,21 +205,21 @@ placeholder="Evidence description">
- Add Evidence - Edit Evidence - Cancel Evidence - Remove Evidence + + + +


- Present + @@ -261,10 +261,10 @@ onchange="changeBlipVolume()">
- Change - Random + +

Only touch these settings if you know what you are doing. -- cgit From d8624ea73b6ade0e710818faacd0182a4aeb7c9e Mon Sep 17 00:00:00 2001 From: sD Date: Thu, 26 Dec 2019 22:05:39 +0100 Subject: decrease margin --- webAO/client.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/webAO/client.css b/webAO/client.css index fdf9ceb..a4a4f09 100644 --- a/webAO/client.css +++ b/webAO/client.css @@ -465,8 +465,7 @@ img { background: #7b2900; display: inline-block; height: 30px; - margin-left: 20px; - margin-top: 55px; + margin: 10px 5px; position: relative; width: 100px; } -- cgit From 79943eb4eb3e9534f833b99cfcdf40acf6749c6f Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 17:23:37 +0100 Subject: trapezoidbuttons looked like ass --- webAO/client.css | 22 ---------------------- webAO/client.html | 14 +++++++------- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/webAO/client.css b/webAO/client.css index a4a4f09..84af5d5 100644 --- a/webAO/client.css +++ b/webAO/client.css @@ -459,28 +459,6 @@ img { box-shadow: 1px inset; } -.trapezoid_button { - color: white; - text-align: center; - background: #7b2900; - display: inline-block; - height: 30px; - margin: 10px 5px; - position: relative; - width: 100px; - } - .trapezoid_button:before { - border-bottom: 15px solid #7b2900; - border-left: 50px solid transparent; - border-right: 50px solid transparent; - content: ""; - height: 0; - left: 0; - position: absolute; - top: -15px; - width: 0; - } - .client_button.hover_button.inactive { display: none; } diff --git a/webAO/client.html b/webAO/client.html index c7195f2..57e7827 100644 --- a/webAO/client.html +++ b/webAO/client.html @@ -54,9 +54,9 @@
- - - + + +

@@ -71,9 +71,9 @@

- - - + + +
Actions @@ -218,7 +218,7 @@

- -- cgit From af776480621572cf47aebc15de9dac4e37e5a77a Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 18:11:49 +0100 Subject: rename master.css --- webAO/client.css | 2 +- webAO/index.html | 2 +- webAO/master.css | 386 +++++++++++++++++++++++++++++++++++++++++++++++++++ webAO/stylesheet.css | 382 -------------------------------------------------- 4 files changed, 388 insertions(+), 384 deletions(-) create mode 100644 webAO/master.css delete mode 100644 webAO/stylesheet.css diff --git a/webAO/client.css b/webAO/client.css index 84af5d5..a5db488 100644 --- a/webAO/client.css +++ b/webAO/client.css @@ -368,7 +368,7 @@ img { } #evi_icon { - background-image: url('misc/empty.png'); + background-image: url("/misc/empty.png"); background-repeat: no-repeat; background-size: contain; } diff --git a/webAO/index.html b/webAO/index.html index 28fe555..7b19fd8 100644 --- a/webAO/index.html +++ b/webAO/index.html @@ -9,7 +9,7 @@ - + diff --git a/webAO/master.css b/webAO/master.css new file mode 100644 index 0000000..f808063 --- /dev/null +++ b/webAO/master.css @@ -0,0 +1,386 @@ +#serverinfo { + margin-top: 75px; + margin-bottom: 0px; + float: left; + font-size:0.6em; +} + +#clientinfo { + margin: 0px; + display: block; + float: left; + clear: both; + font-size:0.6em; +} + +.buttonbg { + background: repeating-linear-gradient(to bottom #792c01, #792c01 3px, #9a491c 1px) repeat; +} + +.button { + padding: 5px; + vertical-align: middle; + text-decoration: none; + cursor: pointer; + background: repeating-linear-gradient(#792c01, #792c01 3px, #9a491c 3px, #9a491c 4px); + border: 1px solid #553e30; + border-radius: 5px; + box-shadow: 0 0 0 1px #FFFFFF; + color: white; + text-align: center; + text-shadow: + 0px -1px 0 #612000, + 1px 0px 0 #612000, + -1px 0px 0 #612000, + 0px 1px 0 #612000; + padding: 11px; + font-family: Times New Roman, sans; + font-weight: normal; +} + +.button:hover { + background-image: url("/images/buttonH.png"); + border: 1px solid #bdb521; +} + +#menu .chosen:before { + height: 200px; + width: 200px; + border-image: url("/images/sel.png") 11 stretch !important; + border-width:11px; + padding: 1px; +} + +#serverdescription_box { + display: inline-block; + position: fixed; + width: 185px; + height: 276px; + top: 35%; + right: 0px; + padding: 0px; + background: url("/images/desc.png") no-repeat; + border: 2px solid #888; + border-radius: 5px; +} + +#serverdescription_content { + width: 180px; + height: 270px; + position: relative; + color: white; + white-space: pre-line; + word-wrap: break-word; + text-align: center; + margin: 2px; + overflow-x: visible; + overflow-y: auto; +} + + +.serverlist { + display: block; + margin: auto; + width: 500px; +} + +.serverlist li { + position: relative; + left: -55px; + background-color: #FFF; + border: 2px solid #BBB; + border-radius: 5px; + padding: 0px; + padding-left: 10px; + display: block; + width: 500px; + height: 50px; + margin: 10px; + margin-left: auto; + margin-right: auto; + float: left; + text-align: center; + cursor: default; +} +.serverlist li:hover { + background-color: #FFFF6B; + border-color: #EFAD21; +} + +.serverlist li p { + display: inline-block !important; +} + +.serverlist li a { + float: right; +} + +.serverlist .button { + position: relative; + top: 0px; + right: -2px; + height: 38px; + padding: 0px; + padding-top: 10px; + border-radius: 0px 5px 5px 0px; + width: 50px; + box-shadow: 0 0 0 2px #BBB; +} + +.serverlist .available { + background-color: #6BFF6B; + border-color: #21AD21; +} + +.serverlist .unavailable { + background-color: #ff6b6B; + border-color: #ad2121; + display: none; +} + +.serverlist .button:hover { + box-shadow: 0 0 0 1px #EFAD21; +} + +#content h2 { + vertical-align: top; + display: inline-block; + margin-top: 0px; + margin-left: auto; + margin-right: auto; +} +#content p { + vertical-align: top; + display: inline-block; +} + +#content > p { + margin-right: 50px; +} + +ul.navbar-nav.ml-auto { + display: inline-flex; + list-style-type: none; +} + +nav.navbar.fixed-top.navbar-expand-lg.navbar-dark.bg-dark.fixed-top{ + background: black; +} + +body{ + margin: 0px; +} + +/*! + * Start Bootstrap - Modern Business (https://startbootstrap.com/template-overviews/modern-business) + * Copyright 2013-2017 Start Bootstrap + * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-logomodern-business-nav/blob/master/LICENSE) + */ + +.carousel-item { + height: 65vh; + min-height: 300px; + background: no-repeat center center scroll; + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + background-size: cover; +} + +.portfolio-item { + margin-bottom: 30px; +} + +.navbar { + font-family: 'Poiret One', cursive; + text-transform: uppercase; + font-size:22px; +} + +.navbar-dark .navbar-nav .nav-link { + margin-right: 25px; + color: white !important; +} + +.navbar-dark .navbar-nav .nav-link:focus, .navbar-dark .navbar-nav .nav-link:hover { + color: rgba(255, 229, 145, .75)!important; + opacity: 100 !important; +} + +body { + background: #2c3d51; + color: white; + font-family: 'Roboto Condensed', sans-serif; +} + +.page-heading{ + font-family: 'Oswald', sans-serif; + text-transform: uppercase; + margin-top: 5px; + text-align: center; +} + +hr.gold { +border-top: 10px solid #f3b137; +width: 250px; +} + +.about { + text-align: center; +} + +.card-body { +background-color: #473322; +font-family: 'Roboto Condensed', sans-serif; +} + +.card-header { +background-color: #2f2216; +border-bottom: 1px solid #ffe591; +font-family: 'Roboto Condensed', sans-serif; +border-radius: 0px !important; +} + +.card-header a { + color: #ffe591 !important; +} + +.card { + border: 1px solid #ffe591; + border-radius: 0px !important; +} + +@media (max-width:411px) { + .top-bois { + display: none !important; + } +} + +.top-bois { + display: inline-table; + width: 100%; +} + +.carousel-item { + height: 90vh; + background-size: contain; +} + +.carousel-inner { + background-color: #2c3d51; +} + +@media (max-width:980px){ + .carousel-item { + background-size: cover; +} +} + +h1 { + font-family: 'Poiret One', cursive; + text-transform: uppercase; +} + +a { + color: #ffe591!important; +} + +@media (max-width:576px){ +.borderbox{ + padding: 0px 20px 0px 20px; +} +} + +.inside-carousel { + position:relative; +} + +.button-carousel, .tagline-carousel { + right: 0; + bottom: 0; + left: 0; + position: absolute; + margin: auto; + text-align: center; +} + +.button-carousel { + background-color: #2f2216; + max-width: 200px; + padding: 30px; + border: 2px solid #ffe591; + color: white !important; + border-radius: 15px; +} + +.button-carousel p{ + margin-top: -17px; + font-family: 'Poiret One', cursive; + text-transform: uppercase; + font-size: 24px; +} + +.download-button h4 { + font-family: 'Poiret One', cursive; + text-transform: uppercase; + margin-bottom:0px; +} + +.button-carousel a, .download-button a { + color: white !important; +} + +.download-button{ + background-color: #2f2216; + max-width: 400px; + padding: 10px; + text-align: center; + border: 2px solid #ffe591; + color: white !important; + border-radius: 15px; + margin: 0 auto; +} + +.card { + background-color: #2c3d51;; +} + +.download-box strong { + color:#ffe591; +} +.download-box a, .download-button a, .links a, .card a { + text-decoration: underline; +} + +.acc { + text-decoration: none !important; +} + +a:hover{ + opacity: 0.8; +} + +.navbar .container { + text-align: center; +} + +a.nav-link { + text-decoration: none !important; +} + +ul.serverlist p { + color: black; +} + +a.nav-link { + padding: 8px; +} + +ul.navbar-nav.ml-auto{ + margin-top: 19px; + padding: 0; +} + +nav.navbar.fixed-top.navbar-expand-lg.navbar-dark.bg-dark.fixed-top{ + height: 65px; +} diff --git a/webAO/stylesheet.css b/webAO/stylesheet.css deleted file mode 100644 index 209a7c0..0000000 --- a/webAO/stylesheet.css +++ /dev/null @@ -1,382 +0,0 @@ -#serverinfo { - margin-top: 75px; - margin-bottom: 0px; - float: left; - font-size:0.6em; -} - -#clientinfo { - margin: 0px; - display: block; - float: left; - clear: both; - font-size:0.6em; -} - -.button { - padding: 5px; - vertical-align: middle; - text-decoration: none; - cursor: pointer; - background-image: url(images/button.png); - border: 1px solid #553e30; - border-radius: 5px; - box-shadow: 0 0 0 1px #FFFFFF; - color: white; - text-align: center; - text-shadow: - 0px -1px 0 #612000, - 1px 0px 0 #612000, - -1px 0px 0 #612000, - 0px 1px 0 #612000; - padding: 11px; - font-family: Times New Roman, sans; - font-weight: normal; -} - -.button:hover { - background-image: url(images/buttonH.png); - border: 1px solid #bdb521; -} - -#menu .chosen:before { - height: 200px; - width: 200px; - border-image: url(images/sel.png) 11 stretch !important; - border-width:11px; - padding: 1px; -} - -#serverdescription_box { - display: inline-block; - position: fixed; - width: 185px; - height: 276px; - top: 35%; - right: 0px; - padding: 0px; - background: url('images/desc.png') no-repeat; - border: 2px solid #888; - border-radius: 5px; -} - -#serverdescription_content { - width: 180px; - height: 270px; - position: relative; - color: white; - white-space: pre-line; - word-wrap: break-word; - text-align: center; - margin: 2px; - overflow-x: visible; - overflow-y: auto; -} - - -.serverlist { - display: block; - margin: auto; - width: 500px; -} - -.serverlist li { - position: relative; - left: -55px; - background-color: #FFF; - border: 2px solid #BBB; - border-radius: 5px; - padding: 0px; - padding-left: 10px; - display: block; - width: 500px; - height: 50px; - margin: 10px; - margin-left: auto; - margin-right: auto; - float: left; - text-align: center; - cursor: default; -} -.serverlist li:hover { - background-color: #FFFF6B; - border-color: #EFAD21; -} - -.serverlist li p { - display: inline-block !important; -} - -.serverlist li a { - float: right; -} - -.serverlist .button { - position: relative; - top: 0px; - right: -2px; - height: 38px; - padding: 0px; - padding-top: 10px; - border-radius: 0px 5px 5px 0px; - width: 50px; - box-shadow: 0 0 0 2px #BBB; -} - -.serverlist .available { - background-color: #6BFF6B; - border-color: #21AD21; -} - -.serverlist .unavailable { - background-color: #ff6b6B; - border-color: #ad2121; - display: none; -} - -.serverlist .button:hover { - box-shadow: 0 0 0 1px #EFAD21; -} - -#content h2 { - vertical-align: top; - display: inline-block; - margin-top: 0px; - margin-left: auto; - margin-right: auto; -} -#content p { - vertical-align: top; - display: inline-block; -} - -#content > p { - margin-right: 50px; -} - -ul.navbar-nav.ml-auto { - display: inline-flex; - list-style-type: none; -} - -nav.navbar.fixed-top.navbar-expand-lg.navbar-dark.bg-dark.fixed-top{ - background: black; -} - -body{ - margin: 0px; -} - -/*! - * Start Bootstrap - Modern Business (https://startbootstrap.com/template-overviews/modern-business) - * Copyright 2013-2017 Start Bootstrap - * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-logomodern-business-nav/blob/master/LICENSE) - */ - -.carousel-item { - height: 65vh; - min-height: 300px; - background: no-repeat center center scroll; - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; - background-size: cover; -} - -.portfolio-item { - margin-bottom: 30px; -} - -.navbar { - font-family: 'Poiret One', cursive; - text-transform: uppercase; - font-size:22px; -} - -.navbar-dark .navbar-nav .nav-link { - margin-right: 25px; - color: white !important; -} - -.navbar-dark .navbar-nav .nav-link:focus, .navbar-dark .navbar-nav .nav-link:hover { - color: rgba(255, 229, 145, .75)!important; - opacity: 100 !important; -} - -body { - background: #2c3d51; - color: white; - font-family: 'Roboto Condensed', sans-serif; -} - -.page-heading{ - font-family: 'Oswald', sans-serif; - text-transform: uppercase; - margin-top: 5px; - text-align: center; -} - -hr.gold { -border-top: 10px solid #f3b137; -width: 250px; -} - -.about { - text-align: center; -} - -.card-body { -background-color: #473322; -font-family: 'Roboto Condensed', sans-serif; -} - -.card-header { -background-color: #2f2216; -border-bottom: 1px solid #ffe591; -font-family: 'Roboto Condensed', sans-serif; -border-radius: 0px !important; -} - -.card-header a { - color: #ffe591 !important; -} - -.card { - border: 1px solid #ffe591; - border-radius: 0px !important; -} - -@media (max-width:411px) { - .top-bois { - display: none !important; - } -} - -.top-bois { - display: inline-table; - width: 100%; -} - -.carousel-item { - height: 90vh; - background-size: contain; -} - -.carousel-inner { - background-color: #2c3d51; -} - -@media (max-width:980px){ - .carousel-item { - background-size: cover; -} -} - -h1 { - font-family: 'Poiret One', cursive; - text-transform: uppercase; -} - -a { - color: #ffe591!important; -} - -@media (max-width:576px){ -.borderbox{ - padding: 0px 20px 0px 20px; -} -} - -.inside-carousel { - position:relative; -} - -.button-carousel, .tagline-carousel { - right: 0; - bottom: 0; - left: 0; - position: absolute; - margin: auto; - text-align: center; -} - -.button-carousel { - background-color: #2f2216; - max-width: 200px; - padding: 30px; - border: 2px solid #ffe591; - color: white !important; - border-radius: 15px; -} - -.button-carousel p{ - margin-top: -17px; - font-family: 'Poiret One', cursive; - text-transform: uppercase; - font-size: 24px; -} - -.download-button h4 { - font-family: 'Poiret One', cursive; - text-transform: uppercase; - margin-bottom:0px; -} - -.button-carousel a, .download-button a { - color: white !important; -} - -.download-button{ - background-color: #2f2216; - max-width: 400px; - padding: 10px; - text-align: center; - border: 2px solid #ffe591; - color: white !important; - border-radius: 15px; - margin: 0 auto; -} - -.card { - background-color: #2c3d51;; -} - -.download-box strong { - color:#ffe591; -} -.download-box a, .download-button a, .links a, .card a { - text-decoration: underline; -} - -.acc { - text-decoration: none !important; -} - -a:hover{ - opacity: 0.8; -} - -.navbar .container { - text-align: center; -} - -a.nav-link { - text-decoration: none !important; -} - -ul.serverlist p { - color: black; -} - -a.nav-link { - padding: 8px; -} - -ul.navbar-nav.ml-auto{ - margin-top: 19px; - padding: 0; -} - -nav.navbar.fixed-top.navbar-expand-lg.navbar-dark.bg-dark.fixed-top{ - height: 65px; -} -- cgit From 5c88b8aa92f285a6fd164ef15889c23c543ea942 Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 18:13:36 +0100 Subject: replace join button png with css --- webAO/images/button.png | Bin 197 -> 0 bytes webAO/images/buttonH.png | Bin 193 -> 0 bytes webAO/master.css | 6 +----- 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 webAO/images/button.png delete mode 100644 webAO/images/buttonH.png diff --git a/webAO/images/button.png b/webAO/images/button.png deleted file mode 100644 index 8ca7dd5..0000000 Binary files a/webAO/images/button.png and /dev/null differ diff --git a/webAO/images/buttonH.png b/webAO/images/buttonH.png deleted file mode 100644 index e21d83c..0000000 Binary files a/webAO/images/buttonH.png and /dev/null differ diff --git a/webAO/master.css b/webAO/master.css index f808063..b447cc2 100644 --- a/webAO/master.css +++ b/webAO/master.css @@ -13,10 +13,6 @@ font-size:0.6em; } -.buttonbg { - background: repeating-linear-gradient(to bottom #792c01, #792c01 3px, #9a491c 1px) repeat; -} - .button { padding: 5px; vertical-align: middle; @@ -39,7 +35,7 @@ } .button:hover { - background-image: url("/images/buttonH.png"); + background: repeating-linear-gradient(#a57318, #a57318 3px, #c68c39 3px, #c68c39 4px); border: 1px solid #bdb521; } -- cgit From c094e94bf9a43f9aba1d21bd5242ee503c3dac83 Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 18:15:55 +0100 Subject: looks exactly the same to me --- webAO/master.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webAO/master.css b/webAO/master.css index b447cc2..9aa459f 100644 --- a/webAO/master.css +++ b/webAO/master.css @@ -42,7 +42,7 @@ #menu .chosen:before { height: 200px; width: 200px; - border-image: url("/images/sel.png") 11 stretch !important; + border-color: #bdb521; border-width:11px; padding: 1px; } @@ -55,7 +55,7 @@ top: 35%; right: 0px; padding: 0px; - background: url("/images/desc.png") no-repeat; + background: url("./images/desc.png") no-repeat; border: 2px solid #888; border-radius: 5px; } -- cgit From 63c0672b5ac430c6a8589a93d5210ad42b998200 Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 18:16:20 +0100 Subject: yeet --- webAO/images/sel.png | Bin 781 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 webAO/images/sel.png diff --git a/webAO/images/sel.png b/webAO/images/sel.png deleted file mode 100644 index d8005f5..0000000 Binary files a/webAO/images/sel.png and /dev/null differ -- cgit From 0b75eb4537427e2acac10672539eb80d8887ca3c Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 18:18:41 +0100 Subject: unused --- webAO/favicon.ico | Bin 0 -> 32038 bytes webAO/images/background.png | Bin 992422 -> 0 bytes webAO/images/logo-neo.png | Bin 35871 -> 0 bytes webAO/images/logo.png | Bin 9214 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 webAO/favicon.ico delete mode 100644 webAO/images/background.png delete mode 100644 webAO/images/logo-neo.png delete mode 100644 webAO/images/logo.png diff --git a/webAO/favicon.ico b/webAO/favicon.ico new file mode 100644 index 0000000..e0815c8 Binary files /dev/null and b/webAO/favicon.ico differ diff --git a/webAO/images/background.png b/webAO/images/background.png deleted file mode 100644 index 0048d20..0000000 Binary files a/webAO/images/background.png and /dev/null differ diff --git a/webAO/images/logo-neo.png b/webAO/images/logo-neo.png deleted file mode 100644 index c625cac..0000000 Binary files a/webAO/images/logo-neo.png and /dev/null differ diff --git a/webAO/images/logo.png b/webAO/images/logo.png deleted file mode 100644 index b07cb99..0000000 Binary files a/webAO/images/logo.png and /dev/null differ -- cgit From 00dfd4ff2a44ea7dfc7c7bda0e5aa8e6769c0802 Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 19:51:17 +0100 Subject: ebidense --- webAO/client.css | 12 ++++++++---- webAO/client.html | 8 ++++---- webAO/client.js | 35 +++++++++++++++++++---------------- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/webAO/client.css b/webAO/client.css index a5db488..be80855 100644 --- a/webAO/client.css +++ b/webAO/client.css @@ -367,10 +367,14 @@ img { height: auto; } -#evi_icon { - background-image: url("/misc/empty.png"); - background-repeat: no-repeat; - background-size: contain; +.evi_icon { + width: 70px; + height: 70px; + background-color: #787878; + outline-color:#886060; + outline-width: 1px; + outline-style: inset; + outline-offset: -1px; } #evi_options { diff --git a/webAO/client.html b/webAO/client.html index 57e7827..71e2e86 100644 --- a/webAO/client.html +++ b/webAO/client.html @@ -27,7 +27,7 @@ Character Various overlay - Character Evidence Shout overlay
@@ -189,7 +189,7 @@
Information
- Evidence Icon + Evidence Icon
@@ -262,7 +262,7 @@

+ onclick="changeCharacter()">Change Character
@@ -301,7 +301,7 @@ - +

webAO

version 2.4

Client created by diff --git a/webAO/client.js b/webAO/client.js index 5b58d10..4e04ba5 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -341,6 +341,7 @@ class Client extends EventEmitter { // Load evidence array to select const evidence_select = document.getElementById("evi_select"); evidence_select.add(new Option("Custom", 0)); + console.log(evidence_arr); evidence_arr.forEach(evidence => { evidence_select.add(new Option(evidence)); }); @@ -681,7 +682,7 @@ class Client extends EventEmitter { evidence_box.innerHTML += `${this.evidences[i - 1].name}`; } } @@ -1381,7 +1382,7 @@ class Viewport { chatBox.style.display = "none"; chatBoxInner.className = ""; eviBox.style.opacity = "0"; - eviBox.style.height = "0%"; + eviBox.style.height = "0"; const shouts = [ undefined, "holdit", @@ -1453,19 +1454,20 @@ class Viewport { if (this.chatmsg.startspeaking) { if (this.chatmsg.evidence > 0) { // Prepare evidence - eviBox.style.backgroundImage = "url('" + client.evidences[this.chatmsg.evidence - 1].icon + "')"; + eviBox.src = safe_tags(client.evidences[this.chatmsg.evidence - 1].icon); + + eviBox.style.width = "auto"; + eviBox.style.height = "30%"; + eviBox.style.opacity = 1; if (this.chatmsg.side === "def") { // Only def show evidence on right eviBox.style.right = "1.5em"; eviBox.style.left = "initial"; - eviBox.style.height = "30%"; - eviBox.style.opacity = 1; - } else { + } else { eviBox.style.right = "initial"; eviBox.style.left = "1.5em"; - eviBox.style.height = "30%"; - eviBox.style.opacity = 1; + } } @@ -2047,13 +2049,14 @@ window.pickEmotion = pickEmotion; * Highlights and selects an evidence for in-character chat. * @param {string} evidence the evidence to be presented */ -export function pickEvidence(evidence) { +export function pickEvidence(evidenceID) { + const evidence = Number(evidenceID); if (client.selectedEvidence !== evidence) { //Update selected evidence if (client.selectedEvidence > 0) { - document.getElementById("evi_" + client.selectedEvidence).className = "client_button"; + document.getElementById("evi_" + client.selectedEvidence).className = "evi_icon"; } - document.getElementById("evi_" + evidence).className = "client_button dark"; + document.getElementById("evi_" + evidence).className = "evi_icon dark"; client.selectedEvidence = evidence; // Show evidence on information window @@ -2127,7 +2130,7 @@ window.deleteEvidence = deleteEvidence; export function cancelEvidence() { //Clear evidence data if (client.selectedEvidence > 0) { - document.getElementById("evi_" + client.selectedEvidence).className = "client_button"; + document.getElementById("evi_" + client.selectedEvidence).className = "evi_icon"; } client.selectedEvidence = 0; @@ -2137,7 +2140,7 @@ export function cancelEvidence() { document.getElementById("evi_filename").value = ""; document.getElementById("evi_name").value = ""; document.getElementById("evi_desc").value = ""; - document.getElementById("evi_icon").style.backgroundImage = "url('misc/empty.png')"; //Clear icon + document.getElementById("evi_preview").src = "misc/empty.png"; //Clear icon // Update button document.getElementById("evi_add").className = "client_button hover_button"; @@ -2170,14 +2173,14 @@ window.getIndexFromSelect = getIndexFromSelect; export function updateEvidenceIcon() { const evidence_select = document.getElementById("evi_select"); const evidence_filename = document.getElementById("evi_filename"); - const evidence_iconbox = document.getElementById("evi_icon"); + const evidence_iconbox = document.getElementById("evi_preview"); if (evidence_select.selectedIndex === 0) { evidence_filename.style.display = "initial"; - evidence_iconbox.style.backgroundImage = `url(${AO_HOST}evidence/${encodeURI(evidence_filename.value.toLowerCase())})`; + evidence_iconbox.src = AO_HOST + "evidence/" + encodeURI(evidence_filename.value.toLowerCase()); } else { evidence_filename.style.display = "none"; - evidence_iconbox.style.backgroundImage = `url(${AO_HOST}evidence/${encodeURI(evidence_select.value.toLowerCase())})`; + evidence_iconbox.src = AO_HOST + "evidence/" + encodeURI(evidence_select.value.toLowerCase()); } } window.updateEvidenceIcon = updateEvidenceIcon; -- cgit From c65fc73f7c12586bb52371ac24ebbec6e68d1bb9 Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 19:55:42 +0100 Subject: no more on/off emotes --- webAO/client.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/webAO/client.js b/webAO/client.js index 4e04ba5..f1ac510 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1063,14 +1063,13 @@ class Client extends EventEmitter { zoom: emoteinfo[3], sfx: esfx.toLowerCase(), sfxdelay: esfxd, - button_off: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_off.png`, - button_on: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` + emote_icon: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` }; emotesList.innerHTML += - `${emotes[i].desc}`; } pickEmotion(1); @@ -2035,13 +2034,13 @@ window.pickChar = pickChar; export function pickEmotion(emo) { try { if (client.selectedEmote !== -1) { - document.getElementById("emo_" + client.selectedEmote).src = client.emote.button_off; + document.getElementById("emo_" + client.selectedEmote).classList = "emote_button dark"; } } catch (err) { // do nothing } client.selectedEmote = emo; - document.getElementById("emo_" + emo).src = client.emote.button_on; + document.getElementById("emo_" + emo).classList = "emote_button"; } window.pickEmotion = pickEmotion; -- cgit From 7770106e86dd54472a1f89559eedd944e0ded755 Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 20:00:29 +0100 Subject: Revert "no more on/off emotes" This reverts commit c65fc73f7c12586bb52371ac24ebbec6e68d1bb9. --- webAO/client.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/webAO/client.js b/webAO/client.js index f1ac510..4e04ba5 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1063,13 +1063,14 @@ class Client extends EventEmitter { zoom: emoteinfo[3], sfx: esfx.toLowerCase(), sfxdelay: esfxd, - emote_icon: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` + button_off: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_off.png`, + button_on: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` }; emotesList.innerHTML += - `${emotes[i].desc}`; } pickEmotion(1); @@ -2034,13 +2035,13 @@ window.pickChar = pickChar; export function pickEmotion(emo) { try { if (client.selectedEmote !== -1) { - document.getElementById("emo_" + client.selectedEmote).classList = "emote_button dark"; + document.getElementById("emo_" + client.selectedEmote).src = client.emote.button_off; } } catch (err) { // do nothing } client.selectedEmote = emo; - document.getElementById("emo_" + emo).classList = "emote_button"; + document.getElementById("emo_" + emo).src = client.emote.button_on; } window.pickEmotion = pickEmotion; -- cgit From 8085841f6dd539759676566ae07125d422c86671 Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 20:01:39 +0100 Subject: Revert "Revert "no more on/off emotes"" This reverts commit 7770106e86dd54472a1f89559eedd944e0ded755. --- webAO/client.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/webAO/client.js b/webAO/client.js index 4e04ba5..f1ac510 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1063,14 +1063,13 @@ class Client extends EventEmitter { zoom: emoteinfo[3], sfx: esfx.toLowerCase(), sfxdelay: esfxd, - button_off: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_off.png`, - button_on: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` + emote_icon: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` }; emotesList.innerHTML += - `${emotes[i].desc}`; } pickEmotion(1); @@ -2035,13 +2034,13 @@ window.pickChar = pickChar; export function pickEmotion(emo) { try { if (client.selectedEmote !== -1) { - document.getElementById("emo_" + client.selectedEmote).src = client.emote.button_off; + document.getElementById("emo_" + client.selectedEmote).classList = "emote_button dark"; } } catch (err) { // do nothing } client.selectedEmote = emo; - document.getElementById("emo_" + emo).src = client.emote.button_on; + document.getElementById("emo_" + emo).classList = "emote_button"; } window.pickEmotion = pickEmotion; -- cgit From bd507aba979f83d14947dc8d1ec6c8d09f9edcac Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 28 Dec 2019 17:31:22 +0100 Subject: Revert "Revert "Revert "no more on/off emotes""" This reverts commit 8085841f6dd539759676566ae07125d422c86671. --- webAO/client.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/webAO/client.js b/webAO/client.js index f1ac510..4e04ba5 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1063,13 +1063,14 @@ class Client extends EventEmitter { zoom: emoteinfo[3], sfx: esfx.toLowerCase(), sfxdelay: esfxd, - emote_icon: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` + button_off: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_off.png`, + button_on: AO_HOST + `characters/${encodeURI(me.name.toLowerCase())}/emotions/button${i}_on.png` }; emotesList.innerHTML += - `${emotes[i].desc}`; } pickEmotion(1); @@ -2034,13 +2035,13 @@ window.pickChar = pickChar; export function pickEmotion(emo) { try { if (client.selectedEmote !== -1) { - document.getElementById("emo_" + client.selectedEmote).classList = "emote_button dark"; + document.getElementById("emo_" + client.selectedEmote).src = client.emote.button_off; } } catch (err) { // do nothing } client.selectedEmote = emo; - document.getElementById("emo_" + emo).classList = "emote_button"; + document.getElementById("emo_" + emo).src = client.emote.button_on; } window.pickEmotion = pickEmotion; -- cgit