Merge pull request #182 from the-badger/fixcss

Some small fixes for the 0.9.2 version
the-badger · Dec 12, 2017 · 65ec381 · 65ec381
2 parents 18e9634 + b2910bc
commit 65ec381
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.9.2] - 2017-12-12
+### Fixed
+- Fix thumbnails size for new users on dashboard
+- Use the correct avatar of the current user on dashboard if he's not on the podium
+
 ## [0.9.1] - 2017-12-07
 ### Fixed
 - Fix thumbnails for all images
@@ -130,7 +135,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.1...HEAD
+[Unreleased]: https://github.com/the-badger/badger/compare/v0.9.2...HEAD
+[0.9.2]: https://github.com/the-badger/badger/compare/v0.9.1...v0.9.2
 [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

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -8,7 +8,7 @@ imports:
 # http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 parameters:
     locale: en
-    version: 0.9.1
+    version: 0.9.2
 
 framework:
     #esi:             ~

diff --git a/src/Badger/Bundle/GameBundle/Resources/views/home.html.twig b/src/Badger/Bundle/GameBundle/Resources/views/home.html.twig
@@ -30,7 +30,7 @@
                     {% for user in newMembers %}
                         <li class="media">
                             <a href="{{ url('userprofile', {username: user.username}) }}" class="media-link">
-                                <div class="media-left"><img src="{{ user.profilePicture }}" class="img-circle" alt=""></div>
+                                <div class="media-left"><img src="{{ user.profilePicture }}" class="img-circle" alt="" style="width: 50px; height: 50px;"></div>
                                 <div class="media-body">
                                     <div class="media-heading text-semibold">{{ user.username }}</div>
                                     <span class="text-muted">Registered on {{ user.getDateRegistered()|date("d/m/Y") }}</span>
@@ -91,7 +91,11 @@
                                         <div class="media-heading text-semibold"><span class="label label-success label-rounded">+{{ nbCompletions }} Badges</span></div>
                                         <ul class="list-inline list-inline-condensed no-margin-bottom mt-15">
                                             {% for user in champions %}
-                                                <li><a href="{{ url('userprofile', {username: user.username}) }}" data-popup="tooltip" title="" data-placement="top" data-original-title="{{ user.username }}"><img src="{{ user.profilePicture }}" class="img-circle img-xs mt-5" alt=""></a></li>
+                                                <li>
+                                                    <a href="{{ url('userprofile', {username: user.username}) }}" data-popup="tooltip" title="" data-placement="top" data-original-title="{{ user.username }}">
+                                                        <img src="{{ user.profilePicture }}" class="img-circle img-xs mt-5" alt="">
+                                                    </a>
+                                                </li>
                                             {% endfor %}
                                         </ul>
                                     </div>
@@ -108,7 +112,7 @@
                 <div class="panel panel-body bg-primary-600 champions-top-unlock champions-{{ tag.code }}" style="background-image: url({{ asset('bundles/game/images/bg.png') }}); -webkit-box-shadow: 0px 0px 32px -9px rgba(0,0,0,0.75); -moz-box-shadow: 0px 0px 32px -9px rgba(0,0,0,0.75); box-shadow: 0px 0px 32px -9px rgba(0,0,0,0.75);">
                     <div class="media no-margin">
                         <div class="media-left media-middle">
-                            <img src="https://avatars.githubusercontent.com/u/301169?v=3" class="img-circle" alt="">
+                            <img src="{{ app.user.profilePicture }}" class="img-circle" alt="" style="width: 50px; height: 50px;">
                         </div>
 
                         <div class="media-body text-right">