diff options
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 5 | ||||
-rwxr-xr-x[-rw-r--r--] | web/sass-files/sass/partials/_perfect-scrollbar.scss | 61 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 50 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post_right.scss | 3 |
4 files changed, 79 insertions, 40 deletions
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 9d4e62bc3..2136b9ffb 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -9,7 +9,6 @@ } .more-table { margin: 0; - table-layout: fixed; p { font-size: 0.9em; overflow: hidden; @@ -57,12 +56,8 @@ &.td--action { text-align: right; padding: 8px 15px 8px 8px; - width: 80px; vertical-align: middle; position: relative; - &.lg { - width: 110px; - } } } } diff --git a/web/sass-files/sass/partials/_perfect-scrollbar.scss b/web/sass-files/sass/partials/_perfect-scrollbar.scss index de88112c9..0e0967d81 100644..100755 --- a/web/sass-files/sass/partials/_perfect-scrollbar.scss +++ b/web/sass-files/sass/partials/_perfect-scrollbar.scss @@ -1,31 +1,23 @@ @charset "UTF-8"; -/* perfect-scrollbar v0.6.10 */ .ps-container { - -ms-touch-action: none; - touch-action: none; - overflow: hidden !important; - -ms-overflow-style: none; } - @supports (-ms-overflow-style: none) { - .ps-container { - overflow: auto !important; } } - @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { - .ps-container { - overflow: auto !important; } } - .ps-container.ps-active-x > .ps-scrollbar-x-rail, - .ps-container.ps-active-y > .ps-scrollbar-y-rail { - display: block; - background-color: transparent; } + overflow: hidden !important; } + .ps-container.ps-active-x > .ps-scrollbar-x-rail, .ps-container.ps-active-y > .ps-scrollbar-y-rail { + display: block; } .ps-container.ps-in-scrolling { - } + } .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail { background-color: #eee; - opacity: 0.9; } + opacity: 0.9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; + filter: alpha(opacity=90); } .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x { background-color: #999; } .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail { background-color: #eee; - opacity: 0.9; } + opacity: 0.9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; + filter: alpha(opacity=90); } .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y { background-color: #999; } .ps-container > .ps-scrollbar-x-rail { @@ -34,8 +26,11 @@ /* please don't change 'position' */ -webkit-border-radius: 4px; -moz-border-radius: 4px; + -ms-border-radius: 4px; border-radius: 4px; opacity: 0; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; + filter: alpha(opacity=0); -webkit-transition: background-color .2s linear, opacity .2s linear; -moz-transition: background-color .2s linear, opacity .2s linear; -o-transition: background-color .2s linear, opacity .2s linear; @@ -49,6 +44,7 @@ background-color: #aaa; -webkit-border-radius: 4px; -moz-border-radius: 4px; + -ms-border-radius: 4px; border-radius: 4px; -webkit-transition: background-color .2s linear; -moz-transition: background-color .2s linear; @@ -63,8 +59,11 @@ /* please don't change 'position' */ -webkit-border-radius: 4px; -moz-border-radius: 4px; + -ms-border-radius: 4px; border-radius: 4px; opacity: 0; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; + filter: alpha(opacity=0); -webkit-transition: background-color .2s linear, opacity .2s linear; -moz-transition: background-color .2s linear, opacity .2s linear; -o-transition: background-color .2s linear, opacity .2s linear; @@ -78,6 +77,7 @@ background-color: #aaa; -webkit-border-radius: 4px; -moz-border-radius: 4px; + -ms-border-radius: 4px; border-radius: 4px; -webkit-transition: background-color .2s linear; -moz-transition: background-color .2s linear; @@ -87,27 +87,36 @@ /* there must be 'right' for ps-scrollbar-y */ width: 8px; } .ps-container:hover.ps-in-scrolling { - } + } .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail { background-color: #eee; - opacity: 0.9; } + opacity: 0.9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; + filter: alpha(opacity=90); } .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x { background-color: #999; } .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail { background-color: #eee; - opacity: 0.9; } + opacity: 0.9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; + filter: alpha(opacity=90); } .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y { background-color: #999; } - .ps-container:hover > .ps-scrollbar-x-rail, - .ps-container:hover > .ps-scrollbar-y-rail { - opacity: 0.6; } + .ps-container:hover > .ps-scrollbar-x-rail, .ps-container:hover > .ps-scrollbar-y-rail { + opacity: 0.6; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; + filter: alpha(opacity=60); } .ps-container:hover > .ps-scrollbar-x-rail:hover { background-color: #eee; - opacity: 0.9; } + opacity: 0.9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; + filter: alpha(opacity=90); } .ps-container:hover > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x { background-color: #999; } .ps-container:hover > .ps-scrollbar-y-rail:hover { background-color: #eee; - opacity: 0.9; } + opacity: 0.9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; + filter: alpha(opacity=90); } .ps-container:hover > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y { background-color: #999; } diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 5d0985fc0..4478b3f15 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -225,9 +225,6 @@ body.ios { position: absolute; height: 100%; -webkit-overflow-scrolling: touch; - &::-webkit-scrollbar { - width: 0px !important; - } &.active { display: inline; } @@ -383,6 +380,10 @@ body.ios { min-height: 25px; display: block; @include opacity(0.7); + white-space: nowrap; + width: 80%; + overflow: hidden; + text-overflow: ellipsis; } } } @@ -407,7 +408,7 @@ body.ios { .post { word-wrap: break-word; - padding: 8px 1em 0; + padding: 8px .5em 0 1em; position: relative; max-width: 100%; @include legacy-pie-clearfix; @@ -456,7 +457,7 @@ body.ios { &.same--root { &.same--user { - padding: 0 1em; + padding: 0 .5em 0 1em; &:hover { @@ -628,6 +629,16 @@ body.ios { } } + .post__embed-container{ + display: block; + max-height: 1000px; + transition: max-height .5s ease; + overflow: hidden; + &[hidden]{ + max-height: 0; + } + } + .dropdown { display: inline-block; visibility: hidden; @@ -686,7 +697,7 @@ body.ios { .post__body { word-wrap: break-word; - padding: 0.2em 0.5em 0em; + padding: 0.2em 0.5em; @include legacy-pie-clearfix; width: calc(100% - 75px); @@ -752,7 +763,32 @@ body.ios { white-space: nowrap; } - .post__time { + .post__embed-visibility { + cursor: pointer; + display: block; + font: normal normal normal 14px/1 FontAwesome; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-size: 0; + width: 30px; + margin-top: -5px; + + &:hover{ + text-decoration: none; + } + + &:before { + content: "\f065"; + font-size: 14px; + } + + &[data-expanded="true"]:before{ + content: "\f066"; + } + } + + .post__time{ font-size: 0.9em; } diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index 01be9e288..2b48fd2c2 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -75,8 +75,7 @@ min-width: 1px; display: block; height: 20px; - max-width: 200px; - @include clearfix; + max-width: 230px; } .post-create-footer { width: 100%; |