thredded 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb521ffdf8a0e754e7e55a856a649913e79295cd33799f29efeab2311f7f0f12
-  data.tar.gz: 0c40013b94c70655bb7de0edcb84bae86a6c4a8d66dc9e84a95682f82e568293
+  metadata.gz: 3b352700d9047e3e225b310dfc168d67b67ae3159da12baa88893b1185f89b46
+  data.tar.gz: 8301bfe7de537c66eac09594ec89371490b5770b7dbaae223f268c41db2bcb98
 SHA512:
-  metadata.gz: bf907ac1caa92e8d6362369c13eb0be750f95237c8a4670426f7973346de420bf6e17fa5bbd54ece98a06acad5522eb601838ea0b0c97e4799d926039be3b95d
-  data.tar.gz: 626752cbba2144434a985f4af447dcf174dd33bf1dbc8e93a28124d34be5177ddcbae74a7232dbbb821419a49e82da2af670f0dc4de4dad8514fdac06213557e
+  metadata.gz: 95cf96447f824d72a3260f9a27ce35aa3827d1d6e64419a184bf8c76e50382a6ed759d46914f72c3680e7553fd25cd6235246b4864bc8dc85ac6e84c3c6bba79
+  data.tar.gz: db8e6876bab1e834633aff07da90cde4b0a6e90b3469615bb21c62f00c8c57ce9b7e47dc148c5e319cf0ce2371c30d33f7e51f95d2e55ba0265f37956ac76c3b

data/README.md

@@ -95,7 +95,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.15.2'
+gem 'thredded', '~> 0.15.3'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.

data/app/assets/stylesheets/thredded/base/_alerts.scss

@@ -20,6 +20,7 @@
   margin-bottom: $thredded-small-spacing;
   padding: $thredded-small-spacing;
   text-decoration: none;
+  width: 100%;
 
   @include thredded-media-desktop-and-up {
     margin-bottom: $thredded-base-spacing;

data/app/assets/stylesheets/thredded/base/_nav.scss

@@ -23,7 +23,6 @@
 
 %thredded--nav-tabs {
   @extend %thredded--list-unstyled;
-  @include thredded--clearfix;
   border-bottom: $thredded-base-border;
   font-size: $thredded-font-size-small;
   margin-left: 0;

data/app/assets/stylesheets/thredded/layout/_navigation.scss

@@ -1,6 +1,4 @@
 .thredded--navigation {
-  display: flex;
-  flex-direction: column;
   position: relative;
   .thredded--icon {
     display: none;
@@ -35,10 +33,6 @@
     position: relative;
     width: 100%;
   }
-  .thredded--main-navigation {
-    position: relative;
-    border: none;
-  }
   .thredded--navigation-breadcrumbs {
     font-size: $thredded-font-size-small;
     padding-right: $icon-nav-item-width * 1;

data/app/controllers/thredded/application_controller.rb

@@ -127,14 +127,10 @@ module Thredded
       nil
     end
 
-    def in_messageboard?
-      params.key?(:messageboard_id)
-    end
-
     # @return [ActiveRecord::Relation]
     def topics_scope
       @topics_scope ||=
-        if in_messageboard?
+        if messageboard_or_nil
           policy_scope(messageboard.topics)
         else
           policy_scope(Thredded::Topic.all).joins(:messageboard).merge(policy_scope(Thredded::Messageboard.all))
@@ -157,7 +153,7 @@ module Thredded
       @unread_followed_topics_count ||=
         if thredded_signed_in?
           scope = topics_scope
-          scope = topics_scope.where(messageboard_id: messageboard.id) if in_messageboard?
+          scope = topics_scope.where(messageboard_id: messageboard.id) if messageboard_or_nil
           scope.unread_followed_by(thredded_current_user).count
         else
           0
@@ -168,7 +164,7 @@ module Thredded
       @unread_topics_count ||=
         if thredded_signed_in?
           scope = topics_scope
-          scope = topics_scope.where(messageboard_id: messageboard.id) if in_messageboard?
+          scope = topics_scope.where(messageboard_id: messageboard.id) if messageboard_or_nil
           scope.unread(thredded_current_user).count
         else
           0

data/app/controllers/thredded/topics_controller.rb

@@ -141,6 +141,10 @@ module Thredded
 
     private
 
+    def in_messageboard?
+      params.key?(:messageboard_id)
+    end
+
     def init_new_topic
       return unless in_messageboard?
       form = Thredded::TopicForm.new(messageboard: messageboard, user: thredded_current_user)

data/app/models/thredded/topic.rb

@@ -32,7 +32,7 @@ module Thredded
     friendly_id :slug_candidates,
                 use: %i[history reserved],
                 # Avoid route conflicts
-                reserved_words: ::Thredded::FriendlyIdReservedWordsAndPagination.new(%w[topics])
+                reserved_words: ::Thredded::FriendlyIdReservedWordsAndPagination.new(%w[topics unread])
 
     belongs_to :user,
                class_name: Thredded.user_class_name,

data/app/views/thredded/shared/_header.html.erb

@@ -1,3 +1,3 @@
-<header>
+<header class="thredded--main-header">
   <%= render 'thredded/shared/nav' %>
 </header>

data/app/views/thredded/shared/_nav.html.erb

@@ -16,9 +16,9 @@
       <%= yield :thredded_breadcrumbs %>
       <%= render 'thredded/search/form', messageboard: messageboard_or_nil %>
       <div class="thredded--spacer"></div>
-      <div class="thredded--scoped-navigation">
+      <ul class="thredded--scoped-navigation">
         <%= render 'thredded/shared/nav/unread_topics', messageboard: messageboard_or_nil %>
-      </div>
+      </ul>
     </div>
   <% end %>
 </nav>

data/lib/thredded/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thredded
-  VERSION = '0.15.2'
+  VERSION = '0.15.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-09 00:00:00.000000000 Z
+date: 2018-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit