From 1d94108ffce4b18660d2de81c5feedf8f5ddc13e Mon Sep 17 00:00:00 2001 From: karkinge Date: Wed, 28 Sep 2016 14:39:09 +0200 Subject: [PATCH 1/4] No cursor unless in debug mode. Cursor cannot be hidden over flash video players (intro,items). --- app_sources/Core/controllers/currentpage.js | 6 ++++-- app_sources/Intro/styles.scss | 1 + app_sources/Settings/styles.scss | 1 + app_sources/index.scss | 9 +++++++++ app_statics/index.html | 2 +- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app_sources/Core/controllers/currentpage.js b/app_sources/Core/controllers/currentpage.js index f433513..337a97b 100644 --- a/app_sources/Core/controllers/currentpage.js +++ b/app_sources/Core/controllers/currentpage.js @@ -1,7 +1,7 @@ 'use strict'; -app.controller('CurrentPage', ['$scope', '$location', - function($scope, $location) { +app.controller('CurrentPage', ['$scope', '$location', 'zspin', + function($scope, $location, zspin) { $scope.$on('$locationChangeSuccess', function (event, newLoc, oldLoc) { // generate some class names for tag, based on first 2 url hashes var hashes = window.location.hash @@ -10,6 +10,8 @@ app.controller('CurrentPage', ['$scope', '$location', .trim() .split(' '); $scope.currentPath = hashes.slice(0, 2).join(' '); + $scope.zspinOptions = zspin.options; }); + } ]); diff --git a/app_sources/Intro/styles.scss b/app_sources/Intro/styles.scss index 6e8d237..c75349f 100644 --- a/app_sources/Intro/styles.scss +++ b/app_sources/Intro/styles.scss @@ -4,4 +4,5 @@ overflow: hidden; position: absolute; background-color: #000; + cursor:none; } \ No newline at end of file diff --git a/app_sources/Settings/styles.scss b/app_sources/Settings/styles.scss index 239a9d8..1006a20 100644 --- a/app_sources/Settings/styles.scss +++ b/app_sources/Settings/styles.scss @@ -1,5 +1,6 @@ body.settings { background-color: #ffffff; + cursor:auto; } #Settings { diff --git a/app_sources/index.scss b/app_sources/index.scss index 3d3da3f..c654e41 100644 --- a/app_sources/index.scss +++ b/app_sources/index.scss @@ -5,6 +5,7 @@ $grey: #e1e1e1; $white: #fff; $black: #000; +$yellow: #FBA301; @font-face { font-family: UMono; @@ -17,6 +18,7 @@ $black: #000; html { font-family: "UMono"; + cursor:none; } body { @@ -152,3 +154,10 @@ input:focus, select:focus { width: 1000px; } } + +// ============================================================================ +// Debug styles override +// ============================================================================ +html.debug{ + cursor:auto; +} \ No newline at end of file diff --git a/app_statics/index.html b/app_statics/index.html index ef8ebeb..3d94b33 100644 --- a/app_statics/index.html +++ b/app_statics/index.html @@ -1,5 +1,5 @@ - + Z-Spin From 4372cc0196be4897b2606e3f897cfd2b62a50fd8 Mon Sep 17 00:00:00 2001 From: karkinge Date: Wed, 28 Sep 2016 16:29:50 +0200 Subject: [PATCH 2/4] FUll-window overlay, enforcing mouse cursor hiding. --- app_sources/index.scss | 13 +++++++++++-- app_statics/index.html | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app_sources/index.scss b/app_sources/index.scss index c654e41..69d19d9 100644 --- a/app_sources/index.scss +++ b/app_sources/index.scss @@ -18,9 +18,17 @@ $yellow: #FBA301; html { font-family: "UMono"; +} +#overlay{ cursor:none; + width:100vw; + height:100vh; + content:''; + display:block; + z-index:9999; + background:transparent; + position:absolute; } - body { overflow-x: hidden; } @@ -158,6 +166,7 @@ input:focus, select:focus { // ============================================================================ // Debug styles override // ============================================================================ -html.debug{ + +#overlay.debug{ cursor:auto; } \ No newline at end of file diff --git a/app_statics/index.html b/app_statics/index.html index 3d94b33..503ef8c 100644 --- a/app_statics/index.html +++ b/app_statics/index.html @@ -1,5 +1,5 @@ - + Z-Spin @@ -20,6 +20,7 @@ +
From 8df64eaf397832140f96c4598e3bc0d05c3f7de4 Mon Sep 17 00:00:00 2001 From: karkinge Date: Wed, 28 Sep 2016 16:37:40 +0200 Subject: [PATCH 3/4] Avoid duplicate id "overlay", use overlay hack only in intro & menu --- app_sources/Intro/template.html | 1 + app_sources/Menu/template.html | 1 + app_sources/index.scss | 4 ++-- app_statics/index.html | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app_sources/Intro/template.html b/app_sources/Intro/template.html index 56a6ab8..3eadf6b 100644 --- a/app_sources/Intro/template.html +++ b/app_sources/Intro/template.html @@ -1,3 +1,4 @@ +
\ No newline at end of file diff --git a/app_sources/Menu/template.html b/app_sources/Menu/template.html index 04fc7e0..b8de78b 100644 --- a/app_sources/Menu/template.html +++ b/app_sources/Menu/template.html @@ -1,3 +1,4 @@ +