Skip to content

Minor fixes and enhancements #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghost wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Minor fixes and enhancements #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d94108
No cursor unless in debug mode. Cursor cannot be hidden over flash vi…
mcarquigny Sep 28, 2016
4372cc0
FUll-window overlay, enforcing mouse cursor hiding.
mcarquigny Sep 28, 2016
8df64ea
Avoid duplicate id "overlay", use overlay hack only in intro & menu
mcarquigny Sep 28, 2016
8ad3b4a
currentPage -> rootControler
mcarquigny Sep 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app_sources/Core/controllers/currentpage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

app.controller('CurrentPage', ['$scope', '$location',
function($scope, $location) {
app.controller('rootControler', ['$scope', '$location', 'zspin',
function($scope, $location, zspin) {
$scope.$on('$locationChangeSuccess', function (event, newLoc, oldLoc) {
// generate some class names for <body> tag, based on first 2 url hashes
var hashes = window.location.hash
Expand All @@ -10,6 +10,8 @@ app.controller('CurrentPage', ['$scope', '$location',
.trim()
.split(' ');
$scope.currentPath = hashes.slice(0, 2).join(' ');
$scope.zspinOptions = zspin.options;
});

}
]);
1 change: 1 addition & 0 deletions app_sources/Intro/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
overflow: hidden;
position: absolute;
background-color: #000;
cursor:none;
}
1 change: 1 addition & 0 deletions app_sources/Intro/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<div id="cursor-overlay" ng-class="{'debug': zspinOptions.debug}"></div>
<div id="Intro" hotkey="{'esc': mainMenu}">
<jplayer src="{{videoSrc}}" autoplay="true" loop="false" on-end="mainMenu"></jplayer>
</div>
1 change: 1 addition & 0 deletions app_sources/Menu/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<div id="cursor-overlay" ng-class="{'debug': zspinOptions.debug}"></div>
<div id="Menu">
<theme ng-if="curTheme" menu="{{menuName}}" name="{{curEntry}}" src="{{curTheme}}" is-default="{{isDefault}}" />
<wheel control="wheelControl" options="wheelOptions" items="entries" />
Expand Down
1 change: 1 addition & 0 deletions app_sources/Settings/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
body.settings {
background-color: #ffffff;
cursor:auto;
}

#Settings {
Expand Down
20 changes: 19 additions & 1 deletion app_sources/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
$grey: #e1e1e1;
$white: #fff;
$black: #000;
$yellow: #FBA301;

@font-face {
font-family: UMono;
Expand All @@ -18,7 +19,16 @@ $black: #000;
html {
font-family: "UMono";
}

#cursor-overlay{
cursor:none;
width:100vw;
height:100vh;
content:'';
display:block;
z-index:9999;
background:transparent;
position:absolute;
}
body {
overflow-x: hidden;
}
Expand Down Expand Up @@ -152,3 +162,11 @@ input:focus, select:focus {
width: 1000px;
}
}

// ============================================================================
// Debug styles override
// ============================================================================

#cursor-overlay.debug{
cursor:auto;
}
2 changes: 1 addition & 1 deletion app_statics/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html ng-app="app" ng-controller="CurrentPage">
<html ng-app="app" ng-controller="rootControler">
<head>
<meta charset="utf8">
<title>Z-Spin</title>
Expand Down