Skip to content

Change quarternary to quaternary #549

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

Merged
merged 1 commit into from
Jul 5, 2018
Merged

Change quarternary to quaternary #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ The Deck tag is the root level tag for your presentation. It supports the follow
| contentHeight | PropTypes.numbers | Baseline content area height (default: 700) |
| contentWidth | PropTypes.numbers | Baseline content area width (default: 1000) |
| history | PropTypes.object | Accepts custom configuration for [history](https://github.com/ReactTraining/history) |
| progress | PropTypes.string | Accepts `pacman`, `bar`, `number` or `none`. To override the color, change the 'quarternary' color in the theme. |
| progress | PropTypes.string | Accepts `pacman`, `bar`, `number` or `none`. To override the color, change the 'quaternary' color in the theme. |
| theme | PropTypes.object | Accepts a theme object for styling your presentation |
| transition | PropTypes.array | Accepts `slide`, `zoom`, `fade` or `spin`, and can be combined. Sets global slide transitions. **Note: If you use the 'scale' transition, fitted text won't work in Safari.** |
| transitionDuration | PropTypes.number | Accepts integer value in milliseconds for global transition duration. |
Expand Down
6 changes: 3 additions & 3 deletions src/themes/default/print.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const defaultColors = {
primary: 'black',
secondary: 'black',
tertiary: 'black',
quarternary: 'black'
quaternary: 'black'
};

const defaultFonts = {
Expand Down Expand Up @@ -60,7 +60,7 @@ const print = (colorArgs = defaultColors, fontArgs = defaultFonts) => {
outline: 0
},
prevIcon: {
fill: colors.quarternary
fill: colors.quaternary
},
next: {
position: 'absolute',
Expand All @@ -73,7 +73,7 @@ const print = (colorArgs = defaultColors, fontArgs = defaultFonts) => {
outline: 0
},
nextIcon: {
fill: colors.quarternary
fill: colors.quaternary
}
},
prism: {
Expand Down
16 changes: 8 additions & 8 deletions src/themes/default/screen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const defaultColors = {
primary: '#f9c300',
secondary: 'black',
tertiary: 'white',
quarternary: 'white'
quaternary: 'white'
};

const defaultFonts = {
Expand Down Expand Up @@ -101,7 +101,7 @@ const screen = (colorArgs = defaultColors, fontArgs = defaultFonts) => {
outline: 0
},
prevIcon: {
fill: colors.quarternary,
fill: colors.quaternary,
transition: 'fill 1s ease-in-out 0.2s'
},
next: {
Expand All @@ -115,7 +115,7 @@ const screen = (colorArgs = defaultColors, fontArgs = defaultFonts) => {
outline: 0
},
nextIcon: {
fill: colors.quarternary,
fill: colors.quaternary,
transition: 'fill 1s ease-in-out 0.2s'
}
},
Expand Down Expand Up @@ -147,7 +147,7 @@ const screen = (colorArgs = defaultColors, fontArgs = defaultFonts) => {
borderTopLeftRadius: '10px',
borderTopRightRadius: '10px',
transition: 'all 0.3s ease-out',
background: colors.quarternary
background: colors.quaternary
},
pacmanBottom: {
position: 'absolute',
Expand All @@ -156,7 +156,7 @@ const screen = (colorArgs = defaultColors, fontArgs = defaultFonts) => {
height: '10px',
borderBottomLeftRadius: '10px',
borderBottomRightRadius: '10px',
background: colors.quarternary,
background: colors.quaternary,
transition: 'all 0.3s ease-out',
top: '10px'
},
Expand All @@ -168,7 +168,7 @@ const screen = (colorArgs = defaultColors, fontArgs = defaultFonts) => {
height: '10px',
borderWidth: 2,
borderStyle: 'solid',
borderColor: colors.quarternary,
borderColor: colors.quaternary,
borderRadius: '50%',
transition: 'all 0.3s ease-out'
}
Expand All @@ -185,7 +185,7 @@ const screen = (colorArgs = defaultColors, fontArgs = defaultFonts) => {
},
bar: {
height: '100%',
background: colors.quarternary,
background: colors.quaternary,
transition: 'all 0.3s ease-out'
}
},
Expand All @@ -195,7 +195,7 @@ const screen = (colorArgs = defaultColors, fontArgs = defaultFonts) => {
bottom: 10,
right: 10,
zIndex: 1000,
color: colors.quarternary,
color: colors.quaternary,
transition: 'all 0.3s ease-out'
}
}
Expand Down