Fixing positions

* addThis * blog-feed-link * article-actions

Fixing positions
* addThis * blog-feed-link * article-actions
Rodrigo Souto · Antonio Terceiro
1 parent 3fe538f1
Showing 4 changed files with 35 additions and 49 deletions Show diff stats
app/views/content_viewer/blog_page.rhtml
app/views/content_viewer/view_page.rhtml
public/designs/themes/base/style.css
public/stylesheets/application.css
@@ -3,7 +3,6 @@
 <%= 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? %>
 <div>
-  <%= link_to(image_tag('icons-mime/rss-feed.png'), article.feed.url, :class => 'blog-feed-link') if article.blog? && article.feed %>
   <div class='blog-description'>
     <%= article.body %>
   </div>
@@ -6,26 +6,9 @@
 <div id="article">
-<%
-  # AddThis Button
-  if block_given? && web2_conf['addthis']
-      opts = web2_conf['addthis']
-%>
-<div id="addThis">
-<script type="text/javascript">
-  addthis_brand = '<%= escape_javascript( @environment.name ) %>';
-<%=
-  str = ''
-  opts.each { |k, v|
-    str += '  addthis_'+ k +' = "'+ escape_javascript( v ) +"\";\n"
-  }
-  str
-%></script>
-<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>
-</div>
-<% end %>
 <div<%= " class='logged-in'" if user %>>
+  <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.blog? && @page.feed %>
   <%= article_title(@page, :no_link => true) %>
   <div id="article-actions">
     <% if @page.allow_post_content?(user) %>
@@ -69,6 +52,7 @@
   </div>
 </div>
+
 <% if !@page.tags.empty? %>
   <div id="article-tags">
     <%= _("This article's tags:") %>
@@ -115,6 +99,25 @@
 </div>
 <% end %>
+<%
+  # AddThis Button
+  if block_given? && web2_conf['addthis']
+      opts = web2_conf['addthis']
+%>
+<div id="addThis">
+<script type="text/javascript">
+  addthis_brand = '<%= escape_javascript( @environment.name ) %>';
+<%=
+  str = ''
+  opts.each { |k, v|
+    str += '  addthis_'+ k +' = "'+ escape_javascript( v ) +"\";\n"
+  }
+  str
+%></script>
+<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>
+</div>
+<% end %>
+
 <div class="comments">
   <a name="comments_list"></a>
   <% if @page.accept_comments? %>
@@ -966,6 +966,14 @@ hr.pre-posts, hr.sep-posts {
   display: none;
 }
+.blog-feed-link {
+  float: right;
+  margin-left: 5px;
+  position: absolute;
+  right: 0px;
+  top: -2px;
+}
+
 .blog-post {
   background: url(imgs/blog-sep.png) repeat-x;
   padding: 15px 20px 5px 20px;
@@ -976,10 +984,6 @@ hr.pre-posts, hr.sep-posts {
   margin-top: 25px;
 }
-#article-actions {
-  top: -28px;
-}
-
 #article-actions a.button,
 #article-actions a.button:hover {
   border: none;
@@ -990,10 +994,8 @@ hr.pre-posts, hr.sep-posts {
   color: #555753;
 }
-#bt_addThis {
-  position: absolute;
-  top: -15px;
-  right: 0px;
+#addThis {
+  text-align: right;
 }
 #content .blog-post .title {
@@ -1019,7 +1021,6 @@ hr.pre-posts, hr.sep-posts {
 }
 #article-tags {
-  float: right;
   color: #FFF;
 }
 #article-tags a {
@@ -969,8 +969,8 @@ code input {
 #article-actions {
   position: absolute;
-  top: -25px;
-  right: -17px;
+  top: 1px;
+  right: 20px;
   padding-right: 15px;
 }
@@ -1143,8 +1143,6 @@ a.comment-picture {
   margin-bottom: -5px;
 }
 #bt_addThis {
-  float: right;
-  margin: 0px;
 }
 #addthis_dropdown15 table td {
@@ -1234,16 +1232,6 @@ a.comment-picture {
   font-size: small;
 }
-.blog-feed-link {
-  float: right;
-}
-
-.blog-description {
-  margin-right: 30px;
-}
-
-
-
 a.button, a.button:visited,
 body.noosfero a.button, body.noosfero a.button:visited,
 input.button {
@@ -1802,12 +1790,8 @@ input.disabled {
    Use article.css for article related css
 */
-.main-block .main-block h1 {
-  overflow: hidden;
-}
-
-.main-block .article-body {
-  overflow-x: auto;
+.main-block, .main-block h1{
+  overflow: visible;
 }
 body div#activation_enterprise {
@@ -2003,7 +1987,6 @@ div#activation_enterprise div {
 .profile-info-picture img {
   border: none;
   padding: 2px;
-  background: #FFF;
 }
 .profile-info-picture .sex-male,
	@@ -3,7 +3,6 @@		@@ -3,7 +3,6 @@
3	<%= 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? %>	3	<%= 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? %>
4		4
5	<div>	5	<div>
6	- <%= link_to(image_tag('icons-mime/rss-feed.png'), article.feed.url, :class => 'blog-feed-link') if article.blog? && article.feed %>
7	<div class='blog-description'>	6	<div class='blog-description'>
8	<%= article.body %>	7	<%= article.body %>
9	</div>	8	</div>