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

Merge branch 'backend-connection' of https://github.com/sensebox/React-Ardublockly into backend-connection

Browse Source
This commit is contained in:
Delucse 2020-12-08 20:16:15 +01:00
commit 3655063eaa
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: {
main: '#DDDDDD'
},
button: {
compile: '#e27136'
}
}
});
class App extends Component {
componentDidMount(){
componentDidMount() {
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 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";
const styles = (theme) => ({
compile: {
backgroundColor: theme.palette.primary.main,
backgroundColor: theme.palette.button.compile,
color: theme.palette.primary.contrastText,
'&:hover': {
backgroundColor: theme.palette.primary.main,
backgroundColor: theme.palette.button.compile,
color: theme.palette.primary.contrastText,
}
}
@ -63,7 +63,7 @@ class SolutionCheck extends Component {
style={{ width: '40px', height: '40px', marginRight: '5px' }}
onClick={() => this.check()}
>
<FontAwesomeIcon icon={faPlay} size="xs" />
<FontAwesomeIcon icon={faClipboardCheck} size="l" />
</IconButton>
</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 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";
const styles = (theme) => ({
@ -24,12 +24,12 @@ const styles = (theme) => ({
color: '#fff',
},
button: {
backgroundColor: theme.palette.primary.main,
backgroundColor: theme.palette.button.compile,
color: theme.palette.primary.contrastText,
width: '40px',
height: '40px',
'&:hover': {
backgroundColor: theme.palette.primary.main,
backgroundColor: theme.palette.button.compile,
color: theme.palette.primary.contrastText,
}
}
@ -116,12 +116,12 @@ class Compile extends Component {
className={this.props.classes.button}
onClick={() => this.compile()}
>
<FontAwesomeIcon icon={faCogs} size="xs" />
<FontAwesomeIcon icon={faClipboardCheck} size="l" />
</IconButton>
</Tooltip>
:
<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>
}
<Backdrop className={this.props.classes.backdrop} open={this.state.progress}>