Merge branch 'master' into sidebar-allignment-fixed

CircuitVerse · Jan 10, 2024 · 11553d6 · 11553d6
2 parents 3bdee9b + 71ac9fd
commit 11553d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/app/assets/stylesheets/simple_discussion.scss b/app/assets/stylesheets/simple_discussion.scss
@@ -293,6 +293,11 @@
   }
 }
 
+.sidebar-sticky {
+  position: sticky;
+  top: 120px;
+}
+
 .thread-page-container {
   border: 1px solid #80808029;
   padding: 15px;

diff --git a/app/views/layouts/simple_discussion.html.erb b/app/views/layouts/simple_discussion.html.erb
@@ -2,7 +2,7 @@
   <h1 class="community-heading"><%= t('community') %></h1>
   <div class="row simple_discussion mt-2">
     <div class="col-md-2 mb-3">
-      <div class="col">
+      <div class="col sidebar-sticky">
         <%= link_to t('ask_a_question'), simple_discussion.new_forum_thread_path, class: "btn forum-primary-btn btn-block mb-4" %>
 
         <div class="forum-thread-filters">

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1,6 +1,6 @@
 en:
   start_a_discussion: Start A Discussion
-  add_a_comment: Add a comment...
+  add_a_comment: Add a comment
   ask_a_question: Ask A Question
   asked_time_ago: "Asked %{time} ago by %{author}"
   choose_a_category: Choose a Category