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-19 12:14:35 -07:00
commit 646f79a9e2
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,15 +2,16 @@
#thredded--container {
.thredded--navigation--search {
margin-top: 4.5em;
#q /* search input */ {
padding-left: 16px;
margin-top: 4.5em;
}
@media only screen and (min-width: 600px) {
#q /* search input */ {
height: 19px;
height: 17px;
margin-top: 0;
}
}
}

4
app/controllers/api/internal/api_controller.rb
View File

@ -11,7 +11,9 @@ module Api
private
def sanitize_content_type
unless Rails.application.config.content_types[:all].map(&:name).include?(params[:page_type])
valid_types = Rails.application.config.content_types[:all] + [Timeline, Document]
unless valid_types.map(&:name).include?(params[:page_type])
raise "Invalid page type: #{params[:page_type]}"
end

2
app/views/data/tags.html.erb
View File

@ -4,7 +4,7 @@
<h2 class="grey-text" style="font-size: 2rem">Your Notebook.ai tags</h2>
<ul class="collapsible">
<% Rails.application.config.content_types[:all].each do |content_type| %>
<% (Rails.application.config.content_types[:all] + [Document, Timeline]).each do |content_type| %>
<%
grouped_tags = PageTag.where(page_type: content_type.name, user_id: current_user).order('tag ASC').group_by(&:tag)