Merge pull request #3 from yasslab/create-textlogo-layout

nanophate · nanophate · commit 9f7cc76ebdb0 · 2016-05-22T23:31:22.000+09:00
Create heading section for CoderDojo
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ ruby '2.3.1'
 gem 'pg', '~> 0.18.4'
 
 gem 'rails', '4.2.6'
-gem 'scrivito', '~> 1.3.0.rc1'
+gem 'scrivito', '~> 1.3.0'
 
 gem 'scrivito_section_widgets', '1.0.0'
 gem 'scrivito_teaser_widget',  '0.1.1'
@@ -13,6 +13,8 @@ gem 'coffee-rails', '~> 4.1.0'
 gem 'jbuilder', '~> 2.0'
 gem 'jquery-rails'
 
+gem 'simple_grid_rails'
+gem "bootstrap-sass", "~> 3.3.5"
 gem 'sass-rails', '~> 5.0'
 gem 'sdoc', '~> 0.4.0', group: :doc
 gem 'uglifier', '>= 1.3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -38,8 +38,13 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.4.0)
     arel (6.0.3)
+    autoprefixer-rails (6.3.6)
+      execjs
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
+    bootstrap-sass (3.3.6)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
     builder (3.2.2)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
@@ -122,20 +127,20 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    scrivito (1.3.0.rc3)
+    scrivito (1.3.0)
       railties
-      scrivito_content_browser (= 1.3.0.rc3)
-      scrivito_editors (= 1.3.0.rc3)
-      scrivito_sdk (= 1.3.0.rc3)
-    scrivito_content_browser (1.3.0.rc3)
+      scrivito_content_browser (= 1.3.0)
+      scrivito_editors (= 1.3.0)
+      scrivito_sdk (= 1.3.0)
+    scrivito_content_browser (1.3.0)
       railties
-      scrivito_sdk (= 1.3.0.rc3)
-    scrivito_editors (1.3.0.rc3)
+      scrivito_sdk (= 1.3.0)
+    scrivito_editors (1.3.0)
       jquery-ui-rails (>= 5.0.0)
       railties
-      scrivito_content_browser (= 1.3.0.rc3)
-      scrivito_sdk (= 1.3.0.rc3)
-    scrivito_sdk (1.3.0.rc3)
+      scrivito_content_browser (= 1.3.0)
+      scrivito_sdk (= 1.3.0)
+    scrivito_sdk (1.3.0)
       addressable (~> 2.3)
       connection_pool (~> 2.2)
       diff-lcs (~> 1.2)
@@ -156,6 +161,7 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    simple_grid_rails (0.1.0)
     spring (1.7.1)
     sprockets (3.6.0)
       concurrent-ruby (~> 1.0)
@@ -182,16 +188,18 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bootstrap-sass (~> 3.3.5)
   coffee-rails (~> 4.1.0)
   jbuilder (~> 2.0)
   jquery-rails
   pg (~> 0.18.4)
   rails (= 4.2.6)
   sass-rails (~> 5.0)
-  scrivito (~> 1.3.0.rc1)
+  scrivito (~> 1.3.0)
   scrivito_section_widgets (= 1.0.0)
   scrivito_teaser_widget (= 0.1.1)
   sdoc (~> 0.4.0)
+  simple_grid_rails
   spring (= 1.7.1)
   sqlite3 (= 1.3.11)
   uglifier (>= 1.3.0)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,3 +14,6 @@
 //= require jquery_ujs
 //= require scrivito
 //= require scrivito_section_widgets
+//= require scrivito
+//= require bootstrap-sprockets
+
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -13,7 +13,9 @@
  *= require scrivito
  *= require scrivito_section_widgets
  */
-body {
-    text-align: center
-}
 
+@import "bootstrap-sprockets";
+@import "bootstrap";
+
+.cover-bg-blue{background-color:#2275CA;}
+.cover-text-white{color:#FFFFFF;}
diff --git a/app/models/paragraph_widget.rb b/app/models/paragraph_widget.rb
@@ -0,0 +1,6 @@
+class ParagraphWidget < Widget
+  attribute :image, :reference
+  attribute :headline, :string
+  attribute :text, :string
+  attribute :color, :enum, values: %w[red green blue], default: 'blue'
+end
diff --git a/app/views/image_widget/show.html.erb b/app/views/image_widget/show.html.erb
@@ -1 +1 @@
-<%= scrivito_image_tag widget, :image %>
+<%= scrivito_image_tag widget, :image, style:'padding-top:-50px;' %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -9,7 +9,9 @@
 
 </head>
 <body>
+  <center>
   <%= yield %>
   <%= scrivito_body_tags %>
+  </center>
 </body>
 </html>
diff --git a/app/views/paragraph_widget/details.html.erb b/app/views/paragraph_widget/details.html.erb
@@ -0,0 +1,5 @@
+<%= scrivito_medium_dialog do %>
+  <%= scrivito_details_for ParagraphWidget.description_for_editor do %>
+    A cover with head, text and image
+  <% end %>
+<% end %>
diff --git a/app/views/paragraph_widget/show.html.erb b/app/views/paragraph_widget/show.html.erb
@@ -0,0 +1,9 @@
+<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>
+</div>
diff --git a/app/views/paragraph_widget/thumbnail.html.erb b/app/views/paragraph_widget/thumbnail.html.erb
@@ -0,0 +1 @@
+<%= scrivito_thumbnail ParagraphWidget.description_for_editor %>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<%= scrivito_image_tag widget, :image %>`
	`1`	`+<%= scrivito_image_tag widget, :image, style:'padding-top:-50px;' %>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<%= scrivito_thumbnail ParagraphWidget.description_for_editor %>`