diff --git a/konnectd/assets/identifier/asset-manifest.json b/konnectd/assets/identifier/asset-manifest.json index be3ac4bb9..7947881d1 100644 --- a/konnectd/assets/identifier/asset-manifest.json +++ b/konnectd/assets/identifier/asset-manifest.json @@ -1,42 +1,40 @@ { "files": { - "static/js/0.7598626e.chunk.js": "./static/js/0.7598626e.chunk.js", - "static/js/0.7598626e.chunk.js.map": "./static/js/0.7598626e.chunk.js.map", - "containers-goodbye.js": "./static/js/containers-goodbye.d2cc21ed.chunk.js", - "containers-goodbye.js.map": "./static/js/containers-goodbye.d2cc21ed.chunk.js.map", - "containers-login.js": "./static/js/containers-login.f4a5c7ac.chunk.js", - "containers-login.js.map": "./static/js/containers-login.f4a5c7ac.chunk.js.map", - "containers-welcome.js": "./static/js/containers-welcome.be5aafb5.chunk.js", - "containers-welcome.js.map": "./static/js/containers-welcome.be5aafb5.chunk.js.map", - "identifier-app.js": "./static/js/identifier-app.ddef38c1.chunk.js", - "identifier-app.js.map": "./static/js/identifier-app.ddef38c1.chunk.js.map", - "identifier-main.js": "./static/js/identifier-main.eb69745c.chunk.js", - "identifier-main.js.map": "./static/js/identifier-main.eb69745c.chunk.js.map", - "main.css": "./static/css/main.51be0eb5.chunk.css", - "main.js": "./static/js/main.3c21505c.chunk.js", - "main.js.map": "./static/js/main.3c21505c.chunk.js.map", - "runtime-main.js": "./static/js/runtime-main.448944d7.js", - "runtime-main.js.map": "./static/js/runtime-main.448944d7.js.map", - "static/js/8.cdac1014.chunk.js": "./static/js/8.cdac1014.chunk.js", - "static/js/8.cdac1014.chunk.js.map": "./static/js/8.cdac1014.chunk.js.map", - "static/js/9.2ca8cafc.chunk.js": "./static/js/9.2ca8cafc.chunk.js", - "static/js/9.2ca8cafc.chunk.js.map": "./static/js/9.2ca8cafc.chunk.js.map", - "static/js/10.351124bf.chunk.js": "./static/js/10.351124bf.chunk.js", - "static/js/10.351124bf.chunk.js.map": "./static/js/10.351124bf.chunk.js.map", + "static/js/0.05482ba6.chunk.js": "./static/js/0.05482ba6.chunk.js", + "static/js/0.05482ba6.chunk.js.map": "./static/js/0.05482ba6.chunk.js.map", + "containers-goodbye.js": "./static/js/containers-goodbye.497bb89c.chunk.js", + "containers-goodbye.js.map": "./static/js/containers-goodbye.497bb89c.chunk.js.map", + "containers-login.js": "./static/js/containers-login.bbd305ee.chunk.js", + "containers-login.js.map": "./static/js/containers-login.bbd305ee.chunk.js.map", + "containers-welcome.js": "./static/js/containers-welcome.f40213e1.chunk.js", + "containers-welcome.js.map": "./static/js/containers-welcome.f40213e1.chunk.js.map", + "identifier-app.js": "./static/js/identifier-app.f2f92e3f.chunk.js", + "identifier-app.js.map": "./static/js/identifier-app.f2f92e3f.chunk.js.map", + "identifier-main.js": "./static/js/identifier-main.680647d9.chunk.js", + "identifier-main.js.map": "./static/js/identifier-main.680647d9.chunk.js.map", + "main.css": "./static/css/main.f59c29f7.chunk.css", + "main.js": "./static/js/main.319f99c0.chunk.js", + "main.js.map": "./static/js/main.319f99c0.chunk.js.map", + "runtime-main.js": "./static/js/runtime-main.ba48e465.js", + "runtime-main.js.map": "./static/js/runtime-main.ba48e465.js.map", + "static/js/8.cecd3c0c.chunk.js": "./static/js/8.cecd3c0c.chunk.js", + "static/js/8.cecd3c0c.chunk.js.map": "./static/js/8.cecd3c0c.chunk.js.map", + "static/js/9.2a2c7a6a.chunk.js": "./static/js/9.2a2c7a6a.chunk.js", + "static/js/9.2a2c7a6a.chunk.js.map": "./static/js/9.2a2c7a6a.chunk.js.map", + "static/js/10.3af7223e.chunk.js": "./static/js/10.3af7223e.chunk.js", + "static/js/10.3af7223e.chunk.js.map": "./static/js/10.3af7223e.chunk.js.map", "index.html": "./index.html", - "precache-manifest.4fdf35e6a3f6f2ff2a9fee86d5d74838.js": "./precache-manifest.4fdf35e6a3f6f2ff2a9fee86d5d74838.js", + "precache-manifest.5a07100ca0e22465d9d34a3470319553.js": "./precache-manifest.5a07100ca0e22465d9d34a3470319553.js", "service-worker.js": "./service-worker.js", - "static/css/main.51be0eb5.chunk.css.map": "./static/css/main.51be0eb5.chunk.css.map", - "static/js/0.7598626e.chunk.js.LICENSE.txt": "./static/js/0.7598626e.chunk.js.LICENSE.txt", - "static/js/10.351124bf.chunk.js.LICENSE.txt": "./static/js/10.351124bf.chunk.js.LICENSE.txt", - "static/js/8.cdac1014.chunk.js.LICENSE.txt": "./static/js/8.cdac1014.chunk.js.LICENSE.txt", - "static/js/9.2ca8cafc.chunk.js.LICENSE.txt": "./static/js/9.2ca8cafc.chunk.js.LICENSE.txt", - "static/media/fancy-background.css": "./static/media/background.d469fc8c.jpg", - "static/media/index.css": "./static/media/roboto-latin-900italic.bc833e72.woff" + "static/css/main.f59c29f7.chunk.css.map": "./static/css/main.f59c29f7.chunk.css.map", + "static/js/0.05482ba6.chunk.js.LICENSE.txt": "./static/js/0.05482ba6.chunk.js.LICENSE.txt", + "static/js/10.3af7223e.chunk.js.LICENSE.txt": "./static/js/10.3af7223e.chunk.js.LICENSE.txt", + "static/js/9.2a2c7a6a.chunk.js.LICENSE.txt": "./static/js/9.2a2c7a6a.chunk.js.LICENSE.txt", + "static/media/app.css": "./static/media/background.d469fc8c.jpg" }, "entrypoints": [ - "static/js/runtime-main.448944d7.js", - "static/css/main.51be0eb5.chunk.css", - "static/js/main.3c21505c.chunk.js" + "static/js/runtime-main.ba48e465.js", + "static/css/main.f59c29f7.chunk.css", + "static/js/main.319f99c0.chunk.js" ] } \ No newline at end of file diff --git a/konnectd/assets/identifier/index.html b/konnectd/assets/identifier/index.html index 6d4e06b17..29631ae47 100644 --- a/konnectd/assets/identifier/index.html +++ b/konnectd/assets/identifier/index.html @@ -1 +1 @@ -Sign in — ownCloud
aABb
\ No newline at end of file +Sign in — ownCloud
\ No newline at end of file diff --git a/konnectd/assets/identifier/static/media/roboto-latin-100.987b8457.woff2 b/konnectd/assets/identifier/static/media/roboto-latin-100.987b8457.woff2 deleted file mode 100644 index d19e7b325..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-100.987b8457.woff2 and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-100.e9dbbe8a.woff b/konnectd/assets/identifier/static/media/roboto-latin-100.e9dbbe8a.woff deleted file mode 100644 index a01e70821..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-100.e9dbbe8a.woff and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-100italic.6232f43d.woff2 b/konnectd/assets/identifier/static/media/roboto-latin-100italic.6232f43d.woff2 deleted file mode 100644 index 2a25bd1a7..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-100italic.6232f43d.woff2 and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-100italic.d704bb3d.woff b/konnectd/assets/identifier/static/media/roboto-latin-100italic.d704bb3d.woff deleted file mode 100644 index b8aabdfe5..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-100italic.d704bb3d.woff and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-300.55536c8e.woff2 b/konnectd/assets/identifier/static/media/roboto-latin-300.55536c8e.woff2 deleted file mode 100644 index 52c5845a7..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-300.55536c8e.woff2 and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-300.a1471d1d.woff b/konnectd/assets/identifier/static/media/roboto-latin-300.a1471d1d.woff deleted file mode 100644 index 96663f072..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-300.a1471d1d.woff and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-300italic.210a7c78.woff b/konnectd/assets/identifier/static/media/roboto-latin-300italic.210a7c78.woff deleted file mode 100644 index a3bfbe352..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-300italic.210a7c78.woff and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-300italic.d69924b9.woff2 b/konnectd/assets/identifier/static/media/roboto-latin-300italic.d69924b9.woff2 deleted file mode 100644 index db95c87dc..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-300italic.d69924b9.woff2 and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-400.5d4aeb4e.woff2 b/konnectd/assets/identifier/static/media/roboto-latin-400.5d4aeb4e.woff2 deleted file mode 100644 index 7e854e669..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-400.5d4aeb4e.woff2 and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-400.bafb105b.woff b/konnectd/assets/identifier/static/media/roboto-latin-400.bafb105b.woff deleted file mode 100644 index 92dfacc61..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-400.bafb105b.woff and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-400italic.9680d5a0.woff b/konnectd/assets/identifier/static/media/roboto-latin-400italic.9680d5a0.woff deleted file mode 100644 index 27c34da2a..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-400italic.9680d5a0.woff and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-400italic.d8bcbe72.woff2 b/konnectd/assets/identifier/static/media/roboto-latin-400italic.d8bcbe72.woff2 deleted file mode 100644 index 3791c883e..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-400italic.d8bcbe72.woff2 and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-500.28546717.woff2 b/konnectd/assets/identifier/static/media/roboto-latin-500.28546717.woff2 deleted file mode 100644 index 8dceabcf6..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-500.28546717.woff2 and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-500.de8b7431.woff b/konnectd/assets/identifier/static/media/roboto-latin-500.de8b7431.woff deleted file mode 100644 index 2633e1525..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-500.de8b7431.woff and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-500italic.510dec37.woff2 b/konnectd/assets/identifier/static/media/roboto-latin-500italic.510dec37.woff2 deleted file mode 100644 index 1b9589945..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-500italic.510dec37.woff2 and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-500italic.ffcc050b.woff b/konnectd/assets/identifier/static/media/roboto-latin-500italic.ffcc050b.woff deleted file mode 100644 index d4d8b157f..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-500italic.ffcc050b.woff and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-700.037d8304.woff2 b/konnectd/assets/identifier/static/media/roboto-latin-700.037d8304.woff2 deleted file mode 100644 index e327dc95b..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-700.037d8304.woff2 and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-700.cf6613d1.woff b/konnectd/assets/identifier/static/media/roboto-latin-700.cf6613d1.woff deleted file mode 100644 index a0d26516a..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-700.cf6613d1.woff and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-700italic.010c1aee.woff2 b/konnectd/assets/identifier/static/media/roboto-latin-700italic.010c1aee.woff2 deleted file mode 100644 index d3239a3b1..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-700italic.010c1aee.woff2 and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-700italic.846d1890.woff b/konnectd/assets/identifier/static/media/roboto-latin-700italic.846d1890.woff deleted file mode 100644 index a3ca24626..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-700italic.846d1890.woff and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-900.19b7a0ad.woff2 b/konnectd/assets/identifier/static/media/roboto-latin-900.19b7a0ad.woff2 deleted file mode 100644 index 442456790..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-900.19b7a0ad.woff2 and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-900.8c2ade50.woff b/konnectd/assets/identifier/static/media/roboto-latin-900.8c2ade50.woff deleted file mode 100644 index 9109f3506..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-900.8c2ade50.woff and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-900italic.7b770d6c.woff2 b/konnectd/assets/identifier/static/media/roboto-latin-900italic.7b770d6c.woff2 deleted file mode 100644 index b7006fb0f..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-900italic.7b770d6c.woff2 and /dev/null differ diff --git a/konnectd/assets/identifier/static/media/roboto-latin-900italic.bc833e72.woff b/konnectd/assets/identifier/static/media/roboto-latin-900italic.bc833e72.woff deleted file mode 100644 index c690e47a7..000000000 Binary files a/konnectd/assets/identifier/static/media/roboto-latin-900italic.bc833e72.woff and /dev/null differ diff --git a/konnectd/ui/public/index.html b/konnectd/ui/public/index.html index 9a6acfd8e..c04ae9cae 100644 --- a/konnectd/ui/public/index.html +++ b/konnectd/ui/public/index.html @@ -13,11 +13,6 @@ -
-
-
-
-
-
aABb
+
diff --git a/konnectd/ui/src/Main.js b/konnectd/ui/src/Main.js index 966c26366..e35cf297f 100644 --- a/konnectd/ui/src/Main.js +++ b/konnectd/ui/src/Main.js @@ -4,32 +4,16 @@ import { connect } from 'react-redux'; import { BrowserRouter } from 'react-router-dom'; -import { withStyles } from '@material-ui/core/styles'; - -import { enhanceBodyBackground } from './utils'; import Routes from './Routes'; -// Trigger loading of background image. -enhanceBodyBackground(); - -const styles = () => ({ - root: { - position: 'relative', - display: 'flex', - flex: 1 - } -}); - class App extends PureComponent { render() { const { classes, hello, pathPrefix } = this.props; return ( -
- - - -
+ + + ); } @@ -58,4 +42,4 @@ const mapStateToProps = (state) => { }; }; -export default connect(mapStateToProps)(withStyles(styles)(App)); +export default connect(mapStateToProps)(App); diff --git a/konnectd/ui/src/app.css b/konnectd/ui/src/app.css index d6076e065..38368416b 100644 --- a/konnectd/ui/src/app.css +++ b/konnectd/ui/src/app.css @@ -7,6 +7,20 @@ strong { font-weight: 600; } +.oc-login-bg { + background-image: url(./images/background.jpg); + background-size: cover; + background-repeat: no-repeat; + background-position: center; + z-index: 0; +} + +#loader { + /* NOTE(longsleep): White here needed because of the background image */ + color: white; + text-shadow: #000 0 0 1px; +} + .oc-logo { position: absolute; top: -120px; @@ -16,20 +30,25 @@ strong { } .oc-input { - background-color: white; - border: 0; - border-radius: 6px; + background-color: #042047; + border: 1px solid rgba(78,133,200,.8); + border-radius: 3px; + color: rgba(255,255,255,.8); width: 300px; height: 40px; - padding: 12px 8px; + padding: 16px; box-sizing: border-box; - font-size: 1.125rem; + font-size: 1rem; } .oc-input:focus { outline: none; } +.oc-input::placeholder { + color: rgba(78,133,200,.8); +} + .oc-input + .oc-input { margin-top: 10px; } @@ -64,6 +83,6 @@ strong { width: 100% !important; } -.oc-mt-s { - margin-top: 10px !important; +.oc-mt-m { + margin-top: 20px !important; } diff --git a/konnectd/ui/src/containers/Login/Login.js b/konnectd/ui/src/containers/Login/Login.js index 296f071a0..435589dc8 100644 --- a/konnectd/ui/src/containers/Login/Login.js +++ b/konnectd/ui/src/containers/Login/Login.js @@ -64,42 +64,40 @@ class Login extends React.PureComponent { : ); return ( -
-
this.logon(event)}> -
- - - {hasError && {errorMessage}} -
- - {loading && } -
+ this.logon(event)}> +
+ + + {hasError && {errorMessage}} +
+ + {loading && }
- -
+
+ ); } diff --git a/konnectd/ui/src/fancy-background.css b/konnectd/ui/src/fancy-background.css deleted file mode 100644 index c788523f4..000000000 --- a/konnectd/ui/src/fancy-background.css +++ /dev/null @@ -1,33 +0,0 @@ -/* fancy background with two components and fade */ - -#bg { - background-color: white; -} - -#bg > div { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - background-size: cover; - background-repeat: no-repeat; - background-position: center; - z-index: 0; -} - -#loader { - /* NOTE(longsleep): White here needed because of the background image */ - color: white; - text-shadow: #000 0 0 1px; -} - -#bg-enhanced { - opacity: 0; - transition: opacity 1s; -} - -#bg-enhanced.enhanced { - background-image: url(./images/background.jpg); - opacity: 1; -} diff --git a/konnectd/ui/src/index.js b/konnectd/ui/src/index.js index 002fc62c1..2b800ba10 100644 --- a/konnectd/ui/src/index.js +++ b/konnectd/ui/src/index.js @@ -1,8 +1,6 @@ import 'kpop/static/css/base.css'; import 'kpop/static/css/scrollbar.css'; -import 'typeface-roboto'; import './app.css'; -import './fancy-background.css'; import * as kpop from 'kpop/es/version';