Merge branch 'fix_lefttopright_template' into 'master'

Make lefttopright only use CSS Add a solution that uses only CSS See merge request !651

Merge branch 'fix_lefttopright_template' into 'master'
Make lefttopright only use CSS Add a solution that uses only CSS See merge request !651
Daniela Feitosa
2 parents 23a10a5f f74749e0
Showing 2 changed files with 20 additions and 33 deletions Show diff stats
public/designs/templates/lefttopright/javascripts/template.js
public/designs/templates/lefttopright/stylesheets/style.css
@@ -1,6 +0,0 @@
-$(document).ready(function() {
-  var box_4_height = $(".box-4").height();
-
-  // Make box-2(the most left one) stay align with box-4
-  $(".box-2").css("margin-top", "-"+box_4_height+"px");
-});
 #boxes {
-  display: table;
   width: 100%;
+  height: 100%;
 }
-.box-1 {
-  width: 58%;
-  float: left;
-  margin: 1% 1% 0% 1%;
+.box-4 {
+  position: relative;
+  float: right;
+  width: 78.5%;
+  max-height: 400px;
+  overflow: hidden;
+  margin-left: 1%;
 }
-
-.box-2 {
+.box-3 {
+  width: 20.5%;
+  height: 100%;
+  min-height: 410px;
   position: relative;
   float: left;
-  width: 20%;
 }
-.box-3 {
+.box-2 {
   position: relative;
   float: right;
-  width: 20%;
+  width: 20.5%;
   margin-top: 1%;
 }
-.box-4 {
-  float: left;
-  width: 79%;
-  margin-left: 21%;
-}
-
-#profile-activity ul,
-#profile-network ul,
-#profile-wall ul {
-  width: 460px;
-}
-#profile-activity ul.comment-replies,
-#profile-network ul.comment-replies,
-#profile-wall ul.comment-replies {
-  width: auto;
-}
-
+.box-1 {
+  position: relative;
+  float: right;
+  width: 57%;
+  margin: 1% 1% 0% 1%;
+}
 \ No newline at end of file
	@@ -1,6 +0,0 @@	@@ -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	-});