From 1b88c0e383aa967a917946df4c4419ee2d6ff178 Mon Sep 17 00:00:00 2001 From: Spyduck Date: Wed, 7 Dec 2016 18:14:53 -0500 Subject: [PATCH 1/5] outfits menu --- 2dui/index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/2dui/index.html b/2dui/index.html index de1f4e3a..5b7b4a01 100644 --- a/2dui/index.html +++ b/2dui/index.html @@ -37,7 +37,10 @@ + + + \ No newline at end of file diff --git a/2dui/apps/avatar/style.css b/2dui/apps/avatar/style.css new file mode 100644 index 00000000..30331774 --- /dev/null +++ b/2dui/apps/avatar/style.css @@ -0,0 +1,134 @@ +html, body { + width: 100%; + height: 100%; + overflow: hidden; + margin: 0; + padding: 0; + + -webkit-touch-callout: none; /* iOS Safari */ + -webkit-user-select: none; /* Chrome/Safari/Opera */ + -khtml-user-select: none; /* Konqueror */ + -moz-user-select: none; /* Firefox */ + -ms-user-select: none; /* Internet Explorer/Edge */ + user-select: none; /* Non-prefixed version, currently + not supported by any browser */ + + font-family: 'Open Sans Regular', sans-serif; + color: white; +} + +#avatarscontainer { +background-color:#2F363B; +} + +.top-bar { + font-size: 28px; + height: 32px; + background: #181818; +} + +.bottom-bar { + height: 32px; + background: #444444; +} + +.name-input { + display:inline; +} +.menu-icon { + display:inline-block; + width: 28px; + height: 28px; + background-position: center; + background-size: 100%; + border-style: hidden; + -webkit-filter: brightness(0.85); +} + +.menu-image { + width: 28px; + height: 28px; + display:inline-block; +} + +.menu-icon:hover { + -webkit-filter: brightness(1); +} + +.menu-icon:active { + -webkit-filter: brightness(0.65); +} + +.menu-icon-trash { + background-image: url('../inventory/images/icons/icon-trash.png'); +} +.inline { + display:inline-block; +} +.left { + float: left; +} +.right { + float: right; +} + +.list { +height:calc(100% - 32px); +background-color:#242A2D; +overflow-y:scroll; +} + + + .bottombutton { + width:32px; + height:32px; + background-size:cover; + display:inline-block; + background-position:middle; + } + .previewbutton { + background-image: url('icons/icon-preview.png'); + + } + .previewbutton:hover { + background-image: url('icons/icon-previewhover.png'); + background-color: white; + } + + .savebutton { + background-image: url('icons/icon-save.png'); + + } + .savebutton:hover { + background-image: url('icons/icon-savehover.png'); + background-color: white; + } + + .shirticon { + background-image: url('icons/icon-shirt.png'); + padding: 8px 8px 8px 8px; + background-size:cover; + position:relative; + display:inline-block; + background-position:middle; + margin-right:8px; + } + + .shirticon:hover { + background-image: url('icons/icon-shirthover.png'); + + } + +li { + list-style-type: none; + padding-left: 8px; + padding-top:8px; + padding-bottom:8px; + vertical-align:middle; + max-height:32px; +} + +li:hover { +background-color:#343A3D; +} + From cbeffed2a565557782b503302333e72bed920374 Mon Sep 17 00:00:00 2001 From: Spyduck Date: Wed, 7 Dec 2016 18:19:02 -0500 Subject: [PATCH 3/5] general-stuff API started --- 2dui/scripts/spyduck.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 2dui/scripts/spyduck.js diff --git a/2dui/scripts/spyduck.js b/2dui/scripts/spyduck.js new file mode 100644 index 00000000..44996656 --- /dev/null +++ b/2dui/scripts/spyduck.js @@ -0,0 +1 @@ +// returns all nodes from the room code an an array: [ [js_id, text], ... ] // example to get first result's text: // var results = GetRoomText() // results[0][0] // js_id // results[0][1] // text function GetRoomText() { var return_results = new Array(); var roomcode = window.janus.roomcode() var expression = new RegExp(')(.*)','gm'); var results = roomcode.match(expression) if (results) { for (result_index in results) { var result = results[result_index]; if (result.length >= 2) { expression = new RegExp(')(.*?)'); var fullstring = result.match(expression)[2]; expression = new RegExp('js_id="(.*?)"'); var js_id = result.match(expression); if (js_id.length >= 1) { js_id = js_id[1]; } else { js_id = ''; } return_results.push( [js_id, fullstring] ); } } } return return_results; } \ No newline at end of file From 5202ffdf1428682b8eec1a97628fb86e8d70d71e Mon Sep 17 00:00:00 2001 From: Spyduck Date: Wed, 7 Dec 2016 22:24:05 -0500 Subject: [PATCH 4/5] fix --- 2dui/scripts/spyduck.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2dui/scripts/spyduck.js b/2dui/scripts/spyduck.js index 44996656..407071da 100644 --- a/2dui/scripts/spyduck.js +++ b/2dui/scripts/spyduck.js @@ -1 +1 @@ -// returns all nodes from the room code an an array: [ [js_id, text], ... ] // example to get first result's text: // var results = GetRoomText() // results[0][0] // js_id // results[0][1] // text function GetRoomText() { var return_results = new Array(); var roomcode = window.janus.roomcode() var expression = new RegExp(')(.*)','gm'); var results = roomcode.match(expression) if (results) { for (result_index in results) { var result = results[result_index]; if (result.length >= 2) { expression = new RegExp(')(.*?)'); var fullstring = result.match(expression)[2]; expression = new RegExp('js_id="(.*?)"'); var js_id = result.match(expression); if (js_id.length >= 1) { js_id = js_id[1]; } else { js_id = ''; } return_results.push( [js_id, fullstring] ); } } } return return_results; } \ No newline at end of file +// returns all nodes from the room code an an array: [ [js_id, text], ... ] // example to get first result's text: // var results = GetRoomText() // results[0][0] // js_id // results[0][1] // text function GetRoomText() { var return_results = new Array(); var roomcode = window.janus.roomcode() var expression = new RegExp(')(.*)','gm'); var results = roomcode.match(expression) if (results) { for (result_index in results) { var result = results[result_index]; if (result.length >= 2) { expression = new RegExp(')(.*?)'); var fullstring = result.match(expression)[2]; expression = new RegExp('js_id="(.*?)"'); var js_id = result.match(expression); if (js_id != null) { if (js_id.length >= 1) { js_id = js_id[1]; } else { js_id = ''; } } else { js_id = ''; } return_results.push( [js_id, fullstring] ); } } } return return_results; } \ No newline at end of file From 194be50e9e84eab8c84c17beafa3c272e3aa5815 Mon Sep 17 00:00:00 2001 From: Spyduck Date: Mon, 6 Feb 2017 18:55:29 -0500 Subject: [PATCH 5/5] renamed OUTFITS to AVATARS --- 2dui/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/2dui/index.html b/2dui/index.html index 5b7b4a01..54015bac 100644 --- a/2dui/index.html +++ b/2dui/index.html @@ -39,7 +39,7 @@
  • MAIN MENU
  • SETTINGS
    • -
  • OUTFITS
    • +
  • AVATARS
  • SAVE