[Git][noosfero/noosfero][master] 2 commits: Make lefttopright only use CSS

[Daniela Feitosa]

Daniela Feitosa pushed to branch master at Noosfero / noosfero


Commits:
f74749e0 by Fabio Teixeira at 2015-08-11T10:15:31Z
Make lefttopright only use CSS

Signed-off-by: Fabio Teixeira <fabio1079 at gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra at gmail.com>

- - - - -
1cc6c422 by Daniela Feitosa at 2015-08-19T14:06:58Z
Merge branch 'fix_lefttopright_template' into 'master'

Make lefttopright only use CSS

Add a solution that uses only CSS

See merge request !651

- - - - -


2 changed files:

- − public/designs/templates/lefttopright/javascripts/template.js
- public/designs/templates/lefttopright/stylesheets/style.css


Changes:

=====================================
public/designs/templates/lefttopright/javascripts/template.js deleted
=====================================
--- a/public/designs/templates/lefttopright/javascripts/template.js
+++ /dev/null
@@ -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");
-});


=====================================
public/designs/templates/lefttopright/stylesheets/style.css
=====================================
--- a/public/designs/templates/lefttopright/stylesheets/style.css
+++ b/public/designs/templates/lefttopright/stylesheets/style.css
@@ -1,42 +1,35 @@
 #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



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/23a10a5ff709427c76e0d7fa48263a77985cc7b4...1cc6c42276a2c2bcc1faad02c7693fd1f77f647a
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150819/cc591069/attachment.html>