Skip to content

Commit c52c196

Browse files
Merge pull request #80 from tolgamizrakci/development
Development
2 parents 29c535b + 101280e commit c52c196

14 files changed

+725
-336
lines changed

src/components/HTMLComponentPanel.jsx

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ import Tab from "@material-ui/core/Tab";
1717
import Chip from "@material-ui/core/Chip";
1818
import theme from "./theme.ts";
1919

20-
// import {HTMLelements,getSize} from "../utils/htmlElements.util";
21-
2220
class HTMLComponentPanel extends Component {
2321
state = {
2422
HtmlComponentName: ""
@@ -53,7 +51,11 @@ class HTMLComponentPanel extends Component {
5351
this.handleCreateHTMLChild("Image");
5452
}}
5553
>
56-
<ImageIcon style={{ color: "#e0e0e0" }} />
54+
<ImageIcon
55+
style={{
56+
color: "#e0e0e0"
57+
}}
58+
/>
5759
</IconButton>
5860
<Chip
5961
label="Image"
@@ -62,7 +64,8 @@ class HTMLComponentPanel extends Component {
6264
style={{
6365
color: "white",
6466
borderColor: "#424242",
65-
borderWidth: "0.5px"
67+
borderWidth: "0.0px",
68+
fontSize: "50%"
6669
}}
6770
/>
6871
</div>
@@ -84,7 +87,8 @@ class HTMLComponentPanel extends Component {
8487
style={{
8588
color: "white",
8689
borderColor: "#424242",
87-
borderWidth: "0.5px"
90+
borderWidth: "0.0px",
91+
fontSize: "50%"
8892
}}
8993
/>
9094
</Grid>
@@ -105,7 +109,8 @@ class HTMLComponentPanel extends Component {
105109
style={{
106110
color: "white",
107111
borderColor: "#424242",
108-
borderWidth: "0.5px"
112+
borderWidth: "0.0px",
113+
fontSize: "50%"
109114
}}
110115
/>
111116
</Grid>
@@ -126,7 +131,8 @@ class HTMLComponentPanel extends Component {
126131
style={{
127132
color: "white",
128133
borderColor: "#424242",
129-
borderWidth: "0.5px"
134+
borderWidth: "0.0px",
135+
fontSize: "50%"
130136
}}
131137
/>
132138
</Grid>
@@ -147,7 +153,8 @@ class HTMLComponentPanel extends Component {
147153
style={{
148154
color: "white",
149155
borderColor: "#424242",
150-
borderWidth: "0.5px"
156+
borderWidth: "0.0px",
157+
fontSize: "50%"
151158
}}
152159
/>
153160
</Grid>
@@ -168,7 +175,8 @@ class HTMLComponentPanel extends Component {
168175
style={{
169176
color: "white",
170177
borderColor: "#424242",
171-
borderWidth: "0.5px"
178+
borderWidth: "0.0px",
179+
fontSize: "50%"
172180
}}
173181
/>
174182
</Grid>
@@ -189,7 +197,10 @@ function styles(theme) {
189197
borderRadius: "1px",
190198
borderColor: "#424242",
191199
bottom: "0px",
192-
padding: "10px",
200+
paddingLeft: "10px",
201+
paddingRight: "10px",
202+
paddingBottom: "25px",
203+
paddingTop: "2px",
193204
boxShadow: "0 6px 6px rgba(0,0,0,0.23)"
194205
// paddingBottom: "10px"
195206
},

src/components/HtmlAttr.jsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import TextField from '@material-ui/core/TextField';
66
import IconButton from '@material-ui/core/IconButton';
77
import SaveIcon from '@material-ui/icons/Save';
88
import { updateHtmlAttr } from '../actions/components';
9-
import { HTMLelements, getSize } from '../utils/htmlElements.util';
9+
import { HTMLelements, getSize } from '../utils/htmlElements.util.ts';
1010
import Paper from '@material-ui/core/Paper';
1111
import Fab from '@material-ui/core/Fab';
1212

@@ -76,7 +76,7 @@ class HtmlAttr extends Component {
7676
console.log(attr, this.state[attr]);
7777
this.props.updateHtmlAttr({ attr, value: this.state[attr] });
7878
this.setState({
79-
[attr]: ""
79+
[attr]: '',
8080
});
8181
};
8282

@@ -90,12 +90,6 @@ class HtmlAttr extends Component {
9090
console.log('focuschild', this.props.focusChild);
9191
}
9292

93-
// setInitialState = () => {
94-
// HTMLelements[focusChildType].attributes.forEach(attr =>
95-
// this.setState({ attr: "" })
96-
// );
97-
// };
98-
9993
render() {
10094
const { focusComponent, classes, deleteProp, addProp, focusChild, updateHtmlAttr } = this.props;
10195

src/components/LeftColExpansionPanel.jsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@ import { withStyles } from "@material-ui/core/styles";
33
import Typography from "@material-ui/core/Typography";
44
import List from "@material-ui/core/List";
55
import ListItem from "@material-ui/core/ListItem";
6-
import ListItemSecondaryAction from "@material-ui/core/ListItemSecondaryAction";
76
import ListItemText from "@material-ui/core/ListItemText";
87
import IconButton from "@material-ui/core/IconButton";
98
import Grid from "@material-ui/core/Grid";
109
import AddIcon from "@material-ui/icons/Add";
1110
import DeleteIcon from "@material-ui/icons/Delete";
1211
import Fab from "@material-ui/core/Fab";
1312

14-
import { openExpansionPanel } from "../utils/componentReducer.util";
15-
1613
const LeftColExpansionPanel = props => {
1714
const {
1815
classes,

src/components/SnackbarContentWrapper.jsx

Lines changed: 0 additions & 88 deletions
This file was deleted.

src/components/Snackbars.jsx

Lines changed: 0 additions & 60 deletions
This file was deleted.

src/components/xxxSnackbars.jsx

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)