Skip to content
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

Jump to bottom

Preview Chat is now showing up correctly. fixes(#3629) #3630

Closed
wants to merge 1 commit into from
+15 −29
Closed

Preview Chat is now showing up correctly. fixes(#3629) #3630

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
43 changes: 15 additions & 28 deletions src/components/cms/BotBuilder/Preview/Preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,14 @@ const PreviewContainer = styled.div`
margin: 14px auto auto auto;
padding: 0px 10px 10px;
position: relative;
overflow: hidden;
@media (max-width: 520px) {
width: 100%;
padding: 0 10px;
}
`;

const PreviewChatContainer = styled.div`
min-height: ${(props) =>
props.width > 1200 ? props.height - 250 + 'px' : '100%'};
min-height: ${(props) => (props.width > 1200 ? 720 + 'px' : '93%')};
@media (max-width: 520px) {
width: 100%;
}
Expand All @@ -81,8 +79,7 @@ const SUSIFrameContainer = styled.div`
border-radius: 4px;
box-shadow: 0 10px 10px rgba(0, 0, 0, 0.16);
overflow-x: hidden;
height: ${(props) =>
props.width > 1200 ? props.height - 250 + 'px' : '630px'};
height: ${(props) => (props.width > 1200 ? 680 + 'px' : '630px')};
width: 100%;
animation: ${moveFromBottomFadeKeyframe} 0.3s ease both;
media(max-width: 667px) {
Expand Down Expand Up @@ -127,26 +124,20 @@ to {
}
`;

const SUSILauncherContainer = styled.div`
right: 0;
direction: ltr;
bottom: 15px;
`;

const SUSILauncherWrapper = styled.div`
width: 60px;
background-size: 60px;
text-align: right;
float: right;
margin-right: 0%;
margin-top: 15px;
margin-top: 0px;
border-radius: 5em;
cursor: pointer;
transition: transform .15s ease-in-out, box-shadow .15s ease-in-out;
transform: translateY(150px);
animation: ${launcherFrameAppearKeyframe} .25s ease forwards
padding: 0;
height: auto;
display: inline-block;
position: relative;
left: 300px;
:hover {
box-shadow: 0 4px 42px 0 rgba(0, 0, 0, .25);
}
Expand All @@ -161,11 +152,11 @@ const SUSILauncherButton = styled.div`
border-radius: 50%;
margin: -1px;
box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.15);
right: 0;
background-position: 50%;
background-repeat: no-repeat;
cursor: pointer;
bottom: 15px;
display: inline-block;
position: relative;
:after {
content: '';
position: absolute;
Expand Down Expand Up @@ -526,17 +517,13 @@ class Preview extends Component {
</SUSIFrameContainer>
)}
</PreviewChatContainer>
<div style={{ textAlign: 'right' }}>
<SUSILauncherContainer>
<SUSILauncherWrapper onClick={this.togglePreview}>
<SUSILauncherButton
data-tip="Toggle Launcher"
$backgroundColor={botbuilderIconColor}
$backgroundImage={botbuilderIconImg}
/>
</SUSILauncherWrapper>
</SUSILauncherContainer>
</div>
<SUSILauncherWrapper onClick={this.togglePreview}>
<SUSILauncherButton
data-tip="Toggle Launcher"
$backgroundColor={botbuilderIconColor}
$backgroundImage={botbuilderIconImg}
/>
</SUSILauncherWrapper>
</PreviewContainer>
</Paper>
</Container>
Expand Down
1 change: 0 additions & 1 deletion surge_deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ export [email protected]
export SURGE_TOKEN=a34fd7119aacd204150edd6a8e29903d

export DEPLOY_DOMAIN=https://pr-${TRAVIS_PULL_REQUEST}-fossasia-susi-web-chat.surge.sh
surge --project ./build --domain $DEPLOY_DOMAIN;