Merge branch 'master' into remove-satellites

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

5 files changed, 22 insertions, 6 deletions

diff --git a/app/assets/javascripts/project.js.coffee b/app/assets/javascripts/project.js.coffee
index 87c1b67a772..39a433dfc91 100644
--- a/app/assets/javascripts/project.js.coffee
+++ b/app/assets/javascripts/project.js.coffee
@@ -24,8 +24,3 @@ class @Project
       $.cookie('hide_no_password_message', 'false', { path: path })
       $(@).parents('.no-password-message').remove()
       e.preventDefault()
-
-    $('.js-toggle-clone-holder').on 'click', (e) ->
-      cloneHolder.toggle()
-
-    cloneHolder.hide() unless $('.empty-project').length
diff --git a/app/assets/stylesheets/base/variables.scss b/app/assets/stylesheets/base/variables.scss
index 08f153dfbc9..cb439a0e0bf 100644
--- a/app/assets/stylesheets/base/variables.scss
+++ b/app/assets/stylesheets/base/variables.scss
@@ -13,6 +13,7 @@ $code_line_height: 1.5;
 $border-color: #E5E5E5;
 $background-color: #f5f5f5;
 $header-height: 50px;
+$readable-width: 1100px;
 
 
 /*
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 586e7b5f8da..3f617e72b02 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -45,3 +45,9 @@
 
   .btn { font-size: 13px; }
 }
+
+.issuable-details {
+  .description {
+    max-width: $readable-width;
+  }
+}
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index 3572f33e91f..b628f99f22c 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -4,14 +4,25 @@
     position: relative;
 
     .issue-title {
-      margin-bottom: 5px;
       font-size: $list-font-size;
+      margin-bottom: 5px;
       font-weight: bold;
+      float: left;
+      width: 97.7%;
+    }
+    
+    @media screen and (max-width: 1100px) {
+      .issues-list .issue .issue-title { 
+        width: 97%;
+      }
     }
 
     .issue-info {
       color: #999;
       font-size: 13px;
+      display: inline-block;
+      width: 100%;
+      padding: 0 0 0 20px;
     }
 
     .issue-check {
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 092918e4de1..5f1a3db4fb6 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -116,6 +116,9 @@
 }
 
 .readme-holder {
+  margin: 0 auto;
+  max-width: $readable-width;
+
   .readme-file-title {
     font-size: 14px;
     font-weight: bold;