FeenixMakers/merged
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unified option handling more

Browse Source
This commit is contained in:
Torsten
2022-12-07 14:14:50 +02:00
parent b606caf2b8
commit f32e6c105c
4 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/merged/merged_helper.rb
View File

@ -20,6 +20,8 @@ module Merged
text
end
end
def button_classes
"mr-3 inline-block rounded-lg px-4 py-3 text-md font-medium text-white"
end
end
end

110
app/helpers/merged/options_helper.rb
View File

@ -13,49 +13,47 @@ module Merged
def order_option(section , clazz = "")
if section.has_option?("order")
option = section.option('order')
puts "Order #{option}"
clazz += " order-last" if option == "right"
clazz += " order-last" if section.option('order') == "right"
end
{class: clazz}
end
def align_option(section)
return {} unless section.has_option?("align")
option = section.option('align')
puts "align #{option}"
# text-center , text-left , text-right , leave comment for tailwind
{class: "text-#{option}"}
def align_option(section , clazz = "")
if section.has_option?("align")
# text-center , text-left , text-right , leave comment for tailwind
clazz += " text-#{section.option('align')}"
end
{class: clazz}
end
def background_option(section)
return {} unless section.has_option?("background")
option = section.option('background')
puts "Background #{option}"
background = bg_for(option)
background += " text-white" if option.include?("solid")
{class: background}
def background_option(section , clazz = "")
if section.has_option?("background")
option = section.option('background')
clazz += bg_for(option)
clazz += " text-white" if option.include?("solid")
end
{class: clazz}
end
def margin_option(section)
return {} unless section.has_option?("margin")
option = section.option('margin')
puts "Margin #{option}"
{class: margin_for(option)}
def margin_option(section , clazz = "")
if section.has_option?("margin")
clazz += margin_for(section.option("margin"))
end
{class: clazz}
end
def color_option(section)
return {} unless section.has_option?("color")
option = section.option('color')
puts "Text color #{option} , #{color_for(option)}"
{class: color_for(option) }
def color_option(section , clazz = "")
if section.has_option?("color")
clazz += color_for(section.option("color"))
end
{class: clazz }
end
def shade_option(section)
return {} unless section.has_option?("shade_color")
option = section.option('shade_color')
puts "Shade color #{option} , #{shade_for(option)}"
{class: shade_for(option) }
if section.has_option?("shade_color")
clazz += shade_for(section.option("shade_color"))
end
{class: clazz }
end
def column_option(section)
@ -76,49 +74,49 @@ module Merged
private
# need full color names for tailwind to pick it up
def bg_for( option )
{ "white" => "bg-white" ,
{ "white" => " bg-white" ,
"none" => "" ,
"light_blue" => "bg-cyan-100" ,
"light_gray" => "bg-gray-100" ,
"light_orange" => "bg-orange-50" ,
"solid_blue" => "bg-cyan-700" ,
"solid_red" => "bg-orange-800" ,
"solid_green" => "bg-green-700" ,
"solid_petrol" => "bg-teal-700" ,
"solid_indigo" => "bg-indigo-800" ,
"solid_black" => "bg-slate-900" ,
"light_blue" => " bg-cyan-100" ,
"light_gray" => " bg-gray-100" ,
"light_orange" => " bg-orange-50" ,
"solid_blue" => " bg-cyan-700" ,
"solid_red" => " bg-orange-800" ,
"solid_green" => " bg-green-700" ,
"solid_petrol" => " bg-teal-700" ,
"solid_indigo" => " bg-indigo-800" ,
"solid_black" => " bg-slate-900" ,
}[option] || ""
end
# need full margin names for tailwind to pick it up
def margin_for( option )
{ "0" => "m-0" ,
{ "0" => " m-0" ,
"none" => "" ,
"20" => "m-20" ,
"20" => " m-20" ,
}[option] || ""
end
# need full color names for tailwind to pick it up
def color_for( option )
{ "white" => "text-white",
{ "white" => " text-white",
"none" => "",
"light_blue" => "text-cyan-100" ,
"solid_blue" => "text-cyan-700" ,
"solid_red" => "text-orange-800" ,
"solid_green" => "text-green-700" ,
"solid_petrol" => "text-teal-700" ,
"solid_indigo" => "text-indigo-800" ,
"solid_black" => "text-slate-900" ,
"light_blue" => " text-cyan-100" ,
"solid_blue" => " text-cyan-700" ,
"solid_red" => " text-orange-800" ,
"solid_green" => " text-green-700" ,
"solid_petrol" => " text-teal-700" ,
"solid_indigo" => " text-indigo-800" ,
"solid_black" => " text-slate-900" ,
}[option] || ""
end
# need full color names for tailwind to pick it up
def shade_for( option )
{ "white_25" => "bg-white/25",
{ "white_25" => " bg-white/25",
"none" => "",
"black_25" => "bg-black/25" ,
"light_blue_25" => "bg-cyan-100/25" ,
"light_red_25" => "bg-orange-300/25" ,
"solid_blue_25" => "bg-cyan-700/25" ,
"solid_red_25" => "bg-orange-800/25" ,
"black_25" => " bg-black/25" ,
"light_blue_25" => " bg-cyan-100/25" ,
"light_red_25" => " bg-orange-300/25" ,
"solid_blue_25" => " bg-cyan-700/25" ,
"solid_red_25" => " bg-orange-800/25" ,
}[option] || ""
end
end

4
app/helpers/merged/view_helper.rb
View File

@ -1,6 +1,7 @@
module Merged
module ViewHelper
include OptionsHelper
include MergedHelper
# section should be hash with at least 'template' key
def find_template(section)
"merged/view/" + section.template
@ -33,9 +34,6 @@ module Merged
end
end
end
def button_classes
"ml-3 inline-block rounded-lg px-4 py-3 text-md font-medium text-white"
end
end
end

6
config/styles.yaml
View File

@ -78,6 +78,10 @@ cards:
fields:
- header
- text
options:
- background
- color
- align
- template: card_normal_square
header: Standard card with square image
text: Image, header, text, normal stuff
@ -117,7 +121,7 @@ options:
desciption:
Text colors. Don't use with solid background colors.
Same colors as background available. Default none, meas as parent.
values: none white light_blue light_gray solid_black solid_blue solid_red solid_indigo
values: none white black light_blue light_gray solid_black solid_blue solid_red solid_indigo
default: none
- name: shade_color
desciption: