Download as
Browse Code »

Commit 1cc6c42276a2c2bcc1faad02c7693fd1f77f647a

Authored by Daniela Feitosa
2 parents 23a10a5f f74749e0
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

Merge branch 'fix_lefttopright_template' into 'master' 

Make lefttopright only use CSS

Add a solution that uses only CSS

See merge request !651
Showing 2 changed files with 20 additions and 33 deletions   Show diff stats
public/designs/templates/lefttopright/javascripts/template.js
View file @23a10a5
... ... @@ -1,6 +0,0 @@
1   -$(document).ready(function() {
2   - var box_4_height = $(".box-4").height();
3   -
4   - // Make box-2(the most left one) stay align with box-4
5   - $(".box-2").css("margin-top", "-"+box_4_height+"px");
6   -});
public/designs/templates/lefttopright/stylesheets/style.css
  Diff comments   View file @1cc6c42
1 1 #boxes {
2   - display: table;
3 2 width: 100%;
  3 + height: 100%;
4 4 }
5 5  
6   -.box-1 {
7   - width: 58%;
8   - float: left;
9   - margin: 1% 1% 0% 1%;
  6 +.box-4 {
  7 + position: relative;
  8 + float: right;
  9 + width: 78.5%;
  10 + max-height: 400px;
  11 + overflow: hidden;
  12 + margin-left: 1%;
10 13 }
11 14  
12   -
13   -.box-2 {
  15 +.box-3 {
  16 + width: 20.5%;
  17 + height: 100%;
  18 + min-height: 410px;
14 19 position: relative;
15 20 float: left;
16   - width: 20%;
17 21 }
18 22  
19   -.box-3 {
  23 +.box-2 {
20 24 position: relative;
21 25 float: right;
22   - width: 20%;
  26 + width: 20.5%;
23 27 margin-top: 1%;
24 28 }
25 29  
26   -.box-4 {
27   - float: left;
28   - width: 79%;
29   - margin-left: 21%;
30   -}
31   -
32   -#profile-activity ul,
33   -#profile-network ul,
34   -#profile-wall ul {
35   - width: 460px;
36   -}
37   -#profile-activity ul.comment-replies,
38   -#profile-network ul.comment-replies,
39   -#profile-wall ul.comment-replies {
40   - width: auto;
41   -}
42   -
  30 +.box-1 {
  31 + position: relative;
  32 + float: right;
  33 + width: 57%;
  34 + margin: 1% 1% 0% 1%;
  35 +}
43 36 \ No newline at end of file
... ...