diff --git a/client/src/assets/images/about-logo.png b/client/src/assets/images/about-logo.png
new file mode 100644
index 00000000..d7fac455
Binary files /dev/null and b/client/src/assets/images/about-logo.png differ
diff --git a/client/src/assets/images/cover.jpg b/client/src/assets/images/login-cover.jpg
similarity index 100%
rename from client/src/assets/images/cover.jpg
rename to client/src/assets/images/login-cover.jpg
diff --git a/client/src/assets/images/logo.png b/client/src/assets/images/logo.png
index d7fac455..0602eb77 100644
Binary files a/client/src/assets/images/logo.png and b/client/src/assets/images/logo.png differ
diff --git a/client/src/components/common/Login/Content.jsx b/client/src/components/common/Login/Content.jsx
index e13f9505..b73c2460 100644
--- a/client/src/components/common/Login/Content.jsx
+++ b/client/src/components/common/Login/Content.jsx
@@ -19,6 +19,8 @@ import { isUsername } from '../../../utils/validator';
import AccessTokenSteps from '../../../constants/AccessTokenSteps';
import TermsModal from './TermsModal';
+import logo from '../../../assets/images/logo.png';
+
import styles from './Content.module.scss';
const createMessage = (error) => {
@@ -175,19 +177,27 @@ const Content = React.memo(() => {
return (
-
-
-
-
-
-
+
+
+
+
+
+

+
+
+
{message && (
{
/>
)}
-
-
- {'Powered by '}
-
- PLANKA
-
-
-
+
diff --git a/client/src/components/common/Login/Content.module.scss b/client/src/components/common/Login/Content.module.scss
index 9f4f1e6a..e1bbd88f 100644
--- a/client/src/components/common/Login/Content.module.scss
+++ b/client/src/components/common/Login/Content.module.scss
@@ -5,7 +5,7 @@
:global(#app) {
.cover {
- background: url("../../../assets/images/cover.jpg") left / cover;
+ background: url("../../../assets/images/login-cover.jpg") left / cover;
}
.coverOverlay {
@@ -23,16 +23,16 @@
font-weight: normal;
}
- .formFooter {
- color: #6b808c;
- font-weight: lighter;
- text-align: center;
+ .form {
+ display: flex;
+ flex: 1;
+ flex-direction: column;
+ justify-content: center;
}
.formTitle {
font-size: 36px;
font-weight: bold;
- margin-bottom: 36px;
}
.formSubtitle {
@@ -41,18 +41,16 @@
margin-bottom: 32px;
}
- .formWrapper {
- margin-bottom: 36px;
- }
-
- .fullHeight {
- height: 100%;
- }
-
.grid {
+ height: 100%;
margin: 0;
}
+ .gridItem {
+ height: 100%;
+ padding: 0;
+ }
+
.inputLabel {
font-size: 16px;
line-height: 20px;
@@ -63,10 +61,40 @@
margin-bottom: 16px;
}
- .loginWrapper {
+ .login {
+ display: flex;
+ flex-direction: column;
margin: 0 auto;
max-width: 440px;
- padding: 0 20px;
+ min-height: 100vh;
+ padding: 40px;
+ row-gap: 40px;
+ }
+
+ .logo {
+ max-height: 144px;
+ max-width: 80%;
+ }
+
+ .logoWrapper {
+ display: flex;
+ justify-content: center;
+ margin-bottom: 40px;
+ }
+
+ .poweredBy {
+ align-items: center;
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+ justify-content: center;
+ margin-top: auto;
+ }
+
+ .poweredByText {
+ color: #6b808c;
+ font-weight: lighter;
+ text-align: center;
}
.wrapper {
diff --git a/client/src/components/users/UserSettingsModal/AboutPane.jsx b/client/src/components/users/UserSettingsModal/AboutPane.jsx
index 44380051..32d2a679 100644
--- a/client/src/components/users/UserSettingsModal/AboutPane.jsx
+++ b/client/src/components/users/UserSettingsModal/AboutPane.jsx
@@ -8,14 +8,14 @@ import { Image, Tab } from 'semantic-ui-react';
import version from '../../../version';
-import logo from '../../../assets/images/logo.png';
+import aboutLogo from '../../../assets/images/about-logo.png';
import styles from './AboutPane.module.scss';
const AboutPane = React.memo(() => (
-
+
{version}
diff --git a/client/src/reducers/core.js b/client/src/reducers/core.js
index f0917084..65d0f04a 100755
--- a/client/src/reducers/core.js
+++ b/client/src/reducers/core.js
@@ -129,13 +129,6 @@ export default (state = initialState, { type, payload }) => {
},
};
case ActionTypes.CONFIG_UPDATE__SUCCESS:
- return {
- ...state,
- config: {
- ...state.config,
- ...payload.config,
- },
- };
case ActionTypes.CONFIG_UPDATE_HANDLE:
return {
...state,
diff --git a/server/api/models/BackgroundImage.js b/server/api/models/BackgroundImage.js
index b6a07b4e..d44fd1bb 100644
--- a/server/api/models/BackgroundImage.js
+++ b/server/api/models/BackgroundImage.js
@@ -40,7 +40,7 @@
* url:
* type: string
* format: uri
- * description: URL to access the full-size background image
+ * description: URL to the full-size background image
* example: https://storage.example.com/background-images/1357158568008091264/original.jpg
* thumbnailUrls:
* type: object
diff --git a/server/api/models/User.js b/server/api/models/User.js
index 97587c1f..818235b0 100755
--- a/server/api/models/User.js
+++ b/server/api/models/User.js
@@ -77,7 +77,7 @@
* cover180:
* type: string
* format: uri
- * description: URL for 180px cover thumbnail
+ * description: URL for 180px thumbnail version
* example: https://storage.example.com/user-avatars/1357158568008091264/cover-180.jpg
* gravatarUrl:
* type: string