schuelerlabor-cleverlab/smarti
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #40 from sensebox/compile-button-color

Browse Source 
update compile button color
This commit is contained in:
Mario Pesch 2020-12-08 20:14:40 +01:00 committed by GitHub
commit c4c9ddc127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/App.js
View File

@ -24,13 +24,16 @@ const theme = createMuiTheme({
}, },
secondary: { secondary: {
main: '#DDDDDD' main: '#DDDDDD'
},
button: {
compile: '#e27136'
} }
} }
}); });
class App extends Component { class App extends Component {
componentDidMount(){ componentDidMount() {
store.dispatch(loadUser()); store.dispatch(loadUser());
} }

8
src/components/Tutorial/SolutionCheck.js
View File

@ -15,15 +15,15 @@ import IconButton from '@material-ui/core/IconButton';
import Tooltip from '@material-ui/core/Tooltip'; import Tooltip from '@material-ui/core/Tooltip';
import Button from '@material-ui/core/Button'; import Button from '@material-ui/core/Button';
import { faPlay } from "@fortawesome/free-solid-svg-icons"; import { faClipboardCheck } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
const styles = (theme) => ({ const styles = (theme) => ({
compile: { compile: {
backgroundColor: theme.palette.primary.main, backgroundColor: theme.palette.button.compile,
color: theme.palette.primary.contrastText, color: theme.palette.primary.contrastText,
'&:hover': { '&:hover': {
backgroundColor: theme.palette.primary.main, backgroundColor: theme.palette.button.compile,
color: theme.palette.primary.contrastText, color: theme.palette.primary.contrastText,
} }
} }
@ -63,7 +63,7 @@ class SolutionCheck extends Component {
style={{ width: '40px', height: '40px', marginRight: '5px' }} style={{ width: '40px', height: '40px', marginRight: '5px' }}
onClick={() => this.check()} onClick={() => this.check()}
> >
<FontAwesomeIcon icon={faPlay} size="xs" /> <FontAwesomeIcon icon={faClipboardCheck} size="l" />
</IconButton> </IconButton>
</Tooltip> </Tooltip>

10
src/components/Workspace/Compile.js
View File

@ -15,7 +15,7 @@ import IconButton from '@material-ui/core/IconButton';
import Tooltip from '@material-ui/core/Tooltip'; import Tooltip from '@material-ui/core/Tooltip';
import TextField from '@material-ui/core/TextField'; import TextField from '@material-ui/core/TextField';
import { faCogs } from "@fortawesome/free-solid-svg-icons"; import { faClipboardCheck } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
const styles = (theme) => ({ const styles = (theme) => ({
@ -24,12 +24,12 @@ const styles = (theme) => ({
color: '#fff', color: '#fff',
}, },
button: { button: {
backgroundColor: theme.palette.primary.main, backgroundColor: theme.palette.button.compile,
color: theme.palette.primary.contrastText, color: theme.palette.primary.contrastText,
width: '40px', width: '40px',
height: '40px', height: '40px',
'&:hover': { '&:hover': {
backgroundColor: theme.palette.primary.main, backgroundColor: theme.palette.button.compile,
color: theme.palette.primary.contrastText, color: theme.palette.primary.contrastText,
} }
} }
@ -116,12 +116,12 @@ class Compile extends Component {
className={this.props.classes.button} className={this.props.classes.button}
onClick={() => this.compile()} onClick={() => this.compile()}
> >
<FontAwesomeIcon icon={faCogs} size="xs" /> <FontAwesomeIcon icon={faClipboardCheck} size="l" />
</IconButton> </IconButton>
</Tooltip> </Tooltip>
: :
<Button style={{ float: 'right', color: 'white' }} variant="contained" color="primary" onClick={() => this.compile()}> <Button style={{ float: 'right', color: 'white' }} variant="contained" color="primary" onClick={() => this.compile()}>
<FontAwesomeIcon icon={faCogs} style={{ marginRight: '5px' }} /> Kompilieren <FontAwesomeIcon icon={faClipboardCheck} style={{ marginRight: '5px' }} /> Kompilieren
</Button> </Button>
} }
<Backdrop className={this.props.classes.backdrop} open={this.state.progress}> <Backdrop className={this.props.classes.backdrop} open={this.state.progress}>