From a867ae2bcd763389f5fc11054fa3d4da13870736 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 4 Oct 2023 13:45:22 +0200 Subject: [PATCH 1/5] Remove a bogus end tag This has been introduced in 38c17b0e (sidebar is a shared partial now, 2012-05-02) and it looks like some unwanted Intellisense left-over. Signed-off-by: Johannes Schindelin --- app/views/books/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/books/show.html.erb b/app/views/books/show.html.erb index 762722f50d..da80a85944 100644 --- a/app/views/books/show.html.erb +++ b/app/views/books/show.html.erb @@ -41,7 +41,7 @@ <% end %>

- The entire Pro Git book, written by Scott Chacon and Ben Straub and published by Apress, is available here. All content is licensed under the Creative Commons Attribution Non Commercial Share Alike 3.0 license. Print versions of the book are available on Amazon.com. + The entire Pro Git book, written by Scott Chacon and Ben Straub and published by Apress, is available here. All content is licensed under the Creative Commons Attribution Non Commercial Share Alike 3.0 license. Print versions of the book are available on Amazon.com.

The version found here has been updated with corrections and additions from hundreds of contributors. If you see an error or have a suggestion, patches and issues are welcome in its GitHub repository. From c4dce0b17cc1675e6da5dd2eddd0485c30220481 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 24 Oct 2023 12:09:44 +0200 Subject: [PATCH 2/5] docs: fix a bogus This clearly wanted to be an end tag. Signed-off-by: Johannes Schindelin --- app/views/doc/ref.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/doc/ref.html.erb b/app/views/doc/ref.html.erb index 4b0751a3de..7b75929ad0 100644 --- a/app/views/doc/ref.html.erb +++ b/app/views/doc/ref.html.erb @@ -13,7 +13,7 @@

- Complete list of all commands + Complete list of all commands
From 3ead70a51bc4655c8371825504b3fbb69d8f77f3 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 17 Oct 2023 09:13:20 +0200 Subject: [PATCH 3/5] Remove obsolete banner We have not shown the banner in years. Let's just drop it. Signed-off-by: Johannes Schindelin --- app/assets/stylesheets/layout.scss | 24 ------------------------ app/helpers/application_helper.rb | 6 ------ app/views/shared/_banner.html.erb | 26 -------------------------- 3 files changed, 56 deletions(-) delete mode 100644 app/views/shared/_banner.html.erb diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 0d45c9b5eb..d0a4ff7f72 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -32,30 +32,6 @@ aside { margin-bottom: 35px; } -.banner-message { - position: relative; - padding: 1em 100px; - margin-bottom: 30px; - font-size: 100%; - color: #855; - background-color: #fcbda5; - - a { - color: #c22; - } - - .dismiss { - position: absolute; - top: 0; - right: 0; - width: 2em; - padding: 0; - line-height: 2em; - background: none; - border: 0; - } -} - #content { float: right; width: 702px; diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 48cbdca0dc..edf5ca59e3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -52,10 +52,4 @@ def image_tag(image, options = {}) tag("img", options) end - - def banner_duration(duration) - return "" if duration.blank? - - ISO8601::Duration.new(duration).to_seconds.round * 1000 - end end diff --git a/app/views/shared/_banner.html.erb b/app/views/shared/_banner.html.erb deleted file mode 100644 index 104f86ab74..0000000000 --- a/app/views/shared/_banner.html.erb +++ /dev/null @@ -1,26 +0,0 @@ - From 40a1ae5c4ffb4cac6fdfdf7b750e4a6560276d46 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 18 Nov 2023 14:40:16 +0100 Subject: [PATCH 4/5] Revert "book2.rake: drop progit2-ms translation" Contrary to the claim of that commit, that repository _does_ exist. Besides, it is referenced in quite a few places, e.g. in `app/views/books/_translations.html.erb`. Therefore we would either remove those references (that were forgotten in the commit that removed the Malaysian translation), or reinstate the entry in `@all_books`. Let's do the latter. This reverts commit 0f82f6f5eb00d32e2347fae0c6cadc89d4f2d627. Signed-off-by: Johannes Schindelin --- app/models/book.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/book.rb b/app/models/book.rb index 884e304c98..f5b737ba85 100644 --- a/app/models/book.rb +++ b/app/models/book.rb @@ -22,6 +22,7 @@ class Book < ApplicationRecord "ja" => "progit/progit2-ja", "ko" => "progit/progit2-ko", "mk" => "progit2-mk/progit2", + "ms" => "progit2-ms/progit2", "nl" => "progit/progit2-nl", "pl" => "progit2-pl/progit2-pl", "pt-br" => "progit/progit2-pt-br", From a492d0565512417f20fed2127e9c9fe872610733 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 18 Jul 2024 09:09:47 +0200 Subject: [PATCH 5/5] Fix rendering of clone's/init's synopses Since git/git@76880f0510c (doc: git-clone: apply new documentation formatting guidelines, 2024-03-29) and its parent commit, the synopses of the manual pages of the `git clone` and the `git init` command are rendered in a different way. This matters because the changes were clearly only tested with AsciiDoc, but not with AsciiDoctor. Using the latter, the formatting is all off, unless the default stylesheet is overridden. On Git's home page, AsciiDoctor is used to render the manual pages, and the default stylesheet is overridden. However, the synopses still look unpleasant to my eye, e.g. because of the inconsistent background color of the `` blocks. This commit changes the style of the `` blocks in the synopses so that they flow better again, visually. Signed-off-by: Johannes Schindelin --- app/assets/stylesheets/man-pages.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/assets/stylesheets/man-pages.scss b/app/assets/stylesheets/man-pages.scss index 5ab9276c7e..cee42ffc50 100644 --- a/app/assets/stylesheets/man-pages.scss +++ b/app/assets/stylesheets/man-pages.scss @@ -54,6 +54,14 @@ font-weight: bold; font-style: normal; } + + code { + background-color: #e8e7dd; + margin-bottom: 0; + border: none; + padding-left: 0; + padding-right: 0; + } } }