From: Kevin Decherf Date: Mon, 26 Nov 2018 17:45:38 +0000 (+0100) Subject: Merge pull request #3783 from wallabag/issue-3780 X-Git-Tag: 2.3.5~4 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=20898d5ef4d2e5ae68a2687578c9273efed274c3;hp=13d94929ecc76e2b83c5bb48290215a35526973f;p=github%2Fwallabag%2Fwallabag.git Merge pull request #3783 from wallabag/issue-3780 material: decrease size of tags on list view --- diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 38dd5a7c..7e43d9d6 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -4,7 +4,7 @@ A release is mostly a git tag of http://github.com/wallabag/wallabag, following ### Steps to release -During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`. +During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (like 2.3.4). #### Files to edit @@ -26,8 +26,8 @@ SYMFONY_ENV=prod composer up --no-dev ```diff script: -- - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist -+ - travis_wait composer update --no-interaction --no-progress +- - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist ++ - travis_wait bash composer update -o --no-interaction --no-progress --prefer-dist ``` - Then continue with these commands: @@ -42,15 +42,14 @@ git push origin release-$LAST_WALLABAG_RELEASE - Run these command to create the package: ``` -make release master /tmp wllbg-release prod +make release VERSION=$LAST_WALLABAG_RELEASE ``` -- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new). You have to upload on this page the package. -- Delete the `release-$LAST_WALLABAG_RELEASE` branch and close the pull request (**DO NOT MERGE IT**). +- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `release-$LAST_WALLABAG_RELEASE` branch. You have to upload the package (generated previously). +- Close the previously created pull request (**DO NOT MERGE IT**) and delete the `release-$LAST_WALLABAG_RELEASE` branch. - Update the URL shortener (used on `wllbg.org` to generate links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`) -- Update [the downloads page](https://github.com/wallabag/wallabag.org/blob/master/content/pages/download.md) on the website (MD5 sum, release date) - Update Dockerfile https://github.com/wallabag/docker (and create a new tag) -- Update wallabag.org website (downloads, releases and new blog post) +- Update wallabag.org website (downloads, MD5 sum, releases and new blog post) - Put the next patch version suffixed with `-dev` in `app/config/config.yml` (`wallabag_core.version`) - Drink a :beer:! diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index b6a73bfd..4f67e038 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss @@ -116,18 +116,6 @@ main { height: 13.5em; } - .card-image .preview, - .card-fullimage .preview { - height: 100%; - background: no-repeat 50%/cover; - background-color: #efefef; - display: block; - - &--default { - background-size: contain; - } - } - &.sw { max-width: 370px; margin-left: auto; @@ -142,6 +130,19 @@ a.original:not(.waves-effect) { display: block; } +.card .card-image .preview, +.card .card-fullimage .preview, +.card-stacked .preview { + height: 100%; + background: no-repeat 50%/cover; + background-color: #efefef; + display: block; + + &--default { + background-size: contain; + } +} + .card-entry-labels li, .card-tag-labels li { margin: 10px 10px 10px auto; @@ -210,16 +211,11 @@ a.original:not(.waves-effect) { text-align: right; } - .preview { + .card-preview { max-width: 100px; - height: auto; + max-height: 50px; margin-right: 10px; flex: 1; - - img { - max-width: 100%; - max-height: 100%; - } } div.metadata { diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 6354b22f..847a8058 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -1,5 +1,5 @@ wallabag_core: - version: 2.3.4 + version: 2.3.5-dev paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' diff --git a/scripts/release.sh b/scripts/release.sh index 6186a486..2356a3f0 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -9,12 +9,12 @@ ENV=$4 rm -rf $TMP_FOLDER/$RELEASE_FOLDER mkdir $TMP_FOLDER/$RELEASE_FOLDER -git clone git@github.com:wallabag/wallabag.git -b $VERSION $TMP_FOLDER/$RELEASE_FOLDER/$VERSION +git clone git@github.com:wallabag/wallabag.git -b release-$VERSION $TMP_FOLDER/$RELEASE_FOLDER/$VERSION cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && SYMFONY_ENV=$ENV COMPOSER_MEMORY_LIMIT=-1 composer up -n --no-dev -cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console wallabag:install --env=$ENV +cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console wallabag:install --env=$ENV -n cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console assets:install --env=$ENV --symlink --relative cd $TMP_FOLDER/$RELEASE_FOLDER && tar czf wallabag-$VERSION.tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $VERSION echo "MD5 checksum of the package for wallabag $VERSION" -md5 $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz +md5 $TMP_FOLDER/$RELEASE_FOLDER/wallabag-release-$VERSION.tar.gz echo "Package to upload to the release server:" -echo $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz +echo $TMP_FOLDER/$RELEASE_FOLDER/wallabag-release-$VERSION.tar.gz diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 48866f6e..e7d42b3d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -96,9 +96,6 @@ - {% if entry.previewPicture is not null %} -
{{ entry.title|e|raw }}
- {% endif %}
{{ entry.content | raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig index 7c83c3bb..1c00f2fa 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig @@ -1,10 +1,9 @@
-
- {% if entry.previewPicture is not null %} - - - - {% endif %} +
+ + {% set previewClassModifier = entry.previewPicture ? '' : ' preview--default' %} + +
{% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withTags': true, 'subClass': 'metadata'} only %}
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 9ae6e73e..c6c19de6 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -275,10 +275,6 @@ {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
- {% if entry.previewPicture is not null %} -
{{ entry.title|striptags|default('entry.default_title'|trans)|raw }}
- {% endif %} -
{{ entry.content | raw }} diff --git a/src/Wallabag/UserBundle/Resources/views/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/layout.html.twig index 99bf7dfd..f97e9870 100644 --- a/src/Wallabag/UserBundle/Resources/views/layout.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/layout.html.twig @@ -11,7 +11,7 @@
-
+
{% block fos_user_content %} {% endblock fos_user_content %}