Merge branch 'improve/scss' of /home/git/repositories/gitlab/gitlabhq

app/assets/javascripts/admin.js.coffee

@@ -14,7 +14,7 @@ class Admin
 
     $('.log-bottom').click (e) ->
       e.preventDefault()
-      visible_log = $(".file_content:visible")
+      visible_log = $(".file-content:visible")
       visible_log.animate({ scrollTop: visible_log.find('ol').height() }, "fast")
 
     modal = $('.change-owner-holder')

app/assets/javascripts/dashboard.js.coffee

@@ -15,7 +15,7 @@ class Dashboard
         uiBox.find(".dash-list li").show()
       else
         uiBox.find(".dash-list li").each (index) ->
-          name = $(this).find(".well-title").text()
+          name = $(this).find(".filter-title").text()
 
           if name.toLowerCase().search(terms.toLowerCase()) == -1
             $(this).hide()

app/assets/stylesheets/common.scss

@@ -23,12 +23,8 @@ body {
 
 .help li { color:$style_color; }
 
-.back_link {
-  text-decoration: underline;
+.back-link {
   font-size: 14px;
-  font-weight: bold;
-  padding: 10px 0;
-  padding-bottom: 0;
 }
 
 table a code {
@@ -412,7 +408,7 @@ img.emoji {
 }
 
 .navless-container {
-  margin-top: 30px;
+  margin-top: 20px;
 }
 
 .description-block {

app/assets/stylesheets/gitlab_bootstrap/avatar.scss

@@ -17,9 +17,6 @@
   &.s24 { width: 24px; height: 24px; margin-right: 8px; }
   &.s26 { width: 26px; height: 26px; margin-right: 8px; }
   &.s32 { width: 32px; height: 32px; margin-right: 10px; }
+  &.s60 { width: 60px; height: 60px; margin-right: 12px; }
   &.s90 { width: 90px; height: 90px; margin-right: 15px; }
 }
-
-
-img.lil_av { padding-left: 4px; padding-right: 3px; }
-img.small { width: 80px; }

app/assets/stylesheets/gitlab_bootstrap/blocks.scss

@@ -11,7 +11,7 @@
  */
 .ui-box {
   background: #F9F9F9;
-  margin-bottom: 25px;
+  margin-bottom: 20px;
   border: 1px solid #CCC;
   word-wrap: break-word;
   @include solid-shade;
@@ -86,10 +86,11 @@
     color: #456;
     font-size: 16px;
     text-shadow: 0 1px 1px #fff;
-    padding: 0px 10px;
-    line-height: 36px;
+    padding: 0 10px;
     font-size: 14px;
+    line-height: 40px;
     font-weight: normal;
+    margin: 0;
 
     > a {
       text-shadow: 0 1px 1px #fff;
@@ -101,8 +102,7 @@
     }
 
     .btn {
-      position: relative;
-      top: -2px;
+      vertical-align: middle;
     }
 
     .nav-pills {
@@ -132,15 +132,6 @@
       margin-bottom: 0;
       padding: 5px 20px;
     }
-    .middle_title {
-      background: #f5f5f5;
-      margin:20px -20px;
-      padding: 0 20px;
-      border-top: 1px solid #eee;
-      border-bottom: 1px solid #eee;
-      font-size: 14px;
-      color: #777;
-    }
   }
 
   .row_title {

app/assets/stylesheets/gitlab_bootstrap/buttons.scss

@@ -43,11 +43,8 @@
     }
   }
 
-  &.success {
-    @extend .btn-success;
-
+  &.btn-success {
     &:hover {
-      @extend .btn-success;
       background: #51a351;
     }
 
@@ -59,7 +56,7 @@
 
   &.btn-create {
     @extend .wide;
-    @extend .success;
+    @extend .btn-success;
   }
 
   &.btn-save {

app/assets/stylesheets/gitlab_bootstrap/common.scss

@@ -68,10 +68,6 @@ input[type='text'].danger {
 
 fieldset legend { font-size: 17px; }
 
-/** PAGINATION **/
-.gitlab_pagination {
-}
-
 .tab-content {
   overflow: visible;
 }

app/assets/stylesheets/gitlab_bootstrap/files.scss

@@ -2,12 +2,12 @@
  * File content holder
  *
  */
-.file_holder {
+.file-holder {
   border: 1px solid #BBB;
   margin-bottom: 1em;
   @include solid-shade;
 
-  .file_title {
+  .file-title {
     border-bottom: 1px solid #bbb;
     @include bg-dark-gray-gradient;
     margin: 0;
@@ -33,7 +33,7 @@
       }
     }
   }
-  .file_content {
+  .file-content {
     background: #fff;
     font-size: 11px;
 
@@ -48,7 +48,8 @@
 
     &.wiki {
       padding: 20px;
-      font-size: 13px;
+      font-size: 14px;
+      line-height: 1.6;
 
       .highlight {
         margin-bottom: 9px;

app/assets/stylesheets/gitlab_bootstrap/mixins.scss

@@ -70,19 +70,24 @@
 @mixin header-font {
   color: $style_color;
   text-shadow: 0 1px 1px #FFF;
-  font-size: 18px;
+  font-size: 16px;
   line-height: 40px;
   font-weight: normal;
-  letter-spacing: -1px;
 }
 
 @mixin md-typography {
   code { padding: 0 4px; }
-  p { font-size: 13px; }
-  h1 { font-size: 26px; line-height: 40px; margin: 10px 0;}
-  h2 { font-size: 22px; line-height: 40px; margin: 10px 0;}
-  h3 { font-size: 18px; line-height: 40px; margin: 10px 0;}
-  h4 { font-size: 16px; line-height: 20px; margin: 10px 0;}
-  h5 { font-size: 14px; line-height: 20px; margin: 10px 0;}
-  h6 { font-size: 12px; line-height: 20px; margin: 10px 0;}
+  h1 { margin-top: 30px;}
+  h2 { margin-top: 25px;}
+  h3 { margin-top: 20px;}
+  h4 { margin-top: 15px;}
+}
+
+@mixin page-title {
+  color: #456;
+  font-size: 20px;
+  font-weight: normal;
+  line-height: 1.5;
+  margin-top: 0px;
+  margin-bottom: 15px;
 }

app/assets/stylesheets/gitlab_bootstrap/typography.scss

@@ -3,15 +3,18 @@
  *
  */
 
-h1, h2, h3, h4, h5, h6 { margin: 0; }
-h3, h4, h5, h6 { line-height: 36px; }
-h5 { font-size: 14px; }
-
-h3.page_title {
-  color: #456;
-  font-size: 20px;
-  font-weight: normal;
-  line-height: 28px;
+h1.page-title {
+  @include page-title;
+  font-size: 28px;
+}
+
+h2.page-title {
+  @include page-title;
+  font-size: 24px;
+}
+
+h3.page-title {
+  @include page-title;
 }
 
 h6 {
@@ -91,11 +94,10 @@ a:focus {
  *
  */
 .wiki {
+  font-size: 14px;
+  line-height: 1.6;
   @include md-typography;
 
-  font-size: 13px;
-  line-height: 20px;
-
   .white .highlight pre { background: #f5f5f5; }
   ul { margin: 0 0 9px 25px !important; }
 }

app/assets/stylesheets/sections/dashboard.scss

@@ -10,9 +10,6 @@
       margin: 0px;
       box-shadow: none;
 
-      > .title {
-        padding: 2px 15px;
-      }
       .nav-projects-tabs li { padding: 0; }
     }
   }
@@ -33,12 +30,10 @@
 
 .dashboard {
   .dash-filter {
-    margin: 0;
+    margin: 7px 0;
     padding: 4px 6px;
     width: 202px;
     float: left;
-    margin-top: 3px;
-    margin-left: -2px;
   }
 }
 

app/assets/stylesheets/sections/events.scss

@@ -31,6 +31,10 @@
  *
  */
 .event-item {
+  &:first-child {
+    padding-top: 0;
+  }
+
   border-bottom: 1px solid #eee;
   .event-title {
     color: #333;

app/assets/stylesheets/sections/header.scss

@@ -13,7 +13,7 @@ header {
       .nav > li > a {
         color: $style_color;
         text-shadow: 0 1px 0 #fff;
-        font-size: 16px;
+        font-size: 14px;
         padding: 10px;
       }
 
@@ -45,6 +45,7 @@ header {
       margin: 0 6px;
 
       h1 {
+        margin: 0;
         background: url('logo-black.png') no-repeat center 1px;
         background-size: 38px;
         float: left;
@@ -68,7 +69,7 @@ header {
     position: relative;
     float: left;
     margin: 0;
-    margin-left: 10px;
+    margin-left: 5px;
     @include header-font;
   }
 
@@ -92,7 +93,7 @@ header {
     margin-left: 10px;
 
     .search-input {
-      @extend .span2;
+      @extend .span3;
       background-image: url("icon-search.png");
       background-repeat: no-repeat;
       background-position: 10px;
@@ -103,7 +104,7 @@ header {
       box-shadow: none;
       @include transition(all 0.15s ease-in 0s);
       &:focus {
-        @extend .span3;
+        @extend .span4;
       }
     }
   }
@@ -160,7 +161,7 @@ header {
     }
     .project_name {
       a {
-        color: #DDD;
+        color: #BBB;
         &:hover {
           color: #FFF;
         }

app/assets/stylesheets/sections/nav.scss

 .main-nav {
   background: #f5f5f5;
-  margin: 30px 0;
+  margin: 20px 0;
   margin-top: 0;
   padding-top: 4px;
   border-bottom: 1px solid #E1E1E1;
 
   ul {
     margin: auto;
-    height: 40px;
+    height: 42px;
     overflow: hidden;
     .count {
       font-weight: normal;
@@ -74,7 +74,7 @@
       text-align: center;
       font-weight: normal;
       height: 38px;
-      line-height: 34px;
+      line-height: 36px;
       color: #777;
       text-shadow: 0 1px 1px white;
       padding: 0 10px;

app/assets/stylesheets/sections/profile.scss

-.profile_history {
-  .event_feed {
-    min-height: 20px;
-    .avatar {
-      width: 20px;
-    }
-  }
-}
-
-.profile_avatar_holder {
-  float: left;
-  width: 60px;
-  height: 60px;
-  margin-right: 20px;
-  img {
-    width: 60px;
-    height: 60px;
-    background: #fff;
-    padding: 1px;
-    border: 1px solid #ddd;
-  }
-}
-
 .save-status-fixed {
   position: fixed;
   left: 20px;

app/assets/stylesheets/sections/projects.scss

@@ -48,7 +48,7 @@
     margin-bottom: 50px;
   }
   h3 {
-    @extend .page_title;
+    @extend .page-title;
   }
 
 }

app/assets/stylesheets/sections/snippets.scss

-.snippet.file_holder {
-  .file_title {
+.snippet.file-holder {
+  .file-title {
     .snippet-file-name {
       position: relative;
       top: -4px;

app/assets/stylesheets/sections/votes.scss

@@ -27,7 +27,7 @@
   }
 }
 .votes-block {
-  margin: 14px 6px 6px 0;
+  margin: 6px;
   .downvotes {
     float: right;
   }

app/assets/stylesheets/sections/wiki.scss

-h3.page_title .edit-wiki-header {
+h3.page-title .edit-wiki-header {
   width: 780px;
   margin-left: auto;
   margin-right: auto;

app/assets/stylesheets/themes/ui_mars.scss

@@ -31,4 +31,8 @@
       border-left: 1px solid #666;
     }
   }
+
+  .main-nav {
+    box-shadow: 0 -1px 0 white inset;
+  }
 }

app/helpers/commits_helper.rb

@@ -134,7 +134,7 @@ module CommitsHelper
       parts = @path.split('/')
 
       parts.each_with_index do |part, i|
-        crumbs += content_tag(:span, '/', class: 'divider')
+        crumbs += content_tag(:span, ' / ', class: 'divider')
         crumbs += content_tag(:li) do
           # The text is just the individual part, but the link needs all the parts before it
           link_to part, project_commits_path(@project, tree_join(@ref, parts[0..i].join('/')))

app/views/admin/background_jobs/show.html.haml

-%h3.page_title Background Jobs
+%h3.page-title Background Jobs
 %br
 .ui-box
   %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}

app/views/admin/dashboard/index.html.haml

 .admin_dash.row
   .span4
     .ui-box
-      %h5.title Projects
+      .title Projects
       .data.padded
         = link_to admin_projects_path do
           %h1= Project.count
@@ -9,7 +9,7 @@
         = link_to 'New Project', new_project_path, class: "btn btn-small"
   .span4
     .ui-box
-      %h5.title Users
+      .title Users
       .data.padded
         = link_to admin_users_path do
           %h1= User.count
@@ -17,7 +17,7 @@
         = link_to 'New User', new_admin_user_path, class: "btn btn-small"
   .span4
     .ui-box
-      %h5.title Groups
+      .title Groups
       .data.padded
         = link_to admin_groups_path do
           %h1= Group.count

app/views/admin/groups/edit.html.haml

-%h3.page_title Edit Group
+%h3.page-title Edit Group
 %hr
 = form_for [:admin, @group] do |f|
   - if @group.errors.any?

app/views/admin/groups/index.html.haml

-%h3.page_title
+%h3.page-title
   Groups (#{@groups.total_count})
   %small
     allows you to keep projects organized.

app/views/admin/groups/new.html.haml

-%h3.page_title New Group
+%h3.page-title New Group
 %hr
 = form_for [:admin, @group] do |f|
   - if @group.errors.any?

app/views/admin/groups/show.html.haml

-%h3.page_title
+%h3.page-title
   Group: #{@group.name}
 
   = link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do
@@ -8,7 +8,7 @@
 .row
   .span6
     .ui-box
-      %h5.title
+      .title
         Group info:
       %ul.well-list
         %li
@@ -50,7 +50,7 @@
             = @group.created_at.stamp("March 1, 1999")
 
     .ui-box
-      %h5.title
+      .title
         Projects
         %small
           (#{@group.projects.count})
@@ -64,7 +64,7 @@
 
   .span6
     .ui-box
-      %h5.title
+      .title
         Add user(s) to the group:
       .ui-box-body.form-holder
         %p.light
@@ -79,7 +79,7 @@
           %hr
           = submit_tag 'Add users into group', class: "btn btn-create"
     .ui-box
-      %h5.title
+      .title
         %strong #{@group.name}
         Group Members
         %small

app/views/admin/logs/show.html.haml

@@ -11,57 +11,57 @@
 %p.light To prevent performance issues admin logs output the last 2000 lines
 .tab-content
   .tab-pane.active#githost
-    .file_holder#README
-      .file_title
+    .file-holder#README
+      .file-title
         %i.icon-file
         githost.log
         .pull-right
           = link_to '#', class: 'log-bottom' do
             %i.icon-arrow-down
             Scroll down
-      .file_content.logs
+      .file-content.logs
         %ol
           - Gitlab::GitLogger.read_latest.each do |line|
             %li
               %p= line
   .tab-pane#application
-    .file_holder#README
-      .file_title
+    .file-holder#README
+      .file-title
         %i.icon-file
         application.log
         .pull-right
           = link_to '#', class: 'log-bottom' do
             %i.icon-arrow-down
             Scroll down
-      .file_content.logs
+      .file-content.logs
         %ol
           - Gitlab::AppLogger.read_latest.each do |line|
             %li
               %p= line
   .tab-pane#production
-    .file_holder#README
-      .file_title
+    .file-holder#README
+      .file-title
         %i.icon-file
         production.log
         .pull-right
           = link_to '#', class: 'log-bottom' do
             %i.icon-arrow-down
             Scroll down
-      .file_content.logs
+      .file-content.logs
         %ol
           - Gitlab::Logger.read_latest_for('production.log').each do |line|
             %li
               %p= line
   .tab-pane#sidekiq
-    .file_holder#README
-      .file_title
+    .file-holder#README
+      .file-title
         %i.icon-file
         sidekiq.log
         .pull-right
           = link_to '#', class: 'log-bottom' do
             %i.icon-arrow-down
             Scroll down
-      .file_content.logs
+      .file-content.logs
         %ol
           - Gitlab::Logger.read_latest_for('sidekiq.log').each do |line|
             %li

app/views/admin/projects/index.html.haml

-%h3.page_title
+%h3.page-title
   Projects
   = link_to 'New Project', new_project_path, class: "btn btn-small pull-right"
 
@@ -41,7 +41,7 @@
           = link_to "Reset", admin_projects_path, class: "btn"
   .span8
     .ui-box
-      %h5.title
+      .title
         Projects (#{@projects.total_count})
       %ul.well-list
         - @projects.each do |project|

app/views/admin/projects/show.html.haml

-%h3.page_title
+%h3.page-title
   Project: #{@project.name_with_namespace}
   = link_to edit_project_path(@project), class: "btn pull-right" do
     %i.icon-edit
@@ -7,7 +7,7 @@
 .row
   .span6
     .ui-box
-      %h5.title
+      .title
         Project info:
       %ul.well-list
         %li
@@ -76,7 +76,7 @@
   .span6
     - if @group
       .ui-box
-        %h5.title
+        .title
           %strong #{@group.name} Group
           members (#{@group.users_groups.count})
           .pull-right
@@ -87,7 +87,7 @@
             = render 'users_groups/users_group', member: member, show_controls: false
 
     .ui-box
-      %h5.title
+      .title
         Team
         %small
           (#{@project.users.count})

app/views/admin/users/edit.html.haml

-%h3.page_title
+%h3.page-title
   #{@user.name} →
   %i.icon-edit
   Edit user

app/views/admin/users/index.html.haml

-%h3.page_title
+%h3.page-title
   Users
   = link_to 'New User', new_admin_user_path, class: "btn btn-small pull-right"
 %br
@@ -32,7 +32,7 @@
 
   .span9
     .ui-box
-      %h5.title
+      .title
         Users (#{@users.total_count})
       %ul.well-list
         - @users.each do |user|

app/views/admin/users/new.html.haml

-%h3.page_title
+%h3.page-title
   %i.icon-plus
   New user
 %hr

app/views/admin/users/show.html.haml

-%h3.page_title
+%h3.page-title
   User:
   = @user.name
   - if @user.blocked?
@@ -21,7 +21,7 @@
 .row
   .span6
     .ui-box
-      %h5.title
+      .title
         Account:
         .pull-right
           = image_tag gravatar_icon(@user.email, 32), class: "avatar s32"
@@ -65,7 +65,7 @@
 
     - if @user.users_groups.present?
       .ui-box
-        %h5.title Groups:
+        .title Groups:
         %ul.well-list
           - @user.users_groups.each do |user_group|
             - group = user_group.group
@@ -76,7 +76,7 @@
 
   .span6
     .ui-box
-      %h5.title Projects (#{@projects.count})
+      .title Projects (#{@projects.count})
       %ul.well-list
         - @projects.sort_by(&:name_with_namespace).each do |project|
           - tm = project.team.find_tm(@user.id)

app/views/dashboard/_groups.html.haml

 .ui-box
-  %h5.title.clearfix
+  .title.clearfix
     = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter'
     - if current_user.can_create_group?
       %span.pull-right
@@ -10,7 +10,7 @@
     - groups.each do |group|
       %li.group-row
         = link_to group_path(id: group.path), class: dom_class(group) do
-          %span.group-name
+          %span.group-name.filter-title
             = truncate(group.name, length: 35)
           %span.arrow
             %i.icon-angle-right

app/views/dashboard/_projects.html.haml

 .ui-box
-  %h5.title.clearfix
+  .title.clearfix
     = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter'
     - if current_user.can_create_project?
       %span.pull-right
@@ -15,7 +15,7 @@
             - if project.namespace
               = project.namespace.human_name
               \/
-          %span.project-name
+          %span.project-name.filter-title
             = truncate(project.name, length: 25)
           %span.arrow
             %i.icon-angle-right

app/views/dashboard/issues.html.haml

-%h3.page_title
+%h3.page-title
   Issues
   %span.light
     –
     Assigned to you
   %span.pull-right #{@issues.total_count} issues
 
-%br
-
 .row
   .span3
     = render 'filter', entity: 'issue'
@@ -15,7 +13,7 @@
       - @issues.group_by(&:project).each do |group|
         %div.ui-box
           - project = group[0]
-          %h5.title
+          .title
             = link_to_project project
              
             %i.icon-angle-right

app/views/dashboard/merge_requests.html.haml

-%h3.page_title
+%h3.page-title
   Merge Requests
   %span.light
     –
     Authored by or assigned to you
   %span.pull-right #{@merge_requests.total_count} merge requests
 
-%br
 .row
   .span3
     = render 'filter', entity: 'merge_request'

app/views/dashboard/projects.html.haml

@@ -22,7 +22,7 @@
 
   .span9
     .ui-box
-      %h5.title
+      .title
         Projects (#{@projects.total_count})
         .pull-right.light
           %small Last activity

app/views/devise/passwords/new.html.haml

 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f|
-  %h3.page_title Reset password
+  %h3.page-title Reset password
   %br
   = devise_error_messages!
   = f.email_field :email, placeholder: "Email",  class: "text"

app/views/devise/registrations/new.html.haml

 = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f|
-  %h3.page_title Sign Up
+  %h3.page-title Sign Up
   %br
   = devise_error_messages!
   %div

app/views/devise/sessions/new.html.haml

 .login-box
-  %h3.page_title Sign in
+  %h3.page-title Sign in
   %br
   - if ldap_enabled?
     %ul.nav.nav-tabs

app/views/errors/access_denied.html.haml

 %h1.http_status_code 403
-%h3.page_title Access Denied
+%h3.page-title Access Denied
 %hr
 %p You are not allowed to access this page.
 %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}

app/views/errors/encoding.html.haml

 %h1.http_status_code 500
-%h3.page_title Encoding Error
+%h3.page-title Encoding Error
 %hr
 %p Page can't be loaded because of an encoding error.

app/views/errors/git_not_found.html.haml

 %h1.http_status_code 404
-%h3.page_title Git Resource Not found
+%h3.page-title Git Resource Not found
 %hr
 %p
   Application can't get access to some branch or commit in your repository. It

app/views/errors/not_found.html.haml

 %h1.http_status_code 404
-%h3.page_title The resource you were looking for doesn't exist.
+%h3.page-title The resource you were looking for doesn't exist.
 %hr
 %p You may have mistyped the address or the page may have moved.

app/views/groups/_filter.html.haml

 = form_tag group_filter_path(entity), method: 'get' do
-  %fieldset.dashboard-search-filter
-    = search_field_tag "search", params[:search], { placeholder: 'Search', class: 'search-text-input' }
-    = button_tag type: 'submit', class: 'btn' do
-      %i.icon-search
-
   %fieldset
-    %legend Status:
     %ul.nav.nav-pills.nav-stacked
       %li{class: ("active" if !params[:status])}
         = link_to group_filter_path(entity, status: nil) do

app/views/groups/_projects.html.haml

 .ui-box
-  %h5.title
+  .title
     Projects (#{projects.count})
     - if can? current_user, :manage_group, @group
       %span.pull-right

app/views/groups/edit.html.haml

@@ -18,7 +18,7 @@
     .tab-content
       .tab-pane.active#tab-edit
         .ui-box
-          %h5.title
+          .title
             %strong= @group.name
             Group Settings:
           %div.form-holder
@@ -42,7 +42,7 @@
 
       .tab-pane#tab-projects
         .ui-box
-          %h5.title
+          .title
             %strong= @group.name
             Projects:
             - if can? current_user, :manage_group, @group
@@ -67,7 +67,7 @@
 
       .tab-pane#tab-transfer
         .ui-box.ui-box-danger
-          %h5.title Transfer group
+          .title Transfer group
           .ui-box-body
             %p
               Transferring group will cause loss of admin control over group and all child projects
@@ -78,7 +78,7 @@
 
       .tab-pane#tab-remove
         .ui-box.ui-box-danger
-          %h5.title Remove group
+          .title Remove group
           .ui-box-body
             %p
               Remove of group will cause removing all child projects and resources.

app/views/groups/issues.html.haml

-%h3.page_title
+%h3.page-title
   Issues
   %small (assigned to you)
   %small.pull-right #{@issues.total_count} issues
@@ -12,7 +12,7 @@
       - @issues.group_by(&:project).each do |group|
         %div.ui-box
           - project = group[0]
-          %h5.title
+          .title
             = link_to_project project
           %ul.well-list.issues-list
             - group[1].each do |issue|

app/views/groups/members.html.haml

@@ -9,7 +9,7 @@
           Only group owners can manage group members
   .span6
     .ui-box
-      %h5.title
+      .title
         %strong #{@group.name}
         Group Members
         %small

app/views/groups/merge_requests.html.haml

-%h3.page_title
+%h3.page-title
   Merge Requests
   %small (authored by or assigned to you)
   %small.pull-right #{@merge_requests.total_count} merge requests

app/views/help/api.html.haml

 = render layout: 'help/api_layout' do
-  %h3.page_title
+  %h3.page-title
     %span.light API
     %span
       \/
     = @category.titleize
   %br
 
-  .file_holder
-    .file_title
+  .file-holder
+    .file-title
       %i.icon-file
       = @category
-    .file_content.wiki
+    .file-content.wiki
       = preserve do
         = markdown File.read(Rails.root.join("doc", "api", "#{@category}.md"))

app/views/help/index.html.haml

-%h3.page_title
-  GITLAB
+%h2.page-title
+  GitLab
   .pull-right
     %span= Gitlab::VERSION
     %small= Gitlab::REVISION
-%hr
-%p.lead
+%p.slead
   Self Hosted Git Management
   %br
   Fast, secure and stable solution based on Ruby on Rails.
@@ -15,7 +14,7 @@
   .span4
     .ui-box
       .title
-        %h5 Quick help
+        Quick help
       %ul.well-list
         %li
           Email your
@@ -39,7 +38,7 @@
   .span4
     .ui-box
       .title
-        %h5 User documentation
+        User documentation
       %ul.well-list
         %li
           %strong= link_to "Workflow", help_workflow_path
@@ -68,7 +67,7 @@
   .span4
     .ui-box
       .title
-        %h5 Admin documentation
+        Admin documentation
       %ul.well-list
 
         %li

app/views/help/markdown.html.haml

 = render layout: 'help/layout' do
-  %h3.page_title GitLab Flavored Markdown
+  %h3.page-title GitLab Flavored Markdown
   %br
 
   .help_body

app/views/help/permissions.html.haml

 = render layout: 'help/layout' do
-  %h3.page_title Permissions
+  %h3.page-title Permissions
   %br
 
   %fieldset

app/views/help/public_access.html.haml

 = render layout: 'help/layout' do
-  %h3.page_title Public Access
+  %h3.page-title Public Access
   %br
 
   %p

app/views/help/raketasks.html.haml

 = render layout: 'help/layout' do
-  %h3.page_title GitLab Rake Tasks
+  %h3.page-title GitLab Rake Tasks
   %br
 
   %p.slead
@@ -19,46 +19,46 @@
 
   .tab-content
     .tab-pane.active#features
-      .file_holder
-        .file_title
+      .file-holder
+        .file-title
           %i.icon-file
           Features
-        .file_content.wiki
+        .file-content.wiki
           = preserve do
             = markdown File.read(Rails.root.join("doc", "raketasks", "features.md"))
 
     .tab-pane#maintenance
-      .file_holder
-        .file_title
+      .file-holder
+        .file-title
           %i.icon-file
           Maintenance
-        .file_content.wiki
+        .file-content.wiki
           = preserve do
             = markdown File.read(Rails.root.join("doc", "raketasks", "maintenance.md"))
 
     .tab-pane#user_management
-      .file_holder
-        .file_title
+      .file-holder
+        .file-title
           %i.icon-file
           User Management
-        .file_content.wiki
+        .file-content.wiki
           = preserve do
             = markdown File.read(Rails.root.join("doc", "raketasks", "user_management.md"))
 
     .tab-pane#cleanup
-      .file_holder
-        .file_title
+      .file-holder
+        .file-title
           %i.icon-file
           Cleanup
-        .file_content.wiki
+        .file-content.wiki
           = preserve do
             = markdown File.read(Rails.root.join("doc", "raketasks", "cleanup.md"))
 
     .tab-pane#backup_restore
-      .file_holder
-        .file_title
+      .file-holder
+        .file-title
           %i.icon-file
           Backup & Restore
-        .file_content.wiki
+        .file-content.wiki
           = preserve do
             = markdown File.read(Rails.root.join("doc", "raketasks", "backup_restore.md"))

app/views/help/ssh.html.haml

 = render layout: 'help/layout' do
-  %h3.page_title SSH Keys
+  %h3.page-title SSH Keys
   %br
 
   %p.slead

app/views/help/system_hooks.html.haml

 = render layout: 'help/layout' do
-  %h3.page_title System hooks
+  %h3.page-title System hooks
   %br
 
   %p.slead

app/views/help/web_hooks.html.haml

 = render layout: 'help/layout' do
-  %h3.page_title Web hooks
+  %h3.page-title Web hooks
   %br
 
   %p.slead

app/views/help/workflow.html.haml

 = render layout: 'help/layout' do
-  %h3.page_title Workflow
+  %h3.page-title Workflow
   %br
 
   %ol.help

app/views/layouts/_page_title.html.haml

-- if content_for?(:page_title)
-  = yield :page_title
+- if content_for?(:page-title)
+  = yield :page-title

app/views/profiles/groups/index.html.haml

 .ui-box
-  %h5.title
+  .title
     %strong Groups
     (#{@groups.count})
     - if current_user.can_create_group?

app/views/profiles/keys/index.html.haml

-%h3.page_title
-  SSH Keys
-  = link_to "Add SSH Key", new_profile_key_path, class: "btn pull-right btn-primary"
-
-%br
 %p.light
   SSH key allows you to establish a secure connection between your computer and GitLab
 %p.light
@@ -12,9 +7,10 @@
 
 
 .ui-box
-  %h5.title
+  .title
     SSH Keys (#{@keys.count})
     .pull-right
+      = link_to "Add SSH Key", new_profile_key_path, class: "btn btn-small btn-primary"
   %ul.well-list#keys-table
     = render @keys
     - if @keys.blank?

app/views/profiles/keys/new.html.haml

-%h3.page_title Add an SSH Key
+%h3.page-title Add an SSH Key
 %hr
 = render 'form'
 

app/views/profiles/keys/show.html.haml

 .row
   .span4
     .ui-box
-      %h5.title
+      .title
         SSH Key
       %ul.well-list
         %li

app/views/profiles/notifications/show.html.haml

-%h3.page_title Setup your notification level
-
-%br
+%h3.page-title Setup your notification level
 
 %p.light
   %strong Disabled

app/views/profiles/show.html.haml

-.profile_avatar_holder
-  = image_tag gravatar_icon(@user.email, 90), alt: ''
-%h3.page_title
+= image_tag gravatar_icon(@user.email, 60), alt: '', class: 'avatar s60'
+%h3.page-title
   = @user.name
   %br
   %small

app/views/projects/blame/show.html.haml

@@ -11,14 +11,14 @@
       %li= link
   .clear
 
-  .file_holder
-    .file_title
+  .file-holder
+    .file-title
       %i.icon-file
       %span.file_name
         = @blob.name
         %small= number_to_human_size @blob.size
       %span.options= render "projects/blob/actions"
-    .file_content.blame
+    .file-content.blame
       %table
         - current_line = 1
         - @blame.each do |commit, lines|

app/views/projects/blob/_blob.html.haml

@@ -17,8 +17,8 @@
         = link_to title, '#'
 
 %div#tree-content-holder.tree-content-holder
-  .file_holder
-    .file_title
+  .file-holder
+    .file-title
       %i.icon-file
       %span.file_name
         = blob.name

app/views/projects/blob/_download.html.haml

-.file_content.blob_file
+.file-content.blob_file
   %center
     = link_to project_blob_path(@project, @id) do
       %div.padded

app/views/projects/blob/_image.html.haml

-.file_content.image_file
+.file-content.image_file
   %img{ src: "data:#{blob.mime_type};base64,#{Base64.encode64(blob.data)}"}

app/views/projects/blob/_text.html.haml

 - if gitlab_markdown?(blob.name)
-  .file_content.wiki
+  .file-content.wiki
     = preserve do
       = markdown(blob.data)
 - elsif markup?(blob.name)
-  .file_content.wiki
+  .file-content.wiki
     = raw GitHub::Markup.render(blob.name, blob.data)
 - else
-  .file_content.code
+  .file-content.code
     - unless blob.empty?
       %div{class: user_color_scheme_class}
         = raw blob.colorize(formatter: :gitlab)

app/views/projects/commit/_commit_box.html.haml

@@ -15,7 +15,7 @@
           %li= link_to "Plain Diff",    project_commit_path(@project, @commit, format: :diff)
       = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do
         %span Browse Code »
-    %h3.commit-title.page_title
+    %h3.commit-title.page-title
       = gfm escape_once(@commit.title)
     - if @commit.description.present?
       %pre.commit-description

app/views/projects/commits/_commits.html.haml

 - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
   %div.ui-box
-    %h5.title
+    .title
       %i.icon-calendar
       %span= day.stamp("28 Aug, 2010")
 

app/views/projects/commits/show.html.haml

@@ -2,6 +2,8 @@
 
 - if @path.present?
   %ul.breadcrumb
+    %li.light
+      History for
     = commits_breadcrumbs
 
 %div{id: dom_id(@project)}

app/views/projects/compare/index.html.haml

 = render "projects/commits/head"
 
-%h3.page_title
+%h3.page-title
   Compare View
-%hr
 
 = render "form"

app/views/projects/compare/show.html.haml

 = render "projects/commits/head"
 
-%h3.page_title
+%h3.page-title
   Compare View
-%hr
 
 = render "form"
 
@@ -14,7 +13,7 @@
 
 - if @commits.present?
   %div.ui-box
-    %h5.title
+    .title
       Commits (#{@commits.count})
     %ul.well-list= render Commit.decorate(@commits)
 

app/views/projects/deploy_keys/new.html.haml

-%h3.page_title New Deploy key
+%h3.page-title New Deploy key
 %hr
 
 = render 'form'

app/views/projects/deploy_keys/show.html.haml

-%h3.page_title
+%h3.page-title
   Deploy key:
   = @key.title
   %small
     created at
     = @key.created_at.stamp("Aug 21, 2011")
-.back_link
+.back-link
   = link_to project_deploy_keys_path(@project) do
     ← To keys list
 %hr

app/views/projects/edit.html.haml

@@ -2,7 +2,7 @@
   .project-edit-errors
   .project-edit-content
     .ui-box.white
-      %h5.title
+      .title
         %strong= @project.name
         Project Settings:
       .form-holder
@@ -102,7 +102,7 @@
 
     - if can?(current_user, :change_namespace, @project)
       .ui-box.ui-box-danger
-        %h5.title Transfer project
+        .title Transfer project
         .errors-holder
         .form-holder
           = form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f|
@@ -122,7 +122,7 @@
       %p.nothing_here_message Only project owner can transfer a project
 
     .ui-box.ui-box-danger
-      %h5.title Rename repository
+      .title Rename repository
       .errors-holder
       .form-holder
         = form_for(@project) do |f|
@@ -140,7 +140,7 @@
 
     - if can?(current_user, :remove_project, @project)
       .ui-box.ui-box-danger
-        %h5.title Remove project
+        .title Remove project
         .ui-box-body
           %p
             Remove of project will cause removing repository and all related resources like issues, merge requests etc.

app/views/projects/edit_tree/show.html.haml

 .file-editor
   = form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do
-    .file_holder
-      .file_title
+    .file-holder
+      .file-title
         %i.icon-file
         %span.file_name
           = @path
@@ -11,7 +11,7 @@
         %span.options
           .btn-group.tree-btn-group
             = link_to "Cancel", project_blob_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: leave_edit_message
-      .file_content.code
+      .file-content.code
         %pre#editor= @blob.data
 
     .control-group.commit_message-group
@@ -21,7 +21,7 @@
         = text_area_tag 'commit_message', '', placeholder: "Update #{@blob.name}", required: true, rows: 3
     .form-actions
       = hidden_field_tag 'last_commit', @last_commit
-      = hidden_field_tag 'content', '', id: :file_content
+      = hidden_field_tag 'content', '', id: "file-content"
       .commit-button-annotation
         = button_tag "Commit changes", class: 'btn commit-btn js-commit-button btn-primary'
         .message
@@ -40,6 +40,6 @@
   disableButtonIfEmptyField("#commit_message", ".js-commit-button");
 
   $(".js-commit-button").click(function(){
-    $("#file_content").val(editor.getValue());
+    $("#file-content").val(editor.getValue());
     $(".file-editor form").submit();
   });

app/views/projects/graphs/show.html.haml

 .loading-graph
   %center
     .loading
-    %h3.page_title Building repository graph. Please wait a moment.
+    %h3.page-title Building repository graph. Please wait a moment.
 
 .stat-graph
   .header.clearfix
@@ -10,7 +10,7 @@
         %option{:value => "commits"} Commits
         %option{:value => "additions"} Additions
         %option{:value => "deletions"} Deletions
-    %h3#date_header.page_title
+    %h3#date_header.page-title
     %input#brush_change{:type => "hidden"}
   .graphs
     #contributors-master

app/views/projects/hooks/index.html.haml

@@ -21,7 +21,7 @@
 
 -if @hooks.any?
   .ui-box
-    %h5.title
+    .title
       Hooks (#{@hooks.count})
     %ul.well-list
       - @hooks.each do |hook|

app/views/projects/issues/_form.html.haml

 %div.issue-form-holder
-  %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
+  %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}"
   = form_for [@project, @issue] do |f|
     -if @issue.errors.any?
       .alert.alert-error

app/views/projects/issues/index.html.haml

 = render "head"
 .issues_content
-  %h3.page_title
+  %h3.page-title
     Issues
     %span (<span class=issue_counter>#{@issues.total_count}</span>)
     .pull-right
@@ -16,8 +16,6 @@
           = hidden_field_tag :label_name, params[:label_name], id: 'search_label_name'
           = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' }
 
-  .clearfix
-
 .row
   .span3
     = render 'filter', entity: 'issue'

app/views/projects/issues/show.html.haml

-%h3.page_title
+%h3.page-title
   Issue ##{@issue.id}
 
   %small
@@ -22,7 +22,7 @@
 .pull-right
   .span3#votes= render 'votes/votes_block', votable: @issue
 
-.back_link
+.back-link
   = link_to project_issues_path(@project) do
     ← To issues list
 

app/views/projects/labels/index.html.haml

 = render "projects/issues/head"
 
-%h3.page_title
+%h3.page-title
   Labels
 %br
 

app/views/projects/merge_requests/edit.html.haml

-%h3.page_title
+%h3.page-title
   = "Edit merge request #{@merge_request.id}"
 %hr
 = render 'form'

app/views/projects/merge_requests/index.html.haml

@@ -2,11 +2,9 @@
   = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do
     %i.icon-plus
     New Merge Request
-%h3.page_title
+%h3.page-title
   Merge Requests
 
-%br
-
 
 .row
   .span3

app/views/projects/merge_requests/new.html.haml

-%h3.page_title New Merge Request
+%h3.page-title New Merge Request
 %hr
 = render 'form'

app/views/projects/merge_requests/show/_commits.html.haml

 - if @commits.present?
   .ui-box
-    %h5.title
+    .title
       %i.icon-list
       Commits (#{@commits.count})
     .commits

app/views/projects/merge_requests/show/_mr_accept.html.haml

@@ -14,7 +14,7 @@
             %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
             for instructions
           .accept_group
-            = f.submit "Accept Merge Request", class: "btn success accept_merge_request"
+            = f.submit "Accept Merge Request", class: "btn btn-success accept_merge_request"
             - unless @project.root_ref? @merge_request.source_branch
               .remove_branch_holder
                 = label_tag :should_remove_source_branch, class: "checkbox" do

app/views/projects/merge_requests/show/_mr_title.html.haml

-%h3.page_title
+%h3.page-title
   = "Merge Request ##{@merge_request.id}:"
    
   %span.label-branch= @merge_request.source_branch
@@ -26,6 +26,6 @@
 .pull-right
   .span3#votes= render 'votes/votes_block', votable: @merge_request
 
-.back_link
+.back-link
   = link_to project_merge_requests_path(@project) do
     ← To merge requests

app/views/projects/milestones/_form.html.haml

-%h3.page_title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
-.back_link
+%h3.page-title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
+.back-link
   = link_to project_milestones_path(@project) do
     ← To milestones
 

app/views/projects/milestones/_issues.html.haml

 .ui-box
-  %h5.title= title
+  .title= title
   %ul.well-list
     - issues.each do |issue|
       %li

app/views/projects/milestones/index.html.haml

 = render "projects/issues/head"
 .milestones_content
-  %h3.page_title
+  %h3.page-title
     Milestones
     - if can? current_user, :admin_milestone, @project
       = link_to new_project_milestone_path(@project), class: "pull-right btn btn-primary", title: "New Milestone" do

app/views/projects/milestones/show.html.haml

 = render "projects/issues/head"
 .row
   .span6
-    %h3.page_title
+    %h3.page-title
       Milestone ##{@milestone.id}
       %small
         = @milestone.expires_at
-    .back_link
+    .back-link
       = link_to project_milestones_path(@project) do
         ← To milestones list
   .span6
@@ -84,13 +84,13 @@
     .row
       .span6
         .ui-box
-          %h5.title Open
+          .title Open
           %ul.well-list
             - @merge_requests.opened.each do |merge_request|
               = render 'merge_request', merge_request: merge_request
       .span6
         .ui-box
-          %h5.title Closed
+          .title Closed
           %ul.well-list
             - @merge_requests.closed.each do |merge_request|
               = render 'merge_request', merge_request: merge_request

app/views/projects/network/_head.html.haml

-%h3.page_title Project Network Graph
+%h3.page-title Project Network Graph
 %hr
 
 .clearfix

app/views/projects/services/_form.html.haml

-%h3.page_title
+%h3.page-title
   - if @service.activated?
     %span.cgreen
       %i.icon-circle
@@ -9,7 +9,7 @@
 
 %p= @service.description
 
-.back_link
+.back-link
   = link_to project_services_path(@project) do
     ← to services
 

app/views/projects/services/index.html.haml

-%h3.page_title Services
-%br
+%h3.page-title Services
 
 %ul.bordered-list
   - @services.each do |service|

app/views/projects/show.html.haml

@@ -7,7 +7,7 @@
     .loading.hide
   .span3
     .light-well
-      %h3.page_title
+      %h3.page-title
         = @project.name
       - if @project.description.present?
         %p.light= @project.description

app/views/projects/snippets/_blob.html.haml

-.file_holder
-  .file_title
+.file-holder
+  .file-title
     %i.icon-file
     %strong= @snippet.file_name
     %span.options
@@ -7,7 +7,7 @@
         - if can?(current_user, :admin_project_snippet, @project) || @snippet.author == current_user
           = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-tiny", title: 'Edit Snippet'
         = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-tiny", target: "_blank"
-  .file_content.code
+  .file-content.code
     - unless @snippet.content.empty?
       %div{class: user_color_scheme_class}
         = raw @snippet.colorize(formatter: :gitlab)

app/views/projects/snippets/_form.html.haml

-%h3.page_title
+%h3.page-title
   = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
 %hr
 .snippet-form-holder
@@ -19,10 +19,10 @@
       .file-editor
         = f.label :file_name, "File"
         .input
-          .file_holder.snippet
-            .file_title
+          .file-holder.snippet
+            .file-title
               = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true
-            .file_content.code
+            .file-content.code
               %pre#editor= @snippet.content
               = f.hidden_field :content, class: 'snippet-file-content'
 

app/views/projects/snippets/index.html.haml

-%h3.page_title
+%h3.page-title
   Snippets
   %small share code pastes with others out of git repository
 

app/views/projects/snippets/show.html.haml

-%h3.page_title
+%h3.page-title
   %i.icon-lock.cgreen
   = @snippet.title
 
@@ -8,6 +8,5 @@
       by
       = image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
       = @snippet.author_name
-%br
 %div= render 'projects/snippets/blob'
 %div#notes= render "projects/notes/notes_with_form"

app/views/projects/team_members/_form.html.haml

-%h3.page_title
+%h3.page-title
   = "New Team member(s)"
-%hr
+
 = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
   -if @user_project_relation.errors.any?
     .alert.alert-error

app/views/projects/team_members/_group_members.html.haml

 .ui-box
-  %h5.title
+  .title
     %strong #{@group.name} Group
     members (#{@group.users_groups.count})
     .pull-right

app/views/projects/team_members/_team.html.haml

 .team-table
   - can_admin_project = (can? current_user, :admin_project, @project)
   .ui-box
-    %h5.title
+    .title
       %strong #{@project.name} Project
       members (#{members.count})
     %ul.well-list

app/views/projects/team_members/import.html.haml

-%h3.page_title
+%h3.page-title
   = "Import team from another project"
 %hr
 %p.slead

app/views/projects/team_members/index.html.haml

-%h3.page_title
+%h3.page-title
   Users with access to this project
 
   - if can? current_user, :admin_team_member, @project

app/views/projects/tree/_readme.html.haml

-.file_holder#README
-  .file_title
+.file-holder#README
+  .file-title
     %i.icon-file
     = readme.name
-  .file_content.wiki
+  .file-content.wiki
     - if gitlab_markdown?(readme.name)
       = preserve do
         = markdown(readme.data)

app/views/projects/wikis/_form.html.haml

@@ -8,7 +8,7 @@
 
   .ui-box.ui-box-show
     .ui-box-head
-      %h3.page_title
+      %h3.page-title
         .edit-wiki-header
           = @wiki.title.titleize
           = f.hidden_field :title, value: @wiki.title

app/views/projects/wikis/_new.html.haml

 %div#modal-new-wiki.modal.hide
   .modal-header
     %a.close{href: "#"} ×
-    %h3.page_title New Wiki Page
+    %h3.page-title New Wiki Page
   .modal-body
     = label_tag :new_wiki_path do
       %span Page slug

app/views/projects/wikis/edit.html.haml

 = render 'nav'
-%h3.page_title
+%h3.page-title
   Editing page
   = render 'main_links'
 = render 'form'

app/views/projects/wikis/empty.html.haml

-%h3.page_title Empty page
+%h3.page-title Empty page
 %hr
 .error_message
   You are not allowed to create wiki pages

app/views/projects/wikis/git_access.html.haml

 = render 'nav'
-%h3.page_title
+%h3.page-title
   Git Access
   %strong= @gollum_wiki.path_with_namespace
   = render 'main_links'

app/views/projects/wikis/history.html.haml

 = render 'nav'
-%h3.page_title
+%h3.page-title
   %span.light History for
   = @wiki.title.titleize
   = render 'main_links'

app/views/projects/wikis/pages.html.haml

 = render 'nav'
-%h3.page_title
+%h3.page-title
   All Pages
   = render 'main_links'
 %br

app/views/projects/wikis/show.html.haml

 = render 'nav'
-%h3.page_title
+%h3.page-title
   = @wiki.title.titleize
   = render 'main_links'
 %br
@@ -8,8 +8,8 @@
     This is an old version of this page.
     You can view the #{link_to "most recent version", project_wiki_path(@project, @wiki)} or browse the #{link_to "history", history_project_wiki_path(@project, @wiki)}.
 
-.file_holder
-  .file_content.wiki
+.file-holder
+  .file-content.wiki
     = preserve do
       = render_wiki_content(@wiki)
 

app/views/public/projects/index.html.haml

 .row
   .span6
-    %h3.page_title
+    %h3.page-title
       Projects (#{@projects.total_count})
       %small with read-only access
   .span6

app/views/search/_blob.html.haml

 %li
-  .file_holder
-    .file_title
+  .file-holder
+    .file-title
       = link_to project_blob_path(@project, tree_join(blob.ref, blob.filename), :anchor => "L" + blob.startline.to_s) do
         %i.icon-file
         %strong
           = blob.filename
-    .file_content.code.term
+    .file-content.code.term
       %div{class: user_color_scheme_class}
         = raw blob.colorize( formatter: :gitlab, options: { first_line_number: blob.startline } )

app/views/shared/_merge_requests.html.haml

@@ -2,7 +2,7 @@
   - @merge_requests.group_by(&:project).each do |group|
     .ui-box
       - project = group[0]
-      %h5.title
+      .title
         = link_to_project project
       %ul.well-list.mr-list
         - group[1].each do |merge_request|

app/views/snippets/_blob.html.haml

-.file_holder
-  .file_title
+.file-holder
+  .file-title
     %i.icon-file
     %strong= @snippet.file_name
     %span.options
@@ -8,7 +8,7 @@
           = link_to "Edit", edit_snippet_path(@snippet), class: "btn btn-tiny", title: 'Edit Snippet'
           = link_to "Delete", snippet_path(@snippet), method: :delete, confirm: "Are you sure?", class: "btn btn-tiny", title: 'Delete Snippet'
         = link_to "Raw", raw_snippet_path(@snippet), class: "btn btn-tiny", target: "_blank"
-  .file_content.code
+  .file-content.code
     - unless @snippet.content.empty?
       %div{class: user_color_scheme_class}
         = raw @snippet.colorize(formatter: :gitlab)

app/views/snippets/_form.html.haml

-%h3.page_title
+%h3.page-title
   = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
 %hr
 .snippet-form-holder
@@ -22,10 +22,10 @@
       .file-editor
         = f.label :file_name, "File"
         .input
-          .file_holder.snippet
-            .file_title
+          .file-holder.snippet
+            .file-title
               = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true
-            .file_content.code
+            .file-content.code
               %pre#editor= @snippet.content
               = f.hidden_field :content, class: 'snippet-file-content'
 

app/views/snippets/current_user_index.html.haml

-%h3.page_title
+%h3.page-title
   My Snippets
   %small share code pastes with others out of git repository
   .pull-right

app/views/snippets/index.html.haml

-%h3.page_title
+%h3.page-title
   Public snippets
   %small share code pastes with others out of git repository
 

app/views/snippets/show.html.haml

-%h3.page_title
+%h3.page-title
   - if @snippet.private?
     %i{:class => "icon-lock cgreen has_bottom_tooltip", "data-original-title" => "Private snippet"}
   - else
@@ -12,5 +12,4 @@
       by
       = image_tag gravatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
       = @snippet.author_name
-%br
 %div= render 'blob'

app/views/snippets/user_index.html.haml

-%h3.page_title
+%h3.page-title
   = image_tag gravatar_icon(@user.email), class: "avatar s24"
   = @user.name
   %span

app/views/users/_profile.html.haml

 .ui-box
-  %h5.title
+  .title
     Profile
   %ul.well-list
     %li

app/views/users/_projects.html.haml

 .ui-box
-  %h5.title Projects
+  .title Projects
   %ul.well-list
     - @projects.each do |project|
       %li

app/views/users/show.html.haml

 .row
   .span8
-    %h3.page_title
+    %h3.page-title
       = image_tag gravatar_icon(@user.email, 90), class: "avatar s90", alt: ''
       = @user.name
       - if @user == current_user

features/steps/project/project_browse_commits.rb

@@ -48,7 +48,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps
     page.should have_selector('ul.breadcrumb span.divider', count: 3)
     page.should have_selector('ul.breadcrumb a', count: 4)
 
-    find('ul.breadcrumb li:first a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/)
+    find('ul.breadcrumb li:nth-child(2) a')['href'].should match(/#{@project.path_with_namespace}\/commits\/master\z/)
     find('ul.breadcrumb li:last a')['href'].should match(%r{master/app/models/project\.rb\z})
   end
 

features/steps/project/project_snippets.rb

@@ -42,7 +42,7 @@ class ProjectSnippets < Spinach::FeatureSteps
   end
 
   And 'I click link "Edit"' do
-    within ".file_title" do
+    within ".file-title" do
       click_link "Edit"
     end
   end

features/steps/snippets/snippets.rb

@@ -13,7 +13,7 @@ class SnippetsFeature < Spinach::FeatureSteps
   end
 
   And 'I click link "Edit"' do
-    within ".file_title" do
+    within ".file-title" do
       click_link "Edit"
     end
   end