Skip to content
Permalink
Browse files

Merge pull request #46 from akivajgordon/develop

Fix bad aliyot markers + reduced visual contrast
  • Loading branch information...
akivajgordon committed Mar 29, 2019
2 parents 000d6c9 + 98fce9a commit 6bf41ce402910cebc84324bb8aa752b7b8d6dfc6
@@ -344,9 +344,7 @@
"verse": 23
}
],
"aliyot": [
4
],
"aliyot": [],
"isPetucha": false
},
{
@@ -12,7 +12,9 @@
"verse": 33
}
],
"aliyot": [],
"aliyot": [
4
],
"isPetucha": false
},
{
@@ -185,7 +185,7 @@
}
],
"aliyot": [
7
1
],
"isPetucha": false
},
@@ -284,7 +284,9 @@
"verse": 1
}
],
"aliyot": [],
"aliyot": [
7
],
"isPetucha": false
},
{
@@ -25,7 +25,9 @@ const Search = ({ search, emitter }) => {

;[
{ key: 'ArrowDown', adjustment: selected => selected + 1 },
{ key: 'ArrowUp', adjustment: selected => selected - 1 }
{ key: 'ArrowUp', adjustment: selected => selected - 1 },
{ key: { key: 'n', ctrl: true }, adjustment: selected => selected + 1 },
{ key: { key: 'p', ctrl: true }, adjustment: selected => selected - 1 }
].forEach(({ key, adjustment }) => self.addEventListener('keydown', whenKey(key, e => {
e.preventDefault()
setSelected(list, adjustment)
@@ -5,8 +5,16 @@ const htmlToElement = (html) => {
return template.content.firstChild
}

const getKeys = (key) => {
if (typeof key === 'string') return { key, ctrl: false }

return key
}

const whenKey = (key, callback) => e => {
if (e.key === key) callback(e)
const { key: k, ctrl } = getKeys(key)

if (e.ctrlKey === ctrl && e.key === k) callback(e)
}

const purgeNode = (node) => {
@@ -22,6 +22,7 @@
body {
height: 100vh;
font-family: sans-serif;
background-color: var(--paper-color, white);
}

ol {
@@ -54,6 +55,8 @@ ol {
height should fill the rest of the container (in this case
the screen), regardless of overflow */
--header-height: 45px;

--paper-color: hsl(0, 0%, 98%);
}

.tikkun-book {
@@ -2,6 +2,7 @@
display: flex;
justify-content: center;
font-family: Shlomosemistam;
color: hsla(0, 0%, 0%, 0.8);
}


@@ -15,7 +15,7 @@
left: 0;
right: 0;
bottom: 0;
background-color: white;
background-color: var(--paper-color, white);
display: flex;
flex-direction: column;
align-items: center;
@@ -148,7 +148,10 @@ describe('jumper', () => {
.should('have.attr', 'data-selected')

cy.focused()
.type('{downarrow}{downarrow}')
.type('{downarrow}{downarrow}{uparrow}')
.type('{ctrl}n')
.type('{ctrl}n')
.type('{ctrl}p')

cy.get('[data-target-class="list-item"]')
.eq(2)

Large diffs are not rendered by default.

@@ -1,4 +1,4 @@
/*! normalize.css v8.0.0 | MIT License | github.com/necolas/normalize.css */
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */

/* Document
========================================================================== */
@@ -24,6 +24,14 @@ body {
margin: 0;
}

/**
* Render the `main` element consistently in IE.
*/

main {
display: block;
}

/**
* Correct the font size and margin on `h1` elements within `section` and
* `article` contexts in Chrome, Firefox, and Safari.

0 comments on commit 6bf41ce

Please sign in to comment.
You can’t perform that action at this time.