diff --git a/scripts/system/assets/models/tinyTablet.fbx b/scripts/system/assets/models/tinyTablet.fbx index cdcdf8af34..4ad5d8760f 100644 Binary files a/scripts/system/assets/models/tinyTablet.fbx and b/scripts/system/assets/models/tinyTablet.fbx differ diff --git a/scripts/system/html/css/miniTablet.css b/scripts/system/html/css/miniTablet.css index 75da2eaf82..35a8354750 100644 --- a/scripts/system/html/css/miniTablet.css +++ b/scripts/system/html/css/miniTablet.css @@ -8,6 +8,14 @@ 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: HiFi-Glyphs; + src: url(../../../../resources/fonts/hifi-glyphs.ttf), + url(../../../../fonts/hifi-glyphs.ttf), + url(../../../../interface/resources/fonts/hifi-glyphs.ttf), + url(../fonts/hifi-glyphs.ttf); +} + * { box-sizing: border-box; padding: 0; @@ -26,12 +34,12 @@ body { section { background-color: #404040; position: relative; - padding: 15px; + padding: 13px; } section .button { width: 100%; - height: 88px; + height: 90px; background-color: #252525; margin-top: 10px; text-align: center; @@ -61,43 +69,33 @@ section .button { } img { - width: 60px; + width: 44px; } #mute { - padding-top: 12px; + padding-top: 19px; } #bubble { - padding-top: 14px; + padding-top: 19px; } -footer { +#expand { position: absolute; - bottom: 0; - width: 100%; - height: 30px; - text-align: center; - color: #e3e3e3; - font-weight: bold; - font-size: 26px; + right: 13px; + bottom: 13px; + width: 40px; + height: 40px; + border-radius: 20px; } - footer div { + #expand span { display: inline-block; - height: 14px; - width: 30px; + transform: rotate(45deg); position: relative; - top: 14px; - } - - footer div p { - position: relative; - top: -15px; - } - - footer .button:hover { - border: 1px solid #e3e3e3; - border-radius: 3px; - margin: -8px; + left: 0; + top: 5px; + font-family: hifi-glyphs; + font-size: 24px; + color: #ffffff; } diff --git a/scripts/system/html/miniTablet.html b/scripts/system/html/miniTablet.html index 3ba8d66196..1f18228987 100644 --- a/scripts/system/html/miniTablet.html +++ b/scripts/system/html/miniTablet.html @@ -23,10 +23,8 @@ See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.
+
`
- diff --git a/scripts/system/miniTablet.js b/scripts/system/miniTablet.js index 25a3389539..403511365b 100644 --- a/scripts/system/miniTablet.js +++ b/scripts/system/miniTablet.js @@ -19,7 +19,7 @@ var // Base overlay proxyOverlay = null, PROXY_MODEL = Script.resolvePath("./assets/models/tinyTablet.fbx"), - PROXY_DIMENSIONS = { x: 0.0637, y: 0.0965, z: 0.0046 }, // Proportional to tablet proper. + PROXY_DIMENSIONS = { x: 0.0637, y: 0.0965, z: 0.0045 }, // Proportional to tablet proper. PROXY_POSITION_LEFT_HAND = { x: 0, y: 0.1, // Distance from joint. @@ -42,12 +42,12 @@ // UI overlay. proxyUIOverlay = null, PROXY_UI_HTML = Script.resolvePath("./html/miniTablet.html"), - PROXY_UI_DIMENSIONS = { x: 0.0577, y: 0.0905 }, + PROXY_UI_DIMENSIONS = { x: 0.059, y: 0.0865 }, PROXY_UI_WIDTH_PIXELS = 150, METERS_TO_INCHES = 39.3701, PROXY_UI_DPI = PROXY_UI_WIDTH_PIXELS / (PROXY_UI_DIMENSIONS.x * METERS_TO_INCHES), PROXY_UI_OFFSET = 0.001, // Above model surface. - PROXY_UI_LOCAL_POSITION = { x: 0, y: 0, z: -(PROXY_DIMENSIONS.z / 2 + PROXY_UI_OFFSET) }, + PROXY_UI_LOCAL_POSITION = { x: 0.0002, y: 0.0024, z: -(PROXY_DIMENSIONS.z / 2 + PROXY_UI_OFFSET) }, PROXY_UI_LOCAL_ROTATION = Quat.fromVec3Degrees({ x: 0, y: 180, z: 0 }), proxyUIOverlayEnabled = false, PROXY_UI_OVERLAY_ENABLED_DELAY = 500,