Updating bootstrap version. Home and Layout views changed. Issue #124.

Signed-off-by:Beatriz Rezener <beatrizrezener@gmail.com> Signed-off-by:Vinicius Franco <viniciusf.arantes@gmail.com>

Updating bootstrap version. Home and Layout views changed. Issue #124.
Signed-off-by:Beatriz Rezener <beatrizrezener@gmail.com> Signed-off-by:Vinicius Franco <viniciusf.arantes@gmail.com>
Beatriz Rezener
1 parent 04c8caad
Showing 6 changed files with 36 additions and 338 deletions Show diff stats
Gemfile
Gemfile.lock
app/assets/stylesheets/bootstrap_and_overrides.css
app/views/home/index.html.erb
app/views/layouts/application.html.erb
app/views/shared/_short_about.html.erb
@@ -37,7 +37,7 @@ gem &#39;kalibro_gatekeeper_client&#39;, &#39;~&gt; 1.0.0&#39;
 gem "pg", "~> 0.17.0"
  
 # Twitter Bootstrap for layout
-gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git', :ref => '95de3b0' #Fixed the ref so it does not update accidentaly and breaks
+gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git', :ref => '3edf24d' #Fixed the ref so it does not update accidentaly and breaks
  
 # Chart generation
 gem "chart-js-rails", "~> 0.0.6"
@@ -1,312 +0,0 @@
-GIT
-  remote: git://github.com/seyhunak/twitter-bootstrap-rails.git
-  revision: 95de3b0e288aede73d38a18cce30cde66e733558
-  ref: 95de3b0
-  specs:
-    twitter-bootstrap-rails (2.2.8)
-      actionpack (>= 3.1)
-      execjs
-      rails (>= 3.1)
-      railties (>= 3.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.1.5)
-      actionpack (= 4.1.5)
-      actionview (= 4.1.5)
-      mail (~> 2.5.4)
-    actionpack (4.1.5)
-      actionview (= 4.1.5)
-      activesupport (= 4.1.5)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.5)
-      activesupport (= 4.1.5)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.5)
-      activesupport (= 4.1.5)
-      builder (~> 3.1)
-    activerecord (4.1.5)
-      activemodel (= 4.1.5)
-      activesupport (= 4.1.5)
-      arel (~> 5.0.0)
-    activesupport (4.1.5)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    bcrypt (3.1.7)
-    better_errors (2.0.0)
-      coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
-      rack (>= 0.9.0)
-    binding_of_caller (0.7.2)
-      debug_inspector (>= 0.0.1)
-    builder (3.2.2)
-    capistrano (3.2.1)
-      i18n
-      rake (>= 10.0.0)
-      sshkit (~> 1.3)
-    capistrano-bundler (1.1.3)
-      capistrano (~> 3.1)
-      sshkit (~> 1.2)
-    capistrano-rails (1.1.2)
-      capistrano (~> 3.1)
-      capistrano-bundler (~> 1.1)
-    capistrano-rvm (0.1.1)
-      capistrano (~> 3.0)
-      sshkit (~> 1.2)
-    capybara (2.4.1)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    chart-js-rails (0.0.7)
-      railties (> 3.1)
-    cliver (0.3.2)
-    coderay (1.1.0)
-    coffee-rails (4.0.1)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.8.0)
-    colorize (0.7.3)
-    colorpicker (0.0.5)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    cucumber (1.3.16)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
-    cucumber-rails (1.4.1)
-      capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 2)
-      mime-types (~> 1.16)
-      nokogiri (~> 1.5)
-      rails (>= 3, < 5)
-    dalli (2.7.2)
-    database_cleaner (1.3.0)
-    debug_inspector (0.0.2)
-    devise (3.3.0)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
-      thread_safe (~> 0.1)
-      warden (~> 1.2.3)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    erubis (2.7.0)
-    exception_notification (4.0.1)
-      actionmailer (>= 3.0.4)
-      activesupport (>= 3.0.4)
-    execjs (2.2.1)
-    factory_girl (4.4.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.4.1)
-      factory_girl (~> 4.4.0)
-      railties (>= 3.0.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
-      faraday (>= 0.7.4, < 0.10)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    google-analytics-rails (0.0.6)
-    hike (1.2.3)
-    i18n (0.6.11)
-    jbuilder (2.1.3)
-      activesupport (>= 3.0.0, < 5)
-      multi_json (~> 1.2)
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.0)
-      railties (>= 3.2.16)
-    json (1.8.1)
-    kalibro_gatekeeper_client (1.0.0)
-      activesupport (>= 2.2.1)
-      faraday_middleware (~> 0.9.0)
-    konacha (3.2.4)
-      actionpack (>= 3.1, < 5)
-      capybara
-      colorize
-      railties (>= 3.1, < 5)
-      sprockets
-    libv8 (3.16.14.5)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.4)
-    mime-types (1.25.1)
-    mini_portile (0.6.0)
-    minitest (5.4.1)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.10.1)
-    multi_test (0.1.1)
-    multipart-post (2.0.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.1)
-    netrc (0.7.7)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    orm_adapter (0.5.0)
-    pg (0.17.1)
-    poltergeist (1.5.1)
-      capybara (~> 2.1)
-      cliver (~> 0.3.1)
-      multi_json (~> 1.0)
-      websocket-driver (>= 0.2.0)
-    polyglot (0.3.5)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (4.1.5)
-      actionmailer (= 4.1.5)
-      actionpack (= 4.1.5)
-      actionview (= 4.1.5)
-      activemodel (= 4.1.5)
-      activerecord (= 4.1.5)
-      activesupport (= 4.1.5)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.5)
-      sprockets-rails (~> 2.0)
-    railties (4.1.5)
-      actionpack (= 4.1.5)
-      activesupport (= 4.1.5)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    rdoc (4.1.2)
-      json (~> 1.4)
-    ref (1.0.5)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec-core (3.1.2)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.0)
-    sass (3.2.19)
-    sass-rails (4.0.3)
-      railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
-      sprockets-rails (~> 2.0)
-    sdoc (0.4.1)
-      json (~> 1.7, >= 1.7.7)
-      rdoc (~> 4.0)
-    shoulda-matchers (2.7.0)
-      activesupport (>= 3.0.0)
-    simplecov (0.9.0)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    spring (1.1.3)
-    sprockets (2.11.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.9)
-    sshkit (1.5.1)
-      colorize
-      net-scp (>= 1.1.2)
-      net-ssh (>= 2.8.0)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    therubyracer (0.12.1)
-      libv8 (~> 3.16.14.0)
-      ref
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tins (1.3.2)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    turbolinks (2.3.0)
-      coffee-rails
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    uglifier (2.5.3)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    warden (1.2.3)
-      rack (>= 1.0)
-    websocket-driver (0.3.4)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  better_errors
-  binding_of_caller
-  capistrano (~> 3.2.1)
-  capistrano-bundler
-  capistrano-rails
-  capistrano-rvm (~> 0.1.0)
-  chart-js-rails (~> 0.0.6)
-  coffee-rails (~> 4.0.0)
-  colorpicker (~> 0.0.5)
-  coveralls
-  cucumber-rails (~> 1.4.0)
-  dalli (~> 2.7.0)
-  database_cleaner
-  devise (~> 3.3.0)
-  exception_notification (~> 4.0.1)
-  factory_girl_rails (~> 4.4.1)
-  google-analytics-rails (~> 0.0.6)
-  jbuilder (~> 2.1.2)
-  jquery-rails
-  jquery-ui-rails (~> 5.0.0)
-  kalibro_gatekeeper_client (~> 1.0.0)
-  konacha (~> 3.2.0)
-  mocha
-  pg (~> 0.17.0)
-  poltergeist (~> 1.5.0)
-  rails (= 4.1.5)
-  rspec-rails (~> 3.1.0)
-  sass-rails (~> 4.0.1)
-  sdoc
-  shoulda-matchers (~> 2.7.0)
-  simplecov
-  spring
-  sqlite3
-  therubyracer
-  turbolinks
-  twitter-bootstrap-rails!
-  uglifier (>= 1.3.0)
@@ -45,3 +45,13 @@ footer div {
 .jquery-ui-accordion{
   line-height: normal; /*overrides h3 line-height specifically for the accordion ones*/
 }
+
+.nav-header{
+    display: block;
+    padding: 3px 15px;
+    font-size: 11px;
+    font-weight: bold;
+    line-height: 20px;
+    color: #999999;
+    text-transform: uppercase;
+}
 \ No newline at end of file
-<div class="hero-unit">
+<div class="jumbotron">
   <p><h1>Understanding Code Metrics</h1></p>
  
   <p>This is Mezuro! A <strong>free/libre</strong> web platform for <strong>collaborative</strong> source code <strong>evaluation</strong>.</p>
@@ -45,23 +45,25 @@
   </head>
   <body>
  
-    <div class="navbar navbar-fluid-top">
+    <div class="navbar navbar-default">
       <div class="navbar-inner">
         <div class="container-fluid">
-          <a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </a>
-          <%= link_to image_tag('logo.png'), root_path, class: 'brand' %></a>
-          <div class="container-fluid nav-collapse">
-            <ul class="nav">
+           <div class="navbar-header">
+              <button type="button" class="navbar-toggle collapsed" data-target="#nav-collapse" data-toggle="collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+              </button>
+              <a><%= link_to image_tag('logo.png'), root_path, class: 'navbar-brand' %></a>
+          </div>
+          <div class="collapse navbar-collapse" id="nav-collapse">
+            <ul class="nav navbar-nav">
               <li><%= link_to 'Home', root_path %></li>
               <li><%= link_to 'Project', projects_path %></li>
               <li><%= link_to 'Configuration', mezuro_configurations_path %></li>
               <li><%= link_to 'Reading Group', reading_groups_path %></li>
             </ul>
-            <ul class="nav" style="float: right;">
+            <ul class="nav navbar-nav" style="float: right;">
               <% if user_signed_in? %>
                 <li><%= link_to 'Edit Account', edit_user_registration_path %></li>
                 <li><%= link_to 'Sign Out', destroy_user_session_path, :method => :delete %></li>
@@ -76,19 +78,19 @@
     </div>
  
     <div class="container-fluid">
-      <div class="row-fluid">
-        <div class="span3">
+      <div class="row">
+        <div class="col-sm-3 col-md-3">
           <div class="well sidebar-nav">
-            <ul class="nav nav-list">
+            <ul class="list-group">
               <% if user_signed_in? %>
                 <li class="nav-header">User info</li>
-                <li>Hello, <strong><%= current_user.name %></strong></li>
-                <li><%= link_to 'My projects', user_projects_path(current_user.id) %></li>
+                <li class="list-group-item">Hello, <strong><%= current_user.name %></strong></li>
+                <li class="list-group-item"><%= link_to 'My projects', user_projects_path(current_user.id) %></li>
               <% end %>
               <li class="nav-header">Tutorials</li>
-              <li><%= link_to 'Analysis', tutorials_path('analyzing') %></li>
-              <li><%= link_to 'Configuring', tutorials_path('configuring') %></li>
-              <li><%= link_to 'Keywords', tutorials_path('keywords') %></li>
+              <li class="list-group-item"><%= link_to 'Analysis', tutorials_path('analyzing') %></li>
+              <li class="list-group-item"><%= link_to 'Configuring', tutorials_path('configuring') %></li>
+              <li class="list-group-item" ><%= link_to 'Keywords', tutorials_path('keywords') %></li>
               <% if content_for?(:sidebar) %>
                 <%= yield :sidebar %>
               <% else %>
@@ -96,8 +98,8 @@
               <% end %>
             </ul>
           </div><!--/.well -->
-        </div><!--/span-->
-        <div class="span9">
+        </div><!--/col-sm-3 col-md-3-->
+        <div class="col-sm-9 col-md-9">
           <div class="alert alert-info" id="loader"><i class="fa fa-spinner fa-spin fa-lg"></i>&nbsp&nbsp Wait an instant while we are loading the page that you have requested.</div>
  
           <%= bootstrap_flash %>
 <li class="nav-header">About Mezuro</li>
-<li>
-  <small> The Mezuro project attempts to provide a platform to compare projects and metric techniques, teaching how to use metrics through configurations and code analysis, avoid technical debts and disseminate code metrics usage and understanding.</small>
-<li>
-<li>
+<li class="list-group-item">
+  <small> The Mezuro project attempts to provide a platform to compare projects and metric techniques, teaching how to use metrics through configurations and code analysis, avoid technical debts and disseminate code metrics usage and understanding.<br></small>
   <small>Here you can try the front-end, which we call Prezento. It interacts with the <%= link_to 'Kalibro Web Service', 'https://github.com/mezuro/kalibro', target: '_blank' %> and <%= link_to 'Kalibro Processor', 'https://github.com/mezuro/kalibro_processor', target: '_blank' %>. It is intended to be a service where you can evaluate your code quality and, if you want, define which set of metrics to use.</small>
 </li>
...	...	@@ -37,7 +37,7 @@ gem 'kalibro_gatekeeper_client', '~> 1.0.0'
37	37	gem "pg", "~> 0.17.0"
38	38
39	39	# Twitter Bootstrap for layout
40		-gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git', :ref => '95de3b0' #Fixed the ref so it does not update accidentaly and breaks
	40	+gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git', :ref => '3edf24d' #Fixed the ref so it does not update accidentaly and breaks
41	41
42	42	# Chart generation
43	43	gem "chart-js-rails", "~> 0.0.6"
...	...
...	...	@@ -1,312 +0,0 @@
1		-GIT
2		- remote: git://github.com/seyhunak/twitter-bootstrap-rails.git
3		- revision: 95de3b0e288aede73d38a18cce30cde66e733558
4		- ref: 95de3b0
5		- specs:
6		- twitter-bootstrap-rails (2.2.8)
7		- actionpack (>= 3.1)
8		- execjs
9		- rails (>= 3.1)
10		- railties (>= 3.1)
11		-
12		-GEM
13		- remote: https://rubygems.org/
14		- specs:
15		- actionmailer (4.1.5)
16		- actionpack (= 4.1.5)
17		- actionview (= 4.1.5)
18		- mail (~> 2.5.4)
19		- actionpack (4.1.5)
20		- actionview (= 4.1.5)
21		- activesupport (= 4.1.5)
22		- rack (~> 1.5.2)
23		- rack-test (~> 0.6.2)
24		- actionview (4.1.5)
25		- activesupport (= 4.1.5)
26		- builder (~> 3.1)
27		- erubis (~> 2.7.0)
28		- activemodel (4.1.5)
29		- activesupport (= 4.1.5)
30		- builder (~> 3.1)
31		- activerecord (4.1.5)
32		- activemodel (= 4.1.5)
33		- activesupport (= 4.1.5)
34		- arel (~> 5.0.0)
35		- activesupport (4.1.5)
36		- i18n (~> 0.6, >= 0.6.9)
37		- json (~> 1.7, >= 1.7.7)
38		- minitest (~> 5.1)
39		- thread_safe (~> 0.1)
40		- tzinfo (~> 1.1)
41		- arel (5.0.1.20140414130214)
42		- bcrypt (3.1.7)
43		- better_errors (2.0.0)
44		- coderay (>= 1.0.0)
45		- erubis (>= 2.6.6)
46		- rack (>= 0.9.0)
47		- binding_of_caller (0.7.2)
48		- debug_inspector (>= 0.0.1)
49		- builder (3.2.2)
50		- capistrano (3.2.1)
51		- i18n
52		- rake (>= 10.0.0)
53		- sshkit (~> 1.3)
54		- capistrano-bundler (1.1.3)
55		- capistrano (~> 3.1)
56		- sshkit (~> 1.2)
57		- capistrano-rails (1.1.2)
58		- capistrano (~> 3.1)
59		- capistrano-bundler (~> 1.1)
60		- capistrano-rvm (0.1.1)
61		- capistrano (~> 3.0)
62		- sshkit (~> 1.2)
63		- capybara (2.4.1)
64		- mime-types (>= 1.16)
65		- nokogiri (>= 1.3.3)
66		- rack (>= 1.0.0)
67		- rack-test (>= 0.5.4)
68		- xpath (~> 2.0)
69		- chart-js-rails (0.0.7)
70		- railties (> 3.1)
71		- cliver (0.3.2)
72		- coderay (1.1.0)
73		- coffee-rails (4.0.1)
74		- coffee-script (>= 2.2.0)
75		- railties (>= 4.0.0, < 5.0)
76		- coffee-script (2.3.0)
77		- coffee-script-source
78		- execjs
79		- coffee-script-source (1.8.0)
80		- colorize (0.7.3)
81		- colorpicker (0.0.5)
82		- coveralls (0.7.1)
83		- multi_json (~> 1.3)
84		- rest-client
85		- simplecov (>= 0.7)
86		- term-ansicolor
87		- thor
88		- cucumber (1.3.16)
89		- builder (>= 2.1.2)
90		- diff-lcs (>= 1.1.3)
91		- gherkin (~> 2.12)
92		- multi_json (>= 1.7.5, < 2.0)
93		- multi_test (>= 0.1.1)
94		- cucumber-rails (1.4.1)
95		- capybara (>= 1.1.2, < 3)
96		- cucumber (>= 1.3.8, < 2)
97		- mime-types (~> 1.16)
98		- nokogiri (~> 1.5)
99		- rails (>= 3, < 5)
100		- dalli (2.7.2)
101		- database_cleaner (1.3.0)
102		- debug_inspector (0.0.2)
103		- devise (3.3.0)
104		- bcrypt (~> 3.0)
105		- orm_adapter (~> 0.1)
106		- railties (>= 3.2.6, < 5)
107		- thread_safe (~> 0.1)
108		- warden (~> 1.2.3)
109		- diff-lcs (1.2.5)
110		- docile (1.1.5)
111		- erubis (2.7.0)
112		- exception_notification (4.0.1)
113		- actionmailer (>= 3.0.4)
114		- activesupport (>= 3.0.4)
115		- execjs (2.2.1)
116		- factory_girl (4.4.0)
117		- activesupport (>= 3.0.0)
118		- factory_girl_rails (4.4.1)
119		- factory_girl (~> 4.4.0)
120		- railties (>= 3.0.0)
121		- faraday (0.9.0)
122		- multipart-post (>= 1.2, < 3)
123		- faraday_middleware (0.9.1)
124		- faraday (>= 0.7.4, < 0.10)
125		- gherkin (2.12.2)
126		- multi_json (~> 1.3)
127		- google-analytics-rails (0.0.6)
128		- hike (1.2.3)
129		- i18n (0.6.11)
130		- jbuilder (2.1.3)
131		- activesupport (>= 3.0.0, < 5)
132		- multi_json (~> 1.2)
133		- jquery-rails (3.1.2)
134		- railties (>= 3.0, < 5.0)
135		- thor (>= 0.14, < 2.0)
136		- jquery-ui-rails (5.0.0)
137		- railties (>= 3.2.16)
138		- json (1.8.1)
139		- kalibro_gatekeeper_client (1.0.0)
140		- activesupport (>= 2.2.1)
141		- faraday_middleware (~> 0.9.0)
142		- konacha (3.2.4)
143		- actionpack (>= 3.1, < 5)
144		- capybara
145		- colorize
146		- railties (>= 3.1, < 5)
147		- sprockets
148		- libv8 (3.16.14.5)
149		- mail (2.5.4)
150		- mime-types (~> 1.16)
151		- treetop (~> 1.4.8)
152		- metaclass (0.0.4)
153		- mime-types (1.25.1)
154		- mini_portile (0.6.0)
155		- minitest (5.4.1)
156		- mocha (1.1.0)
157		- metaclass (~> 0.0.1)
158		- multi_json (1.10.1)
159		- multi_test (0.1.1)
160		- multipart-post (2.0.0)
161		- net-scp (1.2.1)
162		- net-ssh (>= 2.6.5)
163		- net-ssh (2.9.1)
164		- netrc (0.7.7)
165		- nokogiri (1.6.3.1)
166		- mini_portile (= 0.6.0)
167		- orm_adapter (0.5.0)
168		- pg (0.17.1)
169		- poltergeist (1.5.1)
170		- capybara (~> 2.1)
171		- cliver (~> 0.3.1)
172		- multi_json (~> 1.0)
173		- websocket-driver (>= 0.2.0)
174		- polyglot (0.3.5)
175		- rack (1.5.2)
176		- rack-test (0.6.2)
177		- rack (>= 1.0)
178		- rails (4.1.5)
179		- actionmailer (= 4.1.5)
180		- actionpack (= 4.1.5)
181		- actionview (= 4.1.5)
182		- activemodel (= 4.1.5)
183		- activerecord (= 4.1.5)
184		- activesupport (= 4.1.5)
185		- bundler (>= 1.3.0, < 2.0)
186		- railties (= 4.1.5)
187		- sprockets-rails (~> 2.0)
188		- railties (4.1.5)
189		- actionpack (= 4.1.5)
190		- activesupport (= 4.1.5)
191		- rake (>= 0.8.7)
192		- thor (>= 0.18.1, < 2.0)
193		- rake (10.3.2)
194		- rdoc (4.1.2)
195		- json (~> 1.4)
196		- ref (1.0.5)
197		- rest-client (1.7.2)
198		- mime-types (>= 1.16, < 3.0)
199		- netrc (~> 0.7)
200		- rspec-core (3.1.2)
201		- rspec-support (~> 3.1.0)
202		- rspec-expectations (3.1.0)
203		- diff-lcs (>= 1.2.0, < 2.0)
204		- rspec-support (~> 3.1.0)
205		- rspec-mocks (3.1.0)
206		- rspec-support (~> 3.1.0)
207		- rspec-rails (3.1.0)
208		- actionpack (>= 3.0)
209		- activesupport (>= 3.0)
210		- railties (>= 3.0)
211		- rspec-core (~> 3.1.0)
212		- rspec-expectations (~> 3.1.0)
213		- rspec-mocks (~> 3.1.0)
214		- rspec-support (~> 3.1.0)
215		- rspec-support (3.1.0)
216		- sass (3.2.19)
217		- sass-rails (4.0.3)
218		- railties (>= 4.0.0, < 5.0)
219		- sass (~> 3.2.0)
220		- sprockets (~> 2.8, <= 2.11.0)
221		- sprockets-rails (~> 2.0)
222		- sdoc (0.4.1)
223		- json (~> 1.7, >= 1.7.7)
224		- rdoc (~> 4.0)
225		- shoulda-matchers (2.7.0)
226		- activesupport (>= 3.0.0)
227		- simplecov (0.9.0)
228		- docile (~> 1.1.0)
229		- multi_json
230		- simplecov-html (~> 0.8.0)
231		- simplecov-html (0.8.0)
232		- spring (1.1.3)
233		- sprockets (2.11.0)
234		- hike (~> 1.2)
235		- multi_json (~> 1.0)
236		- rack (~> 1.0)
237		- tilt (~> 1.1, != 1.3.0)
238		- sprockets-rails (2.1.4)
239		- actionpack (>= 3.0)
240		- activesupport (>= 3.0)
241		- sprockets (~> 2.8)
242		- sqlite3 (1.3.9)
243		- sshkit (1.5.1)
244		- colorize
245		- net-scp (>= 1.1.2)
246		- net-ssh (>= 2.8.0)
247		- term-ansicolor (1.3.0)
248		- tins (~> 1.0)
249		- therubyracer (0.12.1)
250		- libv8 (~> 3.16.14.0)
251		- ref
252		- thor (0.19.1)
253		- thread_safe (0.3.4)
254		- tilt (1.4.1)
255		- tins (1.3.2)
256		- treetop (1.4.15)
257		- polyglot
258		- polyglot (>= 0.3.1)
259		- turbolinks (2.3.0)
260		- coffee-rails
261		- tzinfo (1.2.2)
262		- thread_safe (~> 0.1)
263		- uglifier (2.5.3)
264		- execjs (>= 0.3.0)
265		- json (>= 1.8.0)
266		- warden (1.2.3)
267		- rack (>= 1.0)
268		- websocket-driver (0.3.4)
269		- xpath (2.0.0)
270		- nokogiri (~> 1.3)
271		-
272		-PLATFORMS
273		- ruby
274		-
275		-DEPENDENCIES
276		- better_errors
277		- binding_of_caller
278		- capistrano (~> 3.2.1)
279		- capistrano-bundler
280		- capistrano-rails
281		- capistrano-rvm (~> 0.1.0)
282		- chart-js-rails (~> 0.0.6)
283		- coffee-rails (~> 4.0.0)
284		- colorpicker (~> 0.0.5)
285		- coveralls
286		- cucumber-rails (~> 1.4.0)
287		- dalli (~> 2.7.0)
288		- database_cleaner
289		- devise (~> 3.3.0)
290		- exception_notification (~> 4.0.1)
291		- factory_girl_rails (~> 4.4.1)
292		- google-analytics-rails (~> 0.0.6)
293		- jbuilder (~> 2.1.2)
294		- jquery-rails
295		- jquery-ui-rails (~> 5.0.0)
296		- kalibro_gatekeeper_client (~> 1.0.0)
297		- konacha (~> 3.2.0)
298		- mocha
299		- pg (~> 0.17.0)
300		- poltergeist (~> 1.5.0)
301		- rails (= 4.1.5)
302		- rspec-rails (~> 3.1.0)
303		- sass-rails (~> 4.0.1)
304		- sdoc
305		- shoulda-matchers (~> 2.7.0)
306		- simplecov
307		- spring
308		- sqlite3
309		- therubyracer
310		- turbolinks
311		- twitter-bootstrap-rails!
312		- uglifier (>= 1.3.0)
...	...	@@ -45,3 +45,13 @@ footer div {
45	45	.jquery-ui-accordion{
46	46	line-height: normal; /overrides h3 line-height specifically for the accordion ones/
47	47	}
	48	+
	49	+.nav-header{
	50	+ display: block;
	51	+ padding: 3px 15px;
	52	+ font-size: 11px;
	53	+ font-weight: bold;
	54	+ line-height: 20px;
	55	+ color: #999999;
	56	+ text-transform: uppercase;
	57	+}
48	58	\ No newline at end of file
...	...
1		-<div class="hero-unit">
	1	+<div class="jumbotron">
2	2	<p><h1>Understanding Code Metrics</h1></p>
3	3
4	4	<p>This is Mezuro! A <strong>free/libre</strong> web platform for <strong>collaborative</strong> source code <strong>evaluation</strong>.</p>
...	...
...	...	@@ -45,23 +45,25 @@
45	45	</head>
46	46	<body>
47	47
48		- <div class="navbar navbar-fluid-top">
	48	+ <div class="navbar navbar-default">
49	49	<div class="navbar-inner">
50	50	<div class="container-fluid">
51		- <a class="btn btn-navbar" data-target=".nav-collapse" data-toggle="collapse">
52		- <span class="icon-bar"></span>
53		- <span class="icon-bar"></span>
54		- <span class="icon-bar"></span>
55		- </a>
56		- <%= link_to image_tag('logo.png'), root_path, class: 'brand' %></a>
57		- <div class="container-fluid nav-collapse">
58		- <ul class="nav">
	51	+ <div class="navbar-header">
	52	+ <button type="button" class="navbar-toggle collapsed" data-target="#nav-collapse" data-toggle="collapse">
	53	+ <span class="icon-bar"></span>
	54	+ <span class="icon-bar"></span>
	55	+ <span class="icon-bar"></span>
	56	+ </button>
	57	+ <a><%= link_to image_tag('logo.png'), root_path, class: 'navbar-brand' %></a>
	58	+ </div>
	59	+ <div class="collapse navbar-collapse" id="nav-collapse">
	60	+ <ul class="nav navbar-nav">
59	61	<li><%= link_to 'Home', root_path %></li>
60	62	<li><%= link_to 'Project', projects_path %></li>
61	63	<li><%= link_to 'Configuration', mezuro_configurations_path %></li>
62	64	<li><%= link_to 'Reading Group', reading_groups_path %></li>
63	65	</ul>
64		- <ul class="nav" style="float: right;">
	66	+ <ul class="nav navbar-nav" style="float: right;">
65	67	<% if user_signed_in? %>
66	68	<li><%= link_to 'Edit Account', edit_user_registration_path %></li>
67	69	<li><%= link_to 'Sign Out', destroy_user_session_path, :method => :delete %></li>
...	...	@@ -76,19 +78,19 @@
76	78	</div>
77	79
78	80	<div class="container-fluid">
79		- <div class="row-fluid">
80		- <div class="span3">
	81	+ <div class="row">
	82	+ <div class="col-sm-3 col-md-3">
81	83	<div class="well sidebar-nav">
82		- <ul class="nav nav-list">
	84	+ <ul class="list-group">
83	85	<% if user_signed_in? %>
84	86	<li class="nav-header">User info</li>
85		- <li>Hello, <strong><%= current_user.name %></strong></li>
86		- <li><%= link_to 'My projects', user_projects_path(current_user.id) %></li>
	87	+ <li class="list-group-item">Hello, <strong><%= current_user.name %></strong></li>
	88	+ <li class="list-group-item"><%= link_to 'My projects', user_projects_path(current_user.id) %></li>
87	89	<% end %>
88	90	<li class="nav-header">Tutorials</li>
89		- <li><%= link_to 'Analysis', tutorials_path('analyzing') %></li>
90		- <li><%= link_to 'Configuring', tutorials_path('configuring') %></li>
91		- <li><%= link_to 'Keywords', tutorials_path('keywords') %></li>
	91	+ <li class="list-group-item"><%= link_to 'Analysis', tutorials_path('analyzing') %></li>
	92	+ <li class="list-group-item"><%= link_to 'Configuring', tutorials_path('configuring') %></li>
	93	+ <li class="list-group-item" ><%= link_to 'Keywords', tutorials_path('keywords') %></li>
92	94	<% if content_for?(:sidebar) %>
93	95	<%= yield :sidebar %>
94	96	<% else %>
...	...	@@ -96,8 +98,8 @@
96	98	<% end %>
97	99	</ul>
98	100	</div><!--/.well -->
99		- </div><!--/span-->
100		- <div class="span9">
	101	+ </div><!--/col-sm-3 col-md-3-->
	102	+ <div class="col-sm-9 col-md-9">
101	103	<div class="alert alert-info" id="loader"><i class="fa fa-spinner fa-spin fa-lg"></i>&nbsp&nbsp Wait an instant while we are loading the page that you have requested.</div>
102	104
103	105	<%= bootstrap_flash %>
...	...
1	1	<li class="nav-header">About Mezuro</li>
2		-<li>
3		- <small> The Mezuro project attempts to provide a platform to compare projects and metric techniques, teaching how to use metrics through configurations and code analysis, avoid technical debts and disseminate code metrics usage and understanding.</small>
4		-<li>
5		-<li>
	2	+<li class="list-group-item">
	3	+ <small> The Mezuro project attempts to provide a platform to compare projects and metric techniques, teaching how to use metrics through configurations and code analysis, avoid technical debts and disseminate code metrics usage and understanding.<br></small>
6	4	<small>Here you can try the front-end, which we call Prezento. It interacts with the <%= link_to 'Kalibro Web Service', 'https://github.com/mezuro/kalibro', target: '_blank' %> and <%= link_to 'Kalibro Processor', 'https://github.com/mezuro/kalibro_processor', target: '_blank' %>. It is intended to be a service where you can evaluate your code quality and, if you want, define which set of metrics to use.</small>
7	5	</li>
...	...