diff --git a/scripts/system/more/app-more.js b/scripts/system/more/app-more.js index 136360f032..bb59f8bb34 100644 --- a/scripts/system/more/app-more.js +++ b/scripts/system/more/app-more.js @@ -25,7 +25,7 @@ "action": "", "script": "" }; - + var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); tablet.screenChanged.connect(onScreenChanged); var button = tablet.addButton({ @@ -48,7 +48,7 @@ isActive: appStatus }); } - + button.clicked.connect(clicked); function sendRunningScriptList() { diff --git a/scripts/system/more/blank_minus-16.png b/scripts/system/more/blank_minus-16.png deleted file mode 100644 index dfa1a82802..0000000000 Binary files a/scripts/system/more/blank_minus-16.png and /dev/null differ diff --git a/scripts/system/more/blank_plus-16.png b/scripts/system/more/blank_plus-16.png deleted file mode 100644 index c40ab20443..0000000000 Binary files a/scripts/system/more/blank_plus-16.png and /dev/null differ diff --git a/scripts/system/more/css/FiraSans-Regular.ttf b/scripts/system/more/css/FiraSans-Regular.ttf new file mode 100644 index 0000000000..d9fdc0e922 Binary files /dev/null and b/scripts/system/more/css/FiraSans-Regular.ttf differ diff --git a/scripts/system/more/css/FiraSans-SemiBold.ttf b/scripts/system/more/css/FiraSans-SemiBold.ttf new file mode 100644 index 0000000000..821a43d7fd Binary files /dev/null and b/scripts/system/more/css/FiraSans-SemiBold.ttf differ diff --git a/scripts/system/more/css/FiraSans.license b/scripts/system/more/css/FiraSans.license new file mode 100644 index 0000000000..37c4a30b62 --- /dev/null +++ b/scripts/system/more/css/FiraSans.license @@ -0,0 +1,94 @@ +Digitized data copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A. +with Reserved Font Name < Fira >, + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/scripts/system/more/css/sidewalk.png b/scripts/system/more/css/sidewalk.png new file mode 100644 index 0000000000..8db0adc2d4 Binary files /dev/null and b/scripts/system/more/css/sidewalk.png differ diff --git a/scripts/system/more/css/styles.css b/scripts/system/more/css/styles.css index c1f0f5d6ae..1fd656d5d1 100644 --- a/scripts/system/more/css/styles.css +++ b/scripts/system/more/css/styles.css @@ -3,54 +3,77 @@ Created by Kalila L. on 23 Feb 2020. Copyright 2020 Vircadia contributors. + Copyright 2022 Overte e.V. Distributed under the Apache License, Version 2.0. See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html */ +@font-face { + font-family: FiraSans-SemiBold; + src: url(FiraSans-SemiBold.ttf); +} + +@font-face { + font-family: FiraSans-Regular; + src: url(FiraSans-Regular.ttf); +} + +html { + width: 100%; + height: 100%; +} + body { - background: #27343B; - font-family: 'Merriweather', sans-serif; + background-color: #000000; + font-family: FiraSans-SemiBold, sans-serif; font-size: 14px; color: #FFFFFF; - font-weight: 600; text-decoration: none; font-style: normal; font-variant: normal; text-transform: none; + width: 100%; + height: 100%; + min-height: 100%; + margin: 0; + padding: 0; + overflow: hidden; +} + +table.item { + width: 100%; + border-collapse: collapse; +} + +tr.item { + vertical-align: top; +} + +td.item { + vertical-align: top; + text-align: left; + padding: 3px; } font.mainTitle { - font-family: 'Quicksand', sans-serif; + font-family: FiraSans-SemiBold, sans-serif; font-size: 28px; color: #ffffff; - font-weight: 800; text-decoration: none; font-style: normal; font-variant: normal; text-transform: none; - text-shadow: 3px 3px 3px rgba(63,64,76,1); -} - -p.mainDesc { - font-family: 'Merriweather', sans-serif; - font-size: 14px; - font-weight: 500; -} - -p a { - color: SteelBlue; } .appdesc a { - color: LightBlue; + color: #00bbff; } font.appname { - font-family: 'Merriweather', sans-serif; + font-family: FiraSans-SemiBold, sans-serif; font-size: 18px; - color: #CFB538; - font-weight: 800; + color: #ffffff; text-decoration: none; font-style: normal; font-variant: normal; @@ -61,10 +84,9 @@ font.appname { } font.appdesc { - font-family: 'Merriweather', sans-serif; - font-size: 15px; - color: #ffffff; - font-weight: 500; + font-family: FiraSans-Regular, sans-serif; + font-size: 14px; + color: #dddddd; text-decoration: none; font-style: normal; font-variant: normal; @@ -75,7 +97,7 @@ font.appdesc { } font.noresult { - font-family: Arial, Helvetica, sans-serif; + font-family: FiraSans-Regular, sans-serif; font-size: 18px; color: #aaaaaa; font-weight: 500; @@ -86,7 +108,7 @@ font.noresult { } font.caption { - font-family: Arial, Helvetica, sans-serif; + font-family: FiraSans-Regular, sans-serif; font-size: 12px; color: #ffffff; font-weight: 600; @@ -96,62 +118,47 @@ font.caption { text-transform: none; } -font.pager { - font-family: 'Quicksand', sans-serif; - font-size: 14px; - color: #B2B5D9; - font-weight: 600; - text-decoration: none; - font-style: normal; - font-variant: normal; - text-transform: none; -} - div.iconContainer{ - border-radius: 15px; + border-radius: 10px; background: #000000; padding: 5px; width: 70px; height: 70px; text-align: center; -} - -table.item { - background: #3E415E; -} - -td { - vertical-align: top; - padding: 5px; + border: 2px solid #ffffff; } button.install { - font-family: Arial, Helvetica, sans-serif; + font-family: FiraSans-SemiBold, sans-serif; background-color: #008CBA; font-size: 16px; color: #ffffff; - font-weight: 600; border-radius: 6px; border: 2px solid #008CBA; transition-duration: 0.3s; float: right; + width: 130px; } button.install:hover { - background-color: #10afe3; + background-color: #10afe3; border: 2px solid #10afe3; } +button.install:focus { + outline: none; +} + button.uninstall { - font-family: Arial, Helvetica, sans-serif; + font-family: FiraSans-SemiBold, sans-serif; background-color: #b34700; font-size: 16px; color: #ffffff; - font-weight: 600; border-radius: 6px; border: 2px solid #b34700; transition-duration: 0.3s; float: right; + width: 130px; } button.uninstall:hover { @@ -159,32 +166,194 @@ button.uninstall:hover { border: 2px solid #e34c22; } +button.uninstall:focus { + outline: none; +} + button.processing { - font-family: Arial, Helvetica, sans-serif; + font-family: FiraSans-SemiBold, sans-serif; background-color: #b59207; font-size: 16px; color: #ffffff; - font-weight: 600; border-radius: 6px; border: 2px solid #b59207; transition-duration: 0.3s; float: right; + width: 130px; } -div.searchbox { - border-radius: 6px; - background: #ffffff; - padding: 4px; - border: 0px; - vertical-align: middle; +button.processing:focus { + outline: none; } -input.searchtextbox{ - font-family: Arial, Helvetica, sans-serif; +#clear_search { + font-family: FiraSans-SemiBold, sans-serif; + font-size: 18px; + color: #999999; + display: none; +} + +#searchtextbox{ + font-family: FiraSans-Regular, sans-serif; font-size: 14px; color: #000000; - font-weight: 400; + width: 93%; text-decoration: none; border: 0px; - outline-color: #ffffff; + outline-color: #bdbdbd; + background-color: #bdbdbd; + margin: 3px; +} + +#searchtextbox:focus { + outline: none; +} + +#search_container { + width: 95%; + margin-top: 3px; + margin-bottom: 2px; + padding: 4px; + border: 0px; + border-radius: 6px; + background-color: #bdbdbd; + display: flex; +} + +button.fieldsSearchFilterOn { + font-family: FiraSans-Regular, sans-serif; + background: #0085b5; + color: #4fd0ff; + font-size: 10px; + padding: 1px 4px 0px 4px; + border: solid #000000 1px; + text-decoration: none; + text-align: center; + margin: 3px; +} + +button.fieldsSearchFilterOn:hover { + border: solid #4fd0ff 1px; +} + +button.fieldsSearchFilterOn:focus { + outline: none; +} + +button.fieldsSearchFilterOff { + font-family: FiraSans-Regular, sans-serif; + background: #333333; + color: #888888; + font-size: 10px; + padding: 1px 4px 0px 4px; + border: solid #000000 1px; + text-decoration: none; + text-align: center; + margin: 3px; +} + +button.fieldsSearchFilterOff:hover { + border: solid #888888 1px; +} + +button.fieldsSearchFilterOff:focus { + outline: none; +} + +#header { + width: 100%; + height: 12%; + background-color: #404040; + padding: 8px; + margin: 0px; +} + +#list { + width: 100%; + height: 80%; + overflow-y: scroll; + display: flex; + background-color: #111111; + background-image: url("sidewalk.png"); + background-repeat: repeat; + background-attachment: local; +} + +#footer { + font-family: FiraSans-Regular, sans-serif; + font-size: 12px; + width: 100%; + height: 8%; + background-color: #404040; + padding: 8px; + margin: 0px; +} + +font.blue { + color: #00bbff; +} + +#cards { + width: 87%; + text-align: left; + background-color: #111111; + background-image: none; +} + +#sidewalk { + width: 13%; +} + +::-webkit-scrollbar { + width: 20px; + height: 10px; +} +::-webkit-scrollbar-track { + background-color: #2e2e2e; +} + +::-webkit-scrollbar-thumb { + background-color: #696969; + border: 2px solid #2e2e2e; + border-radius: 8px; +} + +div.list_background { + width: 100%; + min-height: 14px; + background-color: #111111; + text-align: center; +} + +#load_more { + font-family: FiraSans-SemiBold, sans-serif; + background-color: #545454; + font-size: 16px; + color: #ffffff; + border-radius: 6px; + border: 2px solid #545454; + transition-duration: 0.3s; + width: 130px; + margin-top: 4px; + margin-bottom: 8px; +} + +#load_more:hover { + background-color: #9c9c9c; + border: 2px solid #9c9c9c; +} + +#load_more:focus { + outline: none; +} + +div.card { + width: 100%; + background-color: #303030; + border: 0px; + border-radius: 6px; + box-shadow: 3px 3px 5px rgba(0,0,0,0.8); + margin: 0px; + text-align: center; + padding: 8px; } diff --git a/scripts/system/more/del-x-16.png b/scripts/system/more/del-x-16.png deleted file mode 100644 index 9a5153d26f..0000000000 Binary files a/scripts/system/more/del-x-16.png and /dev/null differ diff --git a/scripts/system/more/minus-16.png b/scripts/system/more/minus-16.png deleted file mode 100644 index e5caf2615c..0000000000 Binary files a/scripts/system/more/minus-16.png and /dev/null differ diff --git a/scripts/system/more/more.html b/scripts/system/more/more.html index 0be950c9c9..f483d24b3f 100644 --- a/scripts/system/more/more.html +++ b/scripts/system/more/more.html @@ -19,44 +19,18 @@ - - - -
- -Want to contribute and add your own app?
- Read the guide!