Merge branch 'custom-carousel-color' into 'master'

Add custom carousel text color functionality

See merge request !2

static/css/style.css

@@ -181,6 +181,14 @@ time.icon span {
 	max-height: 500px;
 }
 
+.carousel-text-dark {
+	color: #000;
+}
+
+.carousel-text-light {
+	color: #fff;
+}
+
 .button-wrapper {
 	text-align: center;
 }

templates/page_with_carousel.html

@@ -5,10 +5,11 @@
         <div class="carousel-inner">
             {% for item in page.images %}
                 {% set image = item.split('|') %}
+		{% set text = image[0].split(';;') %}
                     <div class="item {% if loop.first %} active {% endif %}">
-                        <img class="center-block carousel-image" src="{{ image[1] }}" alt="{{ image[0] }}">
+                        <img class="center-block carousel-image" src="{{ image[1] }}" alt="{{ text[0] }}">
                         <div class="carousel-caption d-none d-md-block">
-                            <h3>{{ image[0] }}</h3>
+				<h3 class="carousel-text-{{ text[1] or 'light' }}">{{ text[0] }}</h3>
                         </div>
                     </div>
              {% endfor %}

templates/page_with_carousel_button.html

@@ -5,10 +5,11 @@
         <div class="carousel-inner">
             {% for item in page.images %}
                 {% set image = item.split('|') %}
+		{% set text = image[0].split(';;') %}
                     <div class="item {% if loop.first %} active {% endif %}">
-                        <img class="center-block carousel-image" src="{{ image[1] }}" alt="{{ image[0] }}">
+                        <img class="center-block carousel-image" src="{{ image[1] }}" alt="{{ text[0] }}">
                         <div class="carousel-caption d-none d-md-block">
-                            <h3>{{ image[0] }}</h3>
+				<h3 class="carousel-text-{{ text[1] or 'light' }}">{{ text[0] }}</h3>
                         </div>
                     </div>
              {% endfor %}