[noosfero/noosfero][master] 2 commits: Remove the 8 wrapper divs from the main content

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
bc60b106 by Antonio Terceiro at 2015-06-01T16:45:57Z
Remove the 8 wrapper divs from the main content

It is now replaced with a single div with class 'main-content'.

This *might* break some old themes, but we need to start getting rid of
these absurds at some point.

- - - - -
f9f5164a by Bráulio Bhavamitra at 2015-06-01T21:25:52Z
Merge branch 'remove-8-wrapper-divs' into 'master'

Remove the 8 wrapper divs from the main content

It is now replaced with a single div with class 'main-content'.

This *might* break some old themes, but we need to start getting rid of
these absurds at some point.

See merge request !587

- - - - -


10 changed files:

- app/helpers/boxes_helper.rb
- − public/designs/themes/base/imgs/content-bg-L.png
- − public/designs/themes/base/imgs/content-bg-N.png
- − public/designs/themes/base/imgs/content-bg-NL.png
- − public/designs/themes/base/imgs/content-bg-NO.png
- − public/designs/themes/base/imgs/content-bg-O.png
- − public/designs/themes/base/imgs/content-bg-S.png
- − public/designs/themes/base/imgs/content-bg-SL.png
- − public/designs/themes/base/imgs/content-bg-SO.png
- public/designs/themes/base/style.css


Changes:

=====================================
app/helpers/boxes_helper.rb
=====================================
--- a/app/helpers/boxes_helper.rb
+++ b/app/helpers/boxes_helper.rb
@@ -122,7 +122,7 @@ module BoxesHelper
   end
 
   def wrap_main_content(content)
-    (1..8).to_a.reverse.inject(content) { |acc,n| content_tag('div', acc, :id => 'main-content-wrapper-' + n.to_s) }
+    content_tag('div', content, :class => 'main-content')
   end
 
   def extract_block_content(content)


=====================================
public/designs/themes/base/imgs/content-bg-L.png deleted
=====================================
Binary files a/public/designs/themes/base/imgs/content-bg-L.png and /dev/null differ


=====================================
public/designs/themes/base/imgs/content-bg-N.png deleted
=====================================
Binary files a/public/designs/themes/base/imgs/content-bg-N.png and /dev/null differ


=====================================
public/designs/themes/base/imgs/content-bg-NL.png deleted
=====================================
Binary files a/public/designs/themes/base/imgs/content-bg-NL.png and /dev/null differ


=====================================
public/designs/themes/base/imgs/content-bg-NO.png deleted
=====================================
Binary files a/public/designs/themes/base/imgs/content-bg-NO.png and /dev/null differ


=====================================
public/designs/themes/base/imgs/content-bg-O.png deleted
=====================================
Binary files a/public/designs/themes/base/imgs/content-bg-O.png and /dev/null differ


=====================================
public/designs/themes/base/imgs/content-bg-S.png deleted
=====================================
Binary files a/public/designs/themes/base/imgs/content-bg-S.png and /dev/null differ


=====================================
public/designs/themes/base/imgs/content-bg-SL.png deleted
=====================================
Binary files a/public/designs/themes/base/imgs/content-bg-SL.png and /dev/null differ


=====================================
public/designs/themes/base/imgs/content-bg-SO.png deleted
=====================================
Binary files a/public/designs/themes/base/imgs/content-bg-SO.png and /dev/null differ


=====================================
public/designs/themes/base/style.css
=====================================
--- a/public/designs/themes/base/style.css
+++ b/public/designs/themes/base/style.css
@@ -293,22 +293,14 @@ body, th, td, input {
 
 /************************** main content *****************************/
 
-#main-content-wrapper-1, #main-content-wrapper-2,
-#main-content-wrapper-3, #main-content-wrapper-4,
-#main-content-wrapper-5, #main-content-wrapper-6,
-#main-content-wrapper-7, #main-content-wrapper-8 {
-  position: relative;
-}
+.main-content {
+  border-style: solid;
+  border-color: #babdb6;
+  border-width: 1px;
+  border-radius: 10px;
+
+  box-shadow: 1px 1px 2px #888888;
 
-#main-content-wrapper-1 { background: url(imgs/content-bg-N.png)  0%     0% repeat-x  }
-#main-content-wrapper-2 { background: url(imgs/content-bg-S.png)  0%   100% repeat-x  }
-#main-content-wrapper-3 { background: url(imgs/content-bg-L.png)  100%   0% repeat-y  }
-#main-content-wrapper-4 { background: url(imgs/content-bg-O.png)  0%     0% repeat-y  }
-#main-content-wrapper-5 { background: url(imgs/content-bg-NL.png) 100%   0% no-repeat }
-#main-content-wrapper-6 { background: url(imgs/content-bg-NO.png) 0%     0% no-repeat }
-#main-content-wrapper-7 { background: url(imgs/content-bg-SL.png) 100% 100% no-repeat }
-#main-content-wrapper-8 { background: url(imgs/content-bg-SO.png) 0%   100% no-repeat }
-#main-content-wrapper-8 {
   padding: 10px 20px;
 }
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/55ea73e2e0446bc093aa98310cc06da476865537...f9f5164a20a2ebca419d30af1331af89db2a79fe
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150601/740a3ae6/attachment.html>