From 8eb2c4e9267f028b6e47054ae88f5026321911e3 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 13 Apr 2016 15:15:47 -0700 Subject: [PATCH] Edits to tutorial layout pg 2, simplified default html --- app/tutorial.rb | 10 +++------- sass/_project-sass/_project-Tutorial.scss | 4 ++-- views/tutorial/html/2.erb | 1 + views/tutorial/layout.erb | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/tutorial.rb b/app/tutorial.rb index cdba092f..d3a217fa 100644 --- a/app/tutorial.rb +++ b/app/tutorial.rb @@ -1,17 +1,13 @@ def default_tutorial_html <<-EOT.strip - - - - - My web site - - + + Hello World! + EOT diff --git a/sass/_project-sass/_project-Tutorial.scss b/sass/_project-sass/_project-Tutorial.scss index 4b68c506..3368fdbe 100644 --- a/sass/_project-sass/_project-Tutorial.scss +++ b/sass/_project-sass/_project-Tutorial.scss @@ -16,7 +16,7 @@ margin-bottom: 0; border: 0; } - h3 { + h3.editor-heading { margin-top: 10px; } .preview { @@ -51,7 +51,7 @@ width: 180px; position: absolute; text-align: center; - + &:nth-child(1) { left: 30px; top: 30px; diff --git a/views/tutorial/html/2.erb b/views/tutorial/html/2.erb index d327a7b5..a5686cfa 100644 --- a/views/tutorial/html/2.erb +++ b/views/tutorial/html/2.erb @@ -9,6 +9,7 @@ background-size: 289px; position: absolute; right: -47px; + top: 0; z-index: 1000;">
And here's some HTML, right in this box! Let's make a change. Replace Hello World with 's Website, and click save! diff --git a/views/tutorial/layout.erb b/views/tutorial/layout.erb index e36106bd..e34cfc01 100644 --- a/views/tutorial/layout.erb +++ b/views/tutorial/layout.erb @@ -25,7 +25,7 @@ <% end %> -

HTML

+

HTML

<%== encoding_fix default_tutorial_html %>