revert front end changes

2 files changed, 9 insertions, 45 deletions

diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index 07d40f40556..37bf38fa65d 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -1,4 +1,6 @@
 .awards {
+  line-height: 34px;
+
   .emoji-icon {
     width: 20px;
     height: 20px;
@@ -7,6 +9,8 @@
 
 .emoji-menu {
   position: absolute;
+  top: 100%;
+  left: 0;
   margin-top: 3px;
   z-index: 1000;
   min-width: 160px;
@@ -19,12 +23,7 @@
   opacity: 0;
   transform: scale(.2);
   transform-origin: 0 -45px;
-  transition: .3s cubic-bezier(.87,-.41,.19,1.44);
-  transition-property: transform, opacity;
-
-  &.is-aligned-right {
-    transform-origin: 100% -45px;
-  }
+  transition: all .3s cubic-bezier(.87,-.41,.19,1.44);
 
   &.is-visible {
     pointer-events: all;
@@ -108,7 +107,7 @@
   }
 
   &.is-loading {
-    .award-control-icon-normal {
+    .award-control-icon {
       display: none;
     }
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 8ad47a50541..624c8249f7e 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -63,8 +63,7 @@ ul.notes {
     &.is-editting {
       .note-header,
       .note-text,
-      .edited-text,
-      .note-awards {
+      .edited-text {
         display: none;
       }
 
@@ -74,6 +73,8 @@ ul.notes {
     }
 
     .note-body {
+      overflow: auto;
+
       .note-text {
         overflow: auto;
         word-wrap: break-word;
@@ -323,42 +324,6 @@ ul.notes {
   }
 }
 
-.note-award-control {
-  display: block;
-
-  &:hover,
-  &:focus {
-    text-decoration: none;
-  }
-
-  .award-control-icon-loading {
-    display: none;
-  }
-
-  &.is-loading {
-    .award-control-icon-normal {
-      display: none;
-    }
-
-    .award-control-icon-loading {
-      display: block;
-    }
- }
-}
-
-.note-awards {
-  .awards {
-    padding-top: 10px;
-  }
-
-  .award-control {
-    padding-top: 2px;
-    padding-bottom: 2px;
-    color: #8f8f8f;
-    font-size: 13px;
-  }
-}
-
 .disabled-comment {
   margin-left: -$gl-padding-top;
   margin-right: -$gl-padding-top;