EDIT / kanjai · Commits

Commit a936583cf2c3d80a97161b13bd7ddb8b13951976

Authored by Karpikau Andrei
1 parent 379ae893

set font size for header and footer

Inline Side-by-side
Showing 5 changed files with 28 additions and 19 deletions
@@ -136,9 +136,9 @@ @@ -136,9 +136,9 @@
136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.8.2, rbenv: 2.1.3) [gem]" level="application" /> 136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.8.2, rbenv: 2.1.3) [gem]" level="application" />
137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.6.0, rbenv: 2.1.3) [gem]" level="application" /> 137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.6.0, rbenv: 2.1.3) [gem]" level="application" />
138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" /> 138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
139 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.6.30, rbenv: 2.1.3) [gem]" level="application" />  
140 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.6.30, rbenv: 2.1.3) [gem]" level="application" />  
141 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.6.30, rbenv: 2.1.3) [gem]" level="application" /> 139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.6.32, rbenv: 2.1.3) [gem]" level="application" />
  140 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.6.32, rbenv: 2.1.3) [gem]" level="application" />
  141 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.6.32, rbenv: 2.1.3) [gem]" level="application" />
142 <orderEntry type="library" scope="PROVIDED" name="aws-sigv4 (v1.0.0, rbenv: 2.1.3) [gem]" level="application" /> 142 <orderEntry type="library" scope="PROVIDED" name="aws-sigv4 (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
143 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" /> 143 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
144 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" /> 144 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
@@ -48,8 +48,8 @@ @@ -48,8 +48,8 @@
48 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> 48 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
49 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb"> 49 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
50 <provider selected="true" editor-type-id="text-editor"> 50 <provider selected="true" editor-type-id="text-editor">
51 - <state vertical-scroll-proportion="0.0" vertical-offset="2514" max-vertical-offset="4635">  
52 - <caret line="191" column="35" selection-start-line="182" selection-start-column="0" selection-end-line="191" selection-end-column="35" /> 51 + <state vertical-scroll-proportion="0.0" vertical-offset="780" max-vertical-offset="4635">
  52 + <caret line="192" column="0" selection-start-line="192" selection-start-column="0" selection-end-line="192" selection-end-column="0" />
53 <folding /> 53 <folding />
54 </state> 54 </state>
55 </provider> 55 </provider>
@@ -88,8 +88,8 @@ @@ -88,8 +88,8 @@
88 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> 88 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
89 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 89 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
90 <provider selected="true" editor-type-id="text-editor"> 90 <provider selected="true" editor-type-id="text-editor">
91 - <state vertical-scroll-proportion="0.0" vertical-offset="420" max-vertical-offset="3270">  
92 - <caret line="56" column="17" selection-start-line="56" selection-start-column="17" selection-end-line="56" selection-end-column="17" /> 91 + <state vertical-scroll-proportion="0.0" vertical-offset="461" max-vertical-offset="3405">
  92 + <caret line="70" column="33" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" />
93 <folding /> 93 <folding />
94 </state> 94 </state>
95 </provider> 95 </provider>
@@ -641,7 +641,7 @@ @@ -641,7 +641,7 @@
641 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 641 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
642 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 642 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
643 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 643 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
644 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.319063" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 644 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32390952" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
645 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> 645 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
646 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> 646 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
647 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 647 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -1026,16 +1026,16 @@ @@ -1026,16 +1026,16 @@
1026 </entry> 1026 </entry>
1027 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb"> 1027 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
1028 <provider selected="true" editor-type-id="text-editor"> 1028 <provider selected="true" editor-type-id="text-editor">
1029 - <state vertical-scroll-proportion="0.0" vertical-offset="2514" max-vertical-offset="4635">  
1030 - <caret line="191" column="35" selection-start-line="182" selection-start-column="0" selection-end-line="191" selection-end-column="35" /> 1029 + <state vertical-scroll-proportion="0.0" vertical-offset="780" max-vertical-offset="4635">
  1030 + <caret line="192" column="0" selection-start-line="192" selection-start-column="0" selection-end-line="192" selection-end-column="0" />
1031 <folding /> 1031 <folding />
1032 </state> 1032 </state>
1033 </provider> 1033 </provider>
1034 </entry> 1034 </entry>
1035 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 1035 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1036 <provider selected="true" editor-type-id="text-editor"> 1036 <provider selected="true" editor-type-id="text-editor">
1037 - <state vertical-scroll-proportion="0.0" vertical-offset="420" max-vertical-offset="3270">  
1038 - <caret line="56" column="17" selection-start-line="56" selection-start-column="17" selection-end-line="56" selection-end-column="17" /> 1037 + <state vertical-scroll-proportion="0.0" vertical-offset="461" max-vertical-offset="3405">
  1038 + <caret line="70" column="33" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" />
1039 <folding /> 1039 <folding />
1040 </state> 1040 </state>
1041 </provider> 1041 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.67) 4 + kanjai (0.0.68)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -64,13 +64,13 @@ GEM @@ -64,13 +64,13 @@ GEM
64 acts_as_tree (2.6.0) 64 acts_as_tree (2.6.0)
65 activerecord (>= 3.0.0) 65 activerecord (>= 3.0.0)
66 arel (6.0.3) 66 arel (6.0.3)
67 - aws-sdk (2.6.30)  
68 - aws-sdk-resources (= 2.6.30)  
69 - aws-sdk-core (2.6.30) 67 + aws-sdk (2.6.32)
  68 + aws-sdk-resources (= 2.6.32)
  69 + aws-sdk-core (2.6.32)
70 aws-sigv4 (~> 1.0) 70 aws-sigv4 (~> 1.0)
71 jmespath (~> 1.0) 71 jmespath (~> 1.0)
72 - aws-sdk-resources (2.6.30)  
73 - aws-sdk-core (= 2.6.30) 72 + aws-sdk-resources (2.6.32)
  73 + aws-sdk-core (= 2.6.32)
74 aws-sigv4 (1.0.0) 74 aws-sigv4 (1.0.0)
75 backport_new_renderer (1.0.0) 75 backport_new_renderer (1.0.0)
76 rails 76 rails
@@ -62,6 +62,15 @@ module Kanjai @@ -62,6 +62,15 @@ module Kanjai
62 options[:header] ||= {} 62 options[:header] ||= {}
63 options[:header][:right] = params['header_right'] 63 options[:header][:right] = params['header_right']
64 end 64 end
  65 + if params['header_font_size'].to_s.present?
  66 + options[:header] ||= {}
  67 + options[:header][:font_size] = params['header_font_size']
  68 + end
  69 + if params['footer_font_size'].to_s.present?
  70 + options[:footer] ||= {}
  71 + options[:footer][:font_size] = params['footer_font_size']
  72 + end
  73 +
65 74
66 render options 75 render options
67 } 76 }
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.68" 2 + VERSION = "0.0.69"
3 end 3 end