diff options
| author | Asaad Mahmood <asaadmahmoodspin@users.noreply.github.com> | 2016-06-16 22:20:43 +0500 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-06-16 09:20:43 -0800 |
| commit | b130a32eaccb6f46ad90eb252291b8376435fb60 (patch) | |
| tree | a1e466c7799e220adb828ec2e3d748056d2c7be4 /webapp/sass | |
| parent | ca138883ab5416706ee3eea866640add338c11f9 (diff) | |
| download | chat-b130a32eaccb6f46ad90eb252291b8376435fb60.tar.gz chat-b130a32eaccb6f46ad90eb252291b8376435fb60.tar.bz2 chat-b130a32eaccb6f46ad90eb252291b8376435fb60.zip | |
Multiple UI fixes (#3357)
* Multiple UI fixes
* Removing utils from tutorial file
Diffstat (limited to 'webapp/sass')
| -rw-r--r-- | webapp/sass/components/_tutorial.scss | 9 | ||||
| -rw-r--r-- | webapp/sass/layout/_post.scss | 17 | ||||
| -rw-r--r-- | webapp/sass/routes/_admin-console.scss | 7 | ||||
| -rw-r--r-- | webapp/sass/routes/_backstage.scss | 6 | ||||
| -rw-r--r-- | webapp/sass/routes/_settings.scss | 9 |
5 files changed, 34 insertions, 14 deletions
diff --git a/webapp/sass/components/_tutorial.scss b/webapp/sass/components/_tutorial.scss index e735ba3f3..e4aff1785 100644 --- a/webapp/sass/components/_tutorial.scss +++ b/webapp/sass/components/_tutorial.scss @@ -66,11 +66,11 @@ margin-top: -10px; .arrow { - border-top-width: 0; border-bottom-color: $white; - top: -10px; + border-top-width: 0; left: 50%; margin-left: -10px; + top: -10px; } } @@ -168,12 +168,15 @@ .tutorial-steps__container { display: table; height: 100%; + left: 0; + position: absolute; text-align: center; + top: 0; width: 100%; .tutorial__content { display: table-cell; - padding: 20px 40px 40px; + padding: 20px 40px 80px; vertical-align: middle; .tutorial__steps { diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss index a3c354f89..baca9a127 100644 --- a/webapp/sass/layout/_post.scss +++ b/webapp/sass/layout/_post.scss @@ -534,9 +534,8 @@ body.ios { ol, ul { - display: inline-block; - margin-top: 1px; - padding-left: 30px; + clear: both; + padding-left: 20px; } } @@ -911,14 +910,18 @@ body.ios { ul, ol { margin-bottom: .4em; + padding-left: 20px; p { margin-bottom: 0; } - li ul, - li ol { - padding: 10px 0 0 20px; + li { + ul, + ol { + margin: 0; + padding: 0 0 0 20px; + } } li.list-item--task-list ul, @@ -991,7 +994,7 @@ body.ios { margin: 0 0 10px; text-rendering: auto; - &.pull-left{ + &.pull-left { margin: 5px 5px 0 0; } diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss index 676264ab2..2a10fc486 100644 --- a/webapp/sass/routes/_admin-console.scss +++ b/webapp/sass/routes/_admin-console.scss @@ -82,6 +82,12 @@ text-align: left; } + .has-error { + .control-label { + font-weight: normal; + } + } + .form-group { margin-bottom: 25px; } @@ -321,7 +327,6 @@ .sidebar-section-title, .sidebar-subsection-title { - @include clearfix; color: alpha-color($white, .5); display: block; font-size: 13px; diff --git a/webapp/sass/routes/_backstage.scss b/webapp/sass/routes/_backstage.scss index f9754f16d..244aad043 100644 --- a/webapp/sass/routes/_backstage.scss +++ b/webapp/sass/routes/_backstage.scss @@ -303,14 +303,14 @@ body { border: 1px solid $light-gray; display: inline-block; height: 210px; - margin: 0 0 20px 30px; + margin: 0 30px 30px 0; padding: 20px; text-align: center; vertical-align: top; width: 250px; - &:first-child { - margin-left: 0; + &:last-child { + margin-right: 0; } &:hover { diff --git a/webapp/sass/routes/_settings.scss b/webapp/sass/routes/_settings.scss index 376cf611e..5b8c36c5c 100644 --- a/webapp/sass/routes/_settings.scss +++ b/webapp/sass/routes/_settings.scss @@ -269,6 +269,7 @@ display: none; font-size: 12px; margin-right: 5px; + &.fa-chevron-down { margin-right: 0; position: relative; @@ -290,6 +291,14 @@ .divider-light { border-bottom: 1px solid lightgrey; + + & + .divider-light { + display: none; + } + + & + .divider-dark { + display: none; + } } .setting-list { |