Skip to content

Commit 0b20cfa

Browse files
committed
Merge pull request #325 from parallaxinc/quickfix1
Fixing button issue on touch screens
2 parents b15ddf4 + bc09a07 commit 0b20cfa

12 files changed

+67
-14
lines changed

assets/theme/parallax.css

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,31 @@
7070
background: rgba(155,157,162,0.37);
7171
z-index: 1;
7272
}
73+
74+
.parallax-button{
75+
background: white;
76+
box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);
77+
border: none;
78+
border-radius: 2px;
79+
color: #000;
80+
position: relative;
81+
height: 36px;
82+
margin: 0 5px 0;
83+
min-width: 80px;
84+
padding: 0 16px;
85+
display: inline-block;
86+
font-family: "Roboto","Helvetica","Arial",sans-serif;
87+
font-size: 14px;
88+
font-weight: 500;
89+
text-transform: uppercase;
90+
letter-spacing: 0;
91+
overflow: hidden;
92+
will-change: box-shadow;
93+
transition: box-shadow .2s cubic-bezier(.4,0,1,1),background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);
94+
outline: none;
95+
cursor: pointer;
96+
text-decoration: none;
97+
text-align: center;
98+
line-height: 36px;
99+
vertical-align: middle;
100+
}

src/components/button.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
'use strict';
2+
3+
const React = require('react');
4+
const ReactStyle = require('react-style');
5+
6+
export default class Button extends React.Component {
7+
render(){
8+
const {
9+
children,
10+
onClick,
11+
} = this.props
12+
13+
return(
14+
<button onClick={onClick} className="parallax-button">{children}</button>
15+
)
16+
}
17+
}

src/components/file-list-item.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
const React = require('react');
4-
const ListItem = require('react-material/components/ListItem');
54

65
const red = '#da2100';
76
const green = '#159600';
@@ -27,15 +26,20 @@ class FileListItem extends React.Component {
2726
onClick
2827
} = this.props;
2928

29+
const liStyle = {
30+
listStyleType: 'none',
31+
padding: "14px 16px 15px"
32+
}
33+
3034
const tempStyles = [styles.fileTempIndicator];
3135
if(temp){
3236
tempStyles.push(styles.fileHasTemp);
3337
}
3438

3539
return (
36-
<ListItem onClick={onClick}>
40+
<li styles={liStyle} onClick={onClick}>
3741
<span styles={tempStyles} /> {filename}
38-
</ListItem>
42+
</li>
3943
);
4044
}
4145
}

src/components/project-list-item.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
const React = require('react');
4-
const ListItem = require('react-material/components/ListItem');
54

65
class Project extends React.Component {
76
render(){
@@ -10,10 +9,15 @@ class Project extends React.Component {
109
children
1110
} = this.props;
1211

12+
const liStyle = {
13+
listStyleType: 'none',
14+
padding: "14px 16px 15px"
15+
}
16+
1317
return (
14-
<ListItem icon="folder" onClick={onClick}>
18+
<li styles={liStyle} icon="folder" onClick={onClick}>
1519
{children}
16-
</ListItem>
20+
</li>
1721
);
1822
}
1923
}

src/views/delete-file-overlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const React = require('react');
44
const { createContainer } = require('sovereign');
5-
const Button = require('react-material/components/Button');
5+
const Button = require('../components/button');
66

77
const Overlay = require('../components/overlay');
88
const OverlayTitle = require('../components/overlay-title');

src/views/delete-project-overlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const React = require('react');
44
const { createContainer } = require('sovereign');
5-
const Button = require('react-material/components/Button');
5+
const Button = require('../components/button');
66

77
const Overlay = require('../components/overlay');
88
const OverlayTitle = require('../components/overlay-title');

src/views/download-overlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const _ = require('lodash');
44
const React = require('react');
5-
const Button = require('react-material/components/Button');
5+
const Button = require('../components/button');
66
const Loader = require('react-loader');
77
const { createContainer } = require('sovereign');
88

src/views/help-overlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const React = require('react');
4-
const Button = require('react-material/components/Button');
4+
const Button = require('../components/button');
55

66
const Overlay = require('../components/overlay');
77
const OverlayTitle = require('../components/overlay-title');

src/views/new-version-overlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const React = require('react');
4-
const Button = require('react-material/components/Button');
4+
const Button = require('../components/button');
55

66
const Overlay = require('../components/overlay');
77
const OverlayTitle = require('../components/overlay-title');

src/views/overwrite-overlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const React = require('react');
44
const { createContainer } = require('sovereign');
5-
const Button = require('react-material/components/Button');
5+
const Button = require('../components/button');
66

77
const Overlay = require('../components/overlay');
88
const OverlayTitle = require('../components/overlay-title');

0 commit comments

Comments
 (0)