diff --git a/package-lock.json b/package-lock.json index 9df2223..a2d466c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6931,8 +6931,7 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "optional": true + "bundled": true }, "aproba": { "version": "1.2.0", @@ -6969,8 +6968,7 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", @@ -6979,8 +6977,7 @@ }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -7083,8 +7080,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -7094,7 +7090,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7120,7 +7115,6 @@ "minipass": { "version": "2.3.5", "bundled": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7137,7 +7131,6 @@ "mkdirp": { "version": "0.5.1", "bundled": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -7221,7 +7214,6 @@ "once": { "version": "1.4.0", "bundled": true, - "optional": true, "requires": { "wrappy": "1" } @@ -7297,8 +7289,7 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "optional": true + "bundled": true }, "safer-buffer": { "version": "2.1.2", @@ -7328,7 +7319,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7346,7 +7336,6 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7385,13 +7374,11 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "optional": true + "bundled": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "optional": true + "bundled": true } } } diff --git a/package.json b/package.json index c1dda77..4915531 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "html-react-parser": "^0.9.1", "json-format-highlight": "^1.0.1", "react": "^16.8.6", - "react-contenteditable": "^3.3.1", "react-dom": "^16.8.6", "react-json-view": "^1.19.1", "react-qr-svg": "^2.2.1", @@ -36,4 +35,4 @@ "last 1 safari version" ] } -} +} \ No newline at end of file diff --git a/src/App/components/gridHeader/gridHeader.css b/src/App/components/gridHeader/gridHeader.css new file mode 100644 index 0000000..e69de29 diff --git a/src/App/components/gridHeader/index.js b/src/App/components/gridHeader/index.js new file mode 100644 index 0000000..279cf7c --- /dev/null +++ b/src/App/components/gridHeader/index.js @@ -0,0 +1,14 @@ +import React from 'react' +import './gridHeader.css' + +class GridHeader extends React.Component { + render() { + return ( +
+

{this.props.text}

+
+ ) + } +} + +export default GridHeader \ No newline at end of file diff --git a/src/App/components/header/header.css b/src/App/components/header/header.css index 2d9c9f5..51e60c1 100644 --- a/src/App/components/header/header.css +++ b/src/App/components/header/header.css @@ -1,9 +1,17 @@ .header { display: flex; - flex-direction: row; + height: 100%; + width: 100%; + padding-left: 2%; + align-items: center; + background-color: #333 } .header__logo, .header__gear { - float: left; +} + +.header__gear { + font-size: 25px; + color: whitesmoke } \ No newline at end of file diff --git a/src/App/components/header/index.js b/src/App/components/header/index.js index 0f437ff..0aed233 100644 --- a/src/App/components/header/index.js +++ b/src/App/components/header/index.js @@ -13,10 +13,8 @@ class Header extends React.Component { render() { return (
- -
QR Converter
-
A
-
+
QR Converter
+
) } diff --git a/src/App/components/qr/qr.css b/src/App/components/qr/qr.css index f8df805..26d59f4 100644 --- a/src/App/components/qr/qr.css +++ b/src/App/components/qr/qr.css @@ -5,11 +5,11 @@ justify-content: center; } .qr__element { - width: 100px; - height: 100px; + width: 200px; + height: 200px; max-width: 100%; max-height: 100%; - padding: 7px; + padding: 6px; border-radius:4px; background-color: #fff; } diff --git a/src/App/components/save/save.css b/src/App/components/save/save.css index bf6206a..ef62402 100644 --- a/src/App/components/save/save.css +++ b/src/App/components/save/save.css @@ -1,7 +1,6 @@ .save { display: flex; flex-direction: column; - align-items: center; justify-content: center; grid-area: save; } \ No newline at end of file diff --git a/src/App/components/search/search.css b/src/App/components/search/search.css index 586ba99..e486e71 100644 --- a/src/App/components/search/search.css +++ b/src/App/components/search/search.css @@ -1,9 +1,6 @@ .search { - margin-top: 5px; - padding: 5px 10px; - display: flex; - width: 100%; - max-width: 200px; + padding: 10px; + background-color: #333; } .search .input--checkbox { diff --git a/src/App/components/textInput/index.js b/src/App/components/textInput/index.js index 6a93e5d..17f85b6 100644 --- a/src/App/components/textInput/index.js +++ b/src/App/components/textInput/index.js @@ -1,5 +1,4 @@ import React from 'react' -import ContentEditable from 'react-contenteditable' import './textInput.css' class TextInput extends React.Component { @@ -22,14 +21,9 @@ class TextInput extends React.Component { render() { return ( - ) } diff --git a/src/App/components/textInput/textInput.css b/src/App/components/textInput/textInput.css index 01044ca..ef30c39 100644 --- a/src/App/components/textInput/textInput.css +++ b/src/App/components/textInput/textInput.css @@ -3,4 +3,8 @@ width: 100%; height: 100%; padding: 25px; + resize: none; + background-color: transparent; + border-color: transparent; + color: white; } \ No newline at end of file diff --git a/src/App/index.js b/src/App/index.js index 784091f..b8e354b 100644 --- a/src/App/index.js +++ b/src/App/index.js @@ -8,6 +8,7 @@ import Header from './components/header' import Search from './components/search' import './App.css' import Store, { QRS } from 'App/store' +import GridHeader from './components/gridHeader' class App extends React.Component { constructor(props) { @@ -85,15 +86,19 @@ class App extends React.Component {
+
+
+
+