Download as
Browse Code »

Commit bc60b10677085364a40520063bbaba685ced0594

Authored by Antonio Terceiro
1 parent af477137
Exists in master and in 25 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

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.
Showing 10 changed files with 8 additions and 16 deletions   Show diff stats
app/helpers/boxes_helper.rb
  Diff comments   View file @bc60b10
@@ -122,7 +122,7 @@ module BoxesHelper @@ -122,7 +122,7 @@ module BoxesHelper
122 end 122 end
123 123
124 def wrap_main_content(content) 124 def wrap_main_content(content)
125 - (1..8).to_a.reverse.inject(content) { |acc,n| content_tag('div', acc, :id => 'main-content-wrapper-' + n.to_s) } 125 + content_tag('div', content, :class => 'main-content')
126 end 126 end
127 127
128 def extract_block_content(content) 128 def extract_block_content(content)
public/designs/themes/base/imgs/content-bg-L.png
View file @af47713

154 Bytes
public/designs/themes/base/imgs/content-bg-N.png
View file @af47713

156 Bytes
public/designs/themes/base/imgs/content-bg-NL.png
View file @af47713

228 Bytes
public/designs/themes/base/imgs/content-bg-NO.png
View file @af47713

214 Bytes
public/designs/themes/base/imgs/content-bg-O.png
View file @af47713

153 Bytes
public/designs/themes/base/imgs/content-bg-S.png
View file @af47713

156 Bytes
public/designs/themes/base/imgs/content-bg-SL.png
View file @af47713

216 Bytes
public/designs/themes/base/imgs/content-bg-SO.png
View file @af47713

217 Bytes
public/designs/themes/base/style.css
  Diff comments   View file @bc60b10
@@ -293,22 +293,14 @@ body, th, td, input { @@ -293,22 +293,14 @@ body, th, td, input {
293 293
294 /************************** main content *****************************/ 294 /************************** main content *****************************/
295 295
296 -#main-content-wrapper-1, #main-content-wrapper-2,  
297 -#main-content-wrapper-3, #main-content-wrapper-4,  
298 -#main-content-wrapper-5, #main-content-wrapper-6,  
299 -#main-content-wrapper-7, #main-content-wrapper-8 {  
300 - position: relative;  
301 -} 296 +.main-content {
  297 + border-style: solid;
  298 + border-color: #babdb6;
  299 + border-width: 1px;
  300 + border-radius: 10px;
  301 +
  302 + box-shadow: 1px 1px 2px #888888;
302 303
303 -#main-content-wrapper-1 { background: url(imgs/content-bg-N.png) 0% 0% repeat-x }  
304 -#main-content-wrapper-2 { background: url(imgs/content-bg-S.png) 0% 100% repeat-x }  
305 -#main-content-wrapper-3 { background: url(imgs/content-bg-L.png) 100% 0% repeat-y }  
306 -#main-content-wrapper-4 { background: url(imgs/content-bg-O.png) 0% 0% repeat-y }  
307 -#main-content-wrapper-5 { background: url(imgs/content-bg-NL.png) 100% 0% no-repeat }  
308 -#main-content-wrapper-6 { background: url(imgs/content-bg-NO.png) 0% 0% no-repeat }  
309 -#main-content-wrapper-7 { background: url(imgs/content-bg-SL.png) 100% 100% no-repeat }  
310 -#main-content-wrapper-8 { background: url(imgs/content-bg-SO.png) 0% 100% no-repeat }  
311 -#main-content-wrapper-8 {  
312 padding: 10px 20px; 304 padding: 10px 20px;
313 } 305 }
314 306