diff --git a/src/app/organisms/settings/Settings.jsx b/src/app/organisms/settings/Settings.jsx index dbb6bae..ec856cd 100644 --- a/src/app/organisms/settings/Settings.jsx +++ b/src/app/organisms/settings/Settings.jsx @@ -7,6 +7,7 @@ import settings from '../../../client/state/settings'; import Text from '../../atoms/text/Text'; import IconButton from '../../atoms/button/IconButton'; +import Button from '../../atoms/button/Button'; import SegmentedControls from '../../atoms/segmented-controls/SegmentedControls'; import PopupWindow, { PWContentSelector } from '../../molecules/popup-window/PopupWindow'; @@ -17,6 +18,8 @@ import LockIC from '../../../../public/res/ic/outlined/lock.svg'; import InfoIC from '../../../../public/res/ic/outlined/info.svg'; import CrossIC from '../../../../public/res/ic/outlined/cross.svg'; +import CinnySVG from '../../../../public/res/svg/cinny.svg'; + function AppearanceSection() { return (
@@ -40,17 +43,31 @@ function AppearanceSection() { } function SecuritySection() { - return
; + return ( +
+ {`Device ID: ${initMatrix.matrixClient.getDeviceId()}`} +
+ ); } function AboutSection() { return ( -
- - About - - Version: 1.0.0 - {`Device ID: ${initMatrix.matrixClient.getDeviceId()}`} +
+
+ Cinny logo +
+ + Cinny + v1.0.0 + + Yet another matrix client + +
+ + +
+
+
); } diff --git a/src/app/organisms/settings/Settings.scss b/src/app/organisms/settings/Settings.scss index f96baf6..2f54d64 100644 --- a/src/app/organisms/settings/Settings.scss +++ b/src/app/organisms/settings/Settings.scss @@ -1,6 +1,6 @@ .settings-window { & .pw__content-container { - height: 100%; + min-height: 100%; } } @@ -11,8 +11,28 @@ margin-left: var(--sp-extra-tight); margin-right: var(--sp-normal); } + + & .setting-tile { + margin-top: var(--sp-normal); + } } .settings__about { - text-align: center; + &__branding { + margin-top: var(--sp-extra-tight); + margin-bottom: var(--sp-normal); + display: flex; + + & > div { + margin: 0 calc(var(--sp-loose) + var(--sp-ultra-tight)); + } + + } + &__btns { + margin: 0; + margin-top: var(--sp-normal); + & button:last-child { + margin: 0 var(--sp-tight) + } + } } \ No newline at end of file