From 25e6e9aca7be87541bfc396f2c53e3ed316e834d Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 4 Nov 2015 00:50:56 +0500 Subject: UI Improvements for multiple tickets --- web/sass-files/sass/partials/_modal.scss | 22 +++++------ web/sass-files/sass/partials/_responsive.scss | 2 +- web/sass-files/sass/partials/_signup.scss | 55 +++++++++++++++------------ 3 files changed, 43 insertions(+), 36 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 9314b4980..0333e0c65 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -149,6 +149,12 @@ @include opacity(0.8); margin: 5px 0; } + .profile-img { + -moz-border-radius: 50px; + -webkit-border-radius: 50px; + border-radius: 50px; + margin-right: 8px; + } .more-name { font-weight: 600; font-size: 0.95em; @@ -230,8 +236,8 @@ position: relative; &:hover .file-playback-controls.stop { - @include opacity(1); - } + @include opacity(1); + } } img { max-width: 100%; @@ -347,7 +353,7 @@ } } -.modal-direct-channels { +.more-modal { .user-list { margin-top: 10px; @@ -362,11 +368,12 @@ } .modal-body { - padding: 20px 0 0; + padding: 10px 0 0; @include clearfix; } .filter-row { + margin-top: 10px; padding: 0 15px; } @@ -379,11 +386,4 @@ .more-purpose { @include opacity(0.7); } - - .profile-img { - -moz-border-radius: 50px; - -webkit-border-radius: 50px; - border-radius: 50px; - margin-right: 8px; - } } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 8f25f58cd..339412b45 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -100,7 +100,7 @@ .date-separator, .new-separator { &.hovered--comment { &:before, &:after { - background: none; + background: none !important; } } } diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss index 84f9892f4..b9486e254 100644 --- a/web/sass-files/sass/partials/_signup.scss +++ b/web/sass-files/sass/partials/_signup.scss @@ -314,32 +314,39 @@ } .signup-team-all { - width: 280px; - box-shadow: 3px 3px 1px #d5d5d5; - margin: 0px 0px 50px 5px; -} - -.signup-team-dir { - background: #fafafa; - border-bottom: 1px solid #d5d5d5; -} - -.signup-team-dir__group { - padding: 15px 10px 15px 10px; -} - -.signup-team-dir__name { - line-height: 1.3 !important; - font-size: 1.5em !important; - font-weight: 300 !important; + margin: 0 0 20px; + border: 1px solid #ddd; + @include border-radius(2px); + .signup-team-dir { + background: #fafafa; + border-top: 1px solid #d5d5d5; + &:first-child { + border: none; + } + a { + color: inherit; + display: block; + padding: 0 15px; + line-height: 3.5em; + height: 3.5em; + font-size: 1.1em; + } + } + .signup-team-dir__name { + white-space: nowrap; + float: left; + overflow: hidden; + text-overflow: ellipsis; + width: 90%; + } + .signup-team-dir__arrow { + float: right; + font-size: 0.9em; + color: #999; + line-height: 3.5em; + } } -.signup-team-dir__arrow { - float: right; - line-height: 1.3 !important; - font-size: 1.5em !important; - font-weight: 300 !important; -} .authorize-box { margin: 100px auto; -- cgit v1.2.3-1-g7c22