Merge branch 'master' into docs_refactor

3ecb3024 · Achilleas Pipinellis · 07f5a6f1 · 835f1961 · 3ecb3024 · 3ecb3024
Commit 3ecb3024 authored 9 years ago by Achilleas Pipinellis
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -3,8 +3,8 @@
  .select2-choice {
    background: #FFF;
    border-color: #DDD;
-    height: 42px;
-    padding: 8px $gl-padding;
+    height: 36px;
+    padding: 6px $gl-padding;
    font-size: $gl-font-size;
    line-height: 1.42857143;
  

--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -21,11 +21,10 @@
  
 .content-wrapper {
  width: 100%;
-  padding: 20px;
  
  .container-fluid {
    background: #FFF;
-    padding: $gl-padding;
+    padding: 0 $gl-padding;
  
    &.container-blank {
      background: none;

--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
 .table-holder {
-  margin: -$gl-padding;
-  margin-top: 0;
-  margin-bottom: 0;
+  margin: 0;
 }
  
 table {
  &.table {
    margin-bottom: $gl-padding;
-    
+
    .dropdown-menu a {
      text-decoration: none;
    }
@@ -32,6 +30,7 @@ table {
      }
  
      th {
+        background-color: $background-color;
        font-weight: normal;
        font-size: 15px;
        border-bottom: 1px solid $border-color !important;

--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -5,10 +5,8 @@
  padding: 0;
  
  .timeline-entry {
-    padding: $gl-padding;
+    padding: $gl-padding 0;
    border-color: $table-border-color;
-    margin-left: -$gl-padding;
-    margin-right: -$gl-padding;
    color: $gl-gray;
    border-bottom: 1px solid $border-white-light;
  

--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -99,47 +99,6 @@
  }
 }
  
-// Nav tabs
-.nav.nav-tabs {
-  margin-bottom: 15px;
-
-  li {
-    > a {
-      margin-right: 5px;
-      line-height: 20px;
-      border-color: #EEE;
-      color: #888;
-      border-bottom: 1px solid #ddd;
-      .badge {
-        background-color: #eee;
-        color: #888;
-        text-shadow: 0 1px 1px #fff;
-      }
-      i.fa {
-        line-height: 14px;
-      }
-    }
-    &.active {
-      > a {
-        border-color: #CCC;
-        border-bottom: 1px solid #fff;
-        color: #333;
-        font-weight: bold;
-      }
-    }
-  }
-}
-
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  color: #666;
-}
-
-.nav-pills > .active > a > span > .badge {
-  background-color: #fff;
-  color: $gl-primary;
-}
-
  
 /**
 * fix to keep tooltips position in top navigation bar

--- a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
@@ -46,7 +46,7 @@ $font-size-base:         $gl-font-size;
 //
 //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
  
-$padding-base-vertical:     9px;
+$padding-base-vertical:     $gl-vert-padding;
 $padding-base-horizontal:   $gl-padding;
 $component-active-color:    #fff;
 $component-active-bg:       $brand-info;

--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -177,7 +177,7 @@ body {
 }
  
 .page-title {
-  margin-top: 0px;
+  margin-top: $gl-padding;
  line-height: 1.3;
  font-size: 1.25em;
  font-weight: 600;

--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -22,8 +22,10 @@ $header-height: 58px;
 $fixed-layout-width: 1280px;
 $gl-gray: #5a5a5a;
 $gl-padding: 16px;
+$gl-vert-padding: 6px;
 $gl-padding-top:10px;
 $gl-avatar-size: 46px;
+$secondary-text: #7f8fa4;
  
 /*
 * Color schema

--- a/app/assets/stylesheets/framework/zen.scss
+++ b/app/assets/stylesheets/framework/zen.scss
@@ -4,7 +4,7 @@
    position: absolute;
    top: 0px;
    right: 4px;
-    line-height: 40px;
+    line-height: 56px;
  }
  
  a.js-zen-leave {

--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -35,6 +35,8 @@
 }
  
 .commit-box {
+  border-top: 1px solid $border-color;
+
  .commit-title {
    margin: 0;
    font-size: 23px;

--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
 .detail-page-header {
-  margin: -$gl-padding;
-  padding: 7px $gl-padding;
-  margin-bottom: 0px;
+  padding: 11px 0;
  border-bottom: 1px solid $border-color;
  color: #5c5d5e;
  font-size: 16px;

--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
 // Common
 .diff-file {
-  margin-left: -$gl-padding;
-  margin-right: -$gl-padding;
-  border: none;
-  border-bottom: 1px solid #E7E9EE;
+  border: 1px solid $border-color;
+  border-top: none;
  
  .diff-header {
    position: relative;
@@ -23,14 +21,6 @@
      }
    }
  
-    .diff-controls {
-      .btn {
-        padding: 0px 10px;
-        font-size: 13px;
-        line-height: 28px;
-      }
-    }
-
    .commit-short-id {
      font-family: $monospace_font;
      font-size: smaller;
@@ -76,6 +66,7 @@
      width: 100%;
      font-family: $monospace_font;
      border: none;
+      border-collapse: separate;
      margin: 0px;
      padding: 0px;
      .line_holder td {

--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -4,9 +4,7 @@
 */
 .event-item {
  font-size: $gl-font-size;
-  padding: $gl-padding $gl-padding $gl-padding ($gl-padding + $gl-avatar-size + 15px);
-  margin-left: -$gl-padding;
-  margin-right: -$gl-padding;
+  padding: $gl-padding 0 $gl-padding ($gl-avatar-size + 15px);
  border-bottom: 1px solid $table-border-color;
  color: #7f8fa4;
  

--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -20,6 +20,11 @@
      position: fixed;
      top: 70px;
      margin-right: 35px;
+
+      &.no-affix {
+        position: relative;
+        top: 0;
+      }
    }
  }
 }
@@ -27,10 +32,10 @@
 .project-issuable-filter {
  .controls {
    float: right;
-    margin-top: 7px;
+    margin-top: 11px;
  }
  
-  .center-top-menu {
+  .nav-links {
    text-align: left;
  }
 }
@@ -95,7 +100,7 @@
  
  .cross-project-reference {
    color: $gl-link-color;
-    
+
    span {
      white-space: nowrap;
      width: 85%;
@@ -105,8 +110,13 @@
      text-overflow: ellipsis;
    }
  
+    cite {
+      font-style: normal;
+    }
+
    button {
      float: right;
+      padding: 3px 5px;
    }
  }
  

--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -6,7 +6,7 @@
    .issue-title {
      margin-bottom: 5px;
      font-size: $list-font-size;
-      font-weight: bold;
+      font-weight: 600;
    }
  
    .issue-info {
@@ -144,3 +144,8 @@ form.edit-issue {
 .issue-form .select2-container {
  width: 250px !important;
 }
+
+.issue-closed-by-widget {
+  color: $secondary-text;
+  margin-left: 52px;
+}
\ No newline at end of file
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -3,9 +3,9 @@
 *
 */
 .mr-state-widget {
-  background: #F7F8FA;
+  background: $background-color;
  color: $gl-gray;
-  border: 1px solid #dce0e6;
+  border: 1px solid $border-color;
  @include border-radius(2px);
  
  form {
@@ -150,7 +150,7 @@
    .merge-request-title {
      margin-bottom: 5px;
      font-size: $list-font-size;
-      font-weight: bold;
+      font-weight: 600;
    }
  
    .merge-request-info {

--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -159,6 +159,7 @@
 .edit_note {
  .markdown-area {
    min-height: 140px;
+    max-height: 430px;
  }
  .note-form-actions {
    background: transparent;

--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -26,6 +26,8 @@
 }
  
 .project-home-panel {
+  padding-bottom: 40px;
+  border-bottom: 1px solid $border-color;
  
  .cover-controls {
    .project-settings-dropdown {
@@ -51,6 +53,8 @@
  }
  
  .notifications-btn {
+    margin-top: -28px;
+
    .fa-bell {
      margin-right: 6px;
    }
@@ -75,17 +79,6 @@
    }
  }
  
-  .git-clone-holder {
-    max-width: 498px;
-
-    .form-control {
-      background: #FFF;
-      font-size: 14px;
-      height: 42px;
-      margin-left: -1px;
-    }
-  }
-
  .visibility-level-label {
    @extend .btn;
    @extend .btn-gray;
@@ -98,24 +91,31 @@
    }
  }
  
-  .git-clone-holder {
-    display: inline-table;
-    position: relative;
-  }
-
  .project-repo-buttons {
-    margin-top: 12px;
+    margin-top: 20px;
    margin-bottom: 0px;
  
    .count-buttons {
      display: block;
-      margin-bottom: 12px;
+      margin-bottom: 20px;
+    }
+
+    .clone-row {
+      .split-repo-buttons,
+      .project-clone-holder {
+        display: inline-block;
+      }
+
+      .split-repo-buttons {
+        margin: 0 12px;
+      }
    }
  
    .btn {
      @include btn-gray;
      text-transform: none;
    }
+
    .count-with-arrow {
      display: inline-block;
      position: relative;
@@ -160,10 +160,10 @@
        border-style: solid;
        font-size: 13px;
        font-weight: 600;
-        line-height: 20px;
-        padding: 11px 16px;
+        line-height: 13px;
+        padding: $gl-vert-padding $gl-padding;
        letter-spacing: .4px;
-        padding: 10px;
+        padding: 10px 14px;
        text-align: center;
        vertical-align: middle;
        touch-action: manipulation;
@@ -189,117 +189,6 @@
  }
 }
  
-.git-clone-holder {
-  .project-home-dropdown + & {
-    margin-right: 45px;
-  }
-
-  .clone-options {
-    display: table-cell;
-    a.btn {
-      width: 100%;
-    }
-  }
-
-  .form-control {
-    cursor: auto;
-    @extend .monospace;
-    background: #FAFAFA;
-    width: 101%;
-  }
-
-  .input-group-addon {
-    background: #f7f8fa;
-
-    &.git-protocols {
-      padding: 0;
-      border: none;
-
-      .input-group-btn:last-child > .btn {
-        @include border-radius-right(0);
-
-        border-left: 1px solid #c6cacf;
-        margin-left: -2px !important;
-      }
-    }
-  }
-}
-
-.projects-search-form {
-
-  .input-group .form-control {
-    height: 42px;
-  }
-}
-
-.input-group-btn {
-  .btn {
-    @include btn-gray;
-    @include btn-middle;
-
-    &:hover {
-      outline: none;
-    }
-
-    &:focus {
-      outline: none;
-    }
-
-    &:active {
-      outline: none;
-    }
-
-    &.btn-clipboard {
-      padding-left: 15px;
-      padding-right: 15px;
-    }
-  }
-
-  .active {
-    @include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
-
-    border: 1px solid #c6cacf !important;
-    background-color: #e4e7ed !important;
-  }
-
-  .btn-green {
-    @include btn-green
-  }
-
-}
-
-.split-repo-buttons {
-  display: inline-table;
-  margin: 0 12px 0 12px;
-
-  .btn{
-    @include btn-gray;
-    @include btn-default;
-  }
-
-  .dropdown-toggle  {
-    margin: -5px;
-  }
-}
-
-#notification-form {
-  margin-left: 5px;
-}
-
-.dropdown-new {
-  margin-left: -5px;
-}
-
-.open > .dropdown-new.btn {
-  @include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
-
-  border: 1px solid #c6cacf !important;
-  background-color: #e4e7ed !important;
-  text-transform: none;
-  color: #313236 !important;
-  font-size: 15px;
-}
-
 .dropdown-menu {
  @include box-shadow(rgba(76, 86, 103, 0.247059) 0px 0px 1px 0px, rgba(31, 37, 50, 0.317647) 0px 2px 18px 0px);
  @include border-radius (0px);
@@ -351,28 +240,6 @@
  color: #555;
 }
  
-ul.nav.nav-projects-tabs {
-  @extend .nav-tabs;
-
-  padding-left: 8px;
-
-  li {
-    a {
-      padding: 6px 25px;
-      margin-top: 2px;
-      border-color: #DDD;
-      background-color: #EEE;
-      text-shadow: 0 1px 1px white;
-      color: #555;
-    }
-    &.active {
-      a {
-        font-weight: bold;
-      }
-    }
-  }
-}
-
 .project_member_row form {
  margin: 0px;
 }
@@ -399,9 +266,9 @@ ul.nav.nav-projects-tabs {
  
 .breadcrumb.repo-breadcrumb {
  padding: 0;
-  line-height: 42px;
  background: transparent;
  border: none;
+  line-height: 42px;
  margin: 0;
  
  > li + li:before {
@@ -416,11 +283,8 @@ ul.nav.nav-projects-tabs {
  
 .top-area {
  border-bottom: 1px solid #EEE;
-  margin: 0 -16px;
-  padding: 0 $gl-padding;
-  height: 42px;
  
-  ul.left-top-menu {
+  ul.nav-links {
    display: inline-block;
    width: 50%;
    margin-bottom: 0px;
@@ -431,12 +295,12 @@ ul.nav.nav-projects-tabs {
    width: 50%;
    display: inline-block;
    float: right;
-    padding-top: 7px;
+    padding-top: 11px;
    text-align: right;
  
    .btn-green {
-      margin-top: -2px;
      margin-left: 10px;
+      float: right;
    }
  }
  
@@ -482,11 +346,11 @@ table.table.protected-branches-list tr.no-border {
  padding-top: 10px;
  padding-bottom: 4px;
  
-  ul.nav-pills {
+  ul.nav {
    display:inline-block;
  }
  
-  .nav-pills li {
+  .nav li {
    display:inline;
  }
  
@@ -523,8 +387,7 @@ pre.light-well {
 }
  
 .projects-search-form {
-  margin: -$gl-padding;
-  padding: $gl-padding;
+  padding: $gl-padding 0;
  padding-bottom: 0;
  margin-bottom: 0px;
  
@@ -574,10 +437,8 @@ pre.light-well {
  @include basic-list;
  
  .project-row {
-    padding: $gl-padding;
+    padding: $gl-padding 0;
    border-color: $table-border-color;
-    margin-left: -$gl-padding;
-    margin-right: -$gl-padding;
  
    &.no-description {
      .project {
@@ -631,8 +492,6 @@ pre.light-well {
 }
  
 .project-last-commit {
-  margin: 0 7px;
-
  .ci-status {
    margin-right: 16px;
  }
@@ -662,9 +521,7 @@ pre.light-well {
 }
  
 .project-show-readme .readme-holder {
-  margin-left: -$gl-padding;
-  margin-right: -$gl-padding;
-  padding: ($gl-padding + 7px);
+  padding: $gl-padding 0;
  border-top: 0;
  
  .edit-project-readme {
@@ -672,3 +529,32 @@ pre.light-well {
    position: relative;
  }
 }
+
+.git-clone-holder {
+  width: 498px;
+
+  .btn-clipboard {
+    border: 1px solid $border-color;
+    padding: 6px $gl-padding;
+  }
+
+  .project-home-dropdown + & {
+    margin-right: 45px;
+  }
+
+  .clone-options {
+    display: table-cell;
+    a.btn {
+      width: 100%;
+    }
+  }
+
+  .form-control {
+    @extend .monospace;
+    background: #FFF;
+    font-size: 14px;
+    margin-left: -1px;
+    cursor: auto;
+    width: 101%;
+  }
+}
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
 .tree-holder {
+  > .nav-block {
+    margin: 11px 0;
+  }
  
  .file-finder {
    width: 50%;
@@ -13,7 +16,7 @@
  
    tr {
      > td, > th {
-        line-height: 28px;
+        line-height: 26px;
      }
  
      &:hover {
@@ -86,12 +89,14 @@
  
 .blob-commit-info {
  list-style: none;
+  padding: $gl-padding;
+  background: $background-color;
+  border: 1px solid $border-color;
+  border-bottom: none;
  margin: 0;
-  padding: 0;
-  margin-bottom: 5px;
  
  .commit {
-    padding: $gl-padding 0;
+    padding: 0;
  
    .commit-row-title {
      .commit-row-message {
@@ -115,3 +120,8 @@
  font-weight: normal;
  color: $md-link-color;
 }
+
+.tree-controls {
+  float: right;
+  margin-top: 11px;
+}
--- a/app/controllers/abuse_reports_controller.rb
+++ b/app/controllers/abuse_reports_controller.rb
@@ -2,6 +2,7 @@ class AbuseReportsController < ApplicationController
  def new
    @abuse_report = AbuseReport.new
    @abuse_report.user_id = params[:user_id]
+    @ref_url = params.fetch(:ref_url, '')
  end
  
  def create