daydream

commit a6305433d3982b40467586ca7f53031af1318f83
parent faf17e50d578f6b73ce88aa2909e63968dd7657a
Author: Marcel <mtrnord1@gmail.com>
Date:   Mon, 15 Jun 2020 21:18:28 +0200

Fix some suggestions from #matrix-design:matrix.org

Took 15 minutes

Diffstat:
M
src/app/views/login.rs
 | 
8
++++----
M
static/custom-css.scss
 | 
21
++++++++++++++++++---
M
static/fonts.scss
 | 
1
-

3 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/app/views/login.rs b/src/app/views/login.rs
@@ -132,7 +132,7 @@ impl Component for Login {
 
     //noinspection RsTypeCheck
     fn view(&self) -> Html {
-        let mut homeserver_classes = "login-input login-input-first";
+        let mut homeserver_classes = "login-input";
         let mut mxid_classes = "login-input";
         let mut password_classes = "login-input";
         match self.state.error_field.as_ref() {
@@ -173,7 +173,7 @@ impl Component for Login {
                                         match &self.state.error {
                                             Some(v) => {
                                                 html! {
-                                                    <h3 class="error">
+                                                    <h4 class="error">
                                                         {
                                                             tr!(
                                                                 // {0} is the Error that happened on login
@@ -182,7 +182,7 @@ impl Component for Login {
                                                                 v
                                                             )
                                                         }
-                                                    </h3>
+                                                    </h4>
                                                 }
                                             }
                                             None => {
@@ -192,7 +192,7 @@ impl Component for Login {
                                     }
 
                                     <form id="login_form" onsubmit=self.link.callback(|e: FocusEvent| {e.prevent_default();  Msg::Login})>
-                                        <div class="login-inline">
+                                        <div class="login-inline login-input-first">
                                            <span class="material-icons login-icons" id="ma-icon" style="font-size: 28px !important;">{"http"}</span>
                                             <input
                                                 pattern="^https:\\/\\/.*$"
diff --git a/static/custom-css.scss b/static/custom-css.scss
@@ -77,7 +77,18 @@ em {
 }
 
 .error {
-  color: red;
+  color: #992E2E;
+  font-family: Roboto;
+  font-style: normal;
+  font-weight: 500;
+  font-size: 16px;
+  line-height: 56px;
+  display: flex;
+  align-items: center;
+  text-align: center;
+  letter-spacing: 0.02em;
+  font-feature-settings: 'ordn' on;
+  margin: 0;
 }
 
 .roomlist {
@@ -260,8 +271,12 @@ _::-webkit-full-page-media, _:future, :root .login-page-bg {
   transform: translateY(-7px);
 }
 
-input.login-input-first {
-  margin-top: 0;
+.login-input-first > input.login-input {
+  margin-top: 0 !important;
+}
+
+.login-input-first > .login-icons {
+  bottom: calc(50% - 6px * 2);
 }
 
 input.login-input {
diff --git a/static/fonts.scss b/static/fonts.scss
@@ -1,2 +1 @@
-@import url('https://fonts.googleapis.com/css2?family=Dancing+Script:wght@700&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Dancing+Script:wght@700&family=Roboto:wght@300;400;500;700&display=swap');