Download as
Browse Code »

Commit 61abd4ff60762c91dc077c87272adc3339264c76

Authored by Daniel Cunha
Committed by Daniela Feitosa
1 parent ac098d93
Exists in master and in 28 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_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Adding LinkListBlock to acceptable center blocks

Showing 2 changed files with 28 additions and 7 deletions   Show diff stats
app/models/box.rb
  Diff comments   View file @61abd4f
... ... @@ -10,7 +10,10 @@ class Box < ActiveRecord::Base
10 10 private
11 11  
12 12 def acceptable_center_blocks
13   - %w{ MainBlock }
  13 + %w{
  14 + MainBlock
  15 + LinkListBlock
  16 + }
14 17 end
15 18  
16 19 def acceptable_side_blocks
... ...
public/designs/themes/base/style.css
  Diff comments   View file @61abd4f
... ... @@ -588,33 +588,51 @@ div#notice {
588 588 display: none;
589 589 }
590 590  
  591 +#content .box-1 .link-list-block {
  592 + margin: 0px;
  593 +}
  594 +
591 595 #content .link-list-block li {
592 596 background: #FFF;
593 597 padding: 0px;
594 598 margin: 5px 0px;
595 599 }
596 600  
  601 +#content .box-1 .link-list-block li {
  602 + display: inline-block;
  603 +}
  604 +
597 605 #content .link-list-block li a {
598 606 font-size: 14px;
599 607 line-height: 24px;
600 608 color: #000;
601 609 background-color: #EEE;
602 610 background-position: 4px 50%;
603   - -moz-border-radius: 4px;
604   - -webkit-border-radius: 4px;
  611 + border-radius: 4px;
  612 +}
  613 +
  614 +#content .box-1 .link-list-block li a {
  615 + padding-left: 25px;
  616 + padding-right: 10px;
  617 + margin-right: 5px;
  618 + background-position: 5px 50%;
605 619 }
606 620  
607 621 #content .link-list-block li a.link-this-page {
608   - -moz-border-radius-topright: 0px;
609   - -moz-border-radius-bottomright: 0px;
610   - -webkit-border-radius-topright: 0px;
611   - -webkit-border-radius-bottomright: 0px;
  622 + border-radius-topright: 0px;
  623 + border-radius-bottomright: 0px;
612 624 background-color: #cecece;
613 625 max-width: 175px;
614 626 width: 200px;
615 627 border-right: 2px solid #555753;
616 628 }
617 629  
  630 +#content .box-1 .link-list-block li a.link-this-page {
  631 + width: auto;
  632 + border: none;
  633 + border-radius: 4px;
  634 +}
  635 +
618 636 #content .link-list-block li a:hover {
619 637 background-color: #555753;
620 638 color: #FFF;
... ...