mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tailwind-redesign

Browse Source
This commit is contained in:
drusepth 2022-10-06 21:34:52 -07:00
commit 47046cc971
3 changed files with 59 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/assets/stylesheets/thredded-overrides.scss
View File

@ -1,13 +1,17 @@
@import "thredded";
#thredded--container {
#q /* search input */ {
padding-left: 16px;
}
.thredded--navigation--search {
margin-top: 4.5em;
@media only screen and (min-width: 600px) {
#q /* search input */ {
height: 19px;
padding-left: 16px;
}
@media only screen and (min-width: 600px) {
#q /* search input */ {
height: 19px;
}
}
}
@ -15,18 +19,33 @@
margin-top: 0.4em;
padding-left: 0.1em;
overflow: hidden;
min-height: 5em;
min-height: 3em;
max-height: 60px;
width: 50%;
li {
display: inline !important;
float: left;
padding-right: 4px;
margin-right: 8px;
}
li a {
padding: 0;
line-height: 2rem;
}
}
.thredded--scoped-navigation {
left: 1rem;
top: 1rem;
}
.thredded--scoped-navigation li a {
padding: 0;
line-height: 2rem;
float: left;
}
.thredded--user-navigation {
@ -34,6 +53,13 @@
margin: 1rem;
border-bottom: 0;
@media only screen and (max-width: 600px) {
.thredded--user-navigation--item {
padding-top: 0.5rem;
padding-right: 0.5rem;
}
}
.thredded--user-navigation--item a {
padding: 8px 4px;
line-height: 2rem;

26
app/views/thredded/shared/_nav.html.erb Normal file
View File

@ -0,0 +1,26 @@
<%= yield :thredded_breadcrumbs %>
<nav class="thredded--navigation">
<ul class="thredded--user-navigation<%= ' thredded--user-navigation-standalone' if Thredded.standalone_layout? %>">
<%= render 'thredded/shared/nav/moderation' %>
<%= render 'thredded/shared/nav/notification_preferences', messageboard: messageboard_or_nil %>
<%= render 'thredded/shared/nav/private_topics' if Thredded.private_messaging_enabled %>
<% if Thredded.standalone_layout? %>
<%= render 'thredded/shared/nav/standalone_profile' if thredded_signed_in? %>
<%= render 'thredded/shared/nav/standalone' %>
<% end %>
</ul>
<% if content_for? :thredded_main_navigation %>
<%= yield :thredded_main_navigation %>
<% else %>
<div class="thredded--main-navigation">
<%# Navigation scoped to the current messageboard if any. %>
<%# yield :thredded_breadcrumbs %>
<%= render 'thredded/search/form', messageboard: messageboard_or_nil %>
<div class="thredded--spacer"></div>
<ul class="thredded--scoped-navigation">
<%= render 'thredded/shared/nav/unread_topics', messageboard: messageboard_or_nil %>
</ul>
</div>
<% end %>
</nav>

2
app/views/thredded/users/_badge.html.erb
View File

@ -15,7 +15,7 @@
<% if user.respond_to?(:selected_billing_plan_id) %>
<% if user.id == 5 %>
<span style="<%= badge_style %>; background: #2196F3; color: white"><%= badge_text.presence + 'Admin' %></span>
<span style="<%= badge_style %>; background: #2196F3; color: white"><%= badge_text.presence || 'Admin' %></span>
<% elsif user.selected_billing_plan_id == 2 %>
<span style="<%= badge_style %>; background: #dedeff"><%= badge_text.presence || 'Beta Tester' %></span>
<% elsif user.selected_billing_plan_id == 3 %>