Refactoring Grape API methods into normal controllers & other things

9 files changed, 62 insertions, 79 deletions

diff --git a/app/assets/javascripts/atom.coffee b/app/assets/javascripts/atom.coffee
deleted file mode 100644
index 24f83d18b..000000000
--- a/app/assets/javascripts/atom.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/home.coffee b/app/assets/javascripts/home.coffee
deleted file mode 100644
index 24f83d18b..000000000
--- a/app/assets/javascripts/home.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/profile.coffee b/app/assets/javascripts/profile.coffee
deleted file mode 100644
index 24f83d18b..000000000
--- a/app/assets/javascripts/profile.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/xrd.coffee b/app/assets/javascripts/xrd.coffee
deleted file mode 100644
index 24f83d18b..000000000
--- a/app/assets/javascripts/xrd.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/accounts.scss b/app/assets/stylesheets/accounts.scss
new file mode 100644
index 000000000..a777633f1
--- /dev/null
+++ b/app/assets/stylesheets/accounts.scss
@@ -0,0 +1,39 @@
+.card {
+  display: flex;
+  background: $primary-color;
+  box-shadow: 4px 3px 0 rgba(0, 0, 0, 0.1);
+
+  .bio {
+    flex-grow: 1;
+  }
+
+  .name {
+    font-size: 20px;
+    line-height: 18px * 1.5;
+    color: $quaternary-color;
+
+    small {
+      display: block;
+      font-size: 14px;
+      color: $quaternary-color;
+    }
+  }
+
+  .avatar {
+    width: 96px;
+    float: left;
+    margin-right: 10px;
+    padding: 10px;
+    padding-right: 0;
+    padding-left: 9px;
+    margin-top: -30px;
+
+    img {
+      width: 94px;
+      height: 94px;
+      display: block;
+      border-radius: 5px;
+      box-shadow: 4px 3px 0 rgba(0, 0, 0, 0.1);
+    }
+  }
+}
diff --git a/app/assets/stylesheets/atom.scss b/app/assets/stylesheets/api/salmon.scss
index 888698db3..13cb648a8 100644
--- a/app/assets/stylesheets/atom.scss
+++ b/app/assets/stylesheets/api/salmon.scss
@@ -1,3 +1,3 @@
-// Place all the styles related to the Atom controller here.
+// Place all the styles related to the API::Salmon controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/xrd.scss b/app/assets/stylesheets/api/subscriptions.scss
index 62391c7d3..9bee8c9bd 100644
--- a/app/assets/stylesheets/xrd.scss
+++ b/app/assets/stylesheets/api/subscriptions.scss
@@ -1,3 +1,3 @@
-// Place all the styles related to the XRD controller here.
+// Place all the styles related to the API::Subscriptions controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 9787c6be1..552356a22 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -20,7 +20,7 @@ body {
 }
 
 .container {
-  width: 800px;
+  width: 700px;
   margin: 0 auto;
   margin-top: 40px;
 }
@@ -40,4 +40,5 @@ body {
 
 
 @import 'home';
-@import 'profile';
+@import 'accounts';
+@import 'stream_entries';
diff --git a/app/assets/stylesheets/profile.scss b/app/assets/stylesheets/stream_entries.scss
index 49ce98d02..5689880ca 100644
--- a/app/assets/stylesheets/profile.scss
+++ b/app/assets/stylesheets/stream_entries.scss
@@ -1,59 +1,32 @@
-.card {
-  display: flex;
-  background: $darker-background-color;
-  border: 1px solid darken($darker-background-color, 15%);
-  box-shadow: 4px 3px 0 rgba(0, 0, 0, 0.1);
-
-  .bio {
-    flex-grow: 1;
-  }
-
-  .name {
-    font-size: 24px;
-    line-height: 18px * 1.5;
-    color: $text-color;
-
-    small {
-      display: block;
-      font-size: 14px;
-      color: $lighter-text-color;
-    }
-  }
-
-  .avatar {
-    width: 96px;
-    float: left;
-    margin-right: 10px;
-    padding: 10px;
-    padding-left: 9px;
-    margin-top: -30px;
-
-    img {
-      width: 94px;
-      height: 94px;
-      display: block;
-      border: 2px solid $lighter-text-color;
-      border-radius: 5px;
-    }
-  }
-}
 
 .activity-stream {
   clear: both;
   box-shadow: 4px 3px 0 rgba(0, 0, 0, 0.1);
 
   .entry {
-    border-bottom: 1px solid darken($background-color, 10%);
+    border-bottom: 1px solid $darker-background-color;
     background: $background-color;
     border-left: 2px solid $primary-color;
 
     &.entry-reblog {
       border-left: 2px solid $tertiary-color;
+
+      .content {
+        a {
+          color: $tertiary-color;
+        }
+      }
     }
 
     &.entry-predecessor, &.entry-successor {
       border-left: 2px solid $lighter-text-color;
       background: darken($background-color, 5%);
+
+      .content {
+        a {
+          color: $lighter-text-color;
+        }
+      }
     }
 
     &.entry-follow, &.entry-favourite {
@@ -92,9 +65,10 @@
   }
 
   .header {
-    margin-bottom: 10px;
+    margin-bottom: 5px;
     padding: 10px;
     padding-bottom: 0;
+    padding-left: 8px;
 
     .name {
       text-decoration: none;
@@ -113,7 +87,7 @@
   }
 
   .pre-header {
-    border-bottom: 1px solid darken($background-color, 10%);
+    border-bottom: 1px solid darken($background-color, 5%);
     color: $tertiary-color;
     padding: 5px 10px;
     padding-left: 8px;
@@ -131,9 +105,10 @@
   }
 
   .content {
-    font-size: 16px;
+    font-size: 14px;
     padding: 0 10px;
     padding-left: 8px;
+    padding-bottom: 25px;
 
     a {
       color: $primary-color;
@@ -153,24 +128,4 @@
       text-decoration: underline;
     }
   }
-
-  .counters {
-    margin-top: 15px;
-    color: $lighter-text-color;
-    cursor: default;
-    padding: 10px;
-    padding-top: 0;
-
-    .counter {
-      display: inline-block;
-      margin-right: 10px;
-      color: $lighter-text-color;
-    }
-
-    .conversation-link {
-      color: $primary-color;
-      text-decoration: underline;
-      float: right;
-    }
-  }
 }