From 04b2f0ffb03ba7155467105de11a04f68799f5bf Mon Sep 17 00:00:00 2001 From: Sandro Liebscher Date: Tue, 5 May 2020 15:17:11 +0200 Subject: [PATCH 1/5] Add Protect from forgery and introduce a style issue --- .../test/dummy/app/controllers/application_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/actiontext/test/dummy/app/controllers/application_controller.rb b/actiontext/test/dummy/app/controllers/application_controller.rb index 09705d12ab4df..ab3f93c2f5ae7 100644 --- a/actiontext/test/dummy/app/controllers/application_controller.rb +++ b/actiontext/test/dummy/app/controllers/application_controller.rb @@ -1,2 +1,7 @@ class ApplicationController < ActionController::Base + + protect_from_forgery + + + end From f00b072617ea7ad5ac376c8fc7af61ab57791293 Mon Sep 17 00:00:00 2001 From: Sandro Liebscher Date: Tue, 5 May 2020 15:46:56 +0200 Subject: [PATCH 2/5] Remove useless empty lines --- .../test/dummy/app/controllers/application_controller.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/actiontext/test/dummy/app/controllers/application_controller.rb b/actiontext/test/dummy/app/controllers/application_controller.rb index ab3f93c2f5ae7..e8065d9505d7e 100644 --- a/actiontext/test/dummy/app/controllers/application_controller.rb +++ b/actiontext/test/dummy/app/controllers/application_controller.rb @@ -1,7 +1,3 @@ class ApplicationController < ActionController::Base - protect_from_forgery - - - end From f4dbc4499c8f44dd6006b52f9227cf10df3385fe Mon Sep 17 00:00:00 2001 From: Sandro Liebscher Date: Tue, 5 May 2020 16:01:36 +0200 Subject: [PATCH 3/5] Fixed some CSS issues --- .../test/fixtures/public/stylesheets/bank.css | 2 +- guides/assets/stylesheets/kindle.css | 3 +- guides/assets/stylesheets/print.css | 35 ++++++++++--------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/actionview/test/fixtures/public/stylesheets/bank.css b/actionview/test/fixtures/public/stylesheets/bank.css index ea161b12b2008..e8606dce1dba7 100644 --- a/actionview/test/fixtures/public/stylesheets/bank.css +++ b/actionview/test/fixtures/public/stylesheets/bank.css @@ -1 +1 @@ -/* bank.css */ \ No newline at end of file +/* bank.css */ diff --git a/guides/assets/stylesheets/kindle.css b/guides/assets/stylesheets/kindle.css index b26cd1786a304..4e50a8a61f5e5 100644 --- a/guides/assets/stylesheets/kindle.css +++ b/guides/assets/stylesheets/kindle.css @@ -3,9 +3,10 @@ p { text-indent: 0; } p, H1, H2, H3, H4, H5, H6, H7, H8, table { margin-top: 1em;} .pagebreak { page-break-before: always; } + #toc H3 { text-indent: 1em; } #toc .document { text-indent: 2em; -} \ No newline at end of file +} diff --git a/guides/assets/stylesheets/print.css b/guides/assets/stylesheets/print.css index 6280422469b8a..c52b657b5c5c0 100644 --- a/guides/assets/stylesheets/print.css +++ b/guides/assets/stylesheets/print.css @@ -4,7 +4,7 @@ /* Modified January 31, 2009 --------------------------------------- */ -body, .wrapper, .note, .info, code, #topNav, .L, .R, #frame, #container, #header, #navigation, #footer, #feature, #mainCol, #subCol, .content {position: static; text-align: left; text-indent: 0; background: White; color: Black; border-color: Black; width: auto; height: auto; display: block; float: none; min-height: 0; margin: 0; padding: 0;} +body, .wrapper, .note, .info, code, #topNav, .L, .R, #frame, #container, #header, #navigation, #footer, #feature, #mainCol, #subCol, .content { position: static; text-align: left; text-indent: 0; background: White; color: Black; border-color: Black; width: auto; height: auto; display: block; float: none; min-height: 0; margin: 0; padding: 0;} body { background: #FFF; @@ -26,27 +26,30 @@ a:link, a:visited { } hr { - background:#ccc; - color:#ccc; - width:100%; - height:2px; - margin:2em 0; - padding:0; - border:none; + background: #ccc; + color: #ccc; + width: 100%; + height: 2px; + margin: 2em 0; + padding: 0; + border: none; } h1,h2,h3,h4,h5,h6 { font-family: "Helvetica Neue", Arial, "Lucida Grande", sans-serif; } -code { font:.9em "Courier New", Monaco, Courier, monospace; display:inline} +code { font: 0.9em "Courier New", Monaco, Courier, monospace; display:inline} -img { float:left; margin:1.5em 1.5em 1.5em 0; } -a img { border:none; } +img { + float: left; + margin: 1.5em 1.5em 1.5em 0; +} +a img { border: none; } blockquote { - margin:1.5em; - padding:1em; - font-style:italic; - font-size:.9em; + margin: 1.5em; + padding: 1em; + font-style: italic; + font-size: 0.9em; } -.small { font-size: .9em; } +.small { font-size: 0.9em; } .large { font-size: 1.1em; } From 7c373aa34bd06506bae963fab7abe5113a3c98e2 Mon Sep 17 00:00:00 2001 From: Sandro Liebscher Date: Tue, 5 May 2020 16:13:58 +0200 Subject: [PATCH 4/5] Fix spaces --- guides/assets/stylesheets/print.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guides/assets/stylesheets/print.css b/guides/assets/stylesheets/print.css index c52b657b5c5c0..71e638db6a841 100644 --- a/guides/assets/stylesheets/print.css +++ b/guides/assets/stylesheets/print.css @@ -51,5 +51,5 @@ blockquote { font-size: 0.9em; } -.small { font-size: 0.9em; } -.large { font-size: 1.1em; } +.small { font-size: 0.9em; } +.large { font-size: 1.1em; } From 83f5907daa3d64a415561348a0ba0e60b630fd60 Mon Sep 17 00:00:00 2001 From: Sandro Liebscher Date: Tue, 5 May 2020 16:25:28 +0200 Subject: [PATCH 5/5] Fix more css --- guides/assets/stylesheets/print.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guides/assets/stylesheets/print.css b/guides/assets/stylesheets/print.css index 71e638db6a841..b5172af34c42d 100644 --- a/guides/assets/stylesheets/print.css +++ b/guides/assets/stylesheets/print.css @@ -36,7 +36,11 @@ hr { } h1,h2,h3,h4,h5,h6 { font-family: "Helvetica Neue", Arial, "Lucida Grande", sans-serif; } -code { font: 0.9em "Courier New", Monaco, Courier, monospace; display:inline} + +code { + font: 0.9em "Courier New", Monaco, Courier, monospace; + display:inline; +} img { float: left;