Skip to content

Fogbugz 3365 - Drag drop responsive bug #29

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
terrylks merged 2 commits into from
May 7, 2019
Merged

Fogbugz 3365 - Drag drop responsive bug #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8d57ae
Fixed Drag & Drop code viewer responsive issue. Header now adjusts to…
May 7, 2019
3cce7ca
Merge commit '63b01ef767357aeb872a0f54d2a2f6308bc251de' into drag-dro…
May 7, 2019
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
32 changes: 27 additions & 5 deletions src/components/DragDropCodeViewer/DragDropCodeViewer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,30 @@ const DivFlexStyled = styled.div`
button{
margin-top: -7px;
}
> :nth-child(1) {
flex: 0.05 0 0;
}
> :nth-child(2) {
flex: 0.7 0 0;
margin-top: 2px;
}
> :nth-child(3) {
flex: 0.2 0 0;
max-width: 156px;
}
@media screen and (max-width: 1240px) {
> :nth-child(1) {
flex: 0.075 0 0;
}
> :nth-child(2) {
flex: 0.625 0 0;
}
}
@media screen and (max-width: 1200px) {
> :nth-child(2) {
margin-top: -7px;
}
}
`
const DragDropSVGStyled = styled(DragDropSVG)`
width: 20px;
Expand Down Expand Up @@ -123,18 +147,16 @@ class DragDropCodeViewer extends Component {
{
this.state.value && this.state.value !== ""
? <DivFlexStyled>
<div className="text-center">
<DragDropSVGStyled />&nbsp;&nbsp;
<label>Drag & Drop files here or click browse to choose a file.</label>
</div>
<DragDropSVGStyled />
<label>Drag &amp; Drop files here or click browse to choose a file.</label>
<ButtonPrimary onClick={(e) => e.preventDefault()} >BROWSE</ButtonPrimary>
</DivFlexStyled>
: <div>
<ImageDiv className="text-center">
<DragDropSVG />
</ImageDiv>
<br />
<p id="ddLabel" className="lead text-center">Drag & Drop files here or<br/> click browse to choose a file.</p>
<p id="ddLabel" className="lead text-center">Drag &amp; Drop files here or<br/> click browse to choose a file.</p>
<br />
<p className="lead text-center browseButton">
<ButtonPrimary onClick={(e) => e.preventDefault()} >BROWSE</ButtonPrimary>
Expand Down