From c3d095b465ed87c086409992ef78b62a06c09909 Mon Sep 17 00:00:00 2001
From: bonespiked <dngreene@gmail.com>
Date: Sat, 1 Apr 2017 17:00:30 -0400
Subject: Add reaction picker (#5904)

---
 webapp/sass/layout/_post-right.scss |   9 +-
 webapp/sass/layout/_post.scss       | 408 ++++++++++++++++++++----------------
 2 files changed, 238 insertions(+), 179 deletions(-)

(limited to 'webapp/sass/layout')

diff --git a/webapp/sass/layout/_post-right.scss b/webapp/sass/layout/_post-right.scss
index d4c1daa6e..5fd7df3f2 100644
--- a/webapp/sass/layout/_post-right.scss
+++ b/webapp/sass/layout/_post-right.scss
@@ -64,14 +64,15 @@
 
         .btn {
             margin-bottom: 10px;
-            
+
             &.disabled {
                 background: grey !important;
                 border-color: transparent !important;
             }
         }
 
-        .custom-textarea {
+        .custom-textarea,
+        .custom-textarea-emoji {
             min-height: 100px;
         }
 
@@ -150,8 +151,8 @@
     overflow: auto;
     position: relative;
     padding-top: 10px;
-    min-height: 429px;
-    
+    min-height: 700px;
+
     .file-preview__container {
         margin-top: 5px;
     }
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index 85f5b2a5a..751980c43 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -360,233 +360,271 @@
 
 .post-create__container {
     label {
-       font-weight: normal;
-    }
-    .custom-textarea {
-        overflow: hidden;
-    }
+     font-weight: normal;
+ }
+ .custom-textarea {
+    overflow: hidden;
+}
 
-    form {
-        margin: 0 auto;
-        padding: .5em 15px 0;
-        width: 100%;
-    }
-    #reply_textbox.custom-textarea-emoji{
-        bottom: 0;
-        max-height: 162px !important;
-        padding-right: 60px;
-        padding-top: 6px;
-        resize: none;
+form {
+    margin: 0 auto;
+    padding: .5em 15px 0;
+    width: 100%;
+}
+#reply_textbox.custom-textarea-emoji{
+    bottom: 0;
+    max-height: 162px !important;
+    padding-right: 60px;
+    padding-top: 6px;
+    resize: none;
 
 
-    }
-    .center {
-        max-width: 1028px;
-    }
 
-    .post-create {
-        &.scroll {
-            .btn-file {
-                right: 10px;
-            }
+}
+.center {
+    max-width: 1028px;
+}
 
-            .custom-textarea {
-                -ms-overflow-style: auto;
-                overflow: auto;
-                padding-right: 43px;
-                resize: none;
-            }
+.post-create {
+    &.scroll {
+        .btn-file {
+            right: 10px;
+        }
 
-            #post_textbox-reference.custom-textarea-emoji {
-                padding-right: 43px;
-                resize: none;
-            }
+        .custom-textarea {
+            -ms-overflow-style: auto;
+            overflow: auto;
+            padding-right: 43px;
+            resize: none;
+        }
 
+        #post_textbox-reference.custom-textarea-emoji {
+            padding-right: 43px;
+            resize: none;
+        }
 
-            #reply_textbox.custom-textarea-emoji {
-                padding-right: 60px;
-                resize: none;
 
-            }
 
-            #post_textbox.custom-textarea-emoji {
-                padding-right: 60px;
-                resize: none;
+        #post_textbox.custom-textarea-emoji {
+            padding-right: 60px;
+            resize: none;
 
-            }
         }
     }
+}
+
+.post-create-body {
+    padding: 0 0 2px;
+    position: relative;
 
-    .post-create-body {
-        padding: 0 0 2px;
+    .post-body__cell {
         position: relative;
+        vertical-align: top;
+    }
 
-        .post-body__cell {
-            position: relative;
-            vertical-align: top;
+    .send-button {
+        @include single-transition(all, .15s);
+        cursor: pointer;
+        display: none;
+        font-size: 18px;
+        height: 37px;
+        line-height: 37px;
+        padding-right: 4px;
+        text-align: center;
+        vertical-align: bottom;
+        width: 45px;
+
+        &:active {
+            @include opacity(.75);
         }
 
-        .send-button {
-            @include single-transition(all, .15s);
-            cursor: pointer;
-            display: none;
-            font-size: 18px;
-            height: 37px;
-            line-height: 37px;
-            padding-right: 4px;
-            text-align: center;
-            vertical-align: bottom;
-            width: 45px;
+        &.disabled {
+            color: grey;
+        }
+    }
 
-            &:active {
-                @include opacity(.75);
-            }
+    .custom-textarea {
+        bottom: 0;
+        max-height: 162px !important;
+        padding-right: 35px;
+        padding-top: 8px;
+        resize: none;
 
-            &.disabled {
-                color: grey;
-            }
-        }
+    }
 
-        .custom-textarea {
-            bottom: 0;
-            max-height: 162px !important;
-            padding-right: 35px;
-            padding-top: 8px;
-            resize: none;
+    #post_textbox-reference.custom-textarea-emoji {
+        bottom: 0;
+        max-height: 162px !important;
+        padding-right: 35px;
+        padding-top: 8px;
+        resize: none;
 
-        }
+    }
 
-        #post_textbox-reference.custom-textarea-emoji {
-            bottom: 0;
-            max-height: 162px !important;
-            padding-right: 35px;
-            padding-top: 8px;
-            resize: none;
 
-        }
+    #post_textbox.custom-textarea-emoji {
+        bottom: 0;
+        max-height: 162px !important;
+        padding-right: 60px;
+        padding-top: 8px;
+        resize: none;
 
+    }
+    .textarea-div {
+        line-height: 1.5;
+        max-height: 163px !important;
+        overflow: auto;
+        padding-right: 30px;
+        padding-top: 8px;
+    }
 
-        #post_textbox.custom-textarea-emoji {
-            bottom: 0;
-            max-height: 162px !important;
-            padding-right: 60px;
-            padding-top: 8px;
-            resize: none;
+    .btn-file {
+        @include single-transition(all, .15s);
+        font-size: 16px;
+        padding: 8px 9px 4px;
+        position: absolute;
+        right: 0;
+        top: 0;
+        z-index: 5;
 
-        }
-        .textarea-div {
-            line-height: 1.5;
-            max-height: 163px !important;
-            overflow: auto;
-            padding-right: 30px;
-            padding-top: 8px;
+        svg {
+            height: 18px;
+            width: 18px;
         }
 
-        .btn-file {
-            @include single-transition(all, .15s);
-            font-size: 16px;
-            padding: 8px 9px 4px;
-            position: absolute;
-            right: 0;
-            top: 0;
-            z-index: 5;
+        &:hover,
+        &:active {
+            box-shadow: none;
+        }
 
-            svg {
-                height: 18px;
-                width: 18px;
-            }
+        &.btn-file__disabled {
+            @include opacity(.1);
 
             &:hover,
             &:active {
-                box-shadow: none;
-            }
-
-            &.btn-file__disabled {
                 @include opacity(.1);
-
-                &:hover,
-                &:active {
-                    @include opacity(.1);
-                }
             }
+        }
 
-            .icon--attachment {
-                @include opacity(.5);
-                display: inline-block;
-                position: relative;
-                vertical-align: top;
+        .icon--attachment {
+            @include opacity(.5);
+            display: inline-block;
+            position: relative;
+            vertical-align: top;
 
-                input {
-                    cursor: pointer;
-                    direction: ltr;
-                    filter: alpha(opacity=0);
-                    font-size: 23px;
-                    height: 100%;
-                    margin: 0;
-                    opacity: 0;
-                    position: absolute;
-                    right: 0;
-                    top: 0;
-                    width: 100%;
-                }
+            input {
+                cursor: pointer;
+                direction: ltr;
+                filter: alpha(opacity=0);
+                font-size: 23px;
+                height: 100%;
+                margin: 0;
+                opacity: 0;
+                position: absolute;
+                right: 0;
+                top: 0;
+                width: 100%;
+            }
 
-                &:hover {
-                    @include opacity(.9);
-                }
+            &:hover {
+                @include opacity(.9);
             }
         }
+    }
+
+
+    .icon--emoji-picker {
+        @include opacity(.5);
+        @include single-transition(all, .15s);
+        cursor: pointer;
+        font-size: 19px;
+        margin-left: 7px;
+        position: relative;
+        vertical-align: top;
 
+        &:hover,
+        &:active {
+            @include opacity(.9);
+            box-shadow: none;
+        }
 
-        .icon--emoji-picker {
+        .icon--attachment {
             @include opacity(.5);
-            @include single-transition(all, .15s);
-            cursor: pointer;
-            font-size: 19px;
-            margin-left: 7px;
+            display: inline-block;
             position: relative;
             vertical-align: top;
 
-            &:hover,
-            &:active {
-                @include opacity(.9);
-                box-shadow: none;
+            input {
+                cursor: pointer;
+                direction: ltr;
+                filter: alpha(opacity=0);
+                font-size: 23px;
+                height: 100%;
+                margin: 0;
+                opacity: 0;
+                position: absolute;
+                right: 0;
+                top: 0;
+                width: 100%;
             }
-        }
 
-        textarea {
-            box-shadow: none;
+            &:hover {
+                @include opacity(.9);
+            }
         }
     }
 
-    .post-create-footer {
-        @include clearfix;
-        font-size: 13px;
-        padding: 3px 0 0;
+
+    .icon--emoji-picker {
+        @include opacity(.5);
+        @include single-transition(all, .15s);
+        cursor: pointer;
+        font-size: 19px;
+        margin-left: 7px;
         position: relative;
+        vertical-align: top;
 
-        .post-error {
-            @include opacity(.55);
-            display: inline-block;
-            font-size: .85em;
-            font-weight: normal;
-            margin-bottom: 0;
-            position: absolute;
-            top: 4px;
+        &:hover,
+        &:active {
+            @include opacity(.9);
+            box-shadow: none;
         }
     }
 
-    .msg-typing {
-        @include opacity(.7);
-        display: block;
-        font-size: .95em;
-        height: 20px;
-        margin-bottom: 5px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
+    textarea {
+        box-shadow: none;
+    }
+}
+
+.post-create-footer {
+    @include clearfix;
+    font-size: 13px;
+    padding: 3px 0 0;
+    position: relative;
+
+    .post-error {
+        @include opacity(.55);
+        display: inline-block;
+        font-size: .85em;
+        font-weight: normal;
+        margin-bottom: 0;
+        position: absolute;
+        top: 4px;
     }
 }
 
+.msg-typing {
+    @include opacity(.7);
+    display: block;
+    font-size: .95em;
+    height: 20px;
+    margin-bottom: 5px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+}
+
 .post-list__table {
     display: table;
     height: 100%;
@@ -619,16 +657,14 @@
             .col__reply {
                 min-width: 0;
             }
-
-            .dropdown {
-                margin-right: 0;
-            }
         }
     }
 
     &:hover {
         .dropdown,
         .comment-icon__container,
+        .reacticon,
+        .reacticon__container,
         .flag-icon__container,
         .post__reply,
         .post__remove {
@@ -1100,8 +1136,8 @@
 
     .dropdown {
         display: inline-block;
-        margin-right: 5px;
         top: -1px;
+        vertical-align: middle;
         visibility: hidden;
 
         .dropdown-menu {
@@ -1122,6 +1158,8 @@
     }
 
     .post__dropdown {
+        vertical-align: middle;
+
         &:after {
             content: '[...]';
             position: relative;
@@ -1249,6 +1287,10 @@
 
         .post-reaction-list {
             min-height: 30px;
+
+            &:empty {
+                display: none;
+            }
         }
 
         .post-reaction {
@@ -1381,6 +1423,8 @@
     .comment-icon__container {
         display: inline-block;
         fill: $primary-color;
+        position: relative;
+        top: 1px;
         visibility: hidden;
 
         &:focus {
@@ -1396,12 +1440,17 @@
             width: 17px;
         }
 
+        .comment-count {
+            margin-left: 2px;
+        }
+
         .comment-icon {
             display: inline-block;
             fill: inherit;
-            margin-right: 3px;
+            margin: 0 1px 0 5px;
             position: relative;
-            top: 2px;
+            top: 1px;
+            vertical-align: top;
         }
 
         path {
@@ -1409,6 +1458,15 @@
         }
     }
 
+    .reacticon__container {
+        display: inline-block;
+        fill: $primary-color;
+        font-size: 16px;
+        margin-left: 5px;
+        vertical-align: top;
+        visibility: hidden;
+    }
+
     .flag-icon__container {
         display: inline-block;
         font-size: 12px;
-- 
cgit v1.2.3-1-g7c22