From 11dd1ebfa7a3b745552541502ccf8be540385626 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Thu, 14 Jan 2016 16:55:35 -0500
Subject: initial restyling to make more appealing

---
 app/assets/javascripts/issuable_context.js.coffee | 4 ++--
 app/assets/stylesheets/framework/sidebar.scss     | 2 +-
 app/assets/stylesheets/pages/detail_page.scss     | 2 +-
 app/assets/stylesheets/pages/issuable.scss        | 3 +++
 app/assets/stylesheets/pages/merge_requests.scss  | 1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/issuable_context.js.coffee b/app/assets/javascripts/issuable_context.js.coffee
index 02232698bc2..dbc6e61d077 100644
--- a/app/assets/javascripts/issuable_context.js.coffee
+++ b/app/assets/javascripts/issuable_context.js.coffee
@@ -12,9 +12,9 @@ class @IssuableContext
 
     $('.issuable-details').waitForImages ->
       $('.issuable-affix').on 'affix.bs.affix', ->
-        $(@).width($(@).outerWidth())
+        $(@).width()
       .on 'affixed-top.bs.affix affixed-bottom.bs.affix', ->
-        $(@).width('')
+        $(@).width()
 
       $('.issuable-affix').affix offset:
         top: ->
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 540d0b03163..277772bfb89 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -24,7 +24,7 @@
 
   .container-fluid {
     background: #FFF;
-    padding: 0 $gl-padding;
+    padding: 0;
 
     &.container-blank {
       background: none;
diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss
index 529a43548c8..4617ca6b17c 100644
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -1,5 +1,5 @@
 .detail-page-header {
-  padding: 11px 0;
+  padding: 11px $gl-padding;
   border-bottom: 1px solid $border-color;
   color: #5c5d5e;
   font-size: 16px;
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index eae3590a189..f3af36181ca 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -41,6 +41,7 @@
 
     .issuable-discussion {
       margin-right: 1px;
+      padding: 0 $gl-padding;
     }
   }
 }
@@ -65,6 +66,8 @@
 }
 
 .issuable-sidebar {
+  padding: 0 $gl-padding;
+
   .block {
     @include clearfix;
     padding:  $gl-padding 0;
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 75f2ae80a92..0aeb72ae503 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -200,4 +200,5 @@
 
 .mr-source-target {
   line-height: 31px;
+  padding: 0 $gl-padding;
 }
-- 
cgit v1.2.1