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

# By Felix Hammerl (5) and others
# Via NavaL
* 'master' of https://github.com/pixelated/pixelated-user-agent:
  serving the client directly, as the current dependency on proxy strips out xsrf cookies -fixing functional test
  only adding feature resource in root_resource test -- fixing build
  changed logout to post Issue #612
  Backend and frontend protection against csrf attacks: - root resources changes the csrf token cookie everytime it is loaded, in particular during the intestitial load during login - it will also add that cookie on single user mode - initialize will still load all resources - but they you cant access them if the csrf token do not match - all ajax calls needs to add the token to the header - non ajax get requests do not need xsrf token validation - non ajax post will have to send the token in as a form input or in the content
  Consolidate stylesheets
  Remove unused font and stylesheetgit s
  Create a new deferred for all IMAPAccount calls
  Clean up jshintrc
  Recreate session on soledad problems
  issue #617: Remove old html whitelister
  Issue #617: Sanitize received content

4 files changed, 11 insertions, 29 deletions

diff --git a/web-ui/app/scss/_mascot.scss b/web-ui/app/scss/_mascot.scss
index 5cfac90d..74279063 100644
--- a/web-ui/app/scss/_mascot.scss
+++ b/web-ui/app/scss/_mascot.scss
@@ -1,5 +1,3 @@
-/* SHEEP */
-
 #no-message-selected-pane {
   position: absolute;
   top: 0;
diff --git a/web-ui/app/scss/styles.scss b/web-ui/app/scss/_styles.scss
index a5a6dca1..63f15f6a 100644
--- a/web-ui/app/scss/styles.scss
+++ b/web-ui/app/scss/_styles.scss
@@ -1,13 +1,6 @@
-
-@import "compass/css3";
-@import "colors";
-@import "mixins";
-@import "alerts";
-@import "read";
-@import "reply";
-@import "compose";
-@import "security";
-
+/*
+ * Miscellaneous styles without apparent grouping
+ */
 
 #logo {
   color: $white;
@@ -15,6 +8,7 @@
 
 #logout {
   color: $white;
+  cursor: pointer;
 }
 
 .search-highlight {
@@ -901,6 +895,3 @@ div.side-nav-bottom {
     cursor: progress;
   }
 }
-
-
-@import "mascot.scss";
diff --git a/web-ui/app/scss/main.scss b/web-ui/app/scss/main.scss
index 7d081ad1..b582a5d5 100644
--- a/web-ui/app/scss/main.scss
+++ b/web-ui/app/scss/main.scss
@@ -2,9 +2,15 @@
 @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%;
 }
diff --git a/web-ui/app/scss/news-cycle.scss b/web-ui/app/scss/news-cycle.scss
deleted file mode 100644
index ecca383c..00000000
--- a/web-ui/app/scss/news-cycle.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-@font-face {
-  font-family: 'News Cycle';
-  src: url('assets/fonts/NewsCycleRegular.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'News Cycle';
-  src: url('assets/fonts/NewsCycleBold.ttf') format('truetype');
-  font-weight: bold;
-  font-style: normal;
-}