diff options
author | =Corey Hulen <corey@hulen.com> | 2015-07-05 09:02:23 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-07-05 09:02:23 -0800 |
commit | 592d68cf4134b668e3ff962d17f8aa75b1bc055f (patch) | |
tree | 6e743b07487caf5fe350439aefdf0355a7e80d9b /web/sass-files/sass/partials/_responsive.scss | |
parent | 72bfc1ee2afd2fa4a34186b62f144f8f6c50d693 (diff) | |
parent | 4a3003c0dcf7d642f233493e32b07beed5d08327 (diff) | |
download | chat-592d68cf4134b668e3ff962d17f8aa75b1bc055f.tar.gz chat-592d68cf4134b668e3ff962d17f8aa75b1bc055f.tar.bz2 chat-592d68cf4134b668e3ff962d17f8aa75b1bc055f.zip |
Merge branch 'master' into mm-1391
Diffstat (limited to 'web/sass-files/sass/partials/_responsive.scss')
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index bed2f6324..0037879cf 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -5,7 +5,7 @@ &.post--comment { &.other--root { .post-comment { - margin-left: 0; + margin-left: -7px; } } } @@ -22,11 +22,16 @@ width: 825px; } .post-body { - padding-left: 0; + width: 736px; border: none; margin: 0; } } + .post-body { + float: none; + width: 750px; + margin: 0; + } .post__content { width: 920px; } @@ -63,10 +68,6 @@ } } } - .post-body { - float: none; - width: 750px; - } } } } @@ -81,7 +82,7 @@ &.post--comment { &.other--root { .post-comment { - margin-left: 0; + margin-left: -7px; } } } @@ -89,6 +90,7 @@ margin-left: 60px; padding-left: 10px; border-left: 4px solid #EEE; + margin-bottom: 10px; div.post-profile-img__container { .post-profile-img { display: none; @@ -98,7 +100,7 @@ width: 825px; } .post-body { - padding-left: 0; + width: 736px; border: none; margin: 0; } @@ -135,6 +137,7 @@ } } .post-body { + margin: 0; float: none; width: 750px; } @@ -231,17 +234,14 @@ } } .modal { + .info__label { + text-align: left; + padding-bottom: 5px; + } .modal-header { - padding-left: 20px; - padding-right: 20px; .modal-action { margin-top: 10px; } - button.close { - width: 35px; - height: 32px; - margin: -5px -10px 0; - } .modal-title { float: none; } @@ -261,9 +261,11 @@ .settings-table { display: block; .settings-content { - display: block; - .section-edit { - text-align: left; + &.minimize-settings { + display: block; + .section-edit { + text-align: left; + } } } .settings-links { @@ -287,10 +289,12 @@ } .settings-table { .settings-content { - padding: 0; - display: none; - .user-settings { - padding: 70px 20px 30px; + &.minimize-settings { + padding: 0; + display: none; + .user-settings { + padding: 70px 20px 30px; + } } } .settings-links { @@ -538,7 +542,6 @@ .modal { .modal-image { .image-wrapper { - padding-bottom: 40px; .modal-close { @include opacity(1); } @@ -575,7 +578,7 @@ &.post--comment { &.other--root { .post-comment { - margin-left: 11px; + margin-left: 4px; } } } |