Download as
Browse Code »

Commit 58b9716d6982694f9a341a4826ac5f6922148da8

Authored by Aurelio A. Heckert
Committed by Antonio Terceiro
1 parent ec400745
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem1050: new generation layout

Showing 18 changed files with 264 additions and 87 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @58b9716
... ... @@ -2,6 +2,12 @@
2 2 # available in all controllers.
3 3 class ApplicationController < ActionController::Base
4 4  
  5 + include ApplicationHelper
  6 + layout :get_layout
  7 + def get_layout
  8 + theme_option(:layout) || 'application'
  9 + end
  10 +
5 11 filter_parameter_logging :password
6 12  
7 13 def log_processing
... ...
app/helpers/application_helper.rb
  Diff comments   View file @58b9716
... ... @@ -290,7 +290,12 @@ module ApplicationHelper
290 290 if in_theme
291 291 result << theme_path
292 292 end
293   - result << '/stylesheets/' << name << '.css'
  293 + name += '.css' if ( name[-4..-1] != '.css' )
  294 + if ( name[0..0] == '/' )
  295 + result << name
  296 + else
  297 + result << '/stylesheets/' << name
  298 + end
294 299 end
295 300  
296 301 def theme_path
... ... @@ -301,6 +306,10 @@ module ApplicationHelper
301 306 end
302 307 end
303 308  
  309 + def theme_stylesheet_path
  310 + theme_path + '/style.css'
  311 + end
  312 +
304 313 def current_theme
305 314 return session[:theme] if (session[:theme])
306 315 p = profile
... ... @@ -311,13 +320,21 @@ module ApplicationHelper
311 320 end
312 321 end
313 322  
314   - def theme_footer
315   - footer = ('../../public' + theme_path + '/footer.rhtml')
316   - if File.exists?(RAILS_ROOT + '/app/views/' + footer)
317   - render :file => footer
  323 + def theme_include(template)
  324 + file = ('../../public' + theme_path + '/' + template + '.rhtml')
  325 + if File.exists?(RAILS_ROOT + '/app/views/' + file)
  326 + render :file => file
318 327 end
319 328 end
320 329  
  330 + def theme_header
  331 + theme_include('header')
  332 + end
  333 +
  334 + def theme_footer
  335 + theme_include('footer')
  336 + end
  337 +
321 338 def is_testing_theme
322 339 !@controller.session[:theme].nil?
323 340 end
... ... @@ -727,13 +744,16 @@ module ApplicationHelper
727 744 end
728 745 end
729 746  
730   - def template_stylesheet_tag
  747 + def template_stylesheet_path
731 748 if profile.nil?
732   - stylesheet_link_tag '/designs/templates/default/stylesheets/style.css'
  749 + '/designs/templates/default/stylesheets/style.css'
733 750 else
734   - stylesheet_link_tag "/designs/templates/#{profile.layout_template}/stylesheets/style.css"
  751 + "/designs/templates/#{profile.layout_template}/stylesheets/style.css"
735 752 end
736 753 end
  754 + def template_stylesheet_tag
  755 + stylesheet_import template_stylesheet_path()
  756 + end
737 757  
738 758 def login_url
739 759 options = Noosfero.url_options.merge({ :controller => 'account', :action => 'login' })
... ... @@ -770,9 +790,11 @@ module ApplicationHelper
770 790 end
771 791  
772 792 def meta_tags_for_article(article)
773   - if article and (article.blog? or (article.parent and article.parent.blog?))
774   - blog = article.blog? ? article : article.parent
775   - "<link rel='alternate' type='application/rss+xml' title='#{blog.feed.title}' href='#{url_for blog.feed.url}' />"
  793 + if @controller.controller_name == 'content_viewer'
  794 + if article and (article.blog? or (article.parent and article.parent.blog?))
  795 + blog = article.blog? ? article : article.parent
  796 + "<link rel='alternate' type='application/rss+xml' title='#{blog.feed.title}' href='#{url_for blog.feed.url}' />"
  797 + end
776 798 end
777 799 end
778 800  
... ... @@ -789,14 +811,40 @@ module ApplicationHelper
789 811 end
790 812 end
791 813  
792   - def icon_theme_stylesheet_tag
  814 + def icon_theme_stylesheet_path
793 815 theme_path = "/designs/icons/#{environment.icon_theme}/style.css"
794 816 if File.exists?(File.join(RAILS_ROOT, 'public', theme_path))
795   - stylesheet_link_tag theme_path
  817 + theme_path
796 818 else
797   - "<!-- Not included: #{stylesheet_link_tag theme_path} -->\n" +
798   - stylesheet_link_tag("/designs/icons/default/style.css")
  819 + '/designs/icons/default/style.css'
799 820 end
800 821 end
801 822  
  823 + def icon_theme_stylesheet_tag
  824 + theme_path = "/designs/icons/#{environment.icon_theme}/style.css"
  825 + stylesheet_import icon_theme_stylesheet_path()
  826 + end
  827 +
  828 + def page_title
  829 + (@page ? @page.name + ' - ' : '') +
  830 + (@profile ? @profile.name + ' - ' : '') +
  831 + @environment.name +
  832 + (@category ? "&rarr; #{@category.full_name}" : '')
  833 + end
  834 +
  835 + def noosfero_javascript
  836 + render :file => 'layouts/_javascript'
  837 + end
  838 +
  839 + def import_controller_stylesheets(options = {})
  840 + stylesheet_import( "controller_"+ @controller.controller_name(), options )
  841 + end
  842 +
  843 + def pngfix_stylesheet_path
  844 + 'iepngfix/iepngfix.css'
  845 + end
  846 + def pngfix_stylesheet
  847 + stylesheet_import pngfix_stylesheet_path()
  848 + end
  849 +
802 850 end
... ...
app/helpers/blog_helper.rb
  Diff comments   View file @58b9716
... ... @@ -21,14 +21,20 @@ module BlogHelper
21 21 :next_label => _('Older posts &raquo;')
22 22 })
23 23 content = []
24   - articles.map{ |i|
25   - css_add = ''
26   - if i.published? || (user==i.profile)
27   - css_add = '-not-published' if !i.published?
28   - content << content_tag('div', display_post(i), :class => 'blog-post' + css_add, :id => "post-#{i.id}")
  24 + artic_len = articles.length
  25 + articles.each_with_index{ |art,i|
  26 + css_add = [ 'position-'+(i+1).to_s() ]
  27 + if art.published? || (user==art.profile)
  28 + css_add << 'first' if i == 0
  29 + css_add << 'last' if i == (artic_len-1)
  30 + css_add << 'not-published' if !art.published?
  31 + content << content_tag('div',
  32 + display_post(art),
  33 + :class => 'blog-post ' + css_add.join(' '),
  34 + :id => "post-#{art.id}")
29 35 end
30 36 }
31   - content.join("\n<hr />\n") + (pagination or '')
  37 + content.join("\n<hr class='sep-posts'/>\n") + (pagination or '')
32 38 end
33 39  
34 40 def display_post(article)
... ...
app/helpers/boxes_helper.rb
  Diff comments   View file @58b9716
1 1 module BoxesHelper
2 2  
  3 + def insert_boxes(content)
  4 + if @controller.send(:boxes_editor?)
  5 + content + display_boxes_editor(@controller.boxes_holder)
  6 + else
  7 + if @controller.send(:uses_design_blocks?)
  8 + display_boxes(@controller.boxes_holder, content)
  9 + else
  10 + content_tag('div', content, :class => 'no-boxes')
  11 + end
  12 + end
  13 + end
  14 +
3 15 def box_decorator
4 16 @box_decorator || DontMoveBlocks
5 17 end
... ... @@ -204,10 +216,9 @@ module BoxesHelper
204 216 @controller.boxes_holder.boxes.map(&:blocks).inject([]){|ac, a| ac + a}
205 217 end
206 218  
207   - def import_blocks_stylesheets
208   - blocks_css_files = current_blocks.map{|b|'blocks/' + b.css_class_name}.uniq
209   - stylesheet_import(blocks_css_files) + "\n" +
210   - stylesheet_import(blocks_css_files, :themed_source => true )
  219 + def import_blocks_stylesheets(options = {})
  220 + @blocks_css_files ||= current_blocks.map{|b|'blocks/' + b.css_class_name}.uniq
  221 + stylesheet_import(@blocks_css_files, options)
211 222 end
212 223  
213 224 end
... ...
app/views/cms/_blog.rhtml
  Diff comments   View file @58b9716
1 1 <%= error_messages_for 'blog' %>
2 2  
3   -<h3><%= _('My Blog') %></h3>
  3 +<h1><%= _('My Blog') %></h1>
4 4  
5 5 <%= render :file => 'shared/tiny_mce' %>
6 6  
... ...
app/views/content_viewer/blog_page.rhtml
  Diff comments   View file @58b9716
1 1 <%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if article.blog? && article.external_feed && article.external_feed.enabled && article.external_feed.fetched_at.nil? %>
2 2  
3 3 <div><%= article.body %></div>
4   -<hr/>
  4 +<hr class="pre-posts"/>
5 5 <div class="blog-posts">
6 6 <%= (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(user, children)) %>
7 7 </div>
... ...
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @58b9716
... ... @@ -17,7 +17,7 @@
17 17 }
18 18 str
19 19 %></script>
20   -<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]', '<%= escape_javascript( @environment.name()+' :: '+@page.title ) %>')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
  20 +<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
21 21 </div>
22 22 <% end; end %>
23 23  
... ...
app/views/layouts/_javascript.rhtml 0 → 100644
  Diff comments   View file @58b9716
... ... @@ -0,0 +1,12 @@
  1 +<%= javascript_include_tag 'default-config' %>
  2 +<%= javascript_include_tag :defaults %>
  3 +<%= javascript_include_tag 'jquery-latest.js' %>
  4 +<script type="text/javascript">
  5 + jQuery.noConflict();
  6 +</script>
  7 +<%= javascript_include_tag 'thickbox.js' %>
  8 +
  9 +<%= javascript_include_tag 'menu' %>
  10 +<%= javascript_include_tag 'auto-open-menu' %>
  11 +<%= include_lightbox_header %>
  12 +<%= javascript_include_tag 'cms' if @controller.controller_name == 'cms' %>
... ...
app/views/layouts/application-ng.rhtml 0 → 100644
  Diff comments   View file @58b9716
... ... @@ -0,0 +1,105 @@
  1 +<html>
  2 + <head>
  3 + <title><%= page_title %></title>
  4 + <%= meta_tags_for_article(@page) %>
  5 + <!--<meta http-equiv="refresh" content="1"/>-->
  6 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  7 + <%= noosfero_javascript %>
  8 + <%= import_blocks_stylesheets %>
  9 + <%= import_controller_stylesheets %>
  10 + <%= stylesheet_import(
  11 + %w( common help menu article button search ),
  12 + %w( blocks forms login-box thickbox profiles),
  13 + template_stylesheet_path(),
  14 + icon_theme_stylesheet_path(),
  15 + theme_stylesheet_path(),
  16 + pngfix_stylesheet_path()
  17 + ) %>
  18 + </head>
  19 + <body class="<%=
  20 + # Identify the current controller and action for the CSS:
  21 + " controller-"+ @controller.controller_name() +
  22 + " action-"+ @controller.controller_name() +"-"+ @controller.action_name() +
  23 + " template-"+ ( profile.nil? ? "default" : profile.layout_template )
  24 + %>" onresize="registerDocumentSize()">
  25 + <script type="text/javascript">
  26 + /* Adds a class to "msie" to the body element if a Microsoft browser is
  27 + * detected. This is needed to workaround several of their limitations.
  28 + */
  29 + if ( navigator.appVersion.indexOf("MSIE") > -1 ) {
  30 + document.body.className += " msie msie" +
  31 + navigator.appVersion.replace(/^.*MSIE\s+([0-9]+).*$/, "$1");
  32 + }
  33 + function registerDocumentSize() {
  34 + document.body.className = document.body.className
  35 + .replace(/(^| )docSize.+( |$)/g, " ");
  36 + for ( var x=100; x<=1500; x+=100 ) {
  37 + if ( document.body.clientWidth > x ) {
  38 + document.body.className += " docSize-GT-" + x;
  39 + } else {
  40 + document.body.className += " docSize-LT-" + x;
  41 + }
  42 + }
  43 + }
  44 + registerDocumentSize();
  45 + </script>
  46 +
  47 + <a href="#content" id="link-go-content"><span>Ir para o conteúdo</span></a>
  48 +
  49 + <div id="wrap-1">
  50 + <div id='theme-header'>
  51 + <%= theme_header %>
  52 + </div>
  53 + <div id="wrap-2">
  54 + <div id="user">
  55 + <% if logged_in? %>
  56 + <%= _('Welcome, %s.') % link_to('<i></i><strong>' + user.identifier + '</strong>', user.url, :id => "homepage-link", :title => _('Go to your homepage')) %>
  57 + <%= link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', user.admin_url, :id => "controlpanel", :title => _("Configure the system")) %>
  58 + <%= link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', user.admin_url, :id => "controlpanel", :title => _("Configure your personal account and content")) %>
  59 + <%= link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system")) %>
  60 + <% else %>
  61 + <%= _('%s or %s') % [thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', 'inlineLoginBox', :id => 'link_login', :help => _('Click here to enter your username and password and be recognized by the system.')), link_to('<strong>' + _('Register') + '</strong>', :controller => 'account', :action => 'signup') ] %>
  62 + <div id='inlineLoginBox' style='display: none;'>
  63 + <%= render :file => 'account/login' %>
  64 + <center><%= thickbox_close_button _('Close') %></center>
  65 + </div>
  66 + <% end %>
  67 +
  68 + <form action="/search" class="search_form" method="get" class="clean">
  69 + <input name="query" size="15" value="<%=_('Search...')%>"
  70 + onfocus="this.form.className='focused';
  71 + if(this.value=='<%=_('Search...')%>'){this.value=''}"
  72 + onblur="this.form.className='';
  73 + if(/^\s*$/.test(this.value)){
  74 + this.value='<%=_('Search...')%>';
  75 + this.form.className='clean'
  76 + }" />
  77 + <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
  78 + </form>
  79 + </div><!-- end id="user" -->
  80 +
  81 + <h1 id="site-title">
  82 + <a href="http://softwarelivre.org"><span> Title of the Site </span></a>
  83 + </h1>
  84 + <div id="navigation">
  85 + <ul>
  86 + <li><%= link_to '<span class="icon-menu-people">' + _('People') + '</span>',
  87 + '/assets/people', :id=>'people' %></li>
  88 + <li><%= link_to '<span class="icon-menu-community">' + _('Communities') + '</span>',
  89 + '/assets/communities', :id=>'communities' %></li>
  90 + <li><%= link_to '<span class="icon-menu-events">' + _('Events') + '</span>',
  91 + '/assets/events', :id=>'events' %></li>
  92 + </ul>
  93 + <div id="navigation-end"></div>
  94 + </div><!-- end id="navigation" -->
  95 + <div id="content">
  96 + <%= insert_boxes(yield) %>
  97 + <br style='clear: both'/>
  98 + </div><!-- end id="content" -->
  99 + </div><!-- end id="wrap-2" -->
  100 + </div><!-- end id="wrap-1" -->
  101 + <div id="theme-footer">
  102 + <%= theme_footer %>
  103 + </div><!-- end id="theme-footer" -->
  104 + </body>
  105 +</html>
... ...
app/views/layouts/application.rhtml
  Diff comments   View file @58b9716
1 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2 2 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>">
3 3 <head>
4   - <title><%=
5   - (@page ? @page.name + ' - ' : '') +
6   - (@profile ? @profile.name + ' - ' : '') +
7   - @environment.name +
8   - (@category ? "&rarr; #{@category.full_name}" : '')
9   - %></title>
  4 + <title><%= page_title %></title>
10 5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
11 6 <meta name="description" content="FIXME: Descriptions of Noosfero" />
12 7 <meta name="keywords" content="Noosfero, Community, Open Source" />
13 8 <link rel="shortcut icon" href="<%= '/designs/themes/' + current_theme + '/images/favicon.ico' %>" type="image/x-icon" />
14   - <%= meta_tags_for_article(@page) if @controller.controller_name == 'content_viewer' %>
15   - <%= javascript_include_tag 'default-config' %>
16   - <%= javascript_include_tag :defaults %>
17   - <%# javascript_include_tag 'animator' %>
  9 + <!-- ok --><%= meta_tags_for_article(@page) %>
18 10  
19   - <%= javascript_include_tag 'jquery-latest.js' %>
20   - <script type="text/javascript">
21   - jQuery.noConflict();
22   - </script>
23   - <%= javascript_include_tag 'thickbox.js' %>
24   -
25   - <%= javascript_include_tag 'menu' %>
26   - <%= javascript_include_tag 'auto-open-menu' %>
27   - <%= include_lightbox_header %>
28   - <%= javascript_include_tag 'cms' if @controller.controller_name == 'cms' %>
  11 + <%= noosfero_javascript %>
29 12 <%= theme_javascript %>
30 13  
31 14 <%#
... ... @@ -39,16 +22,17 @@
39 22 stylesheet_import( %w( common help menu article button search blocks forms login-box ),
40 23 :themed_source => true ) + "\n" +
41 24 # Load the boxes's css file if each exists:
42   - import_blocks_stylesheets +
  25 + import_blocks_stylesheets + "\n" +
  26 + import_blocks_stylesheets(:themed_source => true) + "\n" +
43 27 # Load the controller's css file if it exists:
44   - stylesheet_import( "controller_"+ @controller.controller_name() ) + "\n" +
45   - stylesheet_import( "controller_"+ @controller.controller_name(), :themed_source => true )
  28 + import_controller_stylesheets + "\n" +
  29 + import_controller_stylesheets(:themed_source => true)
46 30 %>
47 31  
48 32 <%= template_stylesheet_tag %>
49 33 <%= icon_theme_stylesheet_tag %>
50 34  
51   - <%= stylesheet_link_tag 'iepngfix/iepngfix.css' %>
  35 + <%= pngfix_stylesheet %>
52 36 </head>
53 37  
54 38 <body class='noosfero category<%= category_color %><%=
... ... @@ -146,18 +130,7 @@
146 130 <div id="header_content">
147 131 </div>
148 132  
149   - <% if @controller.send(:boxes_editor?) %>
150   - <%= yield %>
151   - <%= display_boxes_editor(@controller.boxes_holder) %>
152   - <% else %>
153   - <% if uses_design_blocks? %>
154   - <%= display_boxes(@controller.boxes_holder, yield) %>
155   - <% else %>
156   - <div class='no-boxes'>
157   - <%= yield %>
158   - </div>
159   - <% end %>
160   - <% end %>
  133 + <%= insert_boxes(yield) %>
161 134  
162 135 </div><!-- id="content" -->
163 136 <div id="footer_content"><!-- Rodape do Conteudo -->
... ...
app/views/profile_editor/index.rhtml
  Diff comments   View file @58b9716
1   -<h1 class='control-panel-title'><%= _('Control Panel') %> &mdash; <%= profile.name %></h1>
  1 +<div id="profile-editor-index">
  2 +
  3 + <h1 class="block-title">
  4 + <span class='control-panel-title'><%= profile.name %></span>
  5 + <span class='control-panel-sep'>&#150;</span>
  6 + <span class='control-panel-subtitle'><%= _('Control Panel') %></span>
  7 + </h1>
2 8  
3 9 <%= render :partial => 'pending_tasks' %>
4 10  
... ... @@ -60,3 +66,5 @@
60 66 <% end %>
61 67  
62 68 </div>
  69 +
  70 +</div>
... ...
public/designs/themes/noosfero/stylesheets/common.css
  Diff comments   View file @58b9716
... ... @@ -6,7 +6,7 @@ body.noosfero {
6 6 #wrap {
7 7 background-position: 50% 22px;
8 8 background-repeat: repeat-x;
9   - border: 3px solid #2A5896;
  9 + border: 3px solid #888;
10 10 }
11 11  
12 12 .box-3 {
... ... @@ -27,7 +27,7 @@ a:hover, a:active { color: #08F }
27 27  
28 28 hr {
29 29 border: none;
30   - border-top: 2px dotted #2A5896;
  30 + border-top: 2px dotted black;
31 31 }
32 32  
33 33 #footer {
... ...
public/images/top-bar/assets-menu-bg-azul.gif
View file @ec40074

1.25 KB
public/images/top-bar/assets-menu-top-azul.gif
View file @ec40074

92 Bytes
public/stylesheets/article.css
  Diff comments   View file @58b9716
... ... @@ -60,14 +60,14 @@
60 60  
61 61 .article-comment {
62 62 position: relative;
63   - border: 1px solid #B8CFE7;
  63 + border: 1px solid #ccc;
64 64 margin-bottom: 10px;
65 65 padding: 4px;
66 66 }
67 67  
68 68 .comment-from-owner {
69   - border: 1px solid #3465A4;
70   - background: #B8CFE7;
  69 + border: 1px solid #888;
  70 + background: #eee;
71 71 }
72 72  
73 73 #article .article-comment h4 {
... ... @@ -106,7 +106,7 @@ a.comment-picture {
106 106 }
107 107  
108 108 .comment-from-owner .comment-info {
109   - color: #729FCF;
  109 + color: #666;
110 110 }
111 111  
112 112 .comment-text {
... ... @@ -128,18 +128,18 @@ a.comment-picture {
128 128 .post_comment_box h4 {
129 129 padding: 1px 20px;
130 130 margin: 0px;
131   - background: #B8CFE7;
  131 + background: #eee;
132 132 }
133 133  
134 134 .post_comment_box.closed h4 {
135 135 display: inline;
136   - border: 1px solid #729FCF;
  136 + border: 1px solid #888;
137 137 cursor: pointer;
138 138 }
139 139  
140 140 .post_comment_box.opened {
141   - border: 1px solid #729FCF;
142   - background: #B8CFE7;
  141 + border: 1px solid #888;
  142 + background: #eee;
143 143 }
144 144  
145 145 .post_comment_box form {
... ... @@ -238,22 +238,22 @@ a.comment-picture {
238 238  
239 239 /* NOT PUBLISHED BLOG POSTS */
240 240  
241   -.blog-post-not-published {
  241 +.blog-post.not-published {
242 242 background: url(/images/hachure.png);
243 243 opacity: 0.25;
244 244 filter: alpha(opacity=25);
245 245 zoom: 1;
246 246 }
247 247  
248   -.blog-post-not-published a {
  248 +.blog-post.not-published a {
249 249 text-decoration: none;
250 250 }
251 251  
252   -#content .blog-post-not-published .created-at {
  252 +#content .blog-post.not-published .created-at {
253 253 text-align: left;
254 254 }
255 255  
256   -.blog-post-not-published .metadata {
  256 +.blog-post.not-published .metadata {
257 257 display: block;
258 258 text-align: center;
259 259 font-size: small;
... ...
public/stylesheets/button.css
  Diff comments   View file @58b9716
1 1  
2   -body.noosfero a.button,
3   -body.noosfero a.button:visited,
  2 +a.button, a.button:visited,
  3 +body.noosfero a.button, body.noosfero a.button:visited,
4 4 input.button {
5 5 margin: 0px 2px;
6 6 background-repeat: no-repeat;
... ... @@ -27,6 +27,8 @@ input.button {
27 27 padding-right: 4px;
28 28 }
29 29  
  30 +a.button.with-text,
  31 +a.button.with-text:visited,
30 32 body.noosfero a.button.with-text,
31 33 body.noosfero a.button.with-text:visited,
32 34 input.button.with-text {
... ... @@ -43,6 +45,9 @@ input.button.with-text {
43 45 padding: 0px 2px 2px 20px;
44 46 background-position: 3px 50%;
45 47 }
  48 +.msie a.button.with-text,
  49 +.msie a.button.with-text:visited,
  50 +.msie input.button.with-text,
46 51 body.noosfero.msie a.button.with-text,
47 52 body.noosfero.msie a.button.with-text:visited,
48 53 body.noosfero.msie input.button.with-text {
... ... @@ -51,14 +56,17 @@ body.noosfero.msie input.button.with-text {
51 56 line-height: 20px;
52 57 margin: 2px;
53 58 }
  59 +.msie input.button.with-text,
54 60 body.noosfero.msie input.button.with-text {
55 61 line-height: 16px;
56 62 padding: 0px 0px 1px 15px;
57 63 background-position: 2px 50%;
58 64 }
59 65  
  66 +a.button:hover,
60 67 body.noosfero a.button:hover,
61 68 input.button:hover,
  69 +a.button.with-text:hover,
62 70 body.noosfero a.button.with-text:hover,
63 71 input.button.with-text:hover {
64 72 border: 1px solid #678;
... ...
public/stylesheets/common.css
  Diff comments   View file @58b9716
... ... @@ -151,7 +151,7 @@ div#notice {
151 151 #content h1, #content h2, #content h3,
152 152 #content h4, #content h5, #content h6 {
153 153 margin: 10px 0px;
154   - color: #2A5896;
  154 + /*color: #2A5896;*/
155 155 }
156 156 #content h1 { font-size: 24px }
157 157 #content h2 { font-size: 20px }
... ...
public/stylesheets/menu.css
  Diff comments   View file @58b9716
... ... @@ -11,7 +11,7 @@
11 11 height: 22px;
12 12 font-size: 11px;
13 13 letter-spacing: -1px;
14   - background: #2A5896 url(../images/white-pixel.gif) 0px 100% repeat-x;
  14 + background: #888 url(../images/white-pixel.gif) 0px 100% repeat-x;
15 15 }
16 16  
17 17 #navigation_bar {
... ... @@ -135,12 +135,13 @@
135 135 width: 11px;
136 136 height: 11px;
137 137 overflow: hidden;
138   - background: url(../images/top-bar/assets-menu-top-azul.gif);
  138 + /*background: url(../images/top-bar/assets-menu-top-azul.gif);*/
139 139 }
140 140  
141 141 #assets_menu_list {
142 142 padding: 0px 0px 6px 5px;
143   - background: url(../images/top-bar/assets-menu-bg-azul.gif) 0% 100%;
  143 + /*background: url(../images/top-bar/assets-menu-bg-azul.gif) 0% 100%;*/
  144 + background-color: #888;
144 145 }
145 146  
146 147 #assets_menu ul {
... ... @@ -278,8 +279,7 @@
278 279 position: absolute;
279 280 top: 21px;
280 281 right: 0px;
281   - background: url(../images/top-bar/assets-menu-bg-azul.gif) 0% 100%;
282   - border-right: 1px solid #FFF;
  282 + background: #888;
283 283 }
284 284  
285 285 #user_menu ul {
... ...