Merge branch 'release/3.4.11' into v3.0

TeenQuotes · Dec 6, 2015 · 45bf08a · 45bf08a
2 parents b05f973 + 642b490
commit 45bf08a
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 19 deletions.
diff --git a/app/TeenQuotes/Api/V1/Controllers/APIGlobalController.php b/app/TeenQuotes/Api/V1/Controllers/APIGlobalController.php
@@ -217,6 +217,6 @@ protected function retrieveUser()
      */
     protected function isNotFound($content)
     {
-        return (is_null($content) or empty($content) or $content->count() == 0);
+        return is_null($content) or empty($content) or $content->count() == 0;
     }
 }
diff --git a/app/TeenQuotes/Newsletters/Models/Newsletter.php b/app/TeenQuotes/Newsletters/Models/Newsletter.php
@@ -34,7 +34,7 @@ class Newsletter extends Eloquent
      */
     public function isDaily()
     {
-        return ($this->type == self::DAILY);
+        return $this->type == self::DAILY;
     }
 
     /**
@@ -44,7 +44,7 @@ public function isDaily()
      */
     public function isWeekly()
     {
-        return ($this->type == self::WEEKLY);
+        return $this->type == self::WEEKLY;
     }
 
     /**

diff --git a/app/TeenQuotes/Quotes/Controllers/SearchController.php b/app/TeenQuotes/Quotes/Controllers/SearchController.php
@@ -222,6 +222,6 @@ private function shouldSearchForUsers($query)
      */
     private function stringIsSingleWord($string)
     {
-        return (str_word_count($string) == 1);
+        return str_word_count($string) == 1;
     }
 }
diff --git a/app/TeenQuotes/Quotes/Models/Quote.php b/app/TeenQuotes/Quotes/Models/Quote.php
@@ -135,7 +135,7 @@ public function getTotalCommentsAttribute()
      */
     public function getHasFavoritesAttribute()
     {
-        return ($this->total_favorites > 0);
+        return $this->total_favorites > 0;
     }
 
     /**
@@ -160,7 +160,7 @@ public function getTotalFavoritesAttribute()
      */
     public function getHasCommentsAttribute()
     {
-        return ($this->total_comments > 0);
+        return $this->total_comments > 0;
     }
 
     /**
@@ -198,22 +198,22 @@ public function isFavoriteForCurrentUser()
 
     public function isPublished()
     {
-        return ($this->approved == self::PUBLISHED);
+        return $this->approved == self::PUBLISHED;
     }
 
     public function isPending()
     {
-        return ($this->approved == self::PENDING);
+        return $this->approved == self::PENDING;
     }
 
     public function isWaiting()
     {
-        return ($this->approved == self::WAITING);
+        return $this->approved == self::WAITING;
     }
 
     public function isRefused()
     {
-        return ($this->approved == self::REFUSED);
+        return $this->approved == self::REFUSED;
     }
 
     /**

diff --git a/app/TeenQuotes/Users/Controllers/UsersController.php b/app/TeenQuotes/Users/Controllers/UsersController.php
@@ -243,7 +243,7 @@ private function redirectUserIfContentNotAvailable($user, $type)
 
     private function userViewingSelfProfile($user)
     {
-        return (Auth::check() and Auth::user()->login == $user->login);
+        return Auth::check() and Auth::user()->login == $user->login;
     }
 
     /**
@@ -300,10 +300,9 @@ public function show($user_id, $type = 'published')
 
     private function shouldDisplayWelcomeTutorial($quotes, $user)
     {
-        return (
+        return
             (empty($quotes) or (($quotes instanceof Collection) and $quotes->isEmpty()))
-            and $this->userViewingSelfProfile($user)
-        );
+            and $this->userViewingSelfProfile($user);
     }
 
     private function dataShowFavorites(User $user)
@@ -423,7 +422,7 @@ private function getCountryAndCity(User $user)
 
     private function userIsAllowedToEdit($user)
     {
-        return ($user->login == Auth::user()->login);
+        return $user->login == Auth::user()->login;
     }
 
     /**

diff --git a/public/assets/images/logo-xmas.png b/public/assets/images/logo-xmas.png
diff --git a/public/assets/images/logo-xmas@2x.png b/public/assets/images/logo-xmas@2x.png
diff --git a/...uild/assets/css/styles.min-34d8d28f67.css → ...uild/assets/css/styles.min-8485130ce5.css b/...uild/assets/css/styles.min-34d8d28f67.css → ...uild/assets/css/styles.min-8485130ce5.css
diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json
@@ -1,4 +1,4 @@
 {
-  "assets/css/styles.min.css": "assets/css/styles.min-34d8d28f67.css",
+  "assets/css/styles.min.css": "assets/css/styles.min-8485130ce5.css",
   "assets/js/scripts.min.js": "assets/js/scripts.min-026f200b51.js"
 }
diff --git a/ressources/sass/screen.scss b/ressources/sass/screen.scss
@@ -141,12 +141,12 @@ h3 {
 
 .navbar-fixed-top {
 	.logo {
-		@include background-image-retina($imagesFolder + 'logo', 'png', 200px, 30px);
+		@include background-image-retina($imagesFolder + 'logo-xmas', 'png', 200px, 30px);
 		background-repeat: no-repeat;
 		width: 200px;
 		height: 30px;
 		display: block;
-		margin: 12px 10px 0 0;
+		margin: 9px 10px 0 0;
 		float: left;
 
 		@media screen and (min-width: 320px) and (max-width: 992px) {