summaryrefslogtreecommitdiff
path: root/web-ui/app/scss
diff options
context:
space:
mode:
Diffstat (limited to 'web-ui/app/scss')
-rw-r--r--web-ui/app/scss/_mascot.scss2
-rw-r--r--web-ui/app/scss/_styles.scss (renamed from web-ui/app/scss/styles.scss)17
-rw-r--r--web-ui/app/scss/main.scss8
-rw-r--r--web-ui/app/scss/news-cycle.scss13
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;
-}