Commit 61abd4ff60762c91dc077c87272adc3339264c76
Committed by
Daniela Feitosa
1 parent
ac098d93
Exists in
master
and in
29 other branches
Adding LinkListBlock to acceptable center blocks
Showing
2 changed files
with
28 additions
and
7 deletions
Show diff stats
app/models/box.rb
| @@ -10,7 +10,10 @@ class Box < ActiveRecord::Base | @@ -10,7 +10,10 @@ class Box < ActiveRecord::Base | ||
| 10 | private | 10 | private |
| 11 | 11 | ||
| 12 | def acceptable_center_blocks | 12 | def acceptable_center_blocks |
| 13 | - %w{ MainBlock } | 13 | + %w{ |
| 14 | + MainBlock | ||
| 15 | + LinkListBlock | ||
| 16 | + } | ||
| 14 | end | 17 | end |
| 15 | 18 | ||
| 16 | def acceptable_side_blocks | 19 | def acceptable_side_blocks |
public/designs/themes/base/style.css
| @@ -588,33 +588,51 @@ div#notice { | @@ -588,33 +588,51 @@ div#notice { | ||
| 588 | display: none; | 588 | display: none; |
| 589 | } | 589 | } |
| 590 | 590 | ||
| 591 | +#content .box-1 .link-list-block { | ||
| 592 | + margin: 0px; | ||
| 593 | +} | ||
| 594 | + | ||
| 591 | #content .link-list-block li { | 595 | #content .link-list-block li { |
| 592 | background: #FFF; | 596 | background: #FFF; |
| 593 | padding: 0px; | 597 | padding: 0px; |
| 594 | margin: 5px 0px; | 598 | margin: 5px 0px; |
| 595 | } | 599 | } |
| 596 | 600 | ||
| 601 | +#content .box-1 .link-list-block li { | ||
| 602 | + display: inline-block; | ||
| 603 | +} | ||
| 604 | + | ||
| 597 | #content .link-list-block li a { | 605 | #content .link-list-block li a { |
| 598 | font-size: 14px; | 606 | font-size: 14px; |
| 599 | line-height: 24px; | 607 | line-height: 24px; |
| 600 | color: #000; | 608 | color: #000; |
| 601 | background-color: #EEE; | 609 | background-color: #EEE; |
| 602 | background-position: 4px 50%; | 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 | #content .link-list-block li a.link-this-page { | 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 | background-color: #cecece; | 624 | background-color: #cecece; |
| 613 | max-width: 175px; | 625 | max-width: 175px; |
| 614 | width: 200px; | 626 | width: 200px; |
| 615 | border-right: 2px solid #555753; | 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 | #content .link-list-block li a:hover { | 636 | #content .link-list-block li a:hover { |
| 619 | background-color: #555753; | 637 | background-color: #555753; |
| 620 | color: #FFF; | 638 | color: #FFF; |