Merge pull request #371 from amplimindcc/370-change-lineheight-editor

add line height
amplimindcc · Jun 13, 2024 · 2693cd2 · 2693cd2
2 parents 5d8c06c + fb6f521
commit 2693cd2
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/src/components/PasswordStrengthMeter/PasswordStrengthMeter.css b/src/components/PasswordStrengthMeter/PasswordStrengthMeter.css
@@ -1,7 +1,8 @@
 .password-strength-meter {
     display: flex;
     flex-direction: column;
-    margin-top: 7px;
+    margin-top: 12px;
+    margin-bottom: 5px;
 }
 
 .password-strength-meter-progress {

diff --git a/src/components/PasswordStrengthMeter/PasswordStrengthMeter.scss b/src/components/PasswordStrengthMeter/PasswordStrengthMeter.scss
@@ -1,7 +1,8 @@
 .password-strength-meter {
     display: flex;
     flex-direction: column;
-    margin-top: 7px;
+    margin-top: 12px;
+    margin-bottom: 5px;
 }
 
 .password-strength-meter-progress {

diff --git a/src/pages/Admin/components/Challenges/Challenges.css b/src/pages/Admin/components/Challenges/Challenges.css
@@ -51,9 +51,10 @@
     margin: 10px 0 10px 0;
     text-align: left;
     background-color: lightgray;
-    padding: 0px 10px 0px 10px;
+    padding: 12px;
     border-radius: 8px;
     box-shadow: 0 3px 5px rgba(0, 0, 0, 0.18);
+    line-height: 1.25;
 }
 
 .editor {

diff --git a/src/pages/Admin/components/Challenges/Challenges.scss b/src/pages/Admin/components/Challenges/Challenges.scss
@@ -50,9 +50,10 @@
     margin: 10px 0 10px 0;
     text-align: left;
     background-color: lightgray;
-    padding: 0px 10px 0px 10px;
+    padding: 12px;
     border-radius: 8px;
     box-shadow: 0 3px 5px rgba(0, 0, 0, 0.18);
+    line-height: 1.25;
 }
 
 .editor {

diff --git a/src/pages/Admin/components/Challenges/Challenges.tsx b/src/pages/Admin/components/Challenges/Challenges.tsx
@@ -529,7 +529,7 @@ export default function Challenges() {
                                         'bold italic forecolor | alignleft aligncenter ' +
                                         'alignright alignjustify | bullist numlist outdent indent | ' +
                                         'removeformat | help',
-                                    content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px}',
+                                    content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px; line-height: 1.25;}',
                                     branding: false
                                 }}
                             />

diff --git a/src/pages/Commit/Commit.css b/src/pages/Commit/Commit.css
@@ -35,4 +35,5 @@
 p.description {
     white-space: pre-line;
     background-color: #03213b;
+    line-height: 0.5;
 }

diff --git a/src/pages/Commit/Commit.scss b/src/pages/Commit/Commit.scss
@@ -36,4 +36,5 @@
 p.description {
     white-space: pre-line;
     background-color: $amplimind-background-dark-blue;
+    line-height: 0.5;
 }
diff --git a/src/pages/Invite/Invite.tsx b/src/pages/Invite/Invite.tsx
@@ -286,9 +286,6 @@ const Invite = () => {
                                 onChange={handleChange}
                             />
                         </div>
-                        <PasswordStrengthMeter
-                            password={inputValues.password}
-                        />
                         <Error text={errors.password.text} />
                     </div>
                     <div className="input-wrapper">
@@ -306,6 +303,9 @@ const Invite = () => {
                             />
                         </div>
                         <Error text={errors.passwordRepeat.text} />
+                        <PasswordStrengthMeter
+                            password={inputValues.password}
+                        />
                     </div>
                     <div className="invite-button">
                         <Button