From 1f0feab64b94dc3e235ccd3dce87bc12e0442188 Mon Sep 17 00:00:00 2001 From: Wilson Page Date: Fri, 4 Apr 2014 09:54:03 +0100 Subject: [PATCH] Merge pull request #17949 from wilsonpage/bug/991506 Bug 991506 - flash and swap buttons respond to touches even when hidden --- apps/camera/style/hud.css | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/apps/camera/style/hud.css b/apps/camera/style/hud.css index 882f0d59ef5a..172b7da3657e 100644 --- a/apps/camera/style/hud.css +++ b/apps/camera/style/hud.css @@ -68,14 +68,18 @@ /** Camera Button ---------------------------------------------------------*/ +/** + * 1. Hidden by default + */ + .hud_camera { font-size: 2.6rem; transition: opacity 300ms; - opacity: 0; + opacity: 0; /* 1 */ } /** - * @camera-enabled + * camera-enabled=true */ .hud[camera-enabled=true] .hud_camera { @@ -83,31 +87,26 @@ } /** - * @camera-hidden - */ - -.hud.camera-hidden .hud_camera { - opacity: 0; -} - -/** - * @toggling-camera + * camera-enabled=false */ -.hud[toggling-camera=true] .hud_camera { - background-color: #00b9df; +.hud[camera-enabled=false] .hud_camera { + pointer-events: none; } - /** Flash Button ---------------------------------------------------------*/ +/** + * 1. Hidden by default + */ + .hud_flash { width: 5.8rem; height: 5.8rem; line-height: 5.8rem; font-size: 2.5rem; - opacity: 0; + opacity: 0; /* 1 */ transition: opacity 300ms; } @@ -118,3 +117,11 @@ .hud[flash-enabled=true] .hud_flash { opacity: 1; } + +/** + * flash-enabled=false + */ + +.hud[flash-enabled=false] .hud_flash { + pointer-events: none; +}