fix conflict with master

nanophate · nanophate · commit 5ac3eaa9ba43 · 2016-10-31T19:46:59.000+09:00
diff --git a/README.md b/README.md
@@ -1,2 +1,34 @@
 # coderdojo.jp
+
 Official website of CoderDojo Japan integrated with Rails-based CMS (Scrivito)
+
+- 本番環境: http://coderdojo.jp (using Parse.com that will be shutdown on 2017 January)
+  - GitHub: https://github.com/coderdojo-japan/web
+- デモ環境: http://coderdojo-japan.herokuapp.com/
+  - GitHub: https://github.com/yasslab/coderdojo.jp
+
+## TODO
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
diff --git a/README.rdoc b/README.rdoc
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -18,4 +18,5 @@
 @import "bootstrap";
 
 .cover-bg-blue{background-color:#2275CA;}
-.cover-text-white{color:#FFFFFF;}
+.cover-text-white{color:#FFFFFF;}
+.a {color:#FFFFF;}
diff --git a/app/models/footer_widget.rb b/app/models/footer_widget.rb
@@ -0,0 +1,4 @@
+class FooterWidget < Widget
+  attribute :headline, :html
+  attribute :paragraph, :html
+end
diff --git a/app/views/footer_widget/details.html.erb b/app/views/footer_widget/details.html.erb
@@ -0,0 +1,4 @@
+<%= scrivito_medium_dialog do %>
+  <%= scrivito_details_for FooterWidget.description_for_editor do %>
+  <% end %>
+<% end %>
diff --git a/app/views/footer_widget/show.html.erb b/app/views/footer_widget/show.html.erb
@@ -0,0 +1,7 @@
+<div class="col-12">
+  <div class="col-3 cover-bg-blue">
+    <%= scrivito_tag :h5, widget, :headline, class:'cover-text-white', style:'padding-top:20px;' %>
+    <%= scrivito_tag :p, widget, :paragraph, class:'cover-text-white', style:'padding-bottom:60; padding-top:20px;' %>
+  </div>
+</div>
+
diff --git a/app/views/footer_widget/thumbnail.html.erb b/app/views/footer_widget/thumbnail.html.erb
@@ -0,0 +1 @@
+<%= scrivito_thumbnail FooterWidget.description_for_editor %>
diff --git a/app/views/paragraph_widget/show.html.erb b/app/views/paragraph_widget/show.html.erb
@@ -1,9 +1,7 @@
-<div class="row">
-  <div class="col-12">
-    <div class="col-3 cover-bg-blue ">
-        <%= scrivito_image_tag widget, :image, class:'image-responsive'%>
-        <%= scrivito_tag :h1, widget, :headline, data: {newlines: false}, class:'cover-text-white' %>
-        <%= scrivito_tag :p, widget, :text, class:'cover-text-white', style:'padding-bottom:25px;'%> 
-    </div>
+<div class="col-12">
+  <div class="col-3 cover-bg-blue ">
+      <%= scrivito_image_tag widget, :image, class:'image-responsive'%>
+      <%= scrivito_tag :h1, widget, :headline, data: {newlines: false}, class:'cover-text-white' %>
+      <%= scrivito_tag :p, widget, :text, class:'cover-text-white', style:'padding-bottom:30px;'%> 
   </div>
-</div>
+  </div>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<%= scrivito_thumbnail FooterWidget.description_for_editor %>`