summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2016-10-25 01:04:29 +0500
committerChristopher Speller <crspeller@gmail.com>2016-10-24 16:04:29 -0400
commit510291e2e70f5fecd460afe95e33d310c2f98e3f (patch)
treeee85387833326d15d18c0c75c384b9cffa5ae96b /webapp
parent3a0b0fe63fe3732a819155a97e1cc088cd22d546 (diff)
downloadchat-510291e2e70f5fecd460afe95e33d310c2f98e3f.tar.gz
chat-510291e2e70f5fecd460afe95e33d310c2f98e3f.tar.bz2
chat-510291e2e70f5fecd460afe95e33d310c2f98e3f.zip
Updating shift UI changes (#4317)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/sass/responsive/_mobile.scss136
-rw-r--r--webapp/utils/utils.jsx5
2 files changed, 138 insertions, 3 deletions
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index a3e7ab5f5..87ee837d1 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -730,6 +730,51 @@
white-space: nowrap;
}
+ .dropdown-menu {
+ background: alpha-color($black, .9);
+ height: 100%;
+ left: 0;
+ overflow: auto;
+ padding-bottom: 140px;
+ position: fixed;
+ top: 42px;
+ width: 100%;
+
+ &:after {
+ @include border-radius(50%);
+ background: alpha-color($black, .8);
+ border-bottom: 1px solid alpha-color($white, .3);
+ bottom: 25px;
+ color: $white;
+ content: '×';
+ display: block;
+ font-size: 30px;
+ height: 50px;
+ left: 50%;
+ line-height: 50px;
+ margin-left: -25px;
+ position: fixed;
+ text-align: center;
+ width: 50px;
+ }
+
+ > li {
+ > a {
+ border-bottom: 1px solid alpha-color($white, .3);
+ color: $white;
+ font-weight: 600;
+ line-height: 50px;
+ margin: 0 auto;
+ text-align: center;
+ width: 90%;
+
+ &:hover {
+ background: transparent;
+ }
+ }
+ }
+ }
+
.status {
margin: 0 5px 0 3px;
top: 2px;
@@ -1056,8 +1101,76 @@
}
@media screen and (max-width: 640px) {
+ .post-list__table {
+ .post-list__content {
+ .dropdown-menu {
+ &.bottom {
+ bottom: auto;
+ top: 30%;
+ }
+
+ bottom: auto;
+ height: auto;
+ left: 0;
+ margin-left: 25px;
+ position: fixed;
+ top: 30%;
+ width: calc(100% - 50px);
+ z-index: 9999;
+
+ > li {
+ > a {
+ border-bottom: 1px solid;
+ line-height: 50px;
+ position: relative;
+ text-align: center;
+
+ &:hover {
+ background: transparent;
+ }
+ }
+
+ &:last-child {
+ a {
+ border: none;
+ }
+ }
+ }
+
+ &:before {
+ background: alpha-color($black, .3);
+ content: '';
+ height: 100%;
+ left: 0;
+ position: fixed;
+ top: 0;
+ width: 100%;
+ }
+ }
+ }
+ }
+
.app__body {
.modal {
+ overflow: hidden;
+ padding: 0 !important;
+
+ .modal-dialog {
+ height: 100%;
+ margin: 0;
+ max-width: 100%;
+
+ .modal-content {
+ height: 100%;
+ }
+ }
+
+ .modal-footer {
+ bottom: 0;
+ position: fixed;
+ width: 100%;
+ }
+
.about-modal {
.about-modal__content {
display: block;
@@ -1231,15 +1344,36 @@
}
}
}
+
.tip-overlay {
&.tip-overlay--sidebar {
min-height: 440px;
}
}
+
+ .post-list__table {
+ .post-list__content {
+ .dropdown-menu {
+ &.bottom {
+ top: 25%;
+ }
+
+ top: 25%;
+ }
+ }
+ }
}
// on iOS, allow clicks within an input's label to actually propagate through to the input itself
// http://stackoverflow.com/a/34810294/6325807
label span {
pointer-events: none;
-} \ No newline at end of file
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+ select,
+ textarea,
+ input {
+ font-size: 16px;
+ }
+}
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index fcfec3592..60df87d2a 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -465,6 +465,7 @@ export function applyTheme(theme) {
if (theme.sidebarBg) {
changeCss('.app__body .sidebar--left, .app__body .sidebar--left .sidebar__divider .sidebar__divider__text, .app__body .modal .settings-modal .settings-table .settings-links, .app__body .sidebar--menu', 'background:' + theme.sidebarBg, 1);
changeCss('body.app__body', 'scrollbar-face-color:' + theme.sidebarBg, 3);
+ changeCss('@media(max-width: 768px){.app__body .modal .settings-modal:not(.display--content) .modal-content', 'background:' + theme.sidebarBg, 1);
}
if (theme.sidebarText) {
@@ -544,7 +545,7 @@ export function applyTheme(theme) {
if (theme.centerChannelBg) {
changeCss('@media(min-width: 768px){.app__body .post:hover .post__header .col__reply, .app__body .post.post--hovered .post__header .col__reply', 'background:' + theme.centerChannelBg, 1);
changeCss('.app__body .app__content, .app__body .markdown__table, .app__body .markdown__table tbody tr, .app__body .suggestion-list__content, .app__body .modal .modal-content, .app__body .post.post--compact .post-image__column, .app__body .suggestion-list__divider > span', 'background:' + theme.centerChannelBg, 1);
- changeCss('#post-list .post-list-holder-by-time', 'background:' + theme.centerChannelBg, 1);
+ changeCss('#post-list .post-list-holder-by-time, .app__body .post-list__table .post-list__content .dropdown-menu a', 'background:' + theme.centerChannelBg, 1);
changeCss('#post-create', 'background:' + theme.centerChannelBg, 1);
changeCss('.app__body .date-separator .separator__text, .app__body .new-separator .separator__text', 'background:' + theme.centerChannelBg, 1);
changeCss('.app__body .post-image__details, .app__body .search-help-popover .search-autocomplete__divider span', 'background:' + theme.centerChannelBg, 1);
@@ -565,7 +566,7 @@ export function applyTheme(theme) {
changeCss('.app__body .post-list__arrows, .app__body .post .flag-icon__container', 'fill:' + changeOpacity(theme.centerChannelColor, 0.3), 1);
changeCss('.app__body .modal .status .offline--icon, .app__body .channel-header__links .icon, .app__body .sidebar--right .sidebar--right__subheader .usage__icon', 'fill:' + theme.centerChannelColor, 1);
changeCss('@media(min-width: 768px){.app__body .post:hover .post__header .col__reply, .app__body .post.post--hovered .post__header .col__reply', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 2);
- changeCss('.app__body .sidebar--left, .app__body .sidebar--right .sidebar--right__header, .app__body .suggestion-list__content .command', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
+ changeCss('.app__body .post-list__table .post-list__content .dropdown-menu a, .app__body .sidebar--left, .app__body .sidebar--right .sidebar--right__header, .app__body .suggestion-list__content .command', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
changeCss('.app__body .post.post--system .post__body', 'color:' + changeOpacity(theme.centerChannelColor, 0.6), 1);
changeCss('.app__body .input-group-addon, .app__body .app__content, .app__body .post-create__container .post-create-body .btn-file, .app__body .post-create__container .post-create-footer .msg-typing, .app__body .suggestion-list__content .command, .app__body .modal .modal-content, .app__body .dropdown-menu, .app__body .popover, .app__body .mentions__name, .app__body .tip-overlay, .app__body .form-control[disabled], .app__body .form-control[readonly], .app__body fieldset[disabled] .form-control', 'color:' + theme.centerChannelColor, 1);
changeCss('.app__body .post .post__link', 'color:' + changeOpacity(theme.centerChannelColor, 0.65), 1);