Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fix on wall resize

  • Loading branch information...
commit 1c3918e70f3484a86ce2461c76640e8414c41dd5 1 parent b1c9e4f
@diegocarrera diegocarrera authored
View
19 app/assets/stylesheets/application.css.scss
@@ -99,6 +99,7 @@
.attachment_thumb{visibility:hidden; width: 0px; height: 0px;}
.unborder{border-radius: 0px;}
+.miniborder{border-radius: 5px;}
/************* SEARCH_BAR *************/
@@ -269,6 +270,7 @@
.space_double_center { padding-top: 50px; padding-right: 4px; text-align: center;}
.space_right{padding-right: 20px;}
.space_left{padding-left: 20px;}
+.space_both{padding-left: 15px; padding-right: 10px;}
.space_top{padding-top: 20px;}
@@ -307,12 +309,13 @@
#form #document_file{ opacity: 0; -moz-transition: border 0.2s linear 0s, box-shadow 0.2s linear 0s; width: 200px;}
#home_wall div.root_activity {width: 100%}
-#home_wall li.activity_content {width:85%}
+#home_wall li.activity_content {width:83%}
#home wall li.subactivity {width:100%}
.subactivity{width: 100%;}
-#profile_wall li.activity_content {width: 345px}
-#profile_wall div.root_activity {width: 455px}
+#profile_wall div.root_activity {width: 100%}
+#profile_wall li.activity_content {width: 83%}
+
/***************** ACTIVITY OPTIONS ***/
@@ -366,6 +369,7 @@
.tittle_mens {margin-bottom:4px;}
.dat {margin-left: 15px !important}
.to-r {float: right; width: 15px; height: 15px;}
+
/**************suggestions css *************/
.users_btn_follow input[type="submit"] {
@@ -381,7 +385,8 @@
-moz-opacity: .60;
filter:alpha(opacity=60);
}
- .users_btn_follow input {
+
+.users_btn_follow input {
-webkit-box-shadow: inset 0 0px 0px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 0px 0px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 0px 0px rgba(0, 0, 0, 0.075);
@@ -398,7 +403,7 @@
-moz-box-shadow: inset 0 0px 0px rgba(0, 0, 0, 0.075), 0 0 8px rgba(255, 100, 100, 0.6);
box-shadow: inset 0 0px 0px rgba(0, 0, 0, 0.075), 0 0 8px rgba(255, 100, 100, 0.6);
outline: thin dotted ;
- }
+}
.header_text {
font-size: 16px;
@@ -480,6 +485,10 @@
.input-xlarge {
height: 18px
}
+.input-fluid {
+ height: 18px;
+ width: 98%;
+}
.devise_title{
text-align:right;
font-size: 45px;
View
4 app/views/activities/_child.html.erb
@@ -2,11 +2,11 @@
<ul class="thumbnails">
<li class="span space_left">
<%= link_to image_tag(activity.sender_subject.logo.url(:actor),
- :alt => activity.sender_subject.name),
+ :alt => activity.sender_subject.name, :class => "miniborder"),
activity.sender_subject %>
</li>
<li class="span activity_content">
- <div class="caption elipsis">
+ <div class="caption">
<span><%= link_to(activity.sender_subject.name, activity.sender_subject) %> <%= render activity.activity_objects %></span>
<span>
<%= render :partial => 'activities/options',
View
12 app/views/comments/_new.html.erb
@@ -1,8 +1,8 @@
<% if user_signed_in? && current_subject.can_comment?(activity) %>
- <ul class="activity_new_comment boxy_gray thumbnails span4">
- <li class="span activity_content">
- <div class="caption span4">
- <h4 class="span size11">
+ <ul class="activity_new_comment boxy_gray thumbnails">
+ <li class="span subactivity">
+ <div class="caption input-fluid">
+ <h4 class="span size11 row-fluid-90">
<%= form_for Comment.new(:text => t('comment.input'),
:owner_id => Actor.normalize_id(activity.receiver),
:_activity_parent_id => activity.id),
@@ -12,10 +12,10 @@
<%= f.hidden_field :owner_id %>
<%= f.hidden_field :_activity_parent_id %>
<div class="input_new_comments_container">
- <%= f.text_area :text, :class =>"input_new_comments input-xlarge focused", :id => "comment_text_"+dom_id(activity), :rows=>"1" %>
+ <%= f.text_area :text, :class =>"input_new_comments input-fluid focused", :id => "comment_text_"+dom_id(activity), :rows=>"1" %>
<div class="copy_new_comment" id="copy_comment_text_<%= dom_id(activity) %>"></div>
</div>
- <div class="pagination-right">
+ <div class="pagination-right input-fluid">
<div class="activities_security"></div>
<%= f.submit t('activity.to_comment'), :class =>"myButtonBlue submitActivity", :id => "comment_submit_"+dom_id(activity) %>
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.