Skip to content
This repository has been archived by the owner on Jan 26, 2018. It is now read-only.

Commit

Permalink
Merge pull request #6 from magmodules/development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
Magmodules authored Jun 9, 2017
2 parents e971bca + 824eb0b commit 7a339af
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 62 deletions.
2 changes: 1 addition & 1 deletion app/code/community/Magmodules/Feedbackcompany/etc/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<config>
<modules>
<Magmodules_Feedbackcompany>
<version>1.5.4</version>
<version>1.5.5</version>
</Magmodules_Feedbackcompany>
</modules>
<global>
Expand Down
11 changes: 11 additions & 0 deletions app/design/frontend/base/default/template/magmodules/feedbackcompany/index.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,17 @@ $helper = Mage::helper('feedbackcompany');
</div>
<?php } ?>
</div>

<div class="column">
<?php $questions = $helper->getQuestions($review->getQuestions(), true, 'open'); ?>
<?php foreach ($questions as $question) { ?>
<?php if(!empty($question['answer'])) { ?>
<dt class="title"><?php echo $question['Reviewtitle'] ?></dt>
<dd class="answer"><?php echo $question['answer'] ?></dd>
<?php } ?>
<?php } ?>
</div>

<dl class="dl-feedback">
<?php if ($buyOnline = $review->getBuyOnline()) { ?>
<dt><?php echo $this->__('Buy Online'); ?></dt>
Expand Down
70 changes: 9 additions & 61 deletions skin/frontend/base/default/magmodules/feedbackcompany/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,70 +22,54 @@
justify-content: space-between;
align-items: baseline;
}

.feedbackcompany .page-title h1 {
min-height: 50px;
}

.feedbackcompany .page-title .flexbox-container h1 {
flex-grow: 1;
border-bottom: none;
}

.feedbackcompany .flexbox-container .header-floating-feedbackcompany {
flex-shrink: 0;
}

.feedbackcompany .header-floating-feedbackcompany .button {
padding: 0;
vertical-align: text-bottom;
}

.feedbackcompany .header-floating-feedbackcompany .button span {
padding: 10px 45px 10px 41px;
display: inline-block;
}

.feedbackcompany .total-feedbackcompany {
display: none;
margin-right: 14px;
text-align: right;
}

.feedbackcompany .total-feedbackcompany.total-feedbackcompany-mobile {
display: block;
text-align: center;
margin: 40px 0 30px;
}

.feedbackcompany .total-feedbackcompany .total-block-stars, .feedbackcompany .total-feedbackcompany .total-block-stars-medium {
float: right;
vertical-align: sub;
}

.feedbackcompany .total-feedbackcompany.total-feedbackcompany-mobile .button, .feedbackcompany .total-feedbackcompany.total-feedbackcompany-mobile .total-block-stars {
vertical-align: middle;
}

.feedbackcompany .total-feedbackcompany.total-feedbackcompany-mobile .total-block-stars {
float: none;
margin-top: -8px;
display: inline-block;
}

.feedbackcompany .total-feedbackcompany .total-description {
text-transform: uppercase;
font-size: 10px;
line-height: 22px;
clear: both;
}

.feedbackcompany .about-feedbackcompany {
}

.feedbackcompany .stats-feedbackcompany {
}

.feedbackcompany .about-feedbackcompany {}
.feedbackcompany .stats-feedbackcompany {}
.feedbackcompany .ratingblock-feedbackcompany {
width: 60px;
height: 60px;
Expand All @@ -97,69 +81,62 @@
border: 4px solid white;
box-shadow: 1px 1px 3px #CCCCCC;
}

.feedbackcompany .content-feedbackcompany {
overflow: auto;
width: 100%;
margin-bottom: 5px;
padding-left: 3px;
line-height: 1.7;
}

.feedbackcompany .review-list {
margin-bottom: 25px;
margin-top: 10px;
}

.feedbackcompany .review-list h4 {
font-size: 12px;
border-bottom: 1px solid #E0E0E0;
padding: 6px 3px 10px;
}

.feedbackcompany .review-header {
clear: both;
}

.feedbackcompany .review-content {
padding: 0 3px;
line-height: 2.4;
}

.feedbackcompany .review-content .experience {
margin-bottom: 12px;
}

.feedbackcompany .title {
font-weight: bold;
}
.feedbackcompany .answer {
margin-bottom: 10px;
}
.feedbackcompany ul.overall {
float: right;
}

.feedbackcompany dl {
padding-left: 21px;
}

.feedbackcompany dl:after {
content: "";
display: table;
clear: both;
}

.feedbackcompany dl.summary-index {
line-height: 2.8;
}

.feedbackcompany dl dt {
font-weight: bold;
clear: left;
float: left;
width: 50%;
}

.feedbackcompany dl dd {
float: left;
width: 50%;
}

.feedbackcompany .sprites-icon {
background: url('images/sprites.png') center top no-repeat;
width: 16px;
Expand All @@ -170,24 +147,19 @@
margin-right: -16px;
vertical-align: middle;
}

@media (-webkit-min-device-pixel-ratio: 2), not all, not all, not all, (min-resolution: 192dpi), (min-resolution: 2dppx) {
.feedbackcompany .sprites-icon {
background: url('images/[email protected]') center top no-repeat;
background-size: 16px;
-webkit-transform: translate3d(0, 0, 0);
}

}

.feedbackcompany .sprites-icon.sprites-icon-comment {
background-position: 0 0;
}

.feedbackcompany .sprites-icon.sprites-icon-tick {
background-position: 0 -15px;
}

.feedbackcompany .sprites-icon.sprites-icon-brush {
background-position: 0 -30px;
}
Expand All @@ -207,7 +179,6 @@
border-radius: 10px;
font-style: italic;
}

.company_response:before {
content: "";
position: absolute;
Expand All @@ -219,7 +190,6 @@
display: block;
width: 0;
}

.company_response:after {
content: "";
position: absolute;
Expand All @@ -231,106 +201,84 @@
display: block;
width: 0;
}

.company_response.top:before {
top: -16px;
bottom: auto;
left: 23px;
right: auto;
border-width: 0 16px 16px;
}

.company_response.top:after {
top: -13px;
bottom: auto;
left: 27px;
right: auto;
border-width: 0 13px 13px;
}

@media only screen and (min-width: 600px) {
.feedbackcompany .total-feedbackcompany.total-feedbackcompany-mobile {
display: none;
}

.feedbackcompany .total-feedbackcompany {
display: inline-block;
}

.feedbackcompany .header-floating-feedbackcompany .button {
vertical-align: text-bottom;
}
}

@media only screen and (min-width: 771px) {
.feedbackcompany .total-feedbackcompany {
line-height: 34px;
}

.feedbackcompany .review-content .experience {
margin-bottom: 5px;
line-height: 2;
}

.feedbackcompany .header-floating-feedbackcompany {
padding: 1px 15px;
}

.feedbackcompany .review-list h4 {
padding: 6px 30px 10px;
}

.feedbackcompany .page-title h1 {
padding: 0 15px 20px;
}

.feedbackcompany dl {
padding-left: 0;
}

.feedbackcompany dl.dl-feedback {
margin-bottom: 6px;
margin-bottom: 10px;
}

.feedbackcompany dl.dl-feedback dt {
width: 25%;
}

.feedbackcompany dl.dl-feedback .upper {
line-height: 2.0;
padding-top: 8px;
}

.feedbackcompany dl.dl-feedback dd {
width: 75%;
}

.feedbackcompany dl.summary-index dt {
width: 50%;
}

.feedbackcompany dl.summary-index dd {
width: 50%;
}

.feedbackcompany .summary-index .column {
float: left;
width: 50%;
}

.feedbackcompany .content-feedbackcompany {
padding-left: 15px;
line-height: 1.93;
margin-bottom: 23px;
}

.feedbackcompany .review-content {
padding: 0 30px;
line-height: 2.8;
}

.feedbackcompany .sprites-icon {
left: -24px;
}

}

0 comments on commit 7a339af

Please sign in to comment.