summaryrefslogtreecommitdiffstats
path: root/webapp/sass/components
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2017-01-30 19:39:43 +0500
committerCorey Hulen <corey@hulen.com>2017-01-30 09:39:43 -0500
commit8a0db428bb50e2bab969d931ffd10ab7bc929ac4 (patch)
treeb9b04f037b6b000ba7e3f5ddd45975af4c0e2b83 /webapp/sass/components
parent95e3395a3b3f4920f6f426b75ff031999dcbeb64 (diff)
downloadchat-8a0db428bb50e2bab969d931ffd10ab7bc929ac4.tar.gz
chat-8a0db428bb50e2bab969d931ffd10ab7bc929ac4.tar.bz2
chat-8a0db428bb50e2bab969d931ffd10ab7bc929ac4.zip
Bug fixes (#5218)
* PLT-5319 - Fixing text alignment security modal * PLT-5280 - Fixing add comment button in RHS mobile * PLT-5397 - Fixing Floating timestamp on mobile * PLT-5129 - Hiding formatting help text * PLT-5242 - Adjusting team sidebar border on IE!! * PLT-5226 - Placing settings toggle over header * PLT-5222 - Placed team description tooltip on top * PLT-5201 - Account settings overlap on mobile * PLT-5138 - Adding bg to pending post actions * PLT-5286 - Adjusting play button on youtube videos * PLT-5313 - Adjusting space between emoji reactions * PLT-5187 - Adjusting text in channel switcher * PLT-5399 - Reverting button alignment in modal
Diffstat (limited to 'webapp/sass/components')
-rw-r--r--webapp/sass/components/_mentions.scss7
-rw-r--r--webapp/sass/components/_videos.scss146
2 files changed, 81 insertions, 72 deletions
diff --git a/webapp/sass/components/_mentions.scss b/webapp/sass/components/_mentions.scss
index e1e35ea29..86e7c0a28 100644
--- a/webapp/sass/components/_mentions.scss
+++ b/webapp/sass/components/_mentions.scss
@@ -21,6 +21,13 @@
width: 100%;
z-index: 101;
+ .status {
+ font-size: 15px;
+ text-align: center;
+ vertical-align: bottom;
+ width: 20px;
+ }
+
.fa-user {
position: relative;
top: -1px;
diff --git a/webapp/sass/components/_videos.scss b/webapp/sass/components/_videos.scss
index 93ad5707b..16e3468d1 100644
--- a/webapp/sass/components/_videos.scss
+++ b/webapp/sass/components/_videos.scss
@@ -1,93 +1,95 @@
@charset 'UTF-8';
-.video-div {
- margin-bottom: 8px;
- max-width: 480px;
- position: relative;
+.post {
+ .video-div {
+ margin-bottom: 8px;
+ max-width: 480px;
+ position: relative;
- .video-thumbnail {
- height: auto;
- max-width: 100%;
- }
+ .video-thumbnail {
+ height: auto;
+ max-width: 100%;
+ }
+
+ .video-thumbnail__error {
+ height: 100%;
+ line-height: 2;
+ padding: 110px 0;
+ text-align: center;
+ width: 100%;
- .video-thumbnail__error {
- height: 100%;
- line-height: 2;
- padding: 110px 0;
- text-align: center;
- width: 100%;
+ .fa {
+ @include opacity(.5);
+ }
- .fa {
- @include opacity(.5);
+ div {
+ font-size: 1.2em;
+ }
}
- div {
- font-size: 1.2em;
+ .block {
+ background-color: alpha-color($black, .5);
+ border-radius: 10px;
+ height: 150px;
+ left: 50%;
+ margin: -75px 0 0 -100px;
+ position: absolute;
+ top: 50%;
+ width: 200px;
}
}
- .block {
- background-color: alpha-color($black, .5);
- border-radius: 10px;
- height: 150px;
- left: 50%;
- margin: -75px 0 0 -100px;
- position: absolute;
- top: 50%;
- width: 200px;
+ .video-type {
+ @include opacity(.8);
+ font-size: 15px;
+ margin: 0;
+ padding: 0;
}
-}
-
-.video-type {
- @include opacity(.8);
- font-size: 15px;
- margin: 0;
- padding: 0;
-}
-
-.video-title {
- font-size: 15px;
- margin-top: 3px;
-}
-.play-button {
- @include border-radius(14px);
- border: 4px solid alpha-color($white, .4);
- height: 100px;
- position: absolute;
- right: 51px;
- top: 26px;
- width: 100px;
+ .video-title {
+ font-size: 15px;
+ margin-top: 3px;
+ }
- span {
- border-bottom: 36px solid transparent;
- border-left: 60px solid alpha-color($white, .4);
- border-top: 36px solid transparent;
- height: 0;
- left: 20px;
+ .play-button {
+ @include border-radius(14px);
+ border: 4px solid alpha-color($white, .4);
+ height: 100px;
position: absolute;
- top: 10px;
- width: 0;
+ right: 51px;
+ top: 26px;
+ width: 100px;
+
+ span {
+ border-bottom: 36px solid transparent;
+ border-left: 60px solid alpha-color($white, .4);
+ border-top: 36px solid transparent;
+ height: 0;
+ left: 20px;
+ position: absolute;
+ top: 10px;
+ width: 0;
+ }
}
-}
-.img-div {
- -moz-force-broken-image-icon: 1;
- border-radius: 5px;
- margin-bottom: 8px;
- max-height: 500px;
- max-width: 450px;
- position: relative;
+ .img-div {
+ -moz-force-broken-image-icon: 1;
+ border-radius: 5px;
+ margin-bottom: 8px;
+ max-height: 500px;
+ max-width: 450px;
+ position: relative;
- &.placeholder {
- height: 500px;
+ &.placeholder {
+ height: 500px;
+ }
+
+ .sidebar--right & {
+ max-width: 100%;
+ }
}
- .sidebar--right & {
- max-width: 100%;
+ .video-loading {
+ height: 360px;
}
}
-
-.video-loading {
- height: 360px;
-} \ No newline at end of file