EDIT / kanjai · Commits

Commit d04211a50ecd565b822dcd4dc685b875dad792b7

Authored by Karpikau Andrei
1 parent 440fafc3

test

Inline Side-by-side
Showing 4 changed files with 12 additions and 12 deletions
@@ -85,8 +85,8 @@ @@ -85,8 +85,8 @@
85 <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false"> 85 <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false">
86 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb"> 86 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
87 <provider selected="true" editor-type-id="text-editor"> 87 <provider selected="true" editor-type-id="text-editor">
88 - <state vertical-scroll-proportion="8.333333" vertical-offset="200" max-vertical-offset="810">  
89 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 88 + <state vertical-scroll-proportion="-21.041666" vertical-offset="95" max-vertical-offset="810">
  89 + <caret line="40" column="28" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="28" />
90 <folding /> 90 <folding />
91 </state> 91 </state>
92 </provider> 92 </provider>
@@ -127,7 +127,6 @@ @@ -127,7 +127,6 @@
127 <component name="IdeDocumentHistory"> 127 <component name="IdeDocumentHistory">
128 <option name="CHANGED_PATHS"> 128 <option name="CHANGED_PATHS">
129 <list> 129 <list>
130 - <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb" />  
131 <option value="$PROJECT_DIR$/app/views/devise/sessions/new.html.erb" /> 130 <option value="$PROJECT_DIR$/app/views/devise/sessions/new.html.erb" />
132 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js" /> 131 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js" />
133 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general.css.scss" /> 132 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general.css.scss" />
@@ -177,6 +176,7 @@ @@ -177,6 +176,7 @@
177 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" /> 176 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
178 <option value="$PROJECT_DIR$/config/initializers/assets.rb" /> 177 <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
179 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" /> 178 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
  179 + <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
180 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 180 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
181 </list> 181 </list>
182 </option> 182 </option>
@@ -1027,18 +1027,18 @@ @@ -1027,18 +1027,18 @@
1027 </state> 1027 </state>
1028 </provider> 1028 </provider>
1029 </entry> 1029 </entry>
1030 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb"> 1030 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
1031 <provider selected="true" editor-type-id="text-editor"> 1031 <provider selected="true" editor-type-id="text-editor">
1032 - <state vertical-scroll-proportion="8.333333" vertical-offset="200" max-vertical-offset="810">  
1033 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1032 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
  1033 + <caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" />
1034 <folding /> 1034 <folding />
1035 </state> 1035 </state>
1036 </provider> 1036 </provider>
1037 </entry> 1037 </entry>
1038 - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 1038 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
1039 <provider selected="true" editor-type-id="text-editor"> 1039 <provider selected="true" editor-type-id="text-editor">
1040 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">  
1041 - <caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" /> 1040 + <state vertical-scroll-proportion="-21.041666" vertical-offset="95" max-vertical-offset="810">
  1041 + <caret line="40" column="28" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="28" />
1042 <folding /> 1042 <folding />
1043 </state> 1043 </state>
1044 </provider> 1044 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.7) 4 + kanjai (0.0.8)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 <%= yield %> 38 <%= yield %>
39 39
40 40
41 -<%= stylesheet_link_tag "kanjai/general" %> 41 +<%= stylesheet_link_tag "general" %>
42 <%= stylesheet_link_tag "kanjai/general_admin" %> 42 <%= stylesheet_link_tag "kanjai/general_admin" %>
43 43
44 <%= javascript_include_tag "kanjai/general_admin" %> 44 <%= javascript_include_tag "kanjai/general_admin" %>
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.8" 2 + VERSION = "0.0.9"
3 end 3 end