Replace deprecated classes

Signed-off-by: Dmitriy Zaporozhets <[email protected]>

app/assets/stylesheets/main.scss

@@ -27,9 +27,12 @@ a {
   padding-left: 20px;
 }
 
+.navbar-brand {
+  color: #fff;
+}
+
 .navbar-ci {
   .navbar-inner {
-    padding: 4px;
     background: $style_color;
 
     .brand,

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

@@ -2,7 +2,7 @@
   %h3.project-title
     %span.light Admin /
     #{@project.name}
-.row-fluid
+.row
   .span6
     %fieldset
       %legend Project info

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

@@ -1,7 +1,7 @@
 %p.lead
   To register new runner visit #{link_to 'this page ', runners_path}
 
-.row-fluid
+.row
   .span8
     %h5 Activated:
     %table.table

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

@@ -13,7 +13,7 @@
 - else
   .alert.alert-info
     %h4 This runner will process build only from ASSIGNED projects
-.row-fluid
+.row
   .span6
     %h5 Restrict projects for this runner
     %ul.restrict-projects-list

app/views/builds/show.html.haml

@@ -10,7 +10,7 @@
     ← Back to project builds
 %hr
 
-.row-fluid
+.row
   .span9
     .build-head.alert{class: build_status_alert_class(@build)}
       %h4

app/views/layouts/_foot.html.haml

@@ -1,5 +1,5 @@
 %hr
-.container-fluid
+.container
   .pull-right
     %p.light
       GitLab CI

app/views/layouts/_info.html.haml

@@ -1,4 +1,4 @@
-.container-fluid
+.container
   - if alert || notice
     - if alert
       .alert= alert

app/views/layouts/_nav.html.haml

@@ -1,31 +1,36 @@
 .navbar.navbar-static-top.navbar-ci
   .navbar-inner
-    .container-fluid
-      = link_to 'GitLab CI', root_path, class: "brand"
-      %ul.nav
-        - if current_user && current_user.is_admin
-          %li
-            = link_to admin_runners_path do
-              Runners
-          %li
-            = link_to admin_projects_path do
-              Projects
-        %li
-          = link_to 'Help', help_path
+    .container
+      .navbar-header
+        %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}
+          %span.sr-only Toggle navigation
+          %i.icon-reorder
 
-      %ul.nav.pull-right
-        - if current_user
-          %li
-            = link_to user_sessions_path do
-              .profile-holder
-                = image_tag gravatar_icon(current_user.email, 24)
-                %span= current_user.name
-          %li
-            = link_to user_sessions_path, class: "logout", method: :delete do
-              %i.icon-signout
-              Logout
-        - else
-          %li
-            = link_to 'Login', new_user_sessions_path
+        = link_to 'GitLab CI', root_path, class: "navbar-brand"
 
+      .collapse.navbar-collapse
+        %ul.nav.navbar-nav
+          - if current_user && current_user.is_admin
+            %li
+              = link_to admin_runners_path do
+                Runners
+            %li
+              = link_to admin_projects_path do
+                Projects
+          %li
+            = link_to 'Help', help_path
 
+        %ul.nav.navbar-nav.pull-right
+          - if current_user
+            %li
+              = link_to user_sessions_path do
+                .profile-holder
+                  = image_tag gravatar_icon(current_user.email, 24)
+                  %span= current_user.name
+            %li
+              = link_to user_sessions_path, class: "logout", method: :delete do
+                %i.icon-signout
+                Logout
+          - else
+            %li
+              = link_to 'Login', new_user_sessions_path

app/views/layouts/application.html.haml

@@ -5,10 +5,10 @@
     = render 'layouts/nav'
     = render 'layouts/info'
     - if content_for?(:title)
-      .container-fluid.container-title
+      .container.container-title
         = yield(:title)
       %hr
 
-    .container-fluid.container-body
+    .container.container-body
       = yield
     = render 'layouts/foot'

app/views/layouts/project.html.haml

@@ -4,7 +4,7 @@
   %body
     = render 'layouts/nav'
     = render 'layouts/info'
-    .container-fluid
+    .container
       %h3.project-title
         %span.light Project:
         = @project.name
@@ -17,8 +17,8 @@
           .pull-right
             = link_to 'View on GitLab', @project.gitlab_url, class: 'btn'
     %hr
-    .container-fluid
-      .row-fluid
+    .container
+      .row
         - if current_user
           .span2
             %ul.nav.nav-tabs.nav-stacked.project-menu

app/views/projects/_form.html.haml

@@ -7,7 +7,7 @@
           - @project.errors.full_messages.each do |msg|
             %li= msg
 
-  .row-fluid
+  .row
     .span7
       %fieldset
         %legend Build