jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-23 11:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade rendition to v8.7.2

Browse Source 
Change-type: patch
Changelog-entry: Upgrade rendition to v8.7.2
Signed-off-by: Lorenzo Alberto Maria Ambrosi <lorenzoa@balena.io>
This commit is contained in:
Lorenzo Alberto Maria Ambrosi 2019-05-17 11:42:16 +02:00
parent e0e7775367
commit 3236d6b934
6 changed files with 418 additions and 766 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gui/app/components/file-selector/file-selector/file-list.jsx
View File

@ -87,7 +87,7 @@ class UnstyledFileListWrap extends React.PureComponent {
render () { render () {
return ( return (
<Flex className={ this.props.className } <Flex className={ this.props.className }
innerRef={ ::this.setScrollElem } ref={ ::this.setScrollElem }
wrap="wrap"> wrap="wrap">
{ this.props.children } { this.props.children }
</Flex> </Flex>

6
lib/gui/app/components/file-selector/file-selector/file-selector.jsx
View File

@ -58,7 +58,7 @@ const Flex = styled.div`
overflow: ${ props => props.overflow }; overflow: ${ props => props.overflow };
` `
const Header = Flex.extend` const Header = styled(Flex) `
padding: 10px 15px 0; padding: 10px 15px 0;
border-bottom: 1px solid ${ colors.primary.faded }; border-bottom: 1px solid ${ colors.primary.faded };
@ -67,9 +67,9 @@ const Header = Flex.extend`
} }
` `
const Main = Flex.extend`` const Main = styled(Flex) ``
const Footer = Flex.extend` const Footer = styled(Flex) `
padding: 10px; padding: 10px;
flex: 0 0 auto; flex: 0 0 auto;
border-top: 1px solid ${ colors.primary.faded }; border-top: 1px solid ${ colors.primary.faded };

12
lib/gui/app/components/progress-button/progress-button.jsx
View File

@ -20,7 +20,11 @@ const React = require('react')
const propTypes = require('prop-types') const propTypes = require('prop-types')
const Color = require('color') const Color = require('color')
const { default: styled, keyframes } = require('styled-components') const {
default: styled,
css,
keyframes
} = require('styled-components')
const { ProgressBar, Provider } = require('rendition') const { ProgressBar, Provider } = require('rendition')
@ -49,6 +53,10 @@ const ProgressButtonStripes = keyframes `
} }
` `
const ProgressButtonStripesRule = css `
${ProgressButtonStripes} 1s linear infinite;
`
const FlashProgressBar = styled(ProgressBar) ` const FlashProgressBar = styled(ProgressBar) `
> div { > div {
width: 200px; width: 200px;
@ -83,7 +91,7 @@ const FlashProgressBarValidating = styled(FlashProgressBar) `
background-color: white; background-color: white;
animation: ${ProgressButtonStripes} 1s linear infinite; animation: ${ProgressButtonStripesRule};
overflow: hidden; overflow: hidden;
background-size: 20px 20px; background-size: 20px 20px;

4
lib/gui/app/styled-components.js
View File

@ -16,7 +16,7 @@
'use strict' 'use strict'
const styled = require('styled-components').default const { default: styled } = require('styled-components')
const { colors } = require('./theme') const { colors } = require('./theme')
const { const {
Button, Txt, Flex Button, Txt, Flex
@ -28,6 +28,8 @@ exports.StepButton = styled(Button) `
font-size: 16px; font-size: 16px;
margin: auto; margin: auto;
overflow: hidden; overflow: hidden;
border: none;
border-radius: 2px;
&:disabled { &:disabled {
background-color: ${colors.dark.disabled.background}; background-color: ${colors.dark.disabled.background};

1152
npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@ -65,15 +65,15 @@
"pretty-bytes": "^1.0.4", "pretty-bytes": "^1.0.4",
"prop-types": "^15.5.9", "prop-types": "^15.5.9",
"react": "^16.8.5", "react": "^16.8.5",
"react-dom": "^16.3.2", "react-dom": "^16.8.5",
"react2angular": "^4.0.2", "react2angular": "^4.0.2",
"redux": "^3.5.2", "redux": "^3.5.2",
"rendition": "4.41.1", "rendition": "^8.7.2",
"request": "^2.81.0", "request": "^2.81.0",
"resin-corvus": "^2.0.3", "resin-corvus": "^2.0.3",
"roboto-fontface": "^0.9.0", "roboto-fontface": "^0.9.0",
"semver": "^5.1.1", "semver": "^5.1.1",
"styled-components": "^3.2.3", "styled-components": "^4.2.0",
"styled-system": "^3.1.11", "styled-system": "^3.1.11",
"sudo-prompt": "^8.2.3", "sudo-prompt": "^8.2.3",
"tmp": "^0.1.0", "tmp": "^0.1.0",