From 62940fb72f8ba89b97bbbd2bdc484fd42f5e09ce Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 8 Sep 2015 21:12:36 +0500 Subject: UI changes for various tickets --- web/sass-files/sass/partials/_modal.scss | 4 ++-- web/sass-files/sass/partials/_post.scss | 2 +- web/sass-files/sass/partials/_responsive.scss | 9 +++++++++ web/sass-files/sass/partials/_settings.scss | 16 +++++++++------- web/sass-files/sass/partials/_sidebar--left.scss | 4 ++++ 5 files changed, 25 insertions(+), 10 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index dec08b567..29e05f6bf 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -63,7 +63,6 @@ margin: 0; } button.close { - margin: -2px -2px 0 0; color: #fff; @include opacity(1); z-index: 5; @@ -71,7 +70,8 @@ height: 30px; line-height: 30px; @include single-transition(all, 0.25s, ease-in); - position: relative; + position: absolute; + right: 10px; &:hover { background: rgba(0, 0, 0, 0.1); } diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 231e6fe3f..9a6e6e4c7 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -140,7 +140,7 @@ body.ios { padding: 1em 0 0; position: relative; -webkit-overflow-scrolling: touch; - &.hide-scroll::-webkit-scrollbar { + &::-webkit-scrollbar { width: 0px !important; } } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index c56625b88..a850d5a7f 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -365,6 +365,9 @@ width: 100%; z-index: 5; } + .modal-title { + padding-left: 15px; + } .user-settings { .tab-header { display: none; @@ -513,6 +516,12 @@ height: 45px; position: relative; @include single-transition(all, 0.2s, linear); + .glyphicon-refresh-animate { + right: 33px; + top: 15px; + color: #fff; + color: rgba(255,255,255,0.5); + } .form-control { border: none; padding: 0 10px 0 31px; diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 8d743dfe2..25c093957 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -14,13 +14,15 @@ width:800px; max-width: 100%; .modal-back { - width: 8px; - height: 13px; - background: url("../images/arrow-left.png"); - @include background-size(100% 100%); - margin-right: 10px; - display: inline-block; + width: 40px; + height: 56px; + background: url("../images/arrow-left.png") no-repeat; + @include background-size(8px 13px); + background-position: center; + top: 0; + left: 0; cursor: pointer; + position: absolute; } .modal-body { padding: 0; @@ -59,7 +61,7 @@ .section-max { background: #f2f2f2; - padding: 1em 0; + padding: 1em 0 1.3em; margin-bottom: 0; @include clearfix; .section-title { diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 432b8eb46..933be96ff 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -10,6 +10,10 @@ &.sidebar--padded { padding-top: 44px; } + .dropdown-menu { + max-height: 300px; + overflow: auto; + } .search__form { margin: 0; padding: 1em 1em 0; -- cgit v1.2.3-1-g7c22