From f94200b27cb2234ad3aee66accecd69e4639b7ed Mon Sep 17 00:00:00 2001
From: Felix Hammerl <fhammerl@thoughtworks.com>
Date: Thu, 31 Mar 2016 11:37:53 +0200
Subject: Issue #670: Move reply view to composeO

---
 web-ui/app/scss/_reply.scss              | 37 ----------------------------
 web-ui/app/scss/style.scss               |  1 -
 web-ui/app/scss/views/_compose-view.scss | 41 ++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 38 deletions(-)
 delete mode 100644 web-ui/app/scss/_reply.scss

diff --git a/web-ui/app/scss/_reply.scss b/web-ui/app/scss/_reply.scss
deleted file mode 100644
index 622bdd5a..00000000
--- a/web-ui/app/scss/_reply.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-
-#reply-section {
-  padding-left: 30px;
-  .reply-container {
-    margin: 10px 0;
-    padding: 10px;
-    border: 1px dashed darken($contrast, 10%);
-    @include btn-transition;
-  }
-
-  button {
-    margin: 0;
-  }
-
-  #all-recipients {
-    color: $black;
-  }
-
-  #all-recipients:focus {
-    background-color: darken($contrast, 10%)
-  }
-
-  #reply-button, #reply-all-button, #forward-button {
-    text-align: center;
-    font-weight: 100;
-    font-size: 1.1em;
-    background: $white;
-    color: $medium_light_grey;
-    padding: 25px;
-    margin: 0;
-    @include border-radius(0);
-    &:hover {
-      background: darken($contrast, 5%);
-      cursor: pointer;
-    }
-  }
-}
diff --git a/web-ui/app/scss/style.scss b/web-ui/app/scss/style.scss
index db9486fa..4468bd28 100644
--- a/web-ui/app/scss/style.scss
+++ b/web-ui/app/scss/style.scss
@@ -34,6 +34,5 @@
 @import "others";
 
 // TODO
-@import "reply";
 @import "styles";
 
diff --git a/web-ui/app/scss/views/_compose-view.scss b/web-ui/app/scss/views/_compose-view.scss
index 2ed305c8..e4282564 100644
--- a/web-ui/app/scss/views/_compose-view.scss
+++ b/web-ui/app/scss/views/_compose-view.scss
@@ -318,3 +318,44 @@
         display: block;
     }
 }
+
+#reply-section {
+    padding-left: 30px;
+
+    .reply-container {
+        margin: 10px 0;
+        padding: 10px;
+        border: 1px dashed darken($contrast, 10%);
+
+        @include btn-transition;
+    }
+
+    button {
+        margin: 0;
+    }
+
+    #all-recipients {
+        color: $black;
+    }
+
+    #all-recipients:focus {
+        background-color: darken($contrast, 10%);
+    }
+
+    #reply-button, #reply-all-button, #forward-button {
+        text-align: center;
+        font-weight: 100;
+        font-size: 1.1em;
+        background: $white;
+        color: $medium_light_grey;
+        padding: 25px;
+        margin: 0;
+
+        @include border-radius(0);
+
+        &:hover {
+            background: darken($contrast, 5%);
+            cursor: pointer;
+        }
+    }
+}
-- 
cgit v1.2.3