Commit 6115d992ae2677e79d252ddae652a20988154ee8

Authored by Braulio Bhavamitra
Committed by Braulio Bhavamitra
1 parent 1a4ac038

responsive: update plugin, base-responsive and add noosfero-responsive

Showing 37 changed files with 1079 additions and 196 deletions   Show diff stats
plugins/responsive/lib/ext/application_helper.rb
1 require_dependency 'application_helper' 1 require_dependency 'application_helper'
  2 +require_relative 'input_helper'
2 3
3 module ApplicationHelper 4 module ApplicationHelper
4 5
@@ -406,11 +407,11 @@ module ApplicationHelper @@ -406,11 +407,11 @@ module ApplicationHelper
406 end 407 end
407 408
408 if options[:horizontal] 409 if options[:horizontal]
409 - label_html = content_tag('label', gettext(text), class: 'control-label col-sm-3 col-md-2 col-lg-2', for: field_id)  
410 - result = content_tag('div', label_html + content_tag('div',field_html, class: 'col-sm-9 col-md-6 col-lg-6'), class: 'form-group' ) 410 + label_html = content_tag :label, gettext(text), class: 'control-label col-sm-3 col-md-2 col-lg-2', for: field_id
  411 + result = content_tag :div, label_html + content_tag('div',field_html, class: 'col-sm-9 col-md-6 col-lg-6'), class: 'form-group'
411 else 412 else
412 - label_html = content_tag('label', gettext(text), class: 'control-label', for: field_id)  
413 - result = content_tag('div', label_html + field_html, class: 'form-group' ) 413 + label_html = content_tag :label, gettext(text), class: 'control-label', for: field_id
  414 + result = content_tag :div, label_html + field_html, class: 'form-group'
414 end 415 end
415 416
416 result 417 result
plugins/responsive/lib/ext/form_builder.rb 0 → 100644
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
  1 +
  2 +class ResponsiveFormBuilder < ActionView::Helpers::FormBuilder
  3 +
  4 + %w[file_field text_field text_area password_field submit button].each do |method|
  5 + define_method method do |*args, &block|
  6 + options = args.extract_options!
  7 + options[:class] = "#{options[:class]} form-control"
  8 + super(*(args << options), &block)
  9 + end
  10 + end
  11 +
  12 +end
  13 +
  14 +ActionView::Base.default_form_builder = ResponsiveFormBuilder
  15 +
plugins/responsive/lib/ext/forms_helper.rb
@@ -2,6 +2,7 @@ require_dependency &#39;forms_helper&#39; @@ -2,6 +2,7 @@ require_dependency &#39;forms_helper&#39;
2 require_relative 'application_helper' 2 require_relative 'application_helper'
3 3
4 module FormsHelper 4 module FormsHelper
  5 +
5 extend ActiveSupport::Concern 6 extend ActiveSupport::Concern
6 protected 7 protected
7 8
@@ -30,8 +31,8 @@ module FormsHelper @@ -30,8 +31,8 @@ module FormsHelper
30 31
31 bt_cancel = html_options[:cancel] ? button(:cancel, _('Cancel'), html_options[:cancel]) : '' 32 bt_cancel = html_options[:cancel] ? button(:cancel, _('Cancel'), html_options[:cancel]) : ''
32 33
33 - button_size = html_options[:size] || 'xs'  
34 - size_class = button_size == 'default' ? '' : 'btn-'+button_size 34 + button_size = html_options[:size] || 'default'
  35 + size_class = if button_size == 'default' then '' else 'btn-'+button_size end
35 html_options.delete :size if html_options[:size] 36 html_options.delete :size if html_options[:size]
36 37
37 html_options[:class] = [html_options[:class], 'submit'].compact.join(' ') 38 html_options[:class] = [html_options[:class], 'submit'].compact.join(' ')
@@ -47,6 +48,22 @@ module FormsHelper @@ -47,6 +48,22 @@ module FormsHelper
47 bt_submit + bt_cancel 48 bt_submit + bt_cancel
48 end 49 end
49 50
  51 + %w[select select_tag text_field_tag password_field_tag].each do |method|
  52 + define_method method do |*args, &block|
  53 + #return super(*args, &block) unless theme_responsive?
  54 +
  55 + options = args.extract_options!
  56 + options[:class] = "#{options[:class]} form-control"
  57 + super(*(args << options), &block)
  58 + end
  59 + end
  60 + %w[select_month select_year].each do |method|
  61 + define_method method do |date, options={}, html_options={}|
  62 + html_options[:class] = "#{html_options[:class]} form-control"
  63 + super date, options, html_options
  64 + end
  65 + end
  66 +
50 end 67 end
51 68
52 include ResponsiveChecks 69 include ResponsiveChecks
@@ -54,7 +71,6 @@ module FormsHelper @@ -54,7 +71,6 @@ module FormsHelper
54 include ResponsiveMethods 71 include ResponsiveMethods
55 end 72 end
56 73
57 - protected  
58 end 74 end
59 75
60 module ApplicationHelper 76 module ApplicationHelper
plugins/responsive/lib/ext/input_helper.rb 0 → 100644
@@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
  1 +module InputHelper
  2 +
  3 + extend ActiveSupport::Concern
  4 + protected
  5 +
  6 + def input_group_addon addon, options = {}, &block
  7 + content_tag :div,
  8 + content_tag(:span, addon, class: 'input-group-addon') + yield,
  9 + class: 'input-group'
  10 + end
  11 +
  12 +end
  13 +
  14 +module ApplicationHelper
  15 +
  16 + include InputHelper
  17 +
  18 +end
  19 +
plugins/responsive/public/_bootstrap-sprockets.scss 0 → 100644
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
  1 +@function twbs-font-path($path) {
  2 + @return font-path($path);
  3 +}
  4 +
  5 +@function twbs-image-path($path) {
  6 + @return image-path($path);
  7 +}
plugins/responsive/test/unit/foo_plugin_test.rb 0 → 100644
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
  1 +require File.dirname(__FILE__) + '/../../../../test/test_helper'
  2 +
  3 +class FooPluginTest < ActiveSupport::TestCase
  4 + def test_foo
  5 + FooPlugin::Bar.create!
  6 + end
  7 + def test_monkey_patch
  8 + Profile.new.bar
  9 + end
  10 +end
plugins/responsive/views/layouts/_content.html.erb 0 → 100644
plugins/responsive/views/layouts/_menu_responsive.html.erb
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 </form> 48 </form>
49 </div> 49 </div>
50 <div class="collapse navbar-collapse" id="navbar-user-collapse"> 50 <div class="collapse navbar-collapse" id="navbar-user-collapse">
51 - <ul class="nav navbar-nav navbar-right"> 51 + <ul class="nav navbar-nav pull-right">
52 <% if user.present? %> 52 <% if user.present? %>
53 <% user = user.person %> 53 <% user = user.person %>
54 <%= usermenu_logged_in %> 54 <%= usermenu_logged_in %>
plugins/responsive/views/layouts/_profile_title.html.erb
1 -<div class="row"> 1 +<div class="row profile-title">
2 <div class="block-outer"> 2 <div class="block-outer">
3 <div id="profile-title" class=" block col-lg-12 col-md-12 col-sm-12"> 3 <div id="profile-title" class=" block col-lg-12 col-md-12 col-sm-12">
4 <h1 class="page-title"><%= profile.short_name %> 4 <h1 class="page-title"><%= profile.short_name %>
plugins/responsive/views/templates/_boxes_2leftbars.html.erb
1 <div class="row boxes"> 1 <div class="row boxes">
2 - <div id="box-<%=boxes[0].id%>" class="col-lg-8 col-md-8 col-sm-6 col-lg-push-4 col-md-push-4 col-sm-push-6 box-container-1">  
3 - <%= display_box_content boxes[0], main_content %>  
4 - </div>  
5 - <div id="box-<%=boxes[1].id%>" class="col-lg-2 col-md-2 col-sm-3 col-lg-pull-6 col-md-pull-6 col-sm-pull-4 box-container-2">  
6 - <%= display_box_content boxes[1], main_content %>  
7 - </div>  
8 - <div id="box-<%=boxes[2].id%>" class="col-lg-2 col-md-2 col-sm-3 col-lg-pull-10 col-md-pull-10 col-sm-pull-8 box-container-3">  
9 - <%= display_box_content boxes[2], main_content %>  
10 - </div> 2 + <% if box = boxes[0] %>
  3 + <div id="box-<%=box.id%>" class="col-lg-6 col-md-6 col-sm-6 col-lg-push-6 col-md-push-6 col-sm-push-6 box-container-1">
  4 + <%= display_box_content box, main_content %>
  5 + </div>
  6 + <% end %>
  7 + <% if box = boxes[1] %>
  8 + <div id="box-<%=box.id%>" class="col-lg-3 col-md-3 col-sm-3 col-lg-pull-3 col-md-pull-3 col-sm-pull-4 box-container-2">
  9 + <%= display_box_content box, main_content %>
  10 + </div>
  11 + <% end %>
  12 + <% if box = boxes[2] %>
  13 + <div id="box-<%=box.id%>" class="col-lg-3 col-md-3 col-sm-3 col-lg-pull-8 col-md-pull-8 col-sm-pull-8 box-container-3">
  14 + <%= display_box_content box, main_content %>
  15 + </div>
  16 + <% end %>
11 </div> 17 </div>
plugins/responsive/views/templates/_boxes_default.html.erb
1 <div class="row boxes"> 1 <div class="row boxes">
2 - <div id="box-<%=boxes[0].id%>" class="col-lg-8 col-md-8 col-sm-6 col-lg-push-2 col-md-push-2 col-sm-push-3 box-container-1">  
3 - <%= display_box_content boxes[0], main_content %>  
4 - </div>  
5 - <div id="box-<%=boxes[1].id%>" class="col-lg-2 col-md-2 col-sm-3 col-lg-pull-8 col-md-pull-8 col-sm-pull-6 box-container-2">  
6 - <%= display_box_content boxes[1], main_content %>  
7 - </div>  
8 -  
9 - <div id="box-<%=boxes[2].id%>" class="col-lg-2 col-md-2 col-sm-3 box-container-3">  
10 - <%= display_box_content boxes[2], main_content %>  
11 - </div> 2 + <% if box = boxes[0] %>
  3 + <div id="box-<%=box.id%>" class="col-lg-6 col-md-6 col-sm-6 col-lg-push-3 col-md-push-3 col-sm-push-3 box-container-1">
  4 + <%= display_box_content box, main_content %>
  5 + </div>
  6 + <% end %>
  7 + <% if box = boxes[1] %>
  8 + <div id="box-<%=box.id%>" class="col-lg-3 col-md-3 col-sm-3 col-lg-pull-6 col-md-pull-6 col-sm-pull-6 box-container-2">
  9 + <%= display_box_content box, main_content %>
  10 + </div>
  11 + <% end %>
  12 + <% if box = boxes[2] %>
  13 + <div id="box-<%=box.id%>" class="col-lg-3 col-md-3 col-sm-3 box-container-3">
  14 + <%= display_box_content box, main_content %>
  15 + </div>
  16 + <% end %>
12 </div> 17 </div>
plugins/responsive/views/templates/_boxes_leftbar.html.erb
1 <div class="row boxes" id="boxes"> 1 <div class="row boxes" id="boxes">
2 - <div id="box-<%=boxes[0].id%>" class="col-lg-9 col-md-9 col-sm-8 col-lg-push-3 col-md-push-3 col-sm-push-4 box-container-1">  
3 - <%= display_box_content boxes[0], main_content %>  
4 - </div>  
5 - <div id="box-<%=boxes[1].id%>" class="col-lg-3 col-md-3 col-sm-4 col-lg-pull-9 col-md-pull-9 col-sm-pull-8 box-container-2">  
6 - <%= display_box_content boxes[1], main_content %>  
7 - </div> 2 + <% if box = boxes[0] %>
  3 + <div id="box-<%=box.id%>" class="col-lg-9 col-md-9 col-sm-8 col-lg-push-3 col-md-push-3 col-sm-push-4 box-container-1">
  4 + <%= display_box_content box, main_content %>
  5 + </div>
  6 + <% end %>
  7 + <% if box = boxes[1] %>
  8 + <div id="box-<%=box.id%>" class="col-lg-3 col-md-3 col-sm-4 col-lg-pull-9 col-md-pull-9 col-sm-pull-8 box-container-2">
  9 + <%= display_box_content box, main_content %>
  10 + </div>
  11 + <% end %>
8 </div> 12 </div>
plugins/responsive/views/templates/_boxes_leftbottom.html.erb
1 <div class="row boxes"> 1 <div class="row boxes">
2 - <div id="box-<%=boxes[0].id%>" class="col-lg-9 col-md-9 col-sm-8 col-lg-push-3 col-md-push-3 col-sm-push-4 box-container-1">  
3 - <%= display_box_content boxes[0], main_content %>  
4 - </div>  
5 - <div id="box-<%=boxes[1].id%>" class="col-lg-3 col-md-3 col-sm-4 col-lg-pull-9 col-md-pull-9 col-sm-pull-8 box-container-2">  
6 - <%= display_box_content boxes[1], main_content %>  
7 - </div> 2 + <% if box = boxes[0] %>
  3 + <div id="box-<%=box.id%>" class="col-lg-9 col-md-9 col-sm-8 col-lg-push-3 col-md-push-3 col-sm-push-4 box-container-1">
  4 + <%= display_box_content box, main_content %>
  5 + </div>
  6 + <% end %>
  7 + <% if box = boxes[1] %>
  8 + <div id="box-<%=box.id%>" class="col-lg-3 col-md-3 col-sm-4 col-lg-pull-9 col-md-pull-9 col-sm-pull-8 box-container-2">
  9 + <%= display_box_content box, main_content %>
  10 + </div>
  11 + <% end %>
8 </div> 12 </div>
9 -<div id="box-<%=boxes[2].id%>" class="row">  
10 - <div class="col-lg-12 col-md-12 col-sm-12 box-container-3">  
11 - <%= display_box_content boxes[2], main_content %> 13 +<% if box = boxes[2] %>
  14 + <div id="box-<%=box.id%>" class="row">
  15 + <div class="col-lg-12 col-md-12 col-sm-12 box-container-3">
  16 + <%= display_box_content box, main_content %>
  17 + </div>
12 </div> 18 </div>
13 -</div> 19 +<% end %>
plugins/responsive/views/templates/_boxes_nosidebars.html.erb
1 <div class="row boxes"> 1 <div class="row boxes">
2 - <div id="box-<%=boxes[0].id%>" class="col-lg-12 col-md-12 col-sm-12 box-container-1">  
3 - <%= display_box_content boxes[0], main_content %>  
4 - </div> 2 + <% if box = boxes[0] %>
  3 + <div id="box-<%=box.id%>" class="col-lg-12 col-md-12 col-sm-12 box-container-1">
  4 + <%= display_box_content box, main_content %>
  5 + </div>
  6 + <% end %>
5 </div> 7 </div>
plugins/responsive/views/templates/_boxes_rightbar.html.erb
1 <div class="row boxes"> 1 <div class="row boxes">
2 - <div id="box-<%=boxes[0].id%>" class="col-lg-9 col-md-9 col-sm-8 box-container-1">  
3 - <%= display_box_content boxes[0], main_content %>  
4 - </div>  
5 - <div id="box-<%=boxes[1].id%>" class="col-lg-3 col-md-3 col-sm-4 box-container-2">  
6 - <%= display_box_content boxes[1], main_content %>  
7 - </div> 2 + <% if box = boxes[0] %>
  3 + <div id="box-<%=box.id%>" class="col-lg-9 col-md-9 col-sm-8 box-container-1">
  4 + <%= display_box_content box, main_content %>
  5 + </div>
  6 + <% end %>
  7 + <% if box = boxes[1] %>
  8 + <div id="box-<%=box.id%>" class="col-lg-3 col-md-3 col-sm-4 box-container-2">
  9 + <%= display_box_content box, main_content %>
  10 + </div>
  11 + <% end %>
8 </div> 12 </div>
plugins/responsive/views/templates/_boxes_topleft.html.erb
1 -<div id="box-<%=boxes[2].id%>" class="row toprow"> 1 +<% if box = boxes[2] %>
  2 +<div id="box-<%=box.id%>" class="row toprow">
2 <div class="col-lg-12 col-md-12 col-sm-12 box-container-3"> 3 <div class="col-lg-12 col-md-12 col-sm-12 box-container-3">
3 - <%= display_topbox_content boxes[2], main_content %> 4 + <%= display_topbox_content box, main_content %>
4 </div> 5 </div>
5 </div> 6 </div>
  7 +<% end %>
6 <div class="row boxes"> 8 <div class="row boxes">
7 - <div id="box-<%=boxes[0].id%>" class="col-lg-9 col-md-9 col-sm-8 col-lg-push-3 col-md-push-3 col-sm-push-4 box-container-1">  
8 - <%= display_box_content boxes[0], main_content %>  
9 - </div>  
10 - <div id="box-<%=boxes[1].id%>" class="col-lg-3 col-md-3 col-sm-4 col-lg-pull-9 col-md-pull-9 col-sm-pull-8 box-container-2">  
11 - <%= display_box_content boxes[1], main_content %>  
12 - </div>  
13 -</div>  
14 \ No newline at end of file 9 \ No newline at end of file
  10 + <% if box = boxes[0] %>
  11 + <div id="box-<%=box.id%>" class="col-lg-9 col-md-9 col-sm-8 col-lg-push-3 col-md-push-3 col-sm-push-4 box-container-1">
  12 + <%= display_box_content box, main_content %>
  13 + </div>
  14 + <% end %>
  15 + <% if box = boxes[1] %>
  16 + <div id="box-<%=box.id%>" class="col-lg-3 col-md-3 col-sm-4 col-lg-pull-9 col-md-pull-9 col-sm-pull-8 box-container-2">
  17 + <%= display_box_content box, main_content %>
  18 + </div>
  19 + <% end %>
  20 +</div>
public/designs/themes/base-responsive/errors.css
@@ -1,73 +0,0 @@ @@ -1,73 +0,0 @@
1 -body {  
2 - font-family: sans-serif;  
3 - margin: 0px;  
4 - padding: 0% 0%;  
5 - background: #eee;  
6 - font-size: 12px;  
7 - width: 960px;  
8 - margin: auto;  
9 -}  
10 -  
11 -#wrap {  
12 - margin: 20px 20px 0px 20px;  
13 - border: 1px solid #d3d7cf;  
14 - background: white url(imgs/50x.png) 100% 100% no-repeat;  
15 - height: 480px;  
16 -}  
17 -  
18 -#header {  
19 - background: #ccc url(imgs/menu-top-bg-right.png) top right no-repeat;  
20 - height: 42px;  
21 - margin-top: 48px;  
22 - position: relative;  
23 -}  
24 -  
25 -#logo {  
26 - background: url(imgs/menu-top-bg-left.png) 0px 29px no-repeat;  
27 - position: absolute;  
28 - top: -29px;  
29 - height: 92px;  
30 - width: 400px;  
31 - z-index: 2;  
32 -}  
33 -  
34 -#details {  
35 - position: absolute;  
36 - bottom: 1px;  
37 - right: 13px;  
38 - color: #EEE;  
39 - Xtext-shadow: 1px 1px 1px #fff;  
40 -}  
41 -  
42 -.message,  
43 -#languages {  
44 - margin: 0px 20px;  
45 -}  
46 -  
47 -#languages {  
48 - float: left;  
49 - width: 40%;  
50 - margin-top: 3em;  
51 - border-top: 1px solid #aaa;  
52 - padding-top: 0.5em;  
53 -}  
54 -  
55 -#languages a {  
56 - margin-right: 0.5em;  
57 -}  
58 -  
59 -h1 {  
60 - margin: 30px 0px 0px 0px;  
61 - font-weight: bold;  
62 - font-variant: small-caps;  
63 - border-bottom: 2px solid #2e3436;  
64 - color: #555753;  
65 - font-size: 16px;  
66 -}  
67 -  
68 -a, a:visited {  
69 - color: #666;  
70 -}  
71 -a:hover {  
72 - color: black;  
73 -}  
public/designs/themes/base-responsive/favicon.ico
1 Binary files a/public/designs/themes/base-responsive/favicon.ico and /dev/null differ 1 Binary files a/public/designs/themes/base-responsive/favicon.ico and /dev/null differ
public/designs/themes/base-responsive/favicon.ico 0 → 120000
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +../base/favicon.ico
0 \ No newline at end of file 2 \ No newline at end of file
public/designs/themes/base-responsive/style.scss
1 -@import url(/assets/plugins/responsive/bootstrap/all.css); 1 +$bootstrap-loaded: false !default;
  2 +@if not $bootstrap-loaded {
  3 + @import url(/assets/plugins/responsive/bootstrap/all.css);
  4 + $bootstrap-loaded: true;
  5 +}
  6 +
  7 +// Parts
  8 +// TODO: move more code from here to parts
  9 +@import 'stylesheets/profile_title';
2 10
3 /* ==> button.css <== */ 11 /* ==> button.css <== */
4 12
@@ -574,6 +582,11 @@ div#notice { @@ -574,6 +582,11 @@ div#notice {
574 .link-list-block .empty { 582 .link-list-block .empty {
575 display: none; 583 display: none;
576 } 584 }
  585 +
  586 +#content .link-list-block {
  587 + padding: 15px;
  588 +}
  589 +
577 #content .link-list-block li { 590 #content .link-list-block li {
578 padding: 0px; 591 padding: 0px;
579 margin: 0 0 2px 0; 592 margin: 0 0 2px 0;
@@ -1735,7 +1748,7 @@ img.menu-user-gravatar { @@ -1735,7 +1748,7 @@ img.menu-user-gravatar {
1735 } 1748 }
1736 1749
1737 .noosfero-responsive-top-logo { 1750 .noosfero-responsive-top-logo {
1738 - background:url(/designs/themes/noosfero-responsive/images/logo-noosfero-raw.png); 1751 + background:url(images/logo-noosfero-raw.png);
1739 width:60px; 1752 width:60px;
1740 height:60px; 1753 height:60px;
1741 margin-right:10px; 1754 margin-right:10px;
@@ -1892,17 +1905,6 @@ img, video, audio { @@ -1892,17 +1905,6 @@ img, video, audio {
1892 1905
1893 } 1906 }
1894 1907
1895 -#profile-title a, #profile-title a:visited {  
1896 - font-weight: bold;  
1897 - font-size: 200%;  
1898 - text-decoration: none;  
1899 - color: #2C3E50;  
1900 -}  
1901 -#profile-title a:hover {  
1902 - text-decoration: underline;  
1903 - color: #18BC9C;  
1904 -}  
1905 -  
1906 .common-profile-list-block .vcard a:hover { 1908 .common-profile-list-block .vcard a:hover {
1907 border: 2px solid transparent; 1909 border: 2px solid transparent;
1908 background: none; 1910 background: none;
@@ -1923,14 +1925,6 @@ img, video, audio { @@ -1923,14 +1925,6 @@ img, video, audio {
1923 } 1925 }
1924 } 1926 }
1925 1927
1926 -/* dtygel: This breaks things, so I'll comment out  
1927 -@media screen and (min-width: 768px ) {  
1928 - .box-container-1, .box-container-2, .box-container-3 {  
1929 - padding-right: 0px;  
1930 - }  
1931 -}  
1932 -*/  
1933 -  
1934 .container > #content { 1928 .container > #content {
1935 margin-right: 0px; 1929 margin-right: 0px;
1936 } 1930 }
@@ -1939,9 +1933,6 @@ body { @@ -1939,9 +1933,6 @@ body {
1939 background-color: #eeeeee; 1933 background-color: #eeeeee;
1940 } 1934 }
1941 1935
1942 -.no-boxes {  
1943 - margin-bottom: 20px;  
1944 -}  
1945 .block, .no-boxes { 1936 .block, .no-boxes {
1946 position: relative; 1937 position: relative;
1947 padding: 8px; 1938 padding: 8px;
@@ -1949,6 +1940,7 @@ body { @@ -1949,6 +1940,7 @@ body {
1949 border-radius: 3px; 1940 border-radius: 3px;
1950 border: 1px solid rgba(0,0,0,0.2);/*#d8d8d8;*/ 1941 border: 1px solid rgba(0,0,0,0.2);/*#d8d8d8;*/
1951 background-color: white; 1942 background-color: white;
  1943 + margin-bottom: 20px;
1952 } 1944 }
1953 1945
1954 /* 1946 /*
@@ -1978,10 +1970,6 @@ $padding_value:7px; @@ -1978,10 +1970,6 @@ $padding_value:7px;
1978 padding-top: 21px; 1970 padding-top: 21px;
1979 } 1971 }
1980 1972
1981 -.navbar {  
1982 - margin-bottom: 0px;  
1983 -}  
1984 -  
1985 .nav > li > a { 1973 .nav > li > a {
1986 padding-left: 7px; 1974 padding-left: 7px;
1987 padding-right: 7px; 1975 padding-right: 7px;
@@ -2054,29 +2042,6 @@ table.cms-articles .article-name { @@ -2054,29 +2042,6 @@ table.cms-articles .article-name {
2054 font-weight: bold; 2042 font-weight: bold;
2055 } 2043 }
2056 2044
2057 -@media screen and (min-width: 768px) {  
2058 - .block, .no-boxes {  
2059 - border: none !important;  
2060 - }  
2061 -  
2062 - #wrap-1 {  
2063 - background-color: white !important;  
2064 - box-shadow: 0 0 10px black;  
2065 - -ms-box-shadow: 0 0 10px black;  
2066 - -moz-box-shadow: 0 0 10px black;  
2067 - -webkit-box-shadow: 0 0 10px black;  
2068 - }  
2069 -}  
2070 -  
2071 -@media screen and (max-width: 767px) {  
2072 - .block, .no-boxes {  
2073 - box-shadow: 0 0 10px black;  
2074 - -ms-box-shadow: 0 0 10px black;  
2075 - -moz-box-shadow: 0 0 10px black;  
2076 - -webkit-box-shadow: 0 0 10px black;  
2077 - }  
2078 -}  
2079 -  
2080 #theme-footer #language-chooser { 2045 #theme-footer #language-chooser {
2081 text-align: left; 2046 text-align: left;
2082 } 2047 }
public/designs/themes/base/footer.html.erb
1 -<div id="footer-links">  
2 - <%= link_to _('Manual'), '/doc', id: "link-to-doc", class: 'icon-help' %>  
3 -</div><!-- end id="footer-links" -->  
4 -<div id="copyright">  
5 - <p><%= _('This social network uses <a href="http://noosfero.org/">Noosfero</a>, developed by %s and licensed under the <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> version 3 or any later version.') % link_to('Colivre', 'http://colivre.coop.br/') %></p>  
6 -</div><!-- end id="copyright" -->  
7 -<%= language_chooser(environment) %> 1 +<div class="container">
  2 + <div id="footer-links">
  3 + <%= link_to _('Manual'), '/doc', id: "link-to-doc", class: 'icon-help' %>
  4 + </div><!-- end id="footer-links" -->
  5 + <div id="copyright">
  6 + <p><%= _('This social network uses <a href="http://noosfero.org/">Noosfero</a>, developed by %s and licensed under the <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> version 3 or any later version.') % link_to('Colivre', 'http://colivre.coop.br/') %></p>
  7 + </div><!-- end id="copyright" -->
  8 + <%= language_chooser(environment) %>
  9 +</div>
public/designs/themes/base/style.css
@@ -609,6 +609,10 @@ div#notice { @@ -609,6 +609,10 @@ div#notice {
609 display: none; 609 display: none;
610 } 610 }
611 611
  612 +#content .link-list-block {
  613 + padding: 10px 0px 10px 10px;
  614 +}
  615 +
612 #content .box-1 .link-list-block { 616 #content .box-1 .link-list-block {
613 margin: 0px; 617 margin: 0px;
614 } 618 }
public/designs/themes/default 0 → 120000
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +noosfero
0 \ No newline at end of file 2 \ No newline at end of file
public/designs/themes/noosfero-responsive/bootstrap/_variables.scss 0 → 100644
@@ -0,0 +1,864 @@ @@ -0,0 +1,864 @@
  1 +// When true, asset path helpers are used, otherwise the regular CSS `url()` is used.
  2 +// When there no function is defined, `fn('')` is parsed as string that equals the right hand side
  3 +// NB: in Sass 3.3 there is a native function: function-exists(twbs-font-path)
  4 +$bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;
  5 +
  6 +//
  7 +// Variables
  8 +// --------------------------------------------------
  9 +
  10 +
  11 +//== Colors
  12 +//
  13 +//## Gray and brand colors for use across Bootstrap.
  14 +
  15 +$gray-base: #000 !default;
  16 +$gray-darker: lighten($gray-base, 13.5%) !default; // #222
  17 +$gray-dark: lighten($gray-base, 20%) !default; // #333
  18 +$gray: lighten($gray-base, 33.5%) !default; // #555
  19 +$gray-light: lighten($gray-base, 46.7%) !default; // #777
  20 +$gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
  21 +
  22 +$brand-primary: darken(#428bca, 6.5%) !default;
  23 +$brand-success: #5cb85c !default;
  24 +$brand-info: #5bc0de !default;
  25 +$brand-warning: #f0ad4e !default;
  26 +$brand-danger: #d9534f !default;
  27 +
  28 +
  29 +//== Scaffolding
  30 +//
  31 +//## Settings for some of the most global styles.
  32 +
  33 +//** Background color for `<body>`.
  34 +$body-bg: #fff !default;
  35 +//** Global text color on `<body>`.
  36 +$text-color: $gray-dark !default;
  37 +
  38 +//** Global textual link color.
  39 +$link-color: $brand-primary !default;
  40 +//** Link hover color set via `darken()` function.
  41 +$link-hover-color: darken($link-color, 15%) !default;
  42 +//** Link hover decoration.
  43 +$link-hover-decoration: underline !default;
  44 +
  45 +
  46 +//== Typography
  47 +//
  48 +//## Font, line-height, and color for body text, headings, and more.
  49 +
  50 +$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
  51 +$font-family-serif: Georgia, "Times New Roman", Times, serif !default;
  52 +//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
  53 +$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
  54 +$font-family-base: $font-family-sans-serif !default;
  55 +
  56 +$font-size-base: 14px !default;
  57 +$font-size-large: ceil(($font-size-base * 1.25)) !default; // ~18px
  58 +$font-size-small: ceil(($font-size-base * 0.85)) !default; // ~12px
  59 +
  60 +$font-size-h1: floor(($font-size-base * 2.6)) !default; // ~36px
  61 +$font-size-h2: floor(($font-size-base * 2.15)) !default; // ~30px
  62 +$font-size-h3: ceil(($font-size-base * 1.7)) !default; // ~24px
  63 +$font-size-h4: ceil(($font-size-base * 1.25)) !default; // ~18px
  64 +$font-size-h5: $font-size-base !default;
  65 +$font-size-h6: ceil(($font-size-base * 0.85)) !default; // ~12px
  66 +
  67 +//** Unit-less `line-height` for use in components like buttons.
  68 +$line-height-base: 1.428571429 !default; // 20/14
  69 +//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
  70 +$line-height-computed: floor(($font-size-base * $line-height-base)) !default; // ~20px
  71 +
  72 +//** By default, this inherits from the `<body>`.
  73 +$headings-font-family: inherit !default;
  74 +$headings-font-weight: 500 !default;
  75 +$headings-line-height: 1.1 !default;
  76 +$headings-color: inherit !default;
  77 +
  78 +
  79 +//== Iconography
  80 +//
  81 +//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
  82 +
  83 +//** Load fonts from this directory.
  84 +
  85 +// [converter] Asset helpers such as Sprockets and Node.js Mincer do not resolve relative paths
  86 +$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
  87 +
  88 +//** File name for all font files.
  89 +$icon-font-name: "glyphicons-halflings-regular" !default;
  90 +//** Element ID within SVG icon file.
  91 +$icon-font-svg-id: "glyphicons_halflingsregular" !default;
  92 +
  93 +
  94 +//== Components
  95 +//
  96 +//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
  97 +
  98 +$padding-base-vertical: 6px !default;
  99 +$padding-base-horizontal: 12px !default;
  100 +
  101 +$padding-large-vertical: 10px !default;
  102 +$padding-large-horizontal: 16px !default;
  103 +
  104 +$padding-small-vertical: 5px !default;
  105 +$padding-small-horizontal: 10px !default;
  106 +
  107 +$padding-xs-vertical: 1px !default;
  108 +$padding-xs-horizontal: 5px !default;
  109 +
  110 +$line-height-large: 1.33 !default;
  111 +$line-height-small: 1.5 !default;
  112 +
  113 +$border-radius-base: 4px !default;
  114 +$border-radius-large: 6px !default;
  115 +$border-radius-small: 3px !default;
  116 +
  117 +//** Global color for active items (e.g., navs or dropdowns).
  118 +$component-active-color: #fff !default;
  119 +//** Global background color for active items (e.g., navs or dropdowns).
  120 +$component-active-bg: $brand-primary !default;
  121 +
  122 +//** Width of the `border` for generating carets that indicator dropdowns.
  123 +$caret-width-base: 4px !default;
  124 +//** Carets increase slightly in size for larger components.
  125 +$caret-width-large: 5px !default;
  126 +
  127 +
  128 +//== Tables
  129 +//
  130 +//## Customizes the `.table` component with basic values, each used across all table variations.
  131 +
  132 +//** Padding for `<th>`s and `<td>`s.
  133 +$table-cell-padding: 8px !default;
  134 +//** Padding for cells in `.table-condensed`.
  135 +$table-condensed-cell-padding: 5px !default;
  136 +
  137 +//** Default background color used for all tables.
  138 +$table-bg: transparent !default;
  139 +//** Background color used for `.table-striped`.
  140 +$table-bg-accent: #f9f9f9 !default;
  141 +//** Background color used for `.table-hover`.
  142 +$table-bg-hover: #f5f5f5 !default;
  143 +$table-bg-active: $table-bg-hover !default;
  144 +
  145 +//** Border color for table and cell borders.
  146 +$table-border-color: #ddd !default;
  147 +
  148 +
  149 +//== Buttons
  150 +//
  151 +//## For each of Bootstrap's buttons, define text, background and border color.
  152 +
  153 +$btn-font-weight: normal;
  154 +
  155 +$btn-default-color: #fff;
  156 +$btn-default-bg: $gray-light;
  157 +$btn-default-border: $btn-default-bg;
  158 +
  159 +$btn-primary-color: $btn-default-color;
  160 +$btn-primary-bg: $brand-primary;
  161 +$btn-primary-border: $btn-primary-bg;
  162 +
  163 +$btn-success-color: $btn-default-color;
  164 +$btn-success-bg: $brand-success;
  165 +$btn-success-border: $btn-success-bg;
  166 +
  167 +$btn-info-color: $btn-default-color;
  168 +$btn-info-bg: $brand-info;
  169 +$btn-info-border: $btn-info-bg;
  170 +
  171 +$btn-warning-color: $btn-default-color;
  172 +$btn-warning-bg: $brand-warning;
  173 +$btn-warning-border: $btn-warning-bg;
  174 +
  175 +$btn-danger-color: $btn-default-color;
  176 +$btn-danger-bg: $brand-danger;
  177 +$btn-danger-border: $btn-danger-bg;
  178 +
  179 +$btn-link-disabled-color: $gray-light;
  180 +
  181 +
  182 +//== Forms
  183 +//
  184 +//##
  185 +
  186 +//** `<input>` background color
  187 +$input-bg: #fff !default;
  188 +//** `<input disabled>` background color
  189 +$input-bg-disabled: $gray-lighter !default;
  190 +
  191 +//** Text color for `<input>`s
  192 +$input-color: $gray !default;
  193 +//** `<input>` border color
  194 +$input-border: #ccc !default;
  195 +
  196 +// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
  197 +//** Default `.form-control` border radius
  198 +$input-border-radius: $border-radius-base !default;
  199 +//** Large `.form-control` border radius
  200 +$input-border-radius-large: $border-radius-large !default;
  201 +//** Small `.form-control` border radius
  202 +$input-border-radius-small: $border-radius-small !default;
  203 +
  204 +//** Border color for inputs on focus
  205 +$input-border-focus: #66afe9 !default;
  206 +
  207 +//** Placeholder text color
  208 +$input-color-placeholder: #999 !default;
  209 +
  210 +//** Default `.form-control` height
  211 +$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
  212 +//** Large `.form-control` height
  213 +$input-height-large: (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
  214 +//** Small `.form-control` height
  215 +$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
  216 +
  217 +$legend-color: $gray-dark !default;
  218 +$legend-border-color: #e5e5e5 !default;
  219 +
  220 +//** Background color for textual input addons
  221 +$input-group-addon-bg: $gray-lighter !default;
  222 +//** Border color for textual input addons
  223 +$input-group-addon-border-color: $input-border !default;
  224 +
  225 +//** Disabled cursor for form controls and buttons.
  226 +$cursor-disabled: not-allowed !default;
  227 +
  228 +
  229 +//== Dropdowns
  230 +//
  231 +//## Dropdown menu container and contents.
  232 +
  233 +//** Background for the dropdown menu.
  234 +$dropdown-bg: #fff !default;
  235 +//** Dropdown menu `border-color`.
  236 +$dropdown-border: rgba(0,0,0,.15) !default;
  237 +//** Dropdown menu `border-color` **for IE8**.
  238 +$dropdown-fallback-border: #ccc !default;
  239 +//** Divider color for between dropdown items.
  240 +$dropdown-divider-bg: #e5e5e5 !default;
  241 +
  242 +//** Dropdown link text color.
  243 +$dropdown-link-color: $gray-dark !default;
  244 +//** Hover color for dropdown links.
  245 +$dropdown-link-hover-color: darken($gray-dark, 5%) !default;
  246 +//** Hover background for dropdown links.
  247 +$dropdown-link-hover-bg: #f5f5f5 !default;
  248 +
  249 +//** Active dropdown menu item text color.
  250 +$dropdown-link-active-color: $component-active-color !default;
  251 +//** Active dropdown menu item background color.
  252 +$dropdown-link-active-bg: $component-active-bg !default;
  253 +
  254 +//** Disabled dropdown menu item background color.
  255 +$dropdown-link-disabled-color: $gray-light !default;
  256 +
  257 +//** Text color for headers within dropdown menus.
  258 +$dropdown-header-color: $gray-light !default;
  259 +
  260 +//** Deprecated `$dropdown-caret-color` as of v3.1.0
  261 +$dropdown-caret-color: #000 !default;
  262 +
  263 +
  264 +//-- Z-index master list
  265 +//
  266 +// Warning: Avoid customizing these values. They're used for a bird's eye view
  267 +// of components dependent on the z-axis and are designed to all work together.
  268 +//
  269 +// Note: These variables are not generated into the Customizer.
  270 +
  271 +$zindex-navbar: 1000 !default;
  272 +$zindex-dropdown: 1000 !default;
  273 +$zindex-popover: 1060 !default;
  274 +$zindex-tooltip: 1070 !default;
  275 +$zindex-navbar-fixed: 1030 !default;
  276 +$zindex-modal: 1040 !default;
  277 +
  278 +
  279 +//== Media queries breakpoints
  280 +//
  281 +//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
  282 +
  283 +// Extra small screen / phone
  284 +//** Deprecated `$screen-xs` as of v3.0.1
  285 +$screen-xs: 480px !default;
  286 +//** Deprecated `$screen-xs-min` as of v3.2.0
  287 +$screen-xs-min: $screen-xs !default;
  288 +//** Deprecated `$screen-phone` as of v3.0.1
  289 +$screen-phone: $screen-xs-min !default;
  290 +
  291 +// Small screen / tablet
  292 +//** Deprecated `$screen-sm` as of v3.0.1
  293 +$screen-sm: 768px !default;
  294 +$screen-sm-min: $screen-sm !default;
  295 +//** Deprecated `$screen-tablet` as of v3.0.1
  296 +$screen-tablet: $screen-sm-min !default;
  297 +
  298 +// Medium screen / desktop
  299 +//** Deprecated `$screen-md` as of v3.0.1
  300 +$screen-md: 992px !default;
  301 +$screen-md-min: $screen-md !default;
  302 +//** Deprecated `$screen-desktop` as of v3.0.1
  303 +$screen-desktop: $screen-md-min !default;
  304 +
  305 +// Large screen / wide desktop
  306 +//** Deprecated `$screen-lg` as of v3.0.1
  307 +$screen-lg: 1200px !default;
  308 +$screen-lg-min: $screen-lg !default;
  309 +//** Deprecated `$screen-lg-desktop` as of v3.0.1
  310 +$screen-lg-desktop: $screen-lg-min !default;
  311 +
  312 +// So media queries don't overlap when required, provide a maximum
  313 +$screen-xs-max: ($screen-sm-min - 1) !default;
  314 +$screen-sm-max: ($screen-md-min - 1) !default;
  315 +$screen-md-max: ($screen-lg-min - 1) !default;
  316 +
  317 +
  318 +//== Grid system
  319 +//
  320 +//## Define your custom responsive grid.
  321 +
  322 +//** Number of columns in the grid.
  323 +$grid-columns: 12 !default;
  324 +//** Padding between columns. Gets divided in half for the left and right.
  325 +$grid-gutter-width: 30px !default;
  326 +// Navbar collapse
  327 +//** Point at which the navbar becomes uncollapsed.
  328 +$grid-float-breakpoint: $screen-sm-min !default;
  329 +//** Point at which the navbar begins collapsing.
  330 +$grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
  331 +
  332 +
  333 +//== Container sizes
  334 +//
  335 +//## Define the maximum width of `.container` for different screen sizes.
  336 +
  337 +// Small screen / tablet
  338 +$container-tablet: (720px + $grid-gutter-width) !default;
  339 +//** For `$screen-sm-min` and up.
  340 +$container-sm: $container-tablet !default;
  341 +
  342 +// Medium screen / desktop
  343 +$container-desktop: (940px + $grid-gutter-width) !default;
  344 +//** For `$screen-md-min` and up.
  345 +$container-md: $container-desktop !default;
  346 +
  347 +// Large screen / wide desktop
  348 +$container-large-desktop: (1140px + $grid-gutter-width) !default;
  349 +//** For `$screen-lg-min` and up.
  350 +$container-lg: $container-large-desktop !default;
  351 +
  352 +
  353 +//== Navbar
  354 +//
  355 +//##
  356 +
  357 +// Basics of a navbar
  358 +$navbar-height: 50px !default;
  359 +$navbar-margin-bottom: $line-height-computed !default;
  360 +$navbar-border-radius: $border-radius-base !default;
  361 +$navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default;
  362 +$navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default;
  363 +$navbar-collapse-max-height: 340px !default;
  364 +
  365 +$navbar-default-color: white !default;
  366 +$navbar-default-bg: #2c3e50 !default;
  367 +$navbar-default-border: lighten($navbar-default-bg, 6.5%) !default;
  368 +
  369 +// Navbar links
  370 +$navbar-default-link-color: white !default;
  371 +$navbar-default-link-hover-color: #333 !default;
  372 +$navbar-default-link-hover-bg: transparent !default;
  373 +$navbar-default-link-active-color: #555 !default;
  374 +$navbar-default-link-active-bg: darken($navbar-default-bg, 6.5%) !default;
  375 +$navbar-default-link-disabled-color: #ccc !default;
  376 +$navbar-default-link-disabled-bg: transparent !default;
  377 +
  378 +// Navbar brand label
  379 +$navbar-default-brand-color: $navbar-default-link-color !default;
  380 +$navbar-default-brand-hover-color: darken($navbar-default-brand-color, 10%) !default;
  381 +$navbar-default-brand-hover-bg: transparent !default;
  382 +
  383 +// Navbar toggle
  384 +$navbar-default-toggle-hover-bg: #ddd !default;
  385 +$navbar-default-toggle-icon-bar-bg: #888 !default;
  386 +$navbar-default-toggle-border-color: #ddd !default;
  387 +
  388 +
  389 +// Inverted navbar
  390 +// Reset inverted navbar basics
  391 +$navbar-inverse-color: lighten($gray-light, 15%) !default;
  392 +$navbar-inverse-bg: #222 !default;
  393 +$navbar-inverse-border: darken($navbar-inverse-bg, 10%) !default;
  394 +
  395 +// Inverted navbar links
  396 +$navbar-inverse-link-color: lighten($gray-light, 15%) !default;
  397 +$navbar-inverse-link-hover-color: #fff !default;
  398 +$navbar-inverse-link-hover-bg: transparent !default;
  399 +$navbar-inverse-link-active-color: $navbar-inverse-link-hover-color !default;
  400 +$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 10%) !default;
  401 +$navbar-inverse-link-disabled-color: #444 !default;
  402 +$navbar-inverse-link-disabled-bg: transparent !default;
  403 +
  404 +// Inverted navbar brand label
  405 +$navbar-inverse-brand-color: $navbar-inverse-link-color !default;
  406 +$navbar-inverse-brand-hover-color: #fff !default;
  407 +$navbar-inverse-brand-hover-bg: transparent !default;
  408 +
  409 +// Inverted navbar toggle
  410 +$navbar-inverse-toggle-hover-bg: #333 !default;
  411 +$navbar-inverse-toggle-icon-bar-bg: #fff !default;
  412 +$navbar-inverse-toggle-border-color: #333 !default;
  413 +
  414 +
  415 +//== Navs
  416 +//
  417 +//##
  418 +
  419 +//=== Shared nav styles
  420 +$nav-link-padding: 10px 15px !default;
  421 +$nav-link-hover-bg: $gray-lighter !default;
  422 +
  423 +$nav-disabled-link-color: $gray-light !default;
  424 +$nav-disabled-link-hover-color: $gray-light !default;
  425 +
  426 +//== Tabs
  427 +$nav-tabs-border-color: #ddd !default;
  428 +
  429 +$nav-tabs-link-hover-border-color: $gray-lighter !default;
  430 +
  431 +$nav-tabs-active-link-hover-bg: $body-bg !default;
  432 +$nav-tabs-active-link-hover-color: $gray !default;
  433 +$nav-tabs-active-link-hover-border-color: #ddd !default;
  434 +
  435 +$nav-tabs-justified-link-border-color: #ddd !default;
  436 +$nav-tabs-justified-active-link-border-color: $body-bg !default;
  437 +
  438 +//== Pills
  439 +$nav-pills-border-radius: $border-radius-base !default;
  440 +$nav-pills-active-link-hover-bg: $component-active-bg !default;
  441 +$nav-pills-active-link-hover-color: $component-active-color !default;
  442 +
  443 +
  444 +//== Pagination
  445 +//
  446 +//##
  447 +
  448 +$pagination-color: $link-color !default;
  449 +$pagination-bg: #fff !default;
  450 +$pagination-border: #ddd !default;
  451 +
  452 +$pagination-hover-color: $link-hover-color !default;
  453 +$pagination-hover-bg: $gray-lighter !default;
  454 +$pagination-hover-border: #ddd !default;
  455 +
  456 +$pagination-active-color: #fff !default;
  457 +$pagination-active-bg: $brand-primary !default;
  458 +$pagination-active-border: $brand-primary !default;
  459 +
  460 +$pagination-disabled-color: $gray-light !default;
  461 +$pagination-disabled-bg: #fff !default;
  462 +$pagination-disabled-border: #ddd !default;
  463 +
  464 +
  465 +//== Pager
  466 +//
  467 +//##
  468 +
  469 +$pager-bg: $pagination-bg !default;
  470 +$pager-border: $pagination-border !default;
  471 +$pager-border-radius: 15px !default;
  472 +
  473 +$pager-hover-bg: $pagination-hover-bg !default;
  474 +
  475 +$pager-active-bg: $pagination-active-bg !default;
  476 +$pager-active-color: $pagination-active-color !default;
  477 +
  478 +$pager-disabled-color: $pagination-disabled-color !default;
  479 +
  480 +
  481 +//== Jumbotron
  482 +//
  483 +//##
  484 +
  485 +$jumbotron-padding: 30px !default;
  486 +$jumbotron-color: inherit !default;
  487 +$jumbotron-bg: $gray-lighter !default;
  488 +$jumbotron-heading-color: inherit !default;
  489 +$jumbotron-font-size: ceil(($font-size-base * 1.5)) !default;
  490 +
  491 +
  492 +//== Form states and alerts
  493 +//
  494 +//## Define colors for form feedback states and, by default, alerts.
  495 +
  496 +$state-success-text: #3c763d !default;
  497 +$state-success-bg: #dff0d8 !default;
  498 +$state-success-border: darken(adjust-hue($state-success-bg, -10), 5%) !default;
  499 +
  500 +$state-info-text: #31708f !default;
  501 +$state-info-bg: #d9edf7 !default;
  502 +$state-info-border: darken(adjust-hue($state-info-bg, -10), 7%) !default;
  503 +
  504 +$state-warning-text: #8a6d3b !default;
  505 +$state-warning-bg: #fcf8e3 !default;
  506 +$state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%) !default;
  507 +
  508 +$state-danger-text: #a94442 !default;
  509 +$state-danger-bg: #f2dede !default;
  510 +$state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) !default;
  511 +
  512 +
  513 +//== Tooltips
  514 +//
  515 +//##
  516 +
  517 +//** Tooltip max width
  518 +$tooltip-max-width: 200px !default;
  519 +//** Tooltip text color
  520 +$tooltip-color: #fff !default;
  521 +//** Tooltip background color
  522 +$tooltip-bg: #000 !default;
  523 +$tooltip-opacity: .9 !default;
  524 +
  525 +//** Tooltip arrow width
  526 +$tooltip-arrow-width: 5px !default;
  527 +//** Tooltip arrow color
  528 +$tooltip-arrow-color: $tooltip-bg !default;
  529 +
  530 +
  531 +//== Popovers
  532 +//
  533 +//##
  534 +
  535 +//** Popover body background color
  536 +$popover-bg: #fff !default;
  537 +//** Popover maximum width
  538 +$popover-max-width: 276px !default;
  539 +//** Popover border color
  540 +$popover-border-color: rgba(0,0,0,.2) !default;
  541 +//** Popover fallback border color
  542 +$popover-fallback-border-color: #ccc !default;
  543 +
  544 +//** Popover title background color
  545 +$popover-title-bg: darken($popover-bg, 3%) !default;
  546 +
  547 +//** Popover arrow width
  548 +$popover-arrow-width: 10px !default;
  549 +//** Popover arrow color
  550 +$popover-arrow-color: $popover-bg !default;
  551 +
  552 +//** Popover outer arrow width
  553 +$popover-arrow-outer-width: ($popover-arrow-width + 1) !default;
  554 +//** Popover outer arrow color
  555 +$popover-arrow-outer-color: fade_in($popover-border-color, 0.05) !default;
  556 +//** Popover outer arrow fallback color
  557 +$popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%) !default;
  558 +
  559 +
  560 +//== Labels
  561 +//
  562 +//##
  563 +
  564 +//** Default label background color
  565 +$label-default-bg: $gray-light !default;
  566 +//** Primary label background color
  567 +$label-primary-bg: $brand-primary !default;
  568 +//** Success label background color
  569 +$label-success-bg: $brand-success !default;
  570 +//** Info label background color
  571 +$label-info-bg: $brand-info !default;
  572 +//** Warning label background color
  573 +$label-warning-bg: $brand-warning !default;
  574 +//** Danger label background color
  575 +$label-danger-bg: $brand-danger !default;
  576 +
  577 +//** Default label text color
  578 +$label-color: #fff !default;
  579 +//** Default text color of a linked label
  580 +$label-link-hover-color: #fff !default;
  581 +
  582 +
  583 +//== Modals
  584 +//
  585 +//##
  586 +
  587 +//** Padding applied to the modal body
  588 +$modal-inner-padding: 15px !default;
  589 +
  590 +//** Padding applied to the modal title
  591 +$modal-title-padding: 15px !default;
  592 +//** Modal title line-height
  593 +$modal-title-line-height: $line-height-base !default;
  594 +
  595 +//** Background color of modal content area
  596 +$modal-content-bg: #fff !default;
  597 +//** Modal content border color
  598 +$modal-content-border-color: rgba(0,0,0,.2) !default;
  599 +//** Modal content border color **for IE8**
  600 +$modal-content-fallback-border-color: #999 !default;
  601 +
  602 +//** Modal backdrop background color
  603 +$modal-backdrop-bg: #000 !default;
  604 +//** Modal backdrop opacity
  605 +$modal-backdrop-opacity: .5 !default;
  606 +//** Modal header border color
  607 +$modal-header-border-color: #e5e5e5 !default;
  608 +//** Modal footer border color
  609 +$modal-footer-border-color: $modal-header-border-color !default;
  610 +
  611 +$modal-lg: 900px !default;
  612 +$modal-md: 600px !default;
  613 +$modal-sm: 300px !default;
  614 +
  615 +
  616 +//== Alerts
  617 +//
  618 +//## Define alert colors, border radius, and padding.
  619 +
  620 +$alert-padding: 15px !default;
  621 +$alert-border-radius: $border-radius-base !default;
  622 +$alert-link-font-weight: bold !default;
  623 +
  624 +$alert-success-bg: $state-success-bg !default;
  625 +$alert-success-text: $state-success-text !default;
  626 +$alert-success-border: $state-success-border !default;
  627 +
  628 +$alert-info-bg: $state-info-bg !default;
  629 +$alert-info-text: $state-info-text !default;
  630 +$alert-info-border: $state-info-border !default;
  631 +
  632 +$alert-warning-bg: $state-warning-bg !default;
  633 +$alert-warning-text: $state-warning-text !default;
  634 +$alert-warning-border: $state-warning-border !default;
  635 +
  636 +$alert-danger-bg: $state-danger-bg !default;
  637 +$alert-danger-text: $state-danger-text !default;
  638 +$alert-danger-border: $state-danger-border !default;
  639 +
  640 +
  641 +//== Progress bars
  642 +//
  643 +//##
  644 +
  645 +//** Background color of the whole progress component
  646 +$progress-bg: #f5f5f5 !default;
  647 +//** Progress bar text color
  648 +$progress-bar-color: #fff !default;
  649 +//** Variable for setting rounded corners on progress bar.
  650 +$progress-border-radius: $border-radius-base !default;
  651 +
  652 +//** Default progress bar color
  653 +$progress-bar-bg: $brand-primary !default;
  654 +//** Success progress bar color
  655 +$progress-bar-success-bg: $brand-success !default;
  656 +//** Warning progress bar color
  657 +$progress-bar-warning-bg: $brand-warning !default;
  658 +//** Danger progress bar color
  659 +$progress-bar-danger-bg: $brand-danger !default;
  660 +//** Info progress bar color
  661 +$progress-bar-info-bg: $brand-info !default;
  662 +
  663 +
  664 +//== List group
  665 +//
  666 +//##
  667 +
  668 +//** Background color on `.list-group-item`
  669 +$list-group-bg: #fff !default;
  670 +//** `.list-group-item` border color
  671 +$list-group-border: #ddd !default;
  672 +//** List group border radius
  673 +$list-group-border-radius: $border-radius-base !default;
  674 +
  675 +//** Background color of single list items on hover
  676 +$list-group-hover-bg: #f5f5f5 !default;
  677 +//** Text color of active list items
  678 +$list-group-active-color: $component-active-color !default;
  679 +//** Background color of active list items
  680 +$list-group-active-bg: $component-active-bg !default;
  681 +//** Border color of active list elements
  682 +$list-group-active-border: $list-group-active-bg !default;
  683 +//** Text color for content within active list items
  684 +$list-group-active-text-color: lighten($list-group-active-bg, 40%) !default;
  685 +
  686 +//** Text color of disabled list items
  687 +$list-group-disabled-color: $gray-light !default;
  688 +//** Background color of disabled list items
  689 +$list-group-disabled-bg: $gray-lighter !default;
  690 +//** Text color for content within disabled list items
  691 +$list-group-disabled-text-color: $list-group-disabled-color !default;
  692 +
  693 +$list-group-link-color: #555 !default;
  694 +$list-group-link-hover-color: $list-group-link-color !default;
  695 +$list-group-link-heading-color: #333 !default;
  696 +
  697 +
  698 +//== Panels
  699 +//
  700 +//##
  701 +
  702 +$panel-bg: #fff !default;
  703 +$panel-body-padding: 15px !default;
  704 +$panel-heading-padding: 10px 15px !default;
  705 +$panel-footer-padding: $panel-heading-padding !default;
  706 +$panel-border-radius: $border-radius-base !default;
  707 +
  708 +//** Border color for elements within panels
  709 +$panel-inner-border: #ddd !default;
  710 +$panel-footer-bg: #f5f5f5 !default;
  711 +
  712 +$panel-default-text: $gray-dark !default;
  713 +$panel-default-border: #ddd !default;
  714 +$panel-default-heading-bg: #f5f5f5 !default;
  715 +
  716 +$panel-primary-text: #fff !default;
  717 +$panel-primary-border: $brand-primary !default;
  718 +$panel-primary-heading-bg: $brand-primary !default;
  719 +
  720 +$panel-success-text: $state-success-text !default;
  721 +$panel-success-border: $state-success-border !default;
  722 +$panel-success-heading-bg: $state-success-bg !default;
  723 +
  724 +$panel-info-text: $state-info-text !default;
  725 +$panel-info-border: $state-info-border !default;
  726 +$panel-info-heading-bg: $state-info-bg !default;
  727 +
  728 +$panel-warning-text: $state-warning-text !default;
  729 +$panel-warning-border: $state-warning-border !default;
  730 +$panel-warning-heading-bg: $state-warning-bg !default;
  731 +
  732 +$panel-danger-text: $state-danger-text !default;
  733 +$panel-danger-border: $state-danger-border !default;
  734 +$panel-danger-heading-bg: $state-danger-bg !default;
  735 +
  736 +
  737 +//== Thumbnails
  738 +//
  739 +//##
  740 +
  741 +//** Padding around the thumbnail image
  742 +$thumbnail-padding: 4px !default;
  743 +//** Thumbnail background color
  744 +$thumbnail-bg: $body-bg !default;
  745 +//** Thumbnail border color
  746 +$thumbnail-border: #ddd !default;
  747 +//** Thumbnail border radius
  748 +$thumbnail-border-radius: $border-radius-base !default;
  749 +
  750 +//** Custom text color for thumbnail captions
  751 +$thumbnail-caption-color: $text-color !default;
  752 +//** Padding around the thumbnail caption
  753 +$thumbnail-caption-padding: 9px !default;
  754 +
  755 +
  756 +//== Wells
  757 +//
  758 +//##
  759 +
  760 +$well-bg: #f5f5f5 !default;
  761 +$well-border: darken($well-bg, 7%) !default;
  762 +
  763 +
  764 +//== Badges
  765 +//
  766 +//##
  767 +
  768 +$badge-color: #fff !default;
  769 +//** Linked badge text color on hover
  770 +$badge-link-hover-color: #fff !default;
  771 +$badge-bg: $gray-light !default;
  772 +
  773 +//** Badge text color in active nav link
  774 +$badge-active-color: $link-color !default;
  775 +//** Badge background color in active nav link
  776 +$badge-active-bg: #fff !default;
  777 +
  778 +$badge-font-weight: bold !default;
  779 +$badge-line-height: 1 !default;
  780 +$badge-border-radius: 10px !default;
  781 +
  782 +
  783 +//== Breadcrumbs
  784 +//
  785 +//##
  786 +
  787 +$breadcrumb-padding-vertical: 8px !default;
  788 +$breadcrumb-padding-horizontal: 15px !default;
  789 +//** Breadcrumb background color
  790 +$breadcrumb-bg: #f5f5f5 !default;
  791 +//** Breadcrumb text color
  792 +$breadcrumb-color: #ccc !default;
  793 +//** Text color of current page in the breadcrumb
  794 +$breadcrumb-active-color: $gray-light !default;
  795 +//** Textual separator for between breadcrumb elements
  796 +$breadcrumb-separator: "/" !default;
  797 +
  798 +
  799 +//== Carousel
  800 +//
  801 +//##
  802 +
  803 +$carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default;
  804 +
  805 +$carousel-control-color: #fff !default;
  806 +$carousel-control-width: 15% !default;
  807 +$carousel-control-opacity: .5 !default;
  808 +$carousel-control-font-size: 20px !default;
  809 +
  810 +$carousel-indicator-active-bg: #fff !default;
  811 +$carousel-indicator-border-color: #fff !default;
  812 +
  813 +$carousel-caption-color: #fff !default;
  814 +
  815 +
  816 +//== Close
  817 +//
  818 +//##
  819 +
  820 +$close-font-weight: bold !default;
  821 +$close-color: #000 !default;
  822 +$close-text-shadow: 0 1px 0 #fff !default;
  823 +
  824 +
  825 +//== Code
  826 +//
  827 +//##
  828 +
  829 +$code-color: #c7254e !default;
  830 +$code-bg: #f9f2f4 !default;
  831 +
  832 +$kbd-color: #fff !default;
  833 +$kbd-bg: #333 !default;
  834 +
  835 +$pre-bg: #f5f5f5 !default;
  836 +$pre-color: $gray-dark !default;
  837 +$pre-border-color: #ccc !default;
  838 +$pre-scrollable-max-height: 340px !default;
  839 +
  840 +
  841 +//== Type
  842 +//
  843 +//##
  844 +
  845 +//** Horizontal offset for forms and lists.
  846 +$component-offset-horizontal: 180px !default;
  847 +//** Text muted color
  848 +$text-muted: $gray-light !default;
  849 +//** Abbreviations and acronyms border color
  850 +$abbr-border-color: $gray-light !default;
  851 +//** Headings small color
  852 +$headings-small-color: $gray-light !default;
  853 +//** Blockquote small color
  854 +$blockquote-small-color: $gray-light !default;
  855 +//** Blockquote font size
  856 +$blockquote-font-size: ($font-size-base * 1.25) !default;
  857 +//** Blockquote border color
  858 +$blockquote-border-color: $gray-lighter !default;
  859 +//** Page header border color
  860 +$page-header-border-color: $gray-lighter !default;
  861 +//** Width of horizontal description list titles
  862 +$dl-horizontal-offset: $component-offset-horizontal !default;
  863 +//** Horizontal line color.
  864 +$hr-border: $gray-lighter !default;
public/designs/themes/noosfero-responsive/favicon.ico 0 → 120000
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +../base-responsive/favicon.ico
0 \ No newline at end of file 2 \ No newline at end of file
public/designs/themes/noosfero-responsive/footer.html.erb 0 → 120000
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +../base-responsive/footer.html.erb
0 \ No newline at end of file 2 \ No newline at end of file
public/designs/themes/noosfero-responsive/icons 0 → 120000
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +../base-responsive/icons
0 \ No newline at end of file 2 \ No newline at end of file
public/designs/themes/noosfero-responsive/images/logo-noosfero-raw.png 0 → 100644

6.21 KB

public/designs/themes/noosfero-responsive/images/logo-noosfero.xcf 0 → 100644
No preview for this file type
public/designs/themes/noosfero-responsive/images/thin-logo.png 0 → 100644

5.96 KB

public/designs/themes/noosfero-responsive/images/thin-logo.xcf 0 → 100644
No preview for this file type
public/designs/themes/noosfero-responsive/imgs 0 → 120000
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +../base-responsive/imgs
0 \ No newline at end of file 2 \ No newline at end of file
public/designs/themes/noosfero-responsive/navigation.html.erb 0 → 120000
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +../base-responsive/navigation.html.erb
0 \ No newline at end of file 2 \ No newline at end of file
public/designs/themes/noosfero-responsive/site_title.html.erb 0 → 120000
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +../base-responsive/site_title.html.erb
0 \ No newline at end of file 2 \ No newline at end of file
public/designs/themes/noosfero-responsive/style.scss 0 → 100644
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
  1 +// bootstrap customizations, bootstrap
  2 +// see also plugins/responsive/public/bootstrap/all.scss
  3 +@import 'bootstrap/variables';
  4 +@import 'bootstrap-core';
  5 +
  6 +// say to base-responsive that we already took care of boostrap
  7 +$bootstrap-loaded: true;
  8 +
  9 +@import '../base-responsive/style';
  10 +
public/designs/themes/noosfero-responsive/theme.yml 0 → 100644
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +name: "Noosfero responsive some Bootstrap styling"
  2 +layout: "application-responsive"
  3 +icon_theme: [awesome, pidgin]
  4 +responsive: true
  5 +
public/stylesheets/application.css
@@ -2024,9 +2024,6 @@ a.button.disabled, input.disabled { @@ -2024,9 +2024,6 @@ a.button.disabled, input.disabled {
2024 .new_link_row li { 2024 .new_link_row li {
2025 margin-left: 7px; 2025 margin-left: 7px;
2026 } 2026 }
2027 -#content .link-list-block {  
2028 - padding: 10px 0px 10px 10px;  
2029 -}  
2030 .link-list-block ul { 2027 .link-list-block ul {
2031 padding: 0px; 2028 padding: 0px;
2032 margin: 0px; 2029 margin: 0px;