fixing menues (mobile mostly)
This commit is contained in:
parent
0360afc762
commit
d3c23cdd74
|
@ -11,12 +11,8 @@
|
||||||
* It is generally better to create a new file per style scope.
|
* It is generally better to create a new file per style scope.
|
||||||
*
|
*
|
||||||
*= require_self
|
*= require_self
|
||||||
|
*= require merged/tailwind_styles
|
||||||
*/
|
*/
|
||||||
#thredded--container{
|
#thredded--container{
|
||||||
max-width: 60rem;
|
max-width: 60rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.prose{
|
|
||||||
color: inherit;
|
|
||||||
--tw-prose-bullets: #6b7280;
|
|
||||||
}
|
|
||||||
|
|
|
@ -25,4 +25,23 @@ module ApplicationHelper
|
||||||
image_tag(image , alt: someone.name , class: classes )
|
image_tag(image , alt: someone.name , class: classes )
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def main_menu
|
||||||
|
[["/retreats" , "Retreats"], ["/studios" , "Studios"],
|
||||||
|
["/makerspace" , "Makerspace"],["/coworking" , "Coworking"],
|
||||||
|
["/about" , "About"], ]
|
||||||
|
end
|
||||||
|
def member_memu
|
||||||
|
items =[["/forum" ,"Forum"] , [main_app.member_path(current_member) , "Settings"]]
|
||||||
|
if current_member.admin? and !Rails.env.production?
|
||||||
|
items << [merged.pages_path(), "CMS" ]
|
||||||
|
end
|
||||||
|
items
|
||||||
|
end
|
||||||
|
def mobile_menu
|
||||||
|
if current_member
|
||||||
|
member_memu
|
||||||
|
else
|
||||||
|
[main_app.member_session_path, "Login"]
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -21,6 +21,7 @@ class Entity < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.response(path = "")
|
def self.response(path = "")
|
||||||
|
return "" if Rails.env.development?
|
||||||
host = Rails.application.credentials.weather_dev
|
host = Rails.application.credentials.weather_dev
|
||||||
host = Rails.application.credentials.weather_pro if Rails.env.production?
|
host = Rails.application.credentials.weather_pro if Rails.env.production?
|
||||||
token = Rails.application.credentials.weather_token
|
token = Rails.application.credentials.weather_token
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
%p.font-medium.text-gray-900 Main
|
%p.font-medium.text-gray-900 Main
|
||||||
%nav.mt-6{"aria-label" => "Footer Navigation - Services"}
|
%nav.mt-6{"aria-label" => "Footer Navigation - Services"}
|
||||||
%ul.space-y-4.text-sm
|
%ul.space-y-4.text-sm
|
||||||
-[:restreats , :studios , :makerspace , :coworking].each do |main|
|
-[:retreats , :studios , :makerspace , :coworking].each do |main|
|
||||||
%li
|
%li
|
||||||
%a.text-gray-700.transition.hover:opacity-75{:href => "/#{main}"}
|
%a.text-gray-700.transition.hover:opacity-75{:href => "/#{main}"}
|
||||||
=main.capitalize
|
=main.capitalize
|
||||||
|
@ -75,7 +75,7 @@
|
||||||
.pt-8.mt-8.border-t.border-gray-100
|
.pt-8.mt-8.border-t.border-gray-100
|
||||||
.grid.grid-cols-1.gap-8.lg:grid-cols-2
|
.grid.grid-cols-1.gap-8.lg:grid-cols-2
|
||||||
%p.text-xs.text-left.text-gray-500
|
%p.text-xs.text-left.text-gray-500
|
||||||
2020-22. Osuuskunta Hub Feenix. All rights reserved.
|
2020-23. Osuuskunta Hub Feenix. All rights reserved.
|
||||||
%nav{"aria-label" => "Footer Navigation - Support"}
|
%nav{"aria-label" => "Footer Navigation - Support"}
|
||||||
%ul.flex.flex-wrap.justify-start.gap-4.text-xs.lg:justify-end
|
%ul.flex.flex-wrap.justify-start.gap-4.text-xs.lg:justify-end
|
||||||
%li
|
%li
|
||||||
|
|
|
@ -4,9 +4,9 @@
|
||||||
= image_tag("feenix_lintu.webp" , class: "h-20")
|
= image_tag("feenix_lintu.webp" , class: "h-20")
|
||||||
%span.ml-2.text-xl.font-bold.tracking-wide.text-gray-800.uppercase Hub Feenix
|
%span.ml-2.text-xl.font-bold.tracking-wide.text-gray-800.uppercase Hub Feenix
|
||||||
%ul.flex.items-center.hidden.space-x-8.lg:flex
|
%ul.flex.items-center.hidden.space-x-8.lg:flex
|
||||||
- [:retreats , :studios , :makerspace , :coworking, :about].each do |link|
|
- main_menu.each do |link , text|
|
||||||
%li
|
%li
|
||||||
%a.font-medium.tracking-wide.text-gray-700.transition-colors.duration-400.hover:text-cyan-800{"aria-label" => "Our product", :href => "/#{link}", :title => link.capitalize}= link.capitalize
|
%a.font-medium.tracking-wide.text-gray-700.transition-colors.duration-400.hover:text-cyan-800{"aria-label" => "Our product", :href => link, :title => text}= text
|
||||||
%li
|
%li
|
||||||
= link_to "https://www.facebook.com/hubfeenix" , :target => "_blank" do
|
= link_to "https://www.facebook.com/hubfeenix" , :target => "_blank" do
|
||||||
= image_tag("fb.webp" , class: "h-10 rounded-md")
|
= image_tag("fb.webp" , class: "h-10 rounded-md")
|
||||||
|
|
|
@ -1,13 +1,8 @@
|
||||||
#menu-dropdown.hidden.absolute.right-0.z-10.mt-4.w-36.origin-top-right.rounded-md.border.border-gray-100.bg-white.shadow-lg{:role => "menu"}
|
#menu-dropdown.hidden.absolute.right-0.z-10.mt-4.w-36.origin-top-right.rounded-md.border.border-gray-100.bg-white.shadow-lg{:role => "menu"}
|
||||||
.p-2
|
.p-2
|
||||||
%a.block.rounded-lg.px-4.py-2.text-sm.text-gray-500.hover:bg-gray-50.hover:text-gray-700{:href => "/forum", :role => "menuitem"}
|
- member_memu.each do |link , text|
|
||||||
Forum
|
%a.block.rounded-lg.px-4.py-2.text-sm.text-gray-500.hover:bg-gray-50.hover:text-gray-700{:href => link, :role => "menuitem"}
|
||||||
%a.block.rounded-lg.px-4.py-2.text-sm.text-gray-500.hover:bg-gray-50.hover:text-gray-700{:href => main_app.member_path(current_member), :role => "menuitem"}
|
=text
|
||||||
Settings
|
|
||||||
- unless Rails.env.production?
|
|
||||||
- if current_member.admin?
|
|
||||||
%a.block.rounded-lg.px-4.py-2.text-sm.text-gray-500.hover:bg-gray-50.hover:text-gray-700{:href => merged.pages_path(), :role => "menuitem"}
|
|
||||||
CMS
|
|
||||||
= form_tag( main_app.destroy_member_session_path , {method: :delete } ) do
|
= form_tag( main_app.destroy_member_session_path , {method: :delete } ) do
|
||||||
%button.flex.w-full.items-center.gap-2.rounded-lg.px-4.py-2.text-sm.text-blue-700.hover:bg-red-50{:role => "menuitem", :type => "submit"}
|
%button.flex.w-full.items-center.gap-2.rounded-lg.px-4.py-2.text-sm.text-blue-700.hover:bg-red-50{:role => "menuitem", :type => "submit"}
|
||||||
%svg.h-4.w-4{:fill => "none", :stroke => "currentColor", "stroke-width" => "2", :viewbox => "0 0 24 24", :xmlns => "http://www.w3.org/2000/svg"}
|
%svg.h-4.w-4{:fill => "none", :stroke => "currentColor", "stroke-width" => "2", :viewbox => "0 0 24 24", :xmlns => "http://www.w3.org/2000/svg"}
|
||||||
|
|
|
@ -11,9 +11,14 @@
|
||||||
%path{:d => "M19.7,4.3c-0.4-0.4-1-0.4-1.4,0L12,10.6L5.7,4.3c-0.4-0.4-1-0.4-1.4,0s-0.4,1,0,1.4l6.3,6.3l-6.3,6.3 c-0.4,0.4-0.4,1,0,1.4C4.5,19.9,4.7,20,5,20s0.5-0.1,0.7-0.3l6.3-6.3l6.3,6.3c0.2,0.2,0.5,0.3,0.7,0.3s0.5-0.1,0.7-0.3 c0.4-0.4,0.4-1,0-1.4L13.4,12l6.3-6.3C20.1,5.3,20.1,4.7,19.7,4.3z", :fill => "currentColor"}
|
%path{:d => "M19.7,4.3c-0.4-0.4-1-0.4-1.4,0L12,10.6L5.7,4.3c-0.4-0.4-1-0.4-1.4,0s-0.4,1,0,1.4l6.3,6.3l-6.3,6.3 c-0.4,0.4-0.4,1,0,1.4C4.5,19.9,4.7,20,5,20s0.5-0.1,0.7-0.3l6.3-6.3l6.3,6.3c0.2,0.2,0.5,0.3,0.7,0.3s0.5-0.1,0.7-0.3 c0.4-0.4,0.4-1,0-1.4L13.4,12l6.3-6.3C20.1,5.3,20.1,4.7,19.7,4.3z", :fill => "currentColor"}
|
||||||
%nav
|
%nav
|
||||||
%ul.space-y-6.px-20
|
%ul.space-y-6.px-20
|
||||||
- [:retreats , :studios , :makerspace , :coworking, :about].each do |link|
|
- main_menu.each do |link , text|
|
||||||
%li
|
%li
|
||||||
%a.font-medium.tracking-wide.text-xl{ :href => "/#{link}" , :title => link.capitalize}= link.capitalize
|
%a.font-medium.tracking-wide.text-xl{ :href => "/#{link}" , :title => text }= text
|
||||||
|
%li
|
||||||
|
%hr
|
||||||
|
- mobile_menu.each do |link , text|
|
||||||
|
%li
|
||||||
|
%a.font-medium.tracking-wide.text-xl{ :href => "/#{link}" , :title => text }= text
|
||||||
:javascript
|
:javascript
|
||||||
var drop_hidden = true;
|
var drop_hidden = true;
|
||||||
function menu_on() {
|
function menu_on() {
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
Settings and profiles
|
Settings and profiles
|
||||||
%h4.text-xl.mt-4.md:text-2xl
|
%h4.text-xl.mt-4.md:text-2xl
|
||||||
View and edit your profiles, and change settings
|
View and edit your profiles, and change settings
|
||||||
|
|
||||||
.grid.grid-cols-1.mx-8.gap-8.md:grid-cols-2.mx-12.gap-12.lg:grid-cols-3.mx-16.gap-16
|
.grid.grid-cols-1.mx-8.gap-8.md:grid-cols-2.mx-12.gap-12.lg:grid-cols-3.mx-16.gap-16
|
||||||
.flex.flex-col.justify-between
|
.flex.flex-col.justify-between
|
||||||
%h3.text-2xl.bg-gray-200.p-4.text-center Settings
|
%h3.text-2xl.bg-gray-200.p-4.text-center Settings
|
||||||
|
|
|
@ -58,7 +58,7 @@ Rails.application.configure do
|
||||||
config.active_record.verbose_query_logs = true
|
config.active_record.verbose_query_logs = true
|
||||||
|
|
||||||
# Suppress logger output for asset requests.
|
# Suppress logger output for asset requests.
|
||||||
config.assets.quiet = true
|
config.assets.quiet = false
|
||||||
|
|
||||||
# Raises error for missing translations.
|
# Raises error for missing translations.
|
||||||
# config.i18n.raise_on_missing_translations = true
|
# config.i18n.raise_on_missing_translations = true
|
||||||
|
|
|
@ -12,7 +12,7 @@ Rails.application.routes.draw do
|
||||||
|
|
||||||
mount Thredded::Engine => '/forum'
|
mount Thredded::Engine => '/forum'
|
||||||
|
|
||||||
mount Merged::Engine => "/merged"
|
mount Merged::Engine => "/merged" unless Rails.env.production?
|
||||||
|
|
||||||
get "/news/:id" , to: "merged/view#page" , id: :id , as: :view_blog
|
get "/news/:id" , to: "merged/view#page" , id: :id , as: :view_blog
|
||||||
get ":id" , to: "merged/view#page" , id: :id , as: :view_page
|
get ":id" , to: "merged/view#page" , id: :id , as: :view_page
|
||||||
|
|
Loading…
Reference in New Issue