Download as
Browse Code »

Commit e36907e3c891e04388f2dbb31bbaffffcb25d7c9

Authored by Braulio Bhavamitra
2 parents 7e2ac70a 5d003955
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Merge branch 'rss-icon' into noosfero

Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
app/views/content_viewer/_article_toolbar.html.erb
  Diff comments   View file @e36907e
... ... @@ -62,7 +62,7 @@
62 62 <% if @page.blog? and !@page.image.nil? %>
63 63 <div class="blog-cover"><%= image_tag(@page.image.public_filename())%></div>
64 64 <% end %>
65   - <%= link_to(image_tag('/images/icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
  65 + <%= button_without_text(:feed, _('RSS feed'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
66 66 <%= @plugins.dispatch(:article_header_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %>
67 67 <%= render :partial => 'article_title', :locals => {:no_link => true} %>
68 68 <%= article_translations(@page) %>
... ...
public/designs/icons/tango/style.css
  Diff comments   View file @e36907e
... ... @@ -117,6 +117,9 @@
117 117 .icon-reset-admin-role { background-image: url(../../../images/icons-app/person-icon.png) }
118 118 .icon-clock { background-image: url(Tango/16x16/actions/appointment.png) }
119 119 .icon-fullscreen { background-image: url(Tango/16x16/actions/view-fullscreen.png) }
  120 +.icon-feed,
  121 +.icon-newrss-feed,
  122 +.icon-rss-feed { background-image: url(../../../images/icons-mime/rss-feed-16.png) }
120 123  
121 124 /******************BIG ICONS************************/
122 125 .bigicon-embed { background-image: url(Tango/scalable/apps/utilities-terminal.svg) }
... ...
public/stylesheets/application.css
  Diff comments   View file @e36907e
... ... @@ -3485,9 +3485,6 @@ table.cms-articles .icon:hover {
3485 3485 color: #888a85;
3486 3486 font-size: smaller;
3487 3487 }
3488   -.article-types .icon-newrss-feed, #content .icon-rss-feed {
3489   - background-image: url(../images/icons-mime/rss-feed-16.png);
3490   -}
3491 3488 .article-types a {
3492 3489 text-decoration: none;
3493 3490 color: black;
... ...