diff options
Diffstat (limited to 'web/sass-files')
-rw-r--r-- | web/sass-files/sass/partials/_command-box.scss | 16 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_files.scss | 12 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 6 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 27 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 70 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_settings.scss | 36 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 4 |
7 files changed, 146 insertions, 25 deletions
diff --git a/web/sass-files/sass/partials/_command-box.scss b/web/sass-files/sass/partials/_command-box.scss index 44eb9b8df..565296fae 100644 --- a/web/sass-files/sass/partials/_command-box.scss +++ b/web/sass-files/sass/partials/_command-box.scss @@ -4,20 +4,30 @@ width: 100%; border: $border-gray; bottom: 38px; + overflow: auto; @extend %popover-box-shadow; + .sidebar--right & { + bottom: 100px; + } } .command-name { position: relative; width: 100%; background-color: #fff; - height: 37px; - line-height: 37px; - padding: 2px 10px 2px 5px; + line-height: 24px; + padding: 5px 10px 8px; z-index: 101; + font-size: 0.95em; + border-bottom: 1px solid #ddd; &:hover { background-color: #e8eaed; } + .command__desc { + margin-left: 5px; + color: #999; + line-height: normal; + } } .command-desc { diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index 70f440989..405265f92 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -61,8 +61,8 @@ cursor: pointer; z-index: 5; opacity: inherit; - text-shadow: 0 0px 3px #444; - text-shadow: 0 0px 3px rgba(0, 0, 0, 0.7); + text-shadow: 0 0px 3px #444; + text-shadow: 0 0px 3px rgba(0, 0, 0, 0.7); } } } @@ -159,6 +159,14 @@ padding: 7px; .post-image__name { margin-bottom: 3px; + display: block; + color: #333; + } + .post-image__download { + display: inline-block; + padding-right: 7px; + cursor: pointer; + color: #555; } .post-image__type { color: grey; diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index dec08b567..b94ed2113 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); } @@ -82,7 +82,7 @@ .btn { &.btn-primary { float: right; - margin-top: -4px; + margin: -4px 25px 0 0; position: relative; i { margin-right: 5px; diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 231e6fe3f..6940cf2fb 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -140,9 +140,15 @@ body.ios { padding: 1em 0 0; position: relative; -webkit-overflow-scrolling: touch; - &.hide-scroll::-webkit-scrollbar { + &::-webkit-scrollbar { width: 0px !important; } + &.inactive { + display: none; + } + &.active { + display: inline; + } } .post-list__table { display: table; @@ -182,6 +188,25 @@ body.ios { max-width: 850px; padding: 0 0 2px; position: relative; + .post-body__cell { + vertical-align: top; + position: relative; + } + .send-button { + display: none; + cursor: pointer; + padding-right: 4px; + width: 45px; + height: 37px; + font-size: 18px; + line-height: 37px; + vertical-align: bottom; + text-align: center; + @include single-transition(all, 0.15s); + &:active { + @include opacity(0.75); + } + } .custom-textarea { padding-top: 8px; padding-right: 28px; diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 682809f02..32d65b86b 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -243,6 +243,23 @@ } } @media screen and (max-width: 768px) { + .file-details__container { + display: block; + .file-details__preview { + display: block; + width: 100%; + height: 150px; + border-right: none; + border-bottom: 1px solid #ddd; + img { + width: 64px; + height: 64px; + } + } + .file-details { + height: auto; + } + } .center-file-overlay { font-size: 1.3em; } @@ -348,6 +365,9 @@ width: 100%; z-index: 5; } + .modal-title { + padding-left: 20px; + } .user-settings { .tab-header { display: none; @@ -392,9 +412,35 @@ } } } - #post-create { + .post-create__container { + .post-right__container & { + padding: 0 1em; + } + form { + padding: 0; + } .post-create-body { padding-bottom: 10px; + display: table; + width: 100%; + table-layout: fixed; + .post-body__cell { + display: table-cell; + padding-left: 45px; + } + .app__content & { + .btn-file { + width: 45px; + padding: 0; + line-height: 36px; + bottom: -2px; + left: 0; + top: auto; + } + } + .send-button { + display: table-cell; + } } .post-create-footer .msg-typing { display: none; @@ -405,23 +451,23 @@ margin-top: 0; } .remove-preview { - width: 50px; - height: 50px; - left: 50%; - top: 50%; + width: 28px; + height: 28px; + left: auto; + right: 0; + top: 0; background: #444; - margin: -25px 0 0 -25px; - @include border-radius(50px); + background: rgba(#000, 0.5); text-align: center; &:after { display: none; } i { - line-height: 50px; + line-height: 29px; top: auto; right: auto; position: relative; - font-size: 28px; + font-size: 16px; } } } @@ -496,6 +542,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 99a7eb7bc..2b59a943b 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; @@ -54,12 +56,22 @@ .section-min { padding: 1em 0; margin-bottom: 0; + cursor: pointer; @include clearfix; + &:hover { + background: #f9f9f9; + } + &:hover .fa { + display: inline-block; + } + &:hover .section-edit { + text-decoration: underline; + } } .section-max { background: #f2f2f2; - padding: 1em 0; + padding: 1em 0 1.3em; margin-bottom: 0; @include clearfix; .section-title { @@ -75,6 +87,12 @@ .section-edit { text-align: right; margin-bottom: 5px; + .fa { + margin-right: 7px; + font-size: 12px; + color: #aaa; + display: none; + } } .section-describe { @@ -94,6 +112,10 @@ list-style-type:none; } + .setting-list__hint { + margin-top: 20px; + } + .mentions-input { margin-top: 10px; } 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; |