Skip to content

Commit

Permalink
Merge pull request #122 from duhrer/GH-84
Browse files Browse the repository at this point in the history
GH-84: Work in progress on 1.0 release.
  • Loading branch information
duhrer authored Dec 4, 2023
2 parents 104c12c + 4517ec1 commit ccad258
Show file tree
Hide file tree
Showing 71 changed files with 2,799 additions and 901 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"env": {
"es2017": true,
"browser": true
},
"extends": "eslint-config-fluid",
"rules": {
"indent": [
"@stylistic/js/indent": [
"error",
4,
{ "SwitchCase": 1}
Expand Down
4 changes: 2 additions & 2 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020 The Gamepad Navigator Authors
Copyright (c) 2023 The Gamepad Navigator Authors
See the AUTHORS.md file at the top-level directory of this distribution and at
https://github.com/fluid-lab/gamepad-navigator/raw/master/AUTHORS.md.
Expand All @@ -18,7 +18,7 @@ This is the list of Gamepad Navigator copyright holders. It does not list all in
assigned copyright to an institution or made only minor changes. Please see the version control system's revision
history for details on contributions.

Copyright (c) 2020
Copyright (c) 2023

- Divyanshu Mahajan
- Tony Atkins
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020 The Gamepad Navigator Authors
Copyright (c) 2023 The Gamepad Navigator Authors
See the AUTHORS.md file at the top-level directory of this distribution and at
https://github.com/fluid-lab/gamepad-navigator/raw/master/AUTHORS.md.
Expand Down
14 changes: 13 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2020 The Gamepad Navigator Authors
Copyright (c) 2023 The Gamepad Navigator Authors
See the AUTHORS.md file at the top-level directory of this distribution and at
https://github.com/fluid-lab/gamepad-navigator/raw/master/AUTHORS.md.
Expand Down Expand Up @@ -68,6 +68,18 @@ module.exports = function (grunt) {
src: "node_modules/ally.js/ally.min.js",
dest: "dist/js/lib/ally/"
},
oskCss: {
expand: true,
flatten: true,
src: "node_modules/fluid-osk/src/css/*",
dest: "dist/css/lib/fluid-osk"
},
oskJs: {
expand: true,
flatten: true,
src: "node_modules/fluid-osk/src/js/*",
dest: "dist/js/lib/fluid-osk"
},
source: {
expand: true,
cwd: "src",
Expand Down
2 changes: 1 addition & 1 deletion PRIVACY_POLICY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020 The Gamepad Navigator Authors
Copyright (c) 2023 The Gamepad Navigator Authors
See the AUTHORS.md file at the top-level directory of this distribution and at
https://github.com/fluid-lab/gamepad-navigator/raw/master/AUTHORS.md.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020 The Gamepad Navigator Authors
Copyright (c) 2023 The Gamepad Navigator Authors
See the AUTHORS.md file at the top-level directory of this distribution and at
https://github.com/fluid-lab/gamepad-navigator/raw/master/AUTHORS.md.
Expand Down
24 changes: 24 additions & 0 deletions audit-resolve.json
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,30 @@
"1094500|grunt-prompt>lodash": {
"decision": "ignore",
"madeAt": 1698935257541
},
"1094544|fluid-lint-all>eslint-plugin-markdown>remark-parse>trim>markdownlint-config-fluid>markdownlint>markdown-it>stylelint>autoprefixer>postcss": {
"decision": "ignore",
"madeAt": 1699613213481
},
"1094544|stylelint-config-fluid>stylelint>autoprefixer>postcss": {
"decision": "ignore",
"madeAt": 1699613213481
},
"1094544|stylelint-scss>stylelint>autoprefixer>postcss": {
"decision": "ignore",
"madeAt": 1699613213481
},
"1094544|sugarss>postcss": {
"decision": "ignore",
"madeAt": 1699612632490
},
"1094544|postcss-less>postcss": {
"decision": "ignore",
"madeAt": 1699613213481
},
"1094544|stylelint-order>postcss": {
"decision": "ignore",
"madeAt": 1699613213481
}
},
"rules": {},
Expand Down
2 changes: 1 addition & 1 deletion docs/CANDIDATE_TECHNOLOGIES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020 The Gamepad Navigator Authors
Copyright (c) 2023 The Gamepad Navigator Authors
See the AUTHORS.md file at the top-level directory of this distribution and at
https://github.com/fluid-lab/gamepad-navigator/raw/master/AUTHORS.md.
Expand Down
2 changes: 1 addition & 1 deletion docs/PUBLISHING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020 The Gamepad Navigator Authors
Copyright (c) 2023 The Gamepad Navigator Authors
See the AUTHORS.md file at the top-level directory of this distribution and at
https://github.com/fluid-lab/gamepad-navigator/raw/master/AUTHORS.md.
Expand Down
2 changes: 1 addition & 1 deletion docs/components/configMaps.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020 The Gamepad Navigator Authors
Copyright (c) 2023 The Gamepad Navigator Authors
See the AUTHORS.md file at the top-level directory of this distribution and at
https://github.com/fluid-lab/gamepad-navigator/raw/master/AUTHORS.md.
Expand Down
2 changes: 1 addition & 1 deletion docs/components/configurationPanel.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020 The Gamepad Navigator Authors
Copyright (c) 2023 The Gamepad Navigator Authors
See the AUTHORS.md file at the top-level directory of this distribution and at
https://github.com/fluid-lab/gamepad-navigator/raw/master/AUTHORS.md.
Expand Down
2 changes: 1 addition & 1 deletion docs/components/inputMapper.base.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020 The Gamepad Navigator Authors
Copyright (c) 2023 The Gamepad Navigator Authors
See the AUTHORS.md file at the top-level directory of this distribution and at
https://github.com/fluid-lab/gamepad-navigator/raw/master/AUTHORS.md.
Expand Down
2 changes: 1 addition & 1 deletion docs/components/inputMapper.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020 The Gamepad Navigator Authors
Copyright (c) 2023 The Gamepad Navigator Authors
See the AUTHORS.md file at the top-level directory of this distribution and at
https://github.com/fluid-lab/gamepad-navigator/raw/master/AUTHORS.md.
Expand Down
2 changes: 1 addition & 1 deletion docs/components/navigator.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020 The Gamepad Navigator Authors
Copyright (c) 2023 The Gamepad Navigator Authors
See the AUTHORS.md file at the top-level directory of this distribution and at
https://github.com/fluid-lab/gamepad-navigator/raw/master/AUTHORS.md.
Expand Down
21 changes: 16 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{
"name": "gamepad-navigator",
"version": "0.2.0",
"version": "1.0.0",
"description": "A Chrome extension that allows you to navigate web pages and Chromium-based browsers using a game controller.",
"author": "Divyanshu Mahajan",
"contributors": [
{ "name": "Divyanshu Mahajan" },
{
"name": "Tony Atkins",
"url": "https://duhrer.github.io/"
}
],
"license": "BSD-3-Clause",
"repository": {
"type": "git",
Expand All @@ -14,18 +20,23 @@
"homepage": "https://github.com/fluid-lab/gamepad-navigator#readme",
"scripts": {
"lint": "fluid-lint-all",
"postinstall": "grunt build",
"build": "npm run build:grunt && npm run build:css && npm run build:svgs",
"build:grunt": "grunt build",
"build:css": "node ./utils/bundleCss.js",
"build:svgs": "node ./utils/bundleSvgs.js",
"postinstall": "npm run build",
"test": "testem ci --file tests/testem.json"
},
"dependencies": {
"ally.js": "1.4.1",
"fluid-osk": "0.1.0-dev.20231120T090252Z.d23b7cd.GH-1",
"infusion": "4.6.0"
},
"devDependencies": {
"dotenv": "16.3.1",
"eslint": "8.50.0",
"eslint-config-fluid": "2.1.1",
"fluid-lint-all": "1.2.9",
"eslint-config-fluid": "2.1.1-dev.20231104T144458Z.5488e1c.GH-17",
"fluid-lint-all": "1.2.10-dev.20231104T184451Z.53e64ec.GH-64",
"grunt": "1.6.1",
"grunt-banner": "0.6.0",
"grunt-contrib-clean": "2.0.1",
Expand Down
4 changes: 0 additions & 4 deletions src/css/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,3 @@
* {
font-family: ubuntu, sans-serif;
}

.hidden {
display: none;
}
34 changes: 34 additions & 0 deletions src/css/modal.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
.hidden {
display: none;
}

.modal-outer-container {
align-content: center;
background-color: #000c;
font-family: inherit;
height: 100%;
left: 0;
position: fixed;
Expand All @@ -12,6 +17,7 @@
.modal-inner-container {
background-color: white;
border-radius: 1rem;
color: black;
display: flex;
flex-direction: column;
height: 75%;
Expand All @@ -22,17 +28,40 @@
z-index: 997;
}

@media (max-height: 400px) {
:host(.gamepad-navigator-modal-manager.modal-inner-container) {
height: 95%;
top: 2.5%;
}
}

@media (max-width: 600px) {
:host(.gamepad-navigator-modal-manager) .modal-inner-container {
left: 2.5%;
width: 95%;
}
}

.modal-header {
align-items: center;
align-self: center;
display: flex;
flex-direction: row;
}

.modal-header h3 {
font-size: 2rem;
font-weight: bold;
}

.modal-header .modal-icon svg {
height: 5rem;
width: 5rem;
}

.modal-body {
border: 1px solid #ccc;
height: 100%;
overflow-y: scroll;
}

Expand All @@ -41,6 +70,11 @@
}

.modal-footer button {
background-color: #ccc;
border: 1px solid #999;
border-radius: 0.5rem;
color: black;
font-size: 2rem;
margin: 1rem;
padding: 0.5rem;
}
30 changes: 30 additions & 0 deletions src/css/onscreen-keyboard.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
.osk-keyboard {
margin: auto;
padding-bottom: clamp(0.125rem, 5vh, 2rem);
padding-top: clamp(0.125rem, 5vh, 2rem);
width: 90%;
}

.osk-text-input {
margin: auto;
margin-top: clamp(0.5rem, 2vh, 2rem);
width: 90%;
}

button.osk-key {
color: black;
}

.osk-key {
background-color: #ccc;
margin: clamp(0.1rem, 0.3vw, 0.75rem);
}

.osk-key:focus {
border: 3px solid #339;
}

.onscreen-keyboard-modal .modal-inner-container {
height: clamp(20rem, 80vh, 50rem);
top: clamp(5rem, 10vh, 10rem);
}
Loading

0 comments on commit ccad258

Please sign in to comment.