From b1d30293307ecffd7c82228552cfcc61d930aa54 Mon Sep 17 00:00:00 2001 From: drusepth Date: Wed, 9 Feb 2022 20:29:40 -0800 Subject: [PATCH] start on new logged-in navbar design mockups --- app/models/documents/document.rb | 4 +- app/models/page_types/character.rb | 2 +- app/models/timelines/timeline.rb | 4 +- app/views/layouts/tailwind.html.erb | 5 +- .../tailwind/navbar/_logged_in.html.erb | 64 ++++++------------- 5 files changed, 24 insertions(+), 55 deletions(-) diff --git a/app/models/documents/document.rb b/app/models/documents/document.rb index cbbd1027..bb00164a 100644 --- a/app/models/documents/document.rb +++ b/app/models/documents/document.rb @@ -35,11 +35,11 @@ class Document < ApplicationRecord KEYS_TO_TRIGGER_REVISION_ON_CHANGE = %w(title body synopsis notes_text) def self.color - 'teal' + 'teal bg-teal-500' end def self.text_color - 'teal-text' + 'teal-text text-teal-500' end def color diff --git a/app/models/page_types/character.rb b/app/models/page_types/character.rb index ab0ae49a..7d599bca 100644 --- a/app/models/page_types/character.rb +++ b/app/models/page_types/character.rb @@ -49,7 +49,7 @@ class Character < ApplicationRecord end def self.color - 'red red-500' + 'red bg-red-500' end def self.text_color diff --git a/app/models/timelines/timeline.rb b/app/models/timelines/timeline.rb index e12d6449..0df5bfd8 100644 --- a/app/models/timelines/timeline.rb +++ b/app/models/timelines/timeline.rb @@ -22,11 +22,11 @@ class Timeline < ApplicationRecord end def self.color - 'green' + 'green bg-green-500' end def self.text_color - 'green-text' + 'green-text text-green-500' end # Needed because we sometimes munge Timelines in with ContentPages :( diff --git a/app/views/layouts/tailwind.html.erb b/app/views/layouts/tailwind.html.erb index 4f791c54..769240e1 100644 --- a/app/views/layouts/tailwind.html.erb +++ b/app/views/layouts/tailwind.html.erb @@ -17,16 +17,13 @@ <%# render 'layouts/sidenav' if user_signed_in? %> <%# render 'layouts/recent_edits_sidenav' if user_signed_in? %> <%= render 'layouts/tailwind/navbar' %>
- <%# yield :full_width_page_header %> - <%# yield :full_width_page_content %> - <%= render 'cards/ui/alert' %> <%= render 'cards/ui/notice' %> diff --git a/app/views/layouts/tailwind/navbar/_logged_in.html.erb b/app/views/layouts/tailwind/navbar/_logged_in.html.erb index bf1d4067..748488c1 100644 --- a/app/views/layouts/tailwind/navbar/_logged_in.html.erb +++ b/app/views/layouts/tailwind/navbar/_logged_in.html.erb @@ -1,58 +1,30 @@ -
+
<%= link_to 'Notebook.ai', root_path, class: 'hover:text-blue-100' %>