diff options
Diffstat (limited to 'webapp/sass')
-rw-r--r-- | webapp/sass/components/_dropdown.scss | 1 | ||||
-rw-r--r-- | webapp/sass/components/_modal.scss | 30 | ||||
-rw-r--r-- | webapp/sass/layout/_headers.scss | 165 | ||||
-rw-r--r-- | webapp/sass/layout/_post.scss | 17 | ||||
-rw-r--r-- | webapp/sass/layout/_sidebar-menu.scss | 9 | ||||
-rw-r--r-- | webapp/sass/responsive/_mobile.scss | 11 | ||||
-rw-r--r-- | webapp/sass/responsive/_tablet.scss | 16 |
7 files changed, 126 insertions, 123 deletions
diff --git a/webapp/sass/components/_dropdown.scss b/webapp/sass/components/_dropdown.scss index 5ed0bca61..eaa5c463f 100644 --- a/webapp/sass/components/_dropdown.scss +++ b/webapp/sass/components/_dropdown.scss @@ -1,6 +1,7 @@ @charset 'UTF-8'; .dropdown-menu { + border-radius: $border-rad; &.colorpicker { z-index: 2500; diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss index 30b5d29cd..8b078de86 100644 --- a/webapp/sass/components/_modal.scss +++ b/webapp/sass/components/_modal.scss @@ -29,6 +29,14 @@ } } + .row--invite { + .col-sm-6 { + &:first-child { + padding-right: 0; + } + } + } + .modal__hint { @include opacity(.8); display: block; @@ -194,8 +202,8 @@ } .modal-content { - border-radius: 0; - box-shadow: none; + @include box-shadow(0 0 10px rgba($black, .5)); + border-radius: $border-rad; } .modal-chevron-icon { @@ -417,24 +425,6 @@ } } - - .invite { - margin-right: 40px; - } - - .row--invite { - @include clearfix; - margin-right: 40px; - - .col-sm-6 { - padding: 0 0 0 15px; - - &:first-child { - padding-left: 0; - } - } - } - .more-modal { .user-list { margin-top: 10px; diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss index db2ba48bd..d0ccfbe23 100644 --- a/webapp/sass/layout/_headers.scss +++ b/webapp/sass/layout/_headers.scss @@ -2,6 +2,87 @@ .channel-header { @include flex(0 0 56px); + border-left: none; + font-size: 14px; + line-height: 56px; + width: 100%; + + .member-popover__trigger { + cursor: pointer; + padding-right: 10px; + text-align: right; + width: 60px; + + .fa { + font-size: 16px; + margin-left: 4px; + } + } + + &.alt { + margin: 0; + + th { + font-weight: normal !important; + } + + td { + border: none; + } + } + + th { + text-align: center; + + &:first-child { + border-left: none; + padding-left: 15px; + padding-right: 1em; + text-align: left !important; + width: 100%; + } + + &:last-child { + width: 8.9%; + } + } + + td { + font-size: 13px; + padding: 5px 25px 5px !important; + text-align: center !important; + + &:first-child { + text-align: left !important; + } + } + + .heading { + display: inline-block; + font-size: 1.3em; + font-weight: 600; + margin: 0 4px 0 0; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + vertical-align: middle; + } + + .caret { + margin-top: 3px; + } + + .more { + color: #81848b; + display: inline-block; + font-size: 13px; + text-transform: capitalize; + vertical-align: top; + } + + .disabled { + color: #999999; + } } .row { @@ -256,90 +337,6 @@ } } -.channel-header { - border-left: none; - font-size: 14px; - line-height: 56px; - width: 100%; - - #member_popover { - color: #999999; - cursor: pointer; - width: 50px; - - .fa { - font-size: 16px; - margin-left: 4px; - } - } - - &.alt { - margin: 0; - - th { - font-weight: normal !important; - } - - td { - border: none; - } - } - - th { - text-align: center; - - &:first-child { - border-left: none; - padding-left: 15px; - padding-right: 1em; - text-align: left !important; - width: 100%; - } - - &:last-child { - width: 8.9%; - } - } - - td { - font-size: 13px; - padding: 5px 25px 5px !important; - text-align: center !important; - - &:first-child { - text-align: left !important; - } - } - - .heading { - color: #555555; - display: inline-block; - font-size: 1.3em; - font-weight: 600; - margin: 0 4px 0 0; - max-width: 100%; - overflow: hidden; - text-overflow: ellipsis; - vertical-align: middle; - } - - .caret { - margin-top: 3px; - } - - .more { - color: #81848b; - display: inline-block; - font-size: 13px; - text-transform: capitalize; - vertical-align: top; - } - - .disabled { - color: #999999; - } -} - .channel-header__navbar { font-size: 16px; diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss index db64d739e..228efe26f 100644 --- a/webapp/sass/layout/_post.scss +++ b/webapp/sass/layout/_post.scss @@ -486,7 +486,6 @@ body.ios { &.post--compact { &.post--thread { .post__header { - height: 22px; padding-top: 3px; } } @@ -510,6 +509,10 @@ body.ios { margin: 0 0 7px; } + .post__header { + height: 22px; + } + .post__body { background: transparent !important; line-height: 1.6; @@ -537,10 +540,6 @@ body.ios { } } - .post-image__columns { - clear: both; - } - .post-image__column { @include border-radius(2px); font-size: .9em; @@ -765,8 +764,15 @@ body.ios { @include clearfix; max-width: 200px; text-overflow: ellipsis; + vertical-align: top; white-space: nowrap; } + + strong { + display: none; + font-weight: 900; + margin-left: 2px; + } } .col__reply { @@ -1036,6 +1042,7 @@ body.ios { display: inline-block; margin-right: 6px; visibility: hidden; + svg { fill: inherit; position: relative; diff --git a/webapp/sass/layout/_sidebar-menu.scss b/webapp/sass/layout/_sidebar-menu.scss index 0cf60f328..97ab487c0 100644 --- a/webapp/sass/layout/_sidebar-menu.scss +++ b/webapp/sass/layout/_sidebar-menu.scss @@ -68,13 +68,18 @@ line-height: 40px; padding: 0 15px; - .fa, - .glyphicon { + .icon { + display: inline-block; left: -5px; position: relative; text-align: center; width: 25px; } + + .mentions { + font-size: 17px; + font-weight: bold; + } } } } diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index eec08b1e5..cb1191fe3 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -136,6 +136,13 @@ } } + &.post--comment { + .post__body { + margin-top: 5px; + padding: 2px 0 0 7px; + } + } + &.other--root { &.post--comment { .post__header { @@ -309,7 +316,9 @@ .row--invite { .col-sm-6 { - padding: 0; + &:first-child { + padding-right: 15px; + } } } diff --git a/webapp/sass/responsive/_tablet.scss b/webapp/sass/responsive/_tablet.scss index 9e09c3f42..a461dd35a 100644 --- a/webapp/sass/responsive/_tablet.scss +++ b/webapp/sass/responsive/_tablet.scss @@ -117,20 +117,13 @@ .col__name { font-weight: bold; margin-right: 2px; - padding-right: 10px; + padding-right: 5px; position: relative; z-index: 1; + } - &:after { - content: ':'; - display: inline-block; - font-family: FontAwesome; - font-size: 19px; - position: absolute; - right: 3px; - text-rendering: auto; - top: -5px; - } + strong { + display: inline; } .col__reply { @@ -176,6 +169,7 @@ &.same--root { &.same--user { padding-left: 70px; + padding-top: 0; .post__header { .col__reply { |