summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-03-30 11:34:54 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-03-30 11:34:54 -0400
commit8956e7de9e5c53f305d94985d481622b1285d164 (patch)
tree2ecf79fd6f1ba0985219bd0cab2b038c8487a010 /webapp
parent52074b70a448841d34eec8a4920ab4d35a028d09 (diff)
parent18c29e9ab29b8249974f0b6368c0f14531a79ec8 (diff)
downloadchat-8956e7de9e5c53f305d94985d481622b1285d164.tar.gz
chat-8956e7de9e5c53f305d94985d481622b1285d164.tar.bz2
chat-8956e7de9e5c53f305d94985d481622b1285d164.zip
Merge pull request #2579 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/textbox.jsx2
-rw-r--r--webapp/sass/layout/_post.scss2
-rw-r--r--webapp/sass/routes/_signup.scss15
3 files changed, 6 insertions, 13 deletions
diff --git a/webapp/components/textbox.jsx b/webapp/components/textbox.jsx
index 63d5486a4..c77e1f9a3 100644
--- a/webapp/components/textbox.jsx
+++ b/webapp/components/textbox.jsx
@@ -130,7 +130,7 @@ export default class Textbox extends React.Component {
const helpText = (
<div
- style={{visibility: hasText ? 'visible' : 'hidden', opacity: hasText ? '0.5' : '0'}}
+ style={{visibility: hasText ? 'visible' : 'hidden', opacity: hasText ? '0.3' : '0'}}
className='help__format-text'
>
<b>
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index 05ef09643..f29448bde 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -77,7 +77,7 @@ body.ios {
.help__format-text {
@include opacity(0);
- @include single-transition(all .2s ease);
+ @include single-transition(all, .5s, ease, .5s);
display: inline-block;
font-size: .85em;
margin-right: 10px;
diff --git a/webapp/sass/routes/_signup.scss b/webapp/sass/routes/_signup.scss
index 062e4c9a5..6d6092170 100644
--- a/webapp/sass/routes/_signup.scss
+++ b/webapp/sass/routes/_signup.scss
@@ -98,7 +98,6 @@
.inner__content {
margin: 30px 0 20px;
- padding: 0 1rem;
}
.block--gray {
@@ -132,14 +131,12 @@
font-size: 2.2em;
font-weight: 600;
margin: .5em 0 0;
- padding-left: 1rem;
}
.signup-team__subdomain {
font-size: 1.5em;
font-weight: 300;
margin: .2em 0 1.2em;
- padding-left: 1rem;
text-transform: uppercase;
}
@@ -151,6 +148,7 @@
background: #dddddd;
height: 1px;
margin: 2em 0;
+ margin: 2.5em 0 2.5em -1rem;
text-align: left;
span {
@@ -171,10 +169,6 @@
padding-left: 18px;
}
- .signup__email-container {
- margin-left: 1rem;
- }
-
.btn {
font-size: 1em;
font-weight: 600;
@@ -200,7 +194,7 @@
display: block;
height: 40px;
line-height: 34px;
- margin: 1em 0 1em 10px;
+ margin: 1em 0;
min-width: 200px;
padding: 0 1em;
width: 200px;
@@ -262,7 +256,6 @@
}
&.btn-full {
- margin-left: 0;
padding-left: 35px;
text-align: left;
width: 100%;
@@ -374,11 +367,11 @@
}
.margin--extra {
- margin-top: 3em;
+ margin-top: 2.5em;
}
.margin--extra-2x {
- margin-top: 6em;
+ margin-top: 5em;
}
}