Merge branch 'upstream-fixes'

In the current effort to migrate https://git-scm.com/ to a static Hugo site (see git#1804), we saw a bogus tag that would confuse Hugo. We also saw a now-unused banner that we probably do not want to bother migrating to Hugo. So let's drop both. Signed-off-by: Johannes Schindelin <[email protected]>
dscho · Oct 17, 2023 · 10763f4 · 10763f4
2 parents 810faba + db37eac
commit 10763f4
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 57 deletions.
diff --git 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
@@ -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/books/show.html.erb b/app/views/books/show.html.erb
@@ -41,7 +41,7 @@
     </div>
   <% end %>
   <p>
-  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 <a href="https://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution Non Commercial Share Alike 3.0 license</a>. Print versions of the book are available on <a href="https://www.amazon.com/Pro-Git-Scott-Chacon/dp/1484200772?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon.com</a>.</>
+  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 <a href="https://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution Non Commercial Share Alike 3.0 license</a>. Print versions of the book are available on <a href="https://www.amazon.com/Pro-Git-Scott-Chacon/dp/1484200772?ie=UTF8&camp=1789&creative=9325&creativeASIN=1430218339&linkCode=as2&tag=git-sfconservancy-20">Amazon.com</a>.
   </p>
 
   <p>The version found here has been updated with corrections and additions from <a href="https://github.com/progit/progit2/graphs/contributors">hundreds of contributors</a>. If you see an error or have a suggestion, patches and issues are welcome in its <a href="https://github.com/progit/progit2">GitHub repository</a>.

diff --git a/app/views/shared/_banner.html.erb b/app/views/shared/_banner.html.erb