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

Restyle user-feedback #1100

Merged
merged 2 commits into from
Nov 4, 2019
Merged

Restyle user-feedback #1100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
687c409
Restyle user-feedback
Jikstra Nov 3, 2019
0518fcf
Make font size bigger and fix opacity for default user-feedback
Jikstra Nov 4, 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
Next Next commit
Restyle user-feedback
  • Loading branch information
@Jikstra
Jikstra committed Nov 3, 2019
commit 687c4094677af0a5c14cca12861b6fce4135a5c7
37 changes: 21 additions & 16 deletions scss/_global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,23 +149,28 @@ code {


.user-feedback {
font-size: 20px;
position: fixed;
bottom: 0;
max-width: 80%;
margin: 12px 10px;
border-radius: 4px;
position: fixed;
bottom: 0;
text-align: center;
width: 100%;
z-index: 10;

p {
display: inline-block;
text-align: center;
color: black;
padding: 10px;
z-index: 30;
box-shadow: 0px 2px 4px 2px rgba(0, 0, 0, 0.5);
}
.user-feedback.error {
background-color: #ffffba;
}
.user-feedback.success {
background-color: #4caf50;
font-style: italic;
font-weight: bold;
padding: 7px 14px;
background-color: rgba(105, 104, 104, 0.75);
border-radius: 10px;
color: white;
}
&.error p {
background-color: #b73a3a;
}
&.success p {
background-color: #3ca26a;
}
}

.clear-button {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/ScreenController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class ScreenController extends React.Component {
{this.state.message && (
<div onClick={this.userFeedbackClick}
className={classNames}>
{this.state.message.text}
<p>{this.state.message.text}</p>
</div>
)}
<ScreenContext.Provider value={{
Expand Down