Skip to content
This repository has been archived by the owner on Aug 24, 2022. It is now read-only.

Commit

Permalink
Merge pull request #180 from the-badger/fix09
Browse files Browse the repository at this point in the history
Prepare 0.9.1 version
  • Loading branch information
grena authored Dec 7, 2017
2 parents 42ccd19 + 56c06db commit 18e9634
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 14 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [0.9.1] - 2017-12-07
### Fixed
- Fix thumbnails for all images

## [0.9.0] - 2017-12-07
### Added
- Improved the leaderboard! More fair & organised by tags.
Expand Down Expand Up @@ -126,7 +130,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Badge info view, with obtention percentage and user list who have it
- Feedview with recent unlocks

[Unreleased]: https://github.com/the-badger/badger/compare/v0.9.0...HEAD
[Unreleased]: https://github.com/the-badger/badger/compare/v0.9.1...HEAD
[0.9.1]: https://github.com/the-badger/badger/compare/v0.9.0...v0.9.1
[0.9.0]: https://github.com/the-badger/badger/compare/v0.8.1...v0.9.0
[0.8.1]: https://github.com/the-badger/badger/compare/v0.8.0...v0.8.1
[0.8.0]: https://github.com/the-badger/badger/compare/v0.7.1...v0.8.0
Expand Down
2 changes: 1 addition & 1 deletion app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ imports:
# http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
parameters:
locale: en
version: 0.9.0
version: 0.9.1

framework:
#esi: ~
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div class="media">
<div class="media-left">
<a href="{{ url('viewbadge', {id: badge.id}) }}">
<img style="width: 100px; height: 100px;" class="img-circle img-thumbnail" src="{{ badge.imageWebPath }}" alt="">
<img style="width: 100px; height: 100px;" class="img-circle" src="{{ badge.imageWebPath }}" alt="">
</a>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
{% for pendingCompletion in pendingCompletions %}
<tr>
<td>
<img class="img-circle img-thumbnail" style="width: 60px;" src="{{ pendingCompletion.user.profilePicture }}">
<img class="img-circle" style="width: 60px;" src="{{ pendingCompletion.user.profilePicture }}">
<span class="ml-10">{{ pendingCompletion.user.username }}</span>
</td>
<td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
{% for pendingCompletion in pendingCompletions %}
<tr>
<td>
<img class="img-circle img-thumbnail" style="width: 60px;" src="{{ pendingCompletion.user.profilePicture }}">
<img class="img-circle" style="width: 60px;" src="{{ pendingCompletion.user.profilePicture }}">
<span class="ml-10">{{ pendingCompletion.user.username }}</span>
</td>
<td class="single line">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
{% for pendingCompletion in pendingCompletions %}
<tr>
<td>
<img class="img-circle img-thumbnail" style="width: 60px;" src="{{ pendingCompletion.user.profilePicture }}">
<img class="img-circle" style="width: 60px;" src="{{ pendingCompletion.user.profilePicture }}">
<span class="ml-10">{{ pendingCompletion.user.username }}</span>
</td>
<td class="single line">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
<li class="media">
<a href="{{ url('viewbadge', {id: badgeCompletion['badge'].id}) }}" class="media-link">
<div class="media-left">
<img src="{{ badgeCompletion['badge'].getImageWebPath() }}" class="img-circle" alt="">
<img src="{{ badgeCompletion['badge'].getImageWebPath() }}" class="img-circle" alt="" style="width: 50px; height: 50px;">
</div>

<div class="media-body">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<div class="panel-body">
<div class="media">
<div class="media-left">
<a href="{{ url('viewbadge', {id: badgeCompletion.badge.id}) }}"><img style="width: 100px; height: 100px;" class="img-circle img-thumbnail" src="{{ badgeCompletion.badge.imageWebPath }}" alt=""></a>
<a href="{{ url('viewbadge', {id: badgeCompletion.badge.id}) }}"><img style="width: 100px; height: 100px;" class="img-circle" src="{{ badgeCompletion.badge.imageWebPath }}" alt=""></a>
</div>

<div class="media-body">
Expand Down
4 changes: 2 additions & 2 deletions src/Badger/Bundle/GameBundle/Resources/views/users.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<div class="media">
<div class="media-left">
<a href="{{ url('userprofile', {'username': user.username}) }}" data-popup="lightbox">
<img src="{{ user.profilePicture }}" class="img-circle img-thumbnail img-lg" alt="">
<img src="{{ user.profilePicture }}" class="img-circle img-lg" alt="">
</a>
</div>

Expand Down Expand Up @@ -108,7 +108,7 @@
<div class="media">
<div class="media-left">
<a href="/user/[[ username ]]" data-popup="lightbox">
<img src="[[ profilePicture ]]" class="img-circle img-thumbnail img-lg" alt="">
<img src="[[ profilePicture ]]" class="img-circle img-lg" alt="">
</a>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% if isUnlocked %}
<div class="panel border-lg border-success" style="margin-top: 50px; box-shadow: 0 0 15px -4px rgba(2,168,41,1);">
<div class="panel-body text-center">
<img style="width: 150px; height: 150px; margin-top: -50px; box-shadow: 0px 0px 42px -12px rgba(0,0,0,0.75);" class="img-circle img-thumbnail" src="{{ badge.imageWebPath }}" alt="">
<img style="width: 150px; height: 150px; margin-top: -50px; box-shadow: 0px 0px 42px -12px rgba(0,0,0,0.75);" class="img-circle" src="{{ badge.imageWebPath }}" alt="">
<h5 class="text-semibold">{{ badge.title }}</h5>
<p class="mb-15 description">{{ badge.description }}</p>
<p class="text-muted"><i class="icon-checkmark position-left text-success"></i> You unlocked this badge</p>
Expand All @@ -16,7 +16,7 @@
{% else %}
<div class="panel" style="margin-top: 50px;">
<div class="panel-body text-center">
<img style="width: 150px; height: 150px; margin-top: -50px; box-shadow: 0px 0px 42px -12px rgba(0,0,0,0.75);" class="img-circle img-thumbnail" src="{{ badge.imageWebPath }}" alt="">
<img style="width: 150px; height: 150px; margin-top: -50px; box-shadow: 0px 0px 42px -12px rgba(0,0,0,0.75);" class="img-circle" src="{{ badge.imageWebPath }}" alt="">
<h5 class="text-semibold">{{ badge.title }}</h5>
<p class="mb-15 description">{{ badge.description }}</p>
{% if not isClaimed %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<tr>
<td>
<h4 class="ui image header">
<img class="img-circle img-thumbnail" style="width: 60px;" src="{{ user.profilePicture }}">
<img class="img-circle" style="width: 60px;" src="{{ user.profilePicture }}">
<span class="ml-10"><a href="{{ path('admin_user_show', { 'id': user.id }) }}">{{ user.username }}</a></span>
<small class="text-size-mini">{{ user.email }}</small>
</h4>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<tr>
<td>Profile picture</td>
<td>
<img class="img-circle img-thumbnail" style="width: 60px;" src="{{ user.profilePicture }}">
<img class="img-circle" style="width: 60px;" src="{{ user.profilePicture }}">
<span class="ml-10 text-light">{{ user.profilePicture }}</span>
</td>
</tr>
Expand Down

0 comments on commit 18e9634

Please sign in to comment.