Merge pull request #419 from codetriage/kf-subscribers

Fix layout on subscribers page
codetriage · Mar 10, 2016 · 0438232 · 0438232
2 parents d7a3c81 + 6c1de1f
commit 0438232
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 30 deletions.
diff --git a/app/assets/stylesheets/components/_pagination.scss b/app/assets/stylesheets/components/_pagination.scss
@@ -1,10 +1,14 @@
 .pagination {
   border-color: $base-background-color;
   border-style: solid;
-  border-width: 0 2px 2px 2px;
+  border-width: 2px;
   display: block;
   text-align: center;
 
+  .slats-list & {
+    border-width: 0 2px 2px 2px;
+  }
+
   span,
   em,
   a {

diff --git a/app/assets/stylesheets/components/_subpage-content.scss b/app/assets/stylesheets/components/_subpage-content.scss
@@ -39,6 +39,31 @@
   }
 }
 
+.subpage-header-actions {
+  margin-top: 4px;
+
+  @include media(38rem) {
+    float: right;
+  }
+
+  a {
+    color: $lightest-font-color;
+
+    &:focus,
+    &:hover {
+      color: rgba($lightest-font-color, 0.3);
+    }
+  }
+
+  .header-primary-action {
+    color: $base-font-color;
+    font-size: $small-font-size;
+    letter-spacing: 1px;
+    margin-left: $small-spacing;
+    text-transform: uppercase;
+  }
+}
+
 .subpage-primary-title {
   color: $base-font-color;
   font-size: 1.5rem;

diff --git a/app/assets/stylesheets/components/_user-email.scss b/app/assets/stylesheets/components/_user-email.scss
@@ -0,0 +1,4 @@
+.user-email {
+  margin-top: 7px;
+  font-weight: normal;
+}
diff --git a/app/assets/stylesheets/components/_user.scss b/app/assets/stylesheets/components/_user.scss
diff --git a/app/views/subscribers/show.html.slim b/app/views/subscribers/show.html.slim
@@ -1,4 +1,10 @@
-.repo-wrapper
-  h2.repo-section-title Subscribers to #{link_to @repo.path, @repo}
+div class="subpage-content-wrapper #{ @repo.weight }"
+  header.subpage-content-header
+    h1.subpage-primary-title #{ @repo.subscribers.count } #{ @repo.name } Subscribers
+    .subpage-header-actions
+      = link_to @repo, class: "header-primary-action"
+        | Back to 
+        = @repo.name
+
   ul.avatars-list = render 'avatars', subscribers: @subscribers, show_names: true
   = will_paginate @subscribers
diff --git a/app/views/users/show.html.slim b/app/views/users/show.html.slim
@@ -8,9 +8,9 @@
       h1.subpage-primary-title= @user.github
       h2.subpage-secondary-title.user-email= @user.email
 
-      .user-actions
-        = link_to 'Delete Account'.html_safe, user_path(@user), method: "delete", confirm: "#{t("web-app-theme.confirm", default: "Are you sure?")}", class: 'delete-account'
-        = link_to 'Edit Account'.html_safe, edit_user_path(@user), class: 'edit-account'
+      .subpage-header-actions
+        = link_to 'Delete Account'.html_safe, user_path(@user), method: "delete", confirm: "#{t("web-app-theme.confirm", default: "Are you sure?")}"
+        = link_to 'Edit Account'.html_safe, edit_user_path(@user), class: 'header-primary-action'
 
     section.user-settings.content-section
       h2.content-section-title Settings