Merge branch '4-0-stable' into stable

app/assets/javascripts/issues.js

-function switchToNewIssue(){
-  $(".issues_content").hide("fade", { direction: "left" }, 150, function(){
-    $('select#issue_assignee_id').chosen();
-    $('select#issue_milestone_id').chosen();
-    $("#new_issue_dialog").show("fade", { direction: "right" }, 150);
-    $('.top-tabs .add_new').hide();
-    disableButtonIfEmptyField("#issue_title", ".save-btn");
-    GitLab.GfmAutoComplete.setup();
-  });
-}
-
-function switchToEditIssue(){
-  $(".issues_content").hide("fade", { direction: "left" }, 150, function(){
-    $('select#issue_assignee_id').chosen();
-    $('select#issue_milestone_id').chosen();
-    $("#edit_issue_dialog").show("fade", { direction: "right" }, 150);
-    $('.add_new').hide();
-    disableButtonIfEmptyField("#issue_title", ".save-btn");
-    GitLab.GfmAutoComplete.setup();
-  });
-}
-
-function switchFromNewIssue(){
-  backToIssues();
-}
-
-function switchFromEditIssue(){
-  backToIssues();
-}
-
-function backToIssues(){
-  $("#edit_issue_dialog, #new_issue_dialog").hide("fade", { direction: "right" }, 150, function(){
-    $(".issues_content").show("fade", { direction: "left" }, 150, function() { 
-      $("#edit_issue_dialog").html("");
-      $("#new_issue_dialog").html("");
-      $('.add_new').show();
-    });
-  });
-}
-
 function initIssuesSearch() { 
   var href       = $('#issue_search_form').attr('action');
   var last_terms = '';
@@ -76,23 +36,15 @@ function issuesPage(){
     $(this).closest("form").submit();
   });
-  $("#new_issue_link").click(function(){
-    updateNewIssueURL();
-  });
-
-  $('body').on('ajax:success', '.close_issue, .reopen_issue, #new_issue', function(){
+  $('body').on('ajax:success', '.close_issue, .reopen_issue', function(){
     var t = $(this),
         totalIssues,
-        reopen = t.hasClass('reopen_issue'),
-        newIssue = false;
-    if( this.id == 'new_issue' ){
-      newIssue = true;
-    }
-    $('.issue_counter, #new_issue').each(function(){
+        reopen = t.hasClass('reopen_issue');
+    $('.issue_counter').each(function(){
       var issue = $(this);
       totalIssues = parseInt( $(this).html(), 10 );
-      if( newIssue || ( reopen && issue.closest('.main_menu').length ) ){
+      if( reopen && issue.closest('.main_menu').length ){
         $(this).html( totalIssues+1 );
       }else {
         $(this).html( totalIssues-1 );
@@ -126,20 +78,3 @@ function issuesCheckChanged() {
     $('.issues_filters').show();
   }
 }
-
-function updateNewIssueURL(){
-  var new_issue_link = $("#new_issue_link");
-  var milestone_id = $("#milestone_id").val();
-  var assignee_id = $("#assignee_id").val();
-  var new_href = "";
-  if(milestone_id){
-    new_href = "issue[milestone_id]=" + milestone_id + "&";
-  }
-  if(assignee_id){
-    new_href = new_href + "issue[assignee_id]=" + assignee_id;
-  }
-  if(new_href.length){
-    new_href = new_issue_link.attr("href") + "?" + new_href;
-    new_issue_link.attr("href", new_href);
-  }
-};

app/assets/javascripts/main.js.coffee

@@ -7,6 +7,18 @@ window.slugify = (text) ->
 window.ajaxGet = (url) ->
   $.ajax({type: "GET", url: url, dataType: "script"})
+window.errorMessage = (message) ->
+  ehtml = $("<p>")
+  ehtml.addClass("error_message")
+  ehtml.html(message)
+  ehtml
+
+window.split = (val) ->
+  return val.split( /,\s*/ )
+
+window.extractLast = (term) ->
+  return split( term ).pop()
+
 # Disable button if text field is empty
 window.disableButtonIfEmptyField = (field_selector, button_selector) ->
   field = $(field_selector)
@@ -33,6 +45,11 @@ $ ->
   # Bottom tooltip
   $('.has_bottom_tooltip').tooltip(placement: 'bottom')
+  # Flash
+  if (flash = $("#flash-container")).length > 0
+    flash.click -> $(@).slideUp("slow")
+    flash.slideDown "slow"
+    setTimeout (-> flash.slideUp("slow")), 3000
   # Disable form buttons while a form is submitting
   $('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->

app/assets/javascripts/merge_requests.js

@@ -14,14 +14,6 @@ var MergeRequest = {
       $(".mr_show_all_commits").bind("click", function() { 
         self.showAllCommits();
       });
-
-      $(".line_note_link, .line_note_reply_link").live("click", function(e) {
-        var form = $(".per_line_form");
-        $(this).parent().parent().after(form);
-        form.find("#note_line_code").val($(this).attr("line_code"));
-        form.show();
-        return false;
-      });
     },
   initMergeWidget: 
@@ -34,6 +26,12 @@ var MergeRequest = {
           self.showState(data.state);
         }, "json");
       }
+
+      if(self.opts.ci_enable){
+        $.get(self.opts.url_to_ci_check, function(data){
+          self.showCiState(data.status);
+        }, "json");
+      }
     },
   initTabs:
@@ -87,6 +85,11 @@ var MergeRequest = {
       $(".automerge_widget." + state).show();
     },
+  showCiState:
+    function(state){
+      $(".ci_widget").hide();
+      $(".ci_widget.ci-" + state).show();
+    },
   loadDiff:
     function() { 

app/assets/javascripts/profile.js.coffee

@@ -8,3 +8,13 @@ $ ->
     # Go up the hierarchy and show the corresponding submission feedback element
     $(@).closest('fieldset').find('.update-feedback').show('highlight', {color: '#DFF0D8'}, 500)
+
+  $('.update-username form').on 'ajax:before', ->
+    $('.loading-gif').show()
+    $(this).find('.update-success').hide()
+    $(this).find('.update-failed').hide()
+
+  $('.update-username form').on 'ajax:complete', ->
+    $(this).find('.save-btn').removeAttr('disabled')
+    $(this).find('.save-btn').removeClass('disabled')
+    $(this).find('.loading-gif').hide()

app/assets/javascripts/projects.js.coffee

 window.Projects = ->
-  $('#project_name').on 'change', ->
-    slug = slugify $(@).val()
-    $('#project_code, #project_path').val slug
-
   $('.new_project, .edit_project').on 'ajax:before', ->
     $('.project_new_holder, .project_edit_holder').hide()
     $('.save-project-loader').show()
@@ -22,10 +18,3 @@ $ ->
   # Ref switcher
   $('.project-refs-select').on 'change', ->
     $(@).parents('form').submit()
-
-class @GraphNav
-  @init: ->
-    $('.graph svg').css 'position', 'relative'
-    $('body').bind 'keyup', (e) ->
-      $('.graph svg').animate(left: '+=400') if e.keyCode is 37 # left
-      $('.graph svg').animate(left: '-=400') if e.keyCode is 39 # right

app/assets/javascripts/tree.js.coffee

@@ -28,7 +28,7 @@ $ ->
         return false
       $('#tree-slider .tree-item-file-name a, .breadcrumb li > a').live 'click', (e) ->
-        History.pushState(null, null, $(@).attr('href'))
+        History.pushState(null, null, decodeURIComponent($(@).attr('href')))
         return false
       History.Adapter.bind window, 'statechange', ->

app/assets/stylesheets/application.css

-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require jquery.ui.all
- *= require jquery.ui.aristo
- *= require jquery.atwho
- *= require chosen
- *= require_self
- *= require main
-*/

app/assets/stylesheets/application.scss

+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require jquery.ui.gitlab
+ *= require jquery.atwho
+ *= require chosen
+ *= require_self
+*/
+
+/**
+ * GitLab bootstrap:
+ */
+@import "gitlab_bootstrap.scss";
+
+@import "common.scss";
+@import "ref_select.scss";
+
+@import "sections/header.scss";
+@import "sections/nav.scss";
+@import "sections/commits.scss";
+@import "sections/issues.scss";
+@import "sections/projects.scss";
+@import "sections/snippets.scss";
+@import "sections/votes.scss";
+@import "sections/merge_requests.scss";
+@import "sections/graph.scss";
+@import "sections/events.scss";
+@import "sections/themes.scss";
+@import "sections/tree.scss";
+@import "sections/notes.scss";
+@import "sections/profile.scss";
+@import "sections/login.scss";
+@import "sections/editor.scss";
+
+@import "highlight/white.scss";
+@import "highlight/dark.scss";
+
+/**
+ * UI themes:
+ */
+@import "themes/ui_basic.scss";
+@import "themes/ui_mars.scss";
+@import "themes/ui_modern.scss";
+@import "themes/ui_gray.scss";
+@import "themes/ui_color.scss";
+

app/assets/stylesheets/common.scss

 /** LAYOUT **/
 body {
-  margin-bottom:20px;
+  margin-bottom: 20px;
 }
 .container {
-  padding-top:0;
-  z-index:5;
+  padding-top: 0;
+  z-index: 5;
 }
 .container .content {
-  margin:0 0;
+  margin: 0 0;
 }
-.container  .sidebar {
-  width: 200px;
-  height:100%;
-  min-height:450px;
-  float:right;
-}
-
-
 .visible_link,
 .author_link {
   color: $link_color;
 }
-.help li { color:#111 }
+.help li { color:$style_color; }
 .back_link {
-  text-decoration:underline;
-  font-size:14px;
-  font-weight:bold;
-  padding:10px 0;
-  padding-bottom:0;
+  text-decoration: underline;
+  font-size: 14px;
+  font-weight: bold;
+  padding: 10px 0;
+  padding-bottom: 0;
 }
 .info_link {
-  margin-right:5px;
-  float:left;
+  margin-right: 5px;
+  float: left;
   img {
-    width:20px;
+    width: 20px;
   }
 }
 .download_repo_link {
   background: url("images.png") no-repeat 0 -48px;
-  padding-left:20px;
+  padding-left: 20px;
 }
 table a code {
@@ -61,32 +53,37 @@ table a code {
 }
 .loading {
-  margin:20px auto;
+  margin: 20px auto;
   background: url(ajax_loader.gif) no-repeat center center;
-  width:40px;
-  height:40px;
+  width: 40px;
+  height: 40px;
+  &.loading-gray {
+    background: url(ajax_loader_gray.gif) no-repeat center center;
+  }
 }
 /** FLASH message **/
-#flash_container {
-  height:50px;
-  position:fixed;
-  z-index:10001;
-  top:0px;
-  width:100%;
-  margin-bottom:15px;
-  overflow:hidden;
-  background:white;
-  cursor:pointer;
-  border-bottom:1px solid #ccc;
+#flash-container {
+  height: 50px;
+  position: fixed;
+  z-index: 10001;
+  top: 0px;
+  width: 100%;
+  margin-bottom: 15px;
+  overflow: hidden;
+  background: white;
+  cursor: pointer;
+  border-bottom: 1px solid #ccc;
+  text-align: center;
+  display: none;
   h4 {
-    color:#666;
-    font-size:18px;
-    line-height:38px;
-    padding-top:5px;
-    margin:2px;
-    font-weight:normal;
+    color: #666;
+    font-size: 18px;
+    line-height: 38px;
+    padding-top: 5px;
+    margin: 2px;
+    font-weight: normal;
   }
 }
@@ -94,40 +91,29 @@ table a code {
   margin-right:50px
 }
-.handle:hover {
-  cursor:move;
-}
-
-span.update-author {
-  display:block;
-}
 span.update-author {
-  color:#999;
-  font-weight:normal;
-  font-style:italic;
-}
-span.update-author strong {
-  font-weight:bold;
-  font-style: normal;
+  display: block;
+  color: #999;
+  font-weight: normal;
+  font-style: italic;
+  strong {
+    font-weight: bold;
+    font-style: normal;
+  }
 }
-/** UPDATE ITEM **/
-span.update-author {
-  display:block;
-}
-/** END UPDATE ITEM **/
 .dashboard-loader {
-  float:left;
-  margin:10px;
-  display:none;
+  float: left;
+  margin: 10px;
+  display: none;
 }
 .user-mention {
-  color:#2FA0BB;
-  font-weight:bold;
+  color: #2FA0BB;
+  font-weight: bold;
 }
 .neib {
-  margin-right:10px;
+  margin-right: 10px;
 }
 .label {
@@ -136,9 +122,9 @@ span.update-author {
   &.label-tag {
     background: none;
     border: none;
-    padding:4px 6px;
-    color:#444;
-    text-shadow:0 0 1px #fff;
+    padding: 4px 6px;
+    color: #444;
+    text-shadow: 0 0 1px #fff;
     &.grouped {
       float: left;
@@ -149,9 +135,9 @@ span.update-author {
   &.label-issue {
     background-color: #eee;
     border: 1px solid #ccc;
-    padding:4px 6px;
-    color:#444;
-    text-shadow:0 0 1px #fff;
+    padding: 4px 6px;
+    color: #444;
+    text-shadow: 0 0 1px #fff;
     &.grouped {
       float: left;
@@ -201,21 +187,21 @@ form {
 .field_with_errors {
-  display:inline;
+  display: inline;
 }
 ul.breadcrumb {
-  background:white;
-  border:none;
+  background: white;
+  border: none;
   li {
     display: inline;
     text-shadow: 0 1px 0 white
   }
   a {
-    color:#474D57;
-    font-weight:bold;
-    font-size:14px;
+    color: #474D57;
+    font-weight: bold;
+    font-size: 14px;
   }
   .arrow {
@@ -225,31 +211,31 @@ ul.breadcrumb {
     float: left;
     position: relative;
     left: -10px;
-    padding:0;
-    margin:0;
+    padding: 0;
+    margin: 0;
   }
 }
 input[type=text] {
   &.large_text {
-    padding:6px;
-    font-size:16px;
+    padding: 6px;
+    font-size: 16px;
   }
 }
 input.git_clone_url {
-  width:325px;
+  width: 325px;
 }
 .merge-request-form-holder {
   select {
-    width:300px;
+    width: 300px;
   }
 }
 /** Issues **/
 #issue_assignee_id {
-  width:300px;
+  width: 300px;
 }
 #new_issue_dialog textarea{
@@ -257,26 +243,11 @@ input.git_clone_url {
 }
 .project_list_url {
-  width:250px;
+  width: 250px;
   background:#fff !important;
 }
-/** bordered list **/
-ul.bordered-list {
-  margin:5px 0px;
-  padding:0px;
-  li {
-    padding: 5px 0;
-    border-bottom: 1px solid #EEE;
-    overflow: hidden;
-    display: block;
-    margin:0px;
-  }
-}
-
-ul.bordered-list li:last-child { border:none }
-
 .line_holder {
   &:hover {
     td {
@@ -287,10 +258,10 @@ ul.bordered-list li:last-child { border:none }
 li.commit {
   .avatar {
-    width:24px;
+    width: 24px;
     top:-5px;
-    margin-right:10px;
-    margin-left:10px;
+    margin-right: 10px;
+    margin-left: 10px;
   }
   code {
@@ -310,102 +281,10 @@ p.time {
 .styled_image {
-  border:2px solid #ddd;
-}
-
-
-.ico {
-  background: url("images.png") no-repeat -85px -77px;
-  width: 19px;
-  height: 16px;
-  float: left;
-  position: relative;
-  margin-right: 10px;
-  top: 8px;
-
-  &.project {
-    background-position:  -37px -77px;
-  }
-
-  &.activities {
-    background-position:-162px -22px;
-  }
-  &.projects {
-    background-position:-209px -21px;
-  }
+  border: 2px solid #ddd;
 }
-.leftbar {
-  h5, .title {
-    padding:5px 10px;
-  }
-  h4 {
-    font-size:14px;
-    padding:2px 10px;
-    color:#666;
-    border-bottom:1px solid #f1f1f1;
-  }
-  a:last-child h4 { border:none; }
-
-  a:hover {
-    h4 {
-      color:#111;
-      background:$hover;
-      border-color:#CCC;
-      .ico.project {
-        background-position:-209px -21px;
-      }
-    }
-  }
-  .bottom {
-    padding:10px;
-  }
-}
-
-.votes {
-  font-size: 13px;
-  line-height: 15px;
-  .progress {
-    height: 4px;
-    margin: 0;
-    .bar {
-      float: left;
-      height: 100%;
-    }
-    .bar-success {
-      background-color: #468847;
-      @include bg-gradient(#62C462, #51A351);
-    }
-    .bar-danger {
-      background-color: #B94A48;
-      @include bg-gradient(#EE5F5B, #BD362F);
-    }
-  }
-  .upvotes {
-    display: inline-block;
-    color: #468847;
-  }
-  .downvotes {
-    display: inline-block;
-    color: #B94A48;
-  }
-}
-.votes-block {
-  margin: 14px 6px 6px 0;
-  .downvotes {
-    float: right;
-  }
-}
-.votes-inline {
-  display: inline-block;
-  margin: 0 8px;
-  .progress {
-    display: inline-block;
-    padding: 0 0 2px;
-    width: 45px;
-  }
-}
 /* Fix for readme code (stopped it from being yellow) */
 .readme {
@@ -418,63 +297,45 @@ p.time {
   }
 }
-
 .highlight_word {
-  background:#EEDC94;
+  background: #EEDC94;
 }
 .status_info {
-  font-size:14px;
-  padding:5px 15px;
-  line-height:24px;
-  width:60px;
-  text-align:center;
-  float:left;
-  margin-right:20px;
-
-  &.success {
-    background: #5BB75B;
-    color: white;
-    text-shadow: 0 1px #111;
-    border-color: #9A9;
-  }
+  font-size: 14px;
+  padding: 5px 15px;
+  line-height: 26px;
+  text-align: center;
+  float: right;
+  position: relative;
+  top: -5px;
+  @include border-radius(4px);
+
   &.error {
     background: #DA4E49;
-    border-color: #BD362F;
-    color: white;
-    text-shadow: 0 1px #111;
+    color: #FFF;
   }
 }
 .arrow{
   background: #E3E5EA;
   padding: 5px;
-  margin-top:5px;
-  border-radius: 5px;
+  margin-top: 5px;
+  @include border-radius(5px);
   text-shadow: none;
   color: #999;
   line-height: 16px;
-  font-weight:bold;
+  font-weight: bold;
 }
 .thin_area{
   height: 150px;
 }
-.gitlab_pagination {
-  span a { color:$link_color; }
-  .prev, .next, .current, .page a {
-    padding:10px;
-  }
-  .current {
-    border-bottom:2px solid $style_color;
-  }
-}
-
 // Fixes alignment on notes.
 .new_note {
   label {
-    text-align:left;
+    text-align: left;
   }
 }
@@ -486,7 +347,7 @@ li.note {
       border-bottom:none !important;
     }
     .file {
-      padding-left:20px;
+      padding-left: 20px;
       background:url("icon-attachment.png") no-repeat left center;
     }
   }
@@ -494,7 +355,7 @@ li.note {
 .markdown {
   img {
-    max-width:100%;
+    max-width: 100%;
   }
 }
@@ -504,19 +365,19 @@ li.note {
 .team_member_show {
   td:first-child {
-    color:#aaa;
+    color: #aaa;
   }
 }
 .remember_me {
-  text-align:left;
+  text-align: left;
   input {
-    margin:0;
+    margin: 0;
   }
   span {
-    padding-left:5px;
+    padding-left: 5px;
   }
 }
@@ -530,10 +391,10 @@ li.note {
   .data {
     a {
       h1 {
-        line-height:48px;
-        font-size:48px;
-        padding:20px;
-        text-align:center;
+        line-height: 48px;
+        font-size: 48px;
+        padding: 20px;
+        text-align: center;
       }
     }
   }
@@ -541,12 +402,12 @@ li.note {
 .rss-icon {
   img {
-    width:24px;
-    vertical-align:top;
+    width: 24px;
+    vertical-align: top;
   }
   strong {
-    line-height:24px;
+    line-height: 24px;
   }
 }
@@ -554,43 +415,43 @@ li.note {
 /* CHZN reset few styles */
 .chzn-container-single .chzn-single {
-  background:#FFF;
+  background: #FFF;
   border: 1px solid #bbb;
-  box-shadow:none;
+  box-shadow: none;
 }
 .chzn-container-active .chzn-single {
-  background:#fff;
+  background: #fff;
 }
 .supp_diff_link,
 .mr_show_all_commits {
-  cursor:pointer;
+  cursor: pointer;
 }
 .merge_request,
 .issue {
   &.today{
     background: #EFE;
-    border-color:#CEC;
+    border-color: #CEC;
   }
   &.closed {
     background: #F5f5f5;
-    border-color:#E5E5E5;
+    border-color: #E5E5E5;
   }
   &.merged {
     background: #F5f5f5;
-    border-color:#E5E5E5;
+    border-color: #E5E5E5;
   }
 }
 .git_error_tips {
   @extend .span6;
-  text-align:left;
-  margin-top:40px;
+  text-align: left;
+  margin-top: 40px;
   pre {
-    background:white;
-    border:none;
+    background: white;
+    border: none;
     font-size: 12px;
   }
 }
@@ -602,18 +463,22 @@ li.note {
   margin-bottom: 10px;
   background: #FEE;
   padding-left: 20px;
+
+  &.centered {
+    text-align: center;
+  }
 }
 .oauth_select_holder {
-  padding:20px;
+  padding: 20px;
   img {
-    padding:5px;
-    margin-right:10px;
+    padding: 5px;
+    margin-right: 10px;
   }
   .active {
     img {
-      border:1px solid #ccc;
-      background:$hover;
+      border: 1px solid #ccc;
+      background: $hover;
       @include border-radius(5px);
     }
   }
@@ -627,29 +492,67 @@ li.note {
 .gitlab-promo {
   a {
-    color:#aaa;
+    color: #aaa;
     margin-right: 30px;
   }
 }
 pre {
   &.clean {
-    background:none;
-    border:none;
-    margin:0;
-    padding:0;
+    background: none;
+    border: none;
+    margin: 0;
+    padding: 0;
   }
 }
-.milestone .progress {
-  margin-bottom: 0;
-  margin-top:4px;
+.milestone {
+  &.milestone-closed {
+    background: #eee;
+  }
+  .progress {
+    margin-bottom: 0;
+    margin-top: 4px;
+  }
 }
 .float-link {
-  float:left;
-  margin-right:15px;
+  float: left;
+  margin-right: 15px;
   .s16 {
-    margin-right:5px;
+    margin-right: 5px;
+  }
+}
+
+.dashboard-search-filter {
+  padding:5px;
+
+  .search-text-input {
+    float:left;
+    @extend .span2;
+  }
+  .btn {
+    margin-left: 5px;
+    float:left;
+  }
+}
+
+h1.http_status_code {
+  font-size: 56px;
+  line-height: 100px;
+  font-weight: normal;
+  color: #456;
+}
+
+.control-group {
+  .controls {
+    span {
+      &.descr {
+        position: relative;
+        top: 2px;
+        left: 5px;
+        color: #666;
+      }
+    }
   }
 }

app/assets/stylesheets/gitlab_bootstrap.scss

+/** Override bootstrap variables **/
+$baseFontSize: 13px !default;
+$baseLineHeight: 18px !default;
+
+// BOOTSTRAP
+@import "bootstrap";
+@import "bootstrap/responsive-utilities";
+@import "bootstrap/responsive-1200px-min";
+
+@import "font-awesome";
+
+/**
+ * GitLab bootstrap.
+ * Overrides some styles of twitter bootstrap.
+ * Also give some common classes for GitLab app
+ */
+@import "gitlab_bootstrap/variables.scss";
+@import "gitlab_bootstrap/fonts.scss";
+@import "gitlab_bootstrap/mixins.scss";
+@import "gitlab_bootstrap/common.scss";
+@import "gitlab_bootstrap/typography.scss";
+@import "gitlab_bootstrap/buttons.scss";
+@import "gitlab_bootstrap/blocks.scss";
+@import "gitlab_bootstrap/files.scss";
+@import "gitlab_bootstrap/tables.scss";
+@import "gitlab_bootstrap/lists.scss";

app/assets/stylesheets/gitlab_bootstrap/blocks.scss

@@ -15,8 +15,8 @@
   @extend .borders;
   @extend .prepend-top-20;
   @extend .append-bottom-20;
-  border-width:1px;
-  @include solid_shade;
+  border-width: 1px;
+  @include solid-shade;
   img { max-width: 100%; }
@@ -30,27 +30,37 @@
   .top_box_content,
   .middle_box_content,
   .bottom_box_content {
-    padding:15px;
+    padding: 15px;
+    word-wrap: break-word;
     pre {
       background: none !important;
-      margin:0;
-      border:none;
-      padding:0;
+      margin: 0;
+      border: none;
+      padding: 0;
+    }
+  }
+
+  .top_box_content {
+    .box-title {
+      color: $style_color;
+      font-size: 18px;
+      font-weight: normal;
+      line-height: 28px;
     }
   }
   .middle_box_content {
-    border-radius:0;
-    border:none;
-    font-size:12px;
-    background-color:#f5f5f5;
-    border:none;
-    border-top:1px solid #eee;
+    @include border-radius(0);
+    border: none;
+    font-size: 12px;
+    background-color: #f5f5f5;
+    border: none;
+    border-top: 1px solid #eee;
   }
   .bottom_box_content {
-    border-top:1px solid #eee;
+    border-top: 1px solid #eee;
   }
 }
@@ -59,44 +69,52 @@
  *
  */
 .ui-box {
-  background:#F9F9F9;
+  background: #F9F9F9;
   margin-bottom: 25px;
-  @include round-borders-all(4px);
+
+  border: 1px solid #eaeaea;
+  @include border-radius(4px);
+
   border-color: #CCC;
-  @include solid_shade;
+  @include solid-shade;
   &.white {
-    background:#fff;
+    background: #fff;
   }
   ul {
-    margin:0;
+    margin: 0;
   }
   h5, .title {
     padding: 0 10px;
-    @include round-borders-top(4px);
+    @include border-radius(4px 4px 0 0);
     @include bg-gray-gradient;
+    border-top: 1px solid #eaeaea;
     border-bottom: 1px solid #bbb;
+    > a {
+      text-shadow: 0 1px 1px #fff;
+    }
+
     &.small {
       line-height: 28px;
       font-size: 14px;
-      line-height:28px;
+      line-height: 28px;
       text-shadow: 0 1px 1px white;
     }
     form {
-      padding:9px 0;
-      margin:0px;
+      padding: 9px 0;
+      margin: 0px;
     }
     .nav-pills {
       li {
-        padding:3px 0;
-        &.active a { background-color:$style_color; }
+        padding: 3px 0;
+        &.active a { background-color: $style_color; }
         a {
-          border-radius:7px;
+          @include border-radius(7px);
         }
       }
     }
@@ -104,8 +122,8 @@
   .bottom {
     @include bg-gray-gradient;
-    @include round-borders-bottom(4px);
-    border-bottom:none;
+    @include border-radius(0 0 4px 4px);
+    border-bottom: none;
     border-top: 1px solid #bbb;
   }
@@ -116,38 +134,25 @@
       padding: 5px 20px;
     }
     .middle_title {
-      background:#f5f5f5;
+      background: #f5f5f5;
       margin:20px -20px;
       padding: 0 20px;
-      border-top:1px solid #eee;
-      border-bottom:1px solid #eee;
-      font-size:14px;
-      color:#777;
+      border-top: 1px solid #eee;
+      border-bottom: 1px solid #eee;
+      font-size: 14px;
+      color: #777;
     }
   }
   .row_title {
-    font-weight:bold;
-    color:#444;
+    font-weight: bold;
+    color: #444;
     &:hover {
-      color:#444;
-      text-decoration:underline;
-    }
-  }
-
-  li, .wll {
-    padding:10px;
-    &:first-child {
-      @include round-borders-top(4px);
-      border-top:none;
-    }
-
-    &:last-child {
-      @include round-borders-bottom(4px);
-      border:none;
+      color: #444;
+      text-decoration: underline;
     }
   }
   .ui-box-body {
-    padding:10px;
+    padding: 10px;
   }
 }

app/assets/stylesheets/gitlab_bootstrap/buttons.scss

 .btn {
-  @include bg-gradient(#f7f7f7, #d5d5d5);
-  border-color:#aaa;
+  @include linear-gradient(#f7f7f7, #d5d5d5);
+  border-color: #aaa;
   &:hover {
     @include bg-gray-gradient;
-    border-color:#bbb;
-    color:#333;
+    border-color: #bbb;
+    color: #333;
   }
   &.primary {
-    background:#2a79A3;
-    @include bg-gradient(#47A7b7, #2585b5);
+    background: #2a79A3;
+    @include linear-gradient(#47A7b7, #2585b5);
     border-color: #2A79A3;
-    color:#fff;
+    color: #fff;
     text-shadow: 0 1px 1px #268;
     &:hover {
-      background:$blue_link;
-      color:#fff;
+      background: $primary_color;
+      color: #fff;
     }
     &.disabled {
-      color:#fff;
-      background:#29B;
+      color: #fff;
+      background: #29B;
     }
   }
   &.btn-info {
-    background:#5aB9C3;
-    border-color: $blue_link;
-    color:#fff;
+    background: #5aB9C3;
+    border-color: $primary_color;
+    color: #fff;
     text-shadow: 0 1px 1px #268;
     &:hover {
-      background:$blue_link;
-      color:#fff;
+      background: $primary_color;
+      color: #fff;
     }
     &.disabled {
-      color:#fff;
-      background:#29B;
+      color: #fff;
+      background: #29B;
     }
   }
@@ -49,8 +49,8 @@
     }
     &.disabled {
-      color:#fff;
-      background:#2b2;
+      color: #fff;
+      background: #2b2;
     }
   }
@@ -60,12 +60,12 @@
   }
   &.cancel-btn {
-    float:right;
+    float: right;
   }
   &.wide {
-    padding-left:30px;
-    padding-right:30px;
+    padding-left: 30px;
+    padding-right: 30px;
   }
   &.danger {
@@ -73,7 +73,7 @@
     border-color: #BD362F;
     &:hover {
-      color:#fff;
+      color: #fff;
       background: #EE4E49;
     }
   }
@@ -87,24 +87,24 @@
   }
   &.active {
-    border-color:#aaa;
-    background-color:#ccc;
+    border-color: #aaa;
+    background-color: #ccc;
   }
   &.very_small {
-    font-size:11px;
-    padding:2px 6px;
+    font-size: 11px;
+    padding: 2px 6px;
     line-height: 16px;
-    margin:2px;
+    margin: 2px;
   }
   &.grouped {
-    margin-right:7px;
-    float:left;
+    margin-right: 7px;
+    float: left;
   }
   &.padded {
-    margin-right:3px;
-    padding:4px 10px 4px;
+    margin-right: 3px;
+    padding: 4px 10px 4px;
   }
 }

app/assets/stylesheets/gitlab_bootstrap/common.scss

@@ -10,11 +10,6 @@
 /** COMMON CLASSES **/
 .left { float:left }
 .right { float:right!important }
-.width-50p { width:50% }
-.width-49p { width:49% }
-.width-30p { width:30% }
-.width-65p { width:65% }
-.width-100p { width:100% }
 .append-bottom-10 { margin-bottom:10px }
 .append-bottom-20 { margin-bottom:20px }
 .prepend-top-10 { margin-top:10px }
@@ -24,40 +19,42 @@
 .lborder { border-left:1px solid #eee }
 .no-padding { padding:0 !important; }
 .underlined { border-bottom: 1px solid #CCC; }
-.no-borders { border:none; }
+.no-borders { border: none; }
 .vlink { color: $link_color !important; }
 .underlined_link { text-decoration: underline; }
 .borders { border: 1px solid #ccc; @include shade; }
 .hint { font-style: italic; color: #999; }
 .light { color: #888 }
+.tiny { font-weight: normal }
 /** PILLS & TABS**/
-.nav-pills a:hover { background-color:#888; }
+.nav-pills a:hover { background-color: #888; }
 .nav-pills .active a { background-color: $style_color; }
-.nav-tabs > li > a, .nav-pills > li > a { color:$style_color; }
+.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
+.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
 .nav.nav-tabs {
   li {
     > a {
-      padding:8px 20px;
+      padding: 8px 20px;
       margin-right: 7px;
       line-height: 19px;
       border-color: #EEE;
-      color:#888;
+      color: #888;
       border-bottom: 1px solid #ddd;
       .badge {
         background-color: #eee;
-        color:#888;
-        text-shadow:0 1px 1px #fff;
+        color: #888;
+        text-shadow: 0 1px 1px #fff;
       }
       i[class^="icon-"] {
-        line-height:14px;
+        line-height: 14px;
       }
     }
     &.active {
       > a {
         border-color: #CCC;
         border-bottom: 1px solid #fff;
-        color:#333;
+        color: #333;
       }
     }
   }
@@ -69,25 +66,50 @@
 .alert-message.error { @extend .alert-error; }
 /** AVATARS **/
-img.avatar { float:left; margin-right:12px; width:40px; border:1px solid #ddd; padding:1px; }
-img.avatar.s16 { width:16px; height:16px; margin-right:6px; }
-img.avatar.s24 { width:24px; height:24px; margin-right:8px; }
-img.avatar.s32 { width:32px; height:32px; margin-right:10px; }
-img.lil_av { padding-left: 4px; padding-right:3px; }
+img.avatar { float: left; margin-right: 12px; width: 40px; border: 1px solid #ddd; padding: 1px; }
+img.avatar.s16 { width: 16px; height: 16px; margin-right: 6px; }
+img.avatar.s24 { width: 24px; height: 24px; margin-right: 8px; }
+img.avatar.s32 { width: 32px; height: 32px; margin-right: 10px; }
+img.lil_av { padding-left: 4px; padding-right: 3px; }
 img.small { width: 80px; }
 /** HELPERS **/
-.nothing_here_message { text-align:center; padding:20px; color:#777; }
-p.slead { color:#456; font-size:16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; }
+.nothing_here_message {
+  text-align: center;
+  padding: 20px;
+  color: #666;
+  font-weight: normal;
+  font-size: 16px;
+  line-height: 36px;
+}
+
+p.slead { color: #456; font-size: 16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; }
 /** FORMS **/
 input[type='search'].search-text-input {
   background-image: url("icon-search.png");
   background-repeat: no-repeat;
   background-position: 10px;
-  padding-left:25px;
+  padding-left: 25px;
   @include border-radius(4px);
-  border:1px solid #ccc;
+  border: 1px solid #ccc;
+}
+
+input[type='text'].danger {
+  background: #F2DEDE!important;
+  border-color: #D66;
+  text-shadow: 0 1px 1px #fff
 }
 fieldset legend { font-size: 17px; }
+
+/** PAGINATION **/
+.gitlab_pagination {
+  span a { color: $link_color; }
+  .prev, .next, .current, .page a {
+    padding: 10px;
+  }
+  .current {
+    border-bottom: 2px solid $style_color;
+  }
+}

app/assets/stylesheets/gitlab_bootstrap/files.scss

@@ -3,9 +3,9 @@
  *
  */
 .file_holder {
-  border:1px solid #BBB;
-  margin-bottom:1em;
-  @include solid_shade;
+  border: 1px solid #BBB;
+  margin-bottom: 1em;
+  @include solid-shade;
   .file_title {
     border-bottom: 1px solid #bbb;
@@ -16,47 +16,51 @@
     text-align: left;
     color: #666;
     padding: 9px 10px;
-    height:18px;
+    height: 18px;
     .options {
-      float:right;
+      float: right;
       margin-top: -5px;
     }
     .file_name {
-      color:$style_color;
-      font-size:14px;
+      color: $style_color;
+      font-size: 14px;
       text-shadow: 0 1px 1px #fff;
       small {
-        color:#999;
-        font-size:13px;
+        color: #999;
+        font-size: 13px;
       }
     }
   }
   .file_content {
-    background:#fff;
+    background: #fff;
     font-size: 11px;
     &.wiki {
       font-size: 13px;
       code {
-        padding:0 4px;
+        padding: 0 4px;
       }
-      padding:20px;
-      h1, h2 {
-        line-height: 46px;
-      }
-      h3, h4 {
-        line-height: 40px;
+      padding: 20px;
+
+      h1 { font-size: 26px; line-height: 46px; }
+      h2 { font-size: 22px; line-height: 42px; }
+      h3 { font-size: 20px; line-height: 40px; }
+      h4 { font-size: 18px; line-height: 32px; }
+      h5 { font-size: 16px; line-height: 26px; }
+
+      .white .highlight pre {
+        background: #f5f5f5;
       }
     }
     &.image_file {
-      background:#eee;
-      text-align:center;
+      background: #eee;
+      text-align: center;
       img {
-        padding:100px;
-        max-width:300px;
+        padding: 100px;
+        max-width: 300px;
       }
     }
@@ -69,60 +73,60 @@
      */
     &.blame {
       table {
-        border:none;
-        box-shadow:none;
-        margin:0;
+        border: none;
+        box-shadow: none;
+        margin: 0;
       }
       tr {
         border-bottom: 1px solid #eee;
       }
       td {
         &:first-child {
-          border-left:none;
+          border-left: none;
         }
         &:last-child {
-          border-right:none;
+          border-right: none;
         }
-        background:#fff;
-        padding:5px;
+        background: #fff;
+        padding: 5px;
       }
       .author,
       .blame_commit {
-        background:#f5f5f5;
-        vertical-align:top;
+        background: #f5f5f5;
+        vertical-align: top;
       }
       .lines {
         pre {
-          padding:0;
-          margin:0;
-          background:none;
-          border:none;
+          padding: 0;
+          margin: 0;
+          background: none;
+          border: none;
         }
       }
     }
     &.logs {
-      background:#eee;
+      background: #eee;
       max-height: 700px;
       overflow-y: auto;
       ol {
-        margin-left:40px;
+        margin-left: 40px;
         padding: 10px 0;
         border-left: 1px solid #CCC;
-        margin-bottom:0;
+        margin-bottom: 0;
         background: white;
         li {
-          color:#888;
+          color: #888;
           p {
-            margin:0;
-            color:#333;
-            line-height:24px;
+            margin: 0;
+            color: #333;
+            line-height: 24px;
             padding-left: 10px;
           }
           &:hover {
-            background:$hover;
+            background: $hover;
           }
         }
       }
@@ -142,8 +146,8 @@
         table-layout: fixed;
         pre {
-          background: none;
           border: none;
+          border-radius: 0;
           font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
           font-size: 12px !important;
           line-height: 16px !important;

app/assets/stylesheets/gitlab_bootstrap/fonts.scss

+@font-face{ 
+  font-family: Korolev; 
+  src: font-url('korolev-medium-compressed.otf');
+}
+
+/** Typo **/
+$monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace;
\ No newline at end of file

app/assets/stylesheets/gitlab_bootstrap/lists.scss

-/** LISTS **/
-
-ul {
-  /**
-   * List li block element #1
-   *
-   */
-  .wll {
+/**
+ * Well styled list
+ *
+ */
+.well-list {
+  margin: 0;
+  list-style: none;
+  li {
     background-color: #FFF;
-    padding: 10px 5px;
+    padding: 10px;
     min-height: 20px;
     border-bottom: 1px solid #eee;
     border-bottom: 1px solid rgba(0, 0, 0, 0.05);
-    &.smoke { background-color:#f5f5f5; }
+    &.disabled {
+      color: #888;
+    }
+
+    &.smoke { background-color: #f5f5f5; }
+
     &:hover {
-      background:$hover;
-      border-bottom:1px solid #ADF;
+      background: $hover;
+      border-bottom: 1px solid #ADF;
     }
-    &:last-child { border:none }
+
+    &:first-child {
+      @include border-radius(4px 4px 0 0);
+      border-top: none;
+    }
+
+    &:last-child {
+      @include border-radius(0 0 4px 4px);
+      border: none;
+    }
+
     .author { color: #999; }
     p {
       padding-top: 1px;
-      margin:0;
-      color:#222;
+      margin: 0;
+      color: #222;
       img {
-        position:relative;
-        top:3px;
+        position: relative;
+        top: 3px;
       }
     }
+
+    .well-title {
+      font-size: 14px;
+      line-height: 18px;
+    }
   }
 }
 ol, ul {
   &.styled {
     li {
-      padding:2px;
+      padding: 2px;
     }
   }
 }
+
+/** light list with border-bottom between li **/
+ul.bordered-list {
+  margin: 5px 0px;
+  padding: 0px;
+  li {
+    padding: 5px 0;
+    border-bottom: 1px solid #EEE;
+    overflow: hidden;
+    display: block;
+    margin: 0px;
+    &:last-child { border:none }
+  }
+}

app/assets/stylesheets/gitlab_bootstrap/mixins.scss

+/**
+ * Generic mixins
+ */
+ @mixin box-shadow($shadow) {
+  -webkit-box-shadow: $shadow;
+  -moz-box-shadow: $shadow;
+  -ms-box-shadow: $shadow;
+  -o-box-shadow: $shadow;
+  box-shadow: $shadow;
+}
+
+@mixin border-radius($radius) {
+  -webkit-border-radius: $radius;
+  -moz-border-radius: $radius;
+  -ms-border-radius: $radius;
+  -o-border-radius: $radius;
+  border-radius: $radius;
+}
+
+@mixin linear-gradient($from, $to) {
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
+  background-image: -webkit-linear-gradient($from, $to);
+  background-image: -moz-linear-gradient($from, $to);
+  background-image: -o-linear-gradient($from, $to);
+}
+
+/**
+ * Prefilled mixins
+ * Mixins with fixed values
+ */
+@mixin bg-light-gray-gradient {
+  background: #f1f1f1;
+  background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f5f5f5), to(#e1e1e1));
+  background-image: -webkit-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
+  background-image: -moz-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
+  background-image: -o-linear-gradient(#f5f5f5 6.6%, #e1e1e1);
+}
+
+@mixin bg-gray-gradient {
+  background: #eee;
+  background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
+  background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
+  background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
+  background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
+}
+
+@mixin bg-dark-gray-gradient {
+  background: #eee;
+  background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
+  background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
+  background-image: -o-linear-gradient(#e9e9e9, #d7d7d7);
+}
+
+@mixin shade {
+  @include box-shadow(0 0 3px #ddd);
+}
+
+@mixin solid-shade {
+  @include box-shadow(0 0 0 3px #f1f1f1);
+}
+
+@mixin header-font {
+  color: $style_color;
+  text-shadow: 0 1px 1px #FFF;
+  font-family: 'Korolev', sans-serif;
+  font-size: 28px;
+  line-height: 48px;
+  font-weight: normal;
+}

app/assets/stylesheets/gitlab_bootstrap/tables.scss

 table {
   @extend .table;
   @extend .table-striped;
-  @include solid_shade;
-  border:1px solid #bbb;
-  width:100%;
+  @include solid-shade;
+  border: 1px solid #bbb;
+  width: 100%;
   &.low {
     td {
-      line-height:18px;
+      line-height: 18px;
     }
   }
@@ -31,8 +31,8 @@ table {
   }
   td {
-    border-color:#f1f1f1;
-    line-height:28px;
+    border-color: #f1f1f1;
+    line-height: 28px;
     .s16 {
       margin-top: 5px;
@@ -40,11 +40,11 @@ table {
     }
     &:first-child {
-      border-left:1px solid #bbb;
+      border-left: 1px solid #bbb;
     }
     &:last-child {
-      border-right:1px solid #bbb;
+      border-right: 1px solid #bbb;
     }
   }
@@ -53,10 +53,10 @@ table {
   }
   &.lite {
-    border:none;
-    box-shadow:none;
+    border: none;
+    box-shadow: none;
     tr, td {
-      border:none;
+      border: none;
       background:none !important;
     }
   }

app/assets/stylesheets/gitlab_bootstrap/typography.scss

@@ -5,11 +5,11 @@
 h1, h2, h3, h4, h5, h6 { margin: 0; }
 h3, h4, h5, h6 { line-height: 36px; }
-h5 { font-size:14px; }
+h5 { font-size: 14px; }
 h3.page_title {
-  color:#456;
-  font-size:20px;
+  color: #456;
+  font-size: 20px;
   font-weight: normal;
   line-height: 28px;
 }
@@ -25,7 +25,7 @@ pre {
   &.dark {
     background: #333;
-    color:#f5f5f5;
+    color: #f5f5f5;
   }
 }
@@ -37,8 +37,8 @@ a {
   outline: none;
   color: $link_color;
   &:hover {
-    text-decoration:none;
-    color: $blue_link;
+    text-decoration: none;
+    color: $primary_color;
   }
   &.btn {
@@ -53,27 +53,31 @@ a {
   }
   &.lined {
-    text-decoration:underline;
-    &:hover { text-decoration:underline; }
+    text-decoration: underline;
+    &:hover { text-decoration: underline; }
   }
   &.gray {
-    color:gray;
+    color: gray;
   }
   &.supp_diff_link {
-    text-align:center;
-    padding:20px 0;
-    background:#f1f1f1;
-    width:100%;
-    float:left;
+    text-align: center;
+    padding: 20px 0;
+    background: #f1f1f1;
+    width: 100%;
+    float: left;
   }
   &.neib  {
-    margin-right:15px;
+    margin-right: 15px;
   }
 }
 a:focus {
   outline: none;
 }
+
+.monospace {
+  font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
+}

app/assets/stylesheets/gitlab_bootstrap/variables.scss

+/** Colors **/
+$primary_color: #2FA0BB;
+$link_color: #3A89A3;
+$style_color: #474D57;
+$hover: #D9EDF7;