Bläddra i källkod

Merge pull request #1454 from aragonc/1.11.x

fix announcements slider with texts - refs BT#7683
Alex Aragon Calixto 8 år sedan
förälder
incheckning
cf082dca10
2 ändrade filer med 20 tillägg och 13 borttagningar
  1. 10 9
      app/Resources/public/css/base.css
  2. 10 4
      main/template/default/announcement/slider.tpl

+ 10 - 9
app/Resources/public/css/base.css

@@ -171,7 +171,6 @@ header{
 #carousel-announcement .carousel-control.right, #carousel-announcement .carousel-control.left{
     background-image: none;
 }
-
 #carousel-announcement .left{
   left: 0px;
 }
@@ -181,18 +180,24 @@ header{
 #carousel-announcement .carousel-indicators li{
   width: 20px;
   height: 20px;
-  background-color: #fff;
+  background-color: #ddd;
   margin: 0px 15px 0px 0px;
   position: relative;
 }
 #carousel-announcement .carousel-indicators .active{
-  background: #C52D2F;
+  background: #2C5B8E;
+}
+.carousel-control{
+ width: 5%;   
+}
+.carousel-content .block-text{
+    padding-left: 7%;
+    padding-right: 7%;
+    min-height: 300px;
 }
-
 .panelSliders {
   margin: 20px 0;
 }
-
 .panelSliders .ui-slider-handle {
   border-color: #000;
 }
@@ -201,7 +206,6 @@ header{
   margin: 25px auto;
   text-align: center;
 }
-
 #notice_block p, #notice-block p{
     color: #666;
     font-size: 12px;
@@ -1170,18 +1174,15 @@ a.unread {
     -moz-transform: scale(0.6);
     -o-transform: scale(0.6);
 }
-
 .clip_horizontal {
     position:absolute;
     clip:rect(0px 218px 155px 0px);
     top:-25px;
     left:-48px;
-
     -webkit-transform: scale(0.6);
     -moz-transform: scale(0.6);
     -o-transform: scale(0.6);
 }
-
 .social-plugin-item {
     float:left;
     width:50%;

+ 10 - 4
main/template/default/announcement/slider.tpl

@@ -16,11 +16,17 @@
               {{ announcement.title }}
           </div>
           <div class="carousel-content">
-              {{ announcement.content }}
+              {% if announcement.readMore %}
+                <div class="block-text">
+                    {{ announcement.content }}
+                    <a href="{{ _p.web }}news_list.php?id={{ announcement.id }}">{{ "More" | get_lang }}</a>
+                </div>
+              {% else %}  
+                <div class="block-image">
+                    {{ announcement.content }}
+                </div>
+              {% endif %}
           </div>
-            {% if announcement.readMore %}
-                <a href="{{ _p.web }}news_list.php?id={{ announcement.id }}">{{ "More" | get_lang }}</a>
-            {% endif %}
         </div>
     {% endfor %}
   </div>