diff --git a/CHANGELOG.md b/CHANGELOG.md index db58f10..b800cfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ CHANGELOG * possibility to use a range for the full picture date https://github.com/Psycojoker/prosopopee#full-screen-picture-with-or-without-text-on-it by beudbeud * Update material theme by beudbeud * social share https://github.com/Psycojoker/prosopopee#share by beudbeud -* Define background of section https://github.com/abeudin/prosopopee#background-settings by beudbeud +* Define background and text color of section https://github.com/abeudin/prosopopee#background-settings by beudbeud 0.2 (2016-02-23) ---------------- diff --git a/README.md b/README.md index a914769..1d9c759 100644 --- a/README.md +++ b/README.md @@ -423,11 +423,23 @@ Exemple for background color or you can use picture ```yaml - - type: bordered-picture + - type: text background: "url(background_picture.jpg)" - image: another_picture.jpg + text: Some text ``` +### Text color settings + +For text, html and paragraph section you can define the text color. + +Exemple + +```yaml + - type: bordered-picture + color: "#333" +``` + + ### Example As a recap, here is how the files of the example gallery are organised: diff --git a/prosopopee/themes/exposure/static/css/style-page.css b/prosopopee/themes/exposure/static/css/style-page.css index ddc7db4..cedb963 100644 --- a/prosopopee/themes/exposure/static/css/style-page.css +++ b/prosopopee/themes/exposure/static/css/style-page.css @@ -8,6 +8,7 @@ body { height: 100%; width: 100%; background-color: #FBFBFB; + color: black; margin: 0; } @@ -103,7 +104,6 @@ a { line-height: 1.8em; margin-left: 21%; margin-right: 21%; - color: black; } .paragraph { @@ -112,7 +112,6 @@ a { font-size: 1em; margin-left: 21%; margin-right: 21%; - color: #333; } .paragraph h2 { @@ -120,7 +119,6 @@ a { font-weight: normal; font-size: 2.5em; text-transform: uppercase; - color: black; line-height: 1.4em; } diff --git a/prosopopee/themes/exposure/templates/sections/bordered-picture.html b/prosopopee/themes/exposure/templates/sections/bordered-picture.html index 5a9d230..bc6ef98 100644 --- a/prosopopee/themes/exposure/templates/sections/bordered-picture.html +++ b/prosopopee/themes/exposure/templates/sections/bordered-picture.html @@ -1,7 +1,7 @@ {% set image = Image(section.image) %} {% set caption = section.text %} {{ image.copy()}} -{% if section.color %} +{% if section.background %}
{% endif %}
@@ -16,7 +16,7 @@
-{% if section.color %} +{% if section.background %} {% endif %} diff --git a/prosopopee/themes/exposure/templates/sections/html.html b/prosopopee/themes/exposure/templates/sections/html.html index 602e299..c233fe8 100644 --- a/prosopopee/themes/exposure/templates/sections/html.html +++ b/prosopopee/themes/exposure/templates/sections/html.html @@ -1,12 +1,12 @@ -{% if section.color %} -
+{% if section.background or section.color %} +
{% endif %}
{{ section.html }}
-{% if section.color %} +{% if section.background or section.color %}
{% endif %} diff --git a/prosopopee/themes/exposure/templates/sections/paragraph.html b/prosopopee/themes/exposure/templates/sections/paragraph.html index efba68e..c52f6f6 100644 --- a/prosopopee/themes/exposure/templates/sections/paragraph.html +++ b/prosopopee/themes/exposure/templates/sections/paragraph.html @@ -1,5 +1,5 @@ -{% if section.color %} -
+{% if section.background or section.color %} +
{% endif %}
{% if section.title %} @@ -9,6 +9,6 @@ {% endif %}

{{ section.text }}

-{% if section.color %} +{% if section.background or section.color %}
{% endif %} diff --git a/prosopopee/themes/exposure/templates/sections/pictures-group.html b/prosopopee/themes/exposure/templates/sections/pictures-group.html index 7b2a850..cc48ba3 100644 --- a/prosopopee/themes/exposure/templates/sections/pictures-group.html +++ b/prosopopee/themes/exposure/templates/sections/pictures-group.html @@ -1,4 +1,4 @@ -{% if section.color %} +{% if section.background %}
{% endif %}
@@ -25,6 +25,6 @@
{% endfor %} -{% if section.color %} +{% if section.background %}
{% endif %} diff --git a/prosopopee/themes/exposure/templates/sections/text.html b/prosopopee/themes/exposure/templates/sections/text.html index 803cc4a..3769bb9 100644 --- a/prosopopee/themes/exposure/templates/sections/text.html +++ b/prosopopee/themes/exposure/templates/sections/text.html @@ -1,9 +1,9 @@ -{% if section.color %} -
+{% if section.background or section.color %} +
{% endif %}
{{ section.text }}
-{% if section.color %} +{% if section.background or section.color %}
{% endif %} diff --git a/prosopopee/themes/material/static/css/styles.css b/prosopopee/themes/material/static/css/styles.css index d8fbf05..7b5bdd9 100644 --- a/prosopopee/themes/material/static/css/styles.css +++ b/prosopopee/themes/material/static/css/styles.css @@ -120,3 +120,9 @@ main { .fixed-action-btn.horizontal ul { top: 22%; } + +.card .card-image .card-title { + background-color: rgba(0, 0, 0, 0.3); + width: 100%; + height: 100%; +} diff --git a/prosopopee/themes/material/templates/sections/html.html b/prosopopee/themes/material/templates/sections/html.html index 59153b2..eb1d8d0 100644 --- a/prosopopee/themes/material/templates/sections/html.html +++ b/prosopopee/themes/material/templates/sections/html.html @@ -1,11 +1,11 @@ -{% if section.background %} -
+{% if section.background or section.color %} +
{% endif %}
{{ section.html }}
-{% if section.background %} +{% if section.background or section.color %}
{% endif %} diff --git a/prosopopee/themes/material/templates/sections/paragraph.html b/prosopopee/themes/material/templates/sections/paragraph.html index 4f04800..cf8ebfd 100644 --- a/prosopopee/themes/material/templates/sections/paragraph.html +++ b/prosopopee/themes/material/templates/sections/paragraph.html @@ -1,5 +1,5 @@ -{% if section.background %} -
+{% if section.background or section.color %} +
{% endif %}
{% if section.title %} @@ -11,6 +11,6 @@

{{ section.text }}

-{% if section.background %} +{% if section.background or section.color %}
{% endif %} diff --git a/prosopopee/themes/material/templates/sections/text.html b/prosopopee/themes/material/templates/sections/text.html index e54bc2e..81366da 100644 --- a/prosopopee/themes/material/templates/sections/text.html +++ b/prosopopee/themes/material/templates/sections/text.html @@ -1,11 +1,11 @@ -{% if section.background %} -
+{% if section.background or section.color %} +
{% endif %}

{{ section.text }}

-{% if section.background %} +{% if section.background or section.color %}
{% endif %}