From bc60b10677085364a40520063bbaba685ced0594 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Mon, 1 Jun 2015 16:45:15 -0300 Subject: [PATCH] Remove the 8 wrapper divs from the main content --- app/helpers/boxes_helper.rb | 2 +- public/designs/themes/base/imgs/content-bg-L.png | Bin 154 -> 0 bytes public/designs/themes/base/imgs/content-bg-N.png | Bin 156 -> 0 bytes public/designs/themes/base/imgs/content-bg-NL.png | Bin 228 -> 0 bytes public/designs/themes/base/imgs/content-bg-NO.png | Bin 214 -> 0 bytes public/designs/themes/base/imgs/content-bg-O.png | Bin 153 -> 0 bytes public/designs/themes/base/imgs/content-bg-S.png | Bin 156 -> 0 bytes public/designs/themes/base/imgs/content-bg-SL.png | Bin 216 -> 0 bytes public/designs/themes/base/imgs/content-bg-SO.png | Bin 217 -> 0 bytes public/designs/themes/base/style.css | 22 +++++++--------------- 10 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 public/designs/themes/base/imgs/content-bg-L.png delete mode 100644 public/designs/themes/base/imgs/content-bg-N.png delete mode 100644 public/designs/themes/base/imgs/content-bg-NL.png delete mode 100644 public/designs/themes/base/imgs/content-bg-NO.png delete mode 100644 public/designs/themes/base/imgs/content-bg-O.png delete mode 100644 public/designs/themes/base/imgs/content-bg-S.png delete mode 100644 public/designs/themes/base/imgs/content-bg-SL.png delete mode 100644 public/designs/themes/base/imgs/content-bg-SO.png diff --git a/app/helpers/boxes_helper.rb b/app/helpers/boxes_helper.rb index 917ead3..028e1e1 100644 --- 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) diff --git a/public/designs/themes/base/imgs/content-bg-L.png b/public/designs/themes/base/imgs/content-bg-L.png deleted file mode 100644 index 42986b3..0000000 Binary files a/public/designs/themes/base/imgs/content-bg-L.png and /dev/null differ diff --git a/public/designs/themes/base/imgs/content-bg-N.png b/public/designs/themes/base/imgs/content-bg-N.png deleted file mode 100644 index a54200b..0000000 Binary files a/public/designs/themes/base/imgs/content-bg-N.png and /dev/null differ diff --git a/public/designs/themes/base/imgs/content-bg-NL.png b/public/designs/themes/base/imgs/content-bg-NL.png deleted file mode 100644 index f4715ba..0000000 Binary files a/public/designs/themes/base/imgs/content-bg-NL.png and /dev/null differ diff --git a/public/designs/themes/base/imgs/content-bg-NO.png b/public/designs/themes/base/imgs/content-bg-NO.png deleted file mode 100644 index cacbaf3..0000000 Binary files a/public/designs/themes/base/imgs/content-bg-NO.png and /dev/null differ diff --git a/public/designs/themes/base/imgs/content-bg-O.png b/public/designs/themes/base/imgs/content-bg-O.png deleted file mode 100644 index 630dbc0..0000000 Binary files a/public/designs/themes/base/imgs/content-bg-O.png and /dev/null differ diff --git a/public/designs/themes/base/imgs/content-bg-S.png b/public/designs/themes/base/imgs/content-bg-S.png deleted file mode 100644 index cb70123..0000000 Binary files a/public/designs/themes/base/imgs/content-bg-S.png and /dev/null differ diff --git a/public/designs/themes/base/imgs/content-bg-SL.png b/public/designs/themes/base/imgs/content-bg-SL.png deleted file mode 100644 index cc361ed..0000000 Binary files a/public/designs/themes/base/imgs/content-bg-SL.png and /dev/null differ diff --git a/public/designs/themes/base/imgs/content-bg-SO.png b/public/designs/themes/base/imgs/content-bg-SO.png deleted file mode 100644 index 5acb8d5..0000000 Binary files a/public/designs/themes/base/imgs/content-bg-SO.png and /dev/null differ diff --git a/public/designs/themes/base/style.css b/public/designs/themes/base/style.css index e431bcf..b737daf 100644 --- 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; } -- libgit2 0.21.2