Showing
5 changed files
with
32 additions
and
32 deletions
| @@ -137,8 +137,8 @@ | @@ -137,8 +137,8 @@ | ||
| 137 | <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.5.1, rbenv: 2.1.3) [gem]" level="application" /> | 137 | <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.5.1, 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.5.11, rbenv: 2.1.3) [gem]" level="application" /> | 139 | <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.5.11, rbenv: 2.1.3) [gem]" level="application" /> |
| 140 | - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.5.3, rbenv: 2.1.3) [gem]" level="application" /> | ||
| 141 | - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.5.3, rbenv: 2.1.3) [gem]" level="application" /> | 140 | + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.5.11, rbenv: 2.1.3) [gem]" level="application" /> |
| 141 | + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.5.11, rbenv: 2.1.3) [gem]" level="application" /> | ||
| 142 | <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" /> | 142 | <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="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" /> | 143 | <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" /> |
| 144 | <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" /> | 144 | <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" /> |
| @@ -183,7 +183,7 @@ | @@ -183,7 +183,7 @@ | ||
| 183 | <orderEntry type="library" scope="PROVIDED" name="rake (v11.1.2, rbenv: 2.1.3) [gem]" level="application" /> | 183 | <orderEntry type="library" scope="PROVIDED" name="rake (v11.1.2, rbenv: 2.1.3) [gem]" level="application" /> |
| 184 | <orderEntry type="library" scope="PROVIDED" name="rdoc (v4.2.2, rbenv: 2.1.3) [gem]" level="application" /> | 184 | <orderEntry type="library" scope="PROVIDED" name="rdoc (v4.2.2, rbenv: 2.1.3) [gem]" level="application" /> |
| 185 | <orderEntry type="library" scope="PROVIDED" name="ref (v2.0.0, rbenv: 2.1.3) [gem]" level="application" /> | 185 | <orderEntry type="library" scope="PROVIDED" name="ref (v2.0.0, rbenv: 2.1.3) [gem]" level="application" /> |
| 186 | - <orderEntry type="library" scope="PROVIDED" name="responders (v2.2.0, rbenv: 2.1.3) [gem]" level="application" /> | 186 | + <orderEntry type="library" scope="PROVIDED" name="responders (v2.3.0, rbenv: 2.1.3) [gem]" level="application" /> |
| 187 | <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.4.4, rbenv: 2.1.3) [gem]" level="application" /> | 187 | <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.4.4, rbenv: 2.1.3) [gem]" level="application" /> |
| 188 | <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.4.0, rbenv: 2.1.3) [gem]" level="application" /> | 188 | <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.4.0, rbenv: 2.1.3) [gem]" level="application" /> |
| 189 | <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.4.1, rbenv: 2.1.3) [gem]" level="application" /> | 189 | <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.4.1, rbenv: 2.1.3) [gem]" level="application" /> |
| @@ -193,7 +193,7 @@ | @@ -193,7 +193,7 @@ | ||
| 193 | <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.6, rbenv: 2.1.3) [gem]" level="application" /> | 193 | <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.6, rbenv: 2.1.3) [gem]" level="application" /> |
| 194 | <orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.1, rbenv: 2.1.3) [gem]" level="application" /> | 194 | <orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.1, rbenv: 2.1.3) [gem]" level="application" /> |
| 195 | <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.0, rbenv: 2.1.3) [gem]" level="application" /> | 195 | <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.0, rbenv: 2.1.3) [gem]" level="application" /> |
| 196 | - <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.1.1, rbenv: 2.1.3) [gem]" level="application" /> | 196 | + <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.0, rbenv: 2.1.3) [gem]" level="application" /> |
| 197 | <orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.12.2, rbenv: 2.1.3) [gem]" level="application" /> | 197 | <orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.12.2, rbenv: 2.1.3) [gem]" level="application" /> |
| 198 | <orderEntry type="library" scope="PROVIDED" name="thor (v0.19.1, rbenv: 2.1.3) [gem]" level="application" /> | 198 | <orderEntry type="library" scope="PROVIDED" name="thor (v0.19.1, rbenv: 2.1.3) [gem]" level="application" /> |
| 199 | <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.1.3) [gem]" level="application" /> | 199 | <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.1.3) [gem]" level="application" /> |
| @@ -103,20 +103,20 @@ | @@ -103,20 +103,20 @@ | ||
| 103 | </provider> | 103 | </provider> |
| 104 | </entry> | 104 | </entry> |
| 105 | </file> | 105 | </file> |
| 106 | - <file leaf-file-name="pages_helper.rb" pinned="false" current-in-tab="false"> | 106 | + <file leaf-file-name="pages_helper.rb" pinned="false" current-in-tab="true"> |
| 107 | <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb"> | 107 | <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb"> |
| 108 | <provider selected="true" editor-type-id="text-editor"> | 108 | <provider selected="true" editor-type-id="text-editor"> |
| 109 | - <state vertical-scroll-proportion="-13.888889" vertical-offset="555" max-vertical-offset="2055"> | ||
| 110 | - <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" /> | 109 | + <state vertical-scroll-proportion="0.6919275" vertical-offset="555" max-vertical-offset="2055"> |
| 110 | + <caret line="65" column="42" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" /> | ||
| 111 | <folding /> | 111 | <folding /> |
| 112 | </state> | 112 | </state> |
| 113 | </provider> | 113 | </provider> |
| 114 | </entry> | 114 | </entry> |
| 115 | </file> | 115 | </file> |
| 116 | - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true"> | 116 | + <file leaf-file-name="version.rb" pinned="false" current-in-tab="false"> |
| 117 | <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> | 117 | <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> |
| 118 | <provider selected="true" editor-type-id="text-editor"> | 118 | <provider selected="true" editor-type-id="text-editor"> |
| 119 | - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> | 119 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135"> |
| 120 | <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> | 120 | <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> |
| 121 | <folding /> | 121 | <folding /> |
| 122 | </state> | 122 | </state> |
| @@ -187,8 +187,8 @@ | @@ -187,8 +187,8 @@ | ||
| 187 | <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb" /> | 187 | <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb" /> |
| 188 | <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb" /> | 188 | <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb" /> |
| 189 | <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" /> | 189 | <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" /> |
| 190 | - <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" /> | ||
| 191 | <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> | 190 | <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> |
| 191 | + <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" /> | ||
| 192 | </list> | 192 | </list> |
| 193 | </option> | 193 | </option> |
| 194 | </component> | 194 | </component> |
| @@ -919,10 +919,10 @@ | @@ -919,10 +919,10 @@ | ||
| 919 | </state> | 919 | </state> |
| 920 | </provider> | 920 | </provider> |
| 921 | </entry> | 921 | </entry> |
| 922 | - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb"> | 922 | + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> |
| 923 | <provider selected="true" editor-type-id="text-editor"> | 923 | <provider selected="true" editor-type-id="text-editor"> |
| 924 | - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215"> | ||
| 925 | - <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" /> | 924 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135"> |
| 925 | + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> | ||
| 926 | <folding /> | 926 | <folding /> |
| 927 | </state> | 927 | </state> |
| 928 | </provider> | 928 | </provider> |
| @@ -935,18 +935,18 @@ | @@ -935,18 +935,18 @@ | ||
| 935 | </state> | 935 | </state> |
| 936 | </provider> | 936 | </provider> |
| 937 | </entry> | 937 | </entry> |
| 938 | - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb"> | 938 | + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb"> |
| 939 | <provider selected="true" editor-type-id="text-editor"> | 939 | <provider selected="true" editor-type-id="text-editor"> |
| 940 | - <state vertical-scroll-proportion="-13.888889" vertical-offset="555" max-vertical-offset="2055"> | ||
| 941 | - <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" /> | 940 | + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215"> |
| 941 | + <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" /> | ||
| 942 | <folding /> | 942 | <folding /> |
| 943 | </state> | 943 | </state> |
| 944 | </provider> | 944 | </provider> |
| 945 | </entry> | 945 | </entry> |
| 946 | - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> | 946 | + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb"> |
| 947 | <provider selected="true" editor-type-id="text-editor"> | 947 | <provider selected="true" editor-type-id="text-editor"> |
| 948 | - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> | ||
| 949 | - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> | 948 | + <state vertical-scroll-proportion="0.6919275" vertical-offset="555" max-vertical-offset="2055"> |
| 949 | + <caret line="65" column="42" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" /> | ||
| 950 | <folding /> | 950 | <folding /> |
| 951 | </state> | 951 | </state> |
| 952 | </provider> | 952 | </provider> |
| 1 | PATH | 1 | PATH |
| 2 | remote: . | 2 | remote: . |
| 3 | specs: | 3 | specs: |
| 4 | - kanjai (0.0.58) | 4 | + kanjai (0.0.59) |
| 5 | acts_as_list | 5 | acts_as_list |
| 6 | acts_as_tree | 6 | acts_as_tree |
| 7 | aws-sdk | 7 | aws-sdk |
| @@ -59,17 +59,17 @@ GEM | @@ -59,17 +59,17 @@ GEM | ||
| 59 | minitest (~> 5.1) | 59 | minitest (~> 5.1) |
| 60 | thread_safe (~> 0.3, >= 0.3.4) | 60 | thread_safe (~> 0.3, >= 0.3.4) |
| 61 | tzinfo (~> 1.1) | 61 | tzinfo (~> 1.1) |
| 62 | - acts_as_list (0.7.5) | 62 | + acts_as_list (0.8.1) |
| 63 | activerecord (>= 3.0) | 63 | activerecord (>= 3.0) |
| 64 | - acts_as_tree (2.5.0) | 64 | + acts_as_tree (2.5.1) |
| 65 | activerecord (>= 3.0.0) | 65 | activerecord (>= 3.0.0) |
| 66 | arel (6.0.3) | 66 | arel (6.0.3) |
| 67 | - aws-sdk (2.5.3) | ||
| 68 | - aws-sdk-resources (= 2.5.3) | ||
| 69 | - aws-sdk-core (2.5.3) | 67 | + aws-sdk (2.5.11) |
| 68 | + aws-sdk-resources (= 2.5.11) | ||
| 69 | + aws-sdk-core (2.5.11) | ||
| 70 | jmespath (~> 1.0) | 70 | jmespath (~> 1.0) |
| 71 | - aws-sdk-resources (2.5.3) | ||
| 72 | - aws-sdk-core (= 2.5.3) | 71 | + aws-sdk-resources (2.5.11) |
| 72 | + aws-sdk-core (= 2.5.11) | ||
| 73 | backport_new_renderer (1.0.0) | 73 | backport_new_renderer (1.0.0) |
| 74 | rails | 74 | rails |
| 75 | bcrypt (3.1.11) | 75 | bcrypt (3.1.11) |
| @@ -157,7 +157,7 @@ GEM | @@ -157,7 +157,7 @@ GEM | ||
| 157 | rdoc (4.2.2) | 157 | rdoc (4.2.2) |
| 158 | json (~> 1.4) | 158 | json (~> 1.4) |
| 159 | ref (2.0.0) | 159 | ref (2.0.0) |
| 160 | - responders (2.2.0) | 160 | + responders (2.3.0) |
| 161 | railties (>= 4.2.0, < 5.1) | 161 | railties (>= 4.2.0, < 5.1) |
| 162 | rspec-core (3.4.4) | 162 | rspec-core (3.4.4) |
| 163 | rspec-support (~> 3.4.0) | 163 | rspec-support (~> 3.4.0) |
| @@ -189,7 +189,7 @@ GEM | @@ -189,7 +189,7 @@ GEM | ||
| 189 | sprockets (3.7.0) | 189 | sprockets (3.7.0) |
| 190 | concurrent-ruby (~> 1.0) | 190 | concurrent-ruby (~> 1.0) |
| 191 | rack (> 1, < 3) | 191 | rack (> 1, < 3) |
| 192 | - sprockets-rails (3.1.1) | 192 | + sprockets-rails (3.2.0) |
| 193 | actionpack (>= 4.0) | 193 | actionpack (>= 4.0) |
| 194 | activesupport (>= 4.0) | 194 | activesupport (>= 4.0) |
| 195 | sprockets (>= 3.0.0) | 195 | sprockets (>= 3.0.0) |
| @@ -201,7 +201,7 @@ GEM | @@ -201,7 +201,7 @@ GEM | ||
| 201 | tilt (2.0.5) | 201 | tilt (2.0.5) |
| 202 | tzinfo (1.2.2) | 202 | tzinfo (1.2.2) |
| 203 | thread_safe (~> 0.1) | 203 | thread_safe (~> 0.1) |
| 204 | - uglifier (3.0.1) | 204 | + uglifier (3.0.2) |
| 205 | execjs (>= 0.3.0, < 3) | 205 | execjs (>= 0.3.0, < 3) |
| 206 | warden (1.2.6) | 206 | warden (1.2.6) |
| 207 | rack (>= 1.0) | 207 | rack (>= 1.0) |
| @@ -63,7 +63,7 @@ module Kanjai | @@ -63,7 +63,7 @@ module Kanjai | ||
| 63 | end | 63 | end |
| 64 | 64 | ||
| 65 | else | 65 | else |
| 66 | - class_name = 'row-fluid' | 66 | + class_name = 'row-fluid clearfix' |
| 67 | html_attributes = {} | 67 | html_attributes = {} |
| 68 | html_attributes[:class] = class_name | 68 | html_attributes[:class] = class_name |
| 69 | 69 |