Merge branch 'master' of https://github.com/pixelated/pixelated-user-agent

# By Felix Hammerl (13) and Thais Siqueira (3)
# Via Christoph (1) and Thais Siqueira (1)
* 'master' of https://github.com/pixelated/pixelated-user-agent:
  Sets SSL certifications to false.
  Fixes pep8 errors and update requests to 2.9.1.
  Update locust test to run after xsrf token implementation.
  Issue #620: Adapt unit tests to CSS changes
  Issue #620: Refactor palceholder
  Issue #620: Remove former main css file
  Issue #620: Spike growl CSS modularization
  Issue #617: Highlight search terms by altering mail content
  Issue #617: Allow only >=3 alphanumeric characters in search field
  Issue #617: Restrict searching to alphanumeric characters
  Issue #617: Remove highlighting for sandboxed content
  Issue #617: Add sandbox to build scripts
  Issue #617: Add sandbox to user-agent
  Issue #617: Create sandbox resouces
  Issue #617: Add iframe-resizer
  Issue #617: Serve content from Sandbox resource

1 files changed, 0 insertions, 37 deletions

diff --git a/web-ui/app/scss/main.scss b/web-ui/app/scss/main.scss
deleted file mode 100644
index b582a5d5..00000000
--- a/web-ui/app/scss/main.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-@import "compass/css3";
-@import "reset";
-@import "foundation";
-@import "colors";
-@import "mixins";
-@import "alerts";
-@import "read";
-@import "reply";
-@import "compose";
-@import "security";
-@import "mascot";
-@import "styles";
-
-html {
-    height:100%;
-}
-body {
-    min-height:100%;
-    overflow: hidden;
-    background: $white;
-}
-header#main {
-  overflow: hidden;
-  position: fixed;
-  top: 0;
-  width: 100%;
-  position: relative;
-  margin-bottom: 0;
-}
-
-.no-padding {
-  padding: 0;
-}
-
-.text-right {
-  text-align: right;
-}