Merge pull request #1855 from dscho/upstream-fixes

Some fixes for bugs noticed while migrating to Hugo
git · Jul 19, 2024 · fb88c03 · fb88c03
2 parents 8befbc3 + a492d05
commit fb88c03
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 58 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/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;
+      }
     }
   }
 

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/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",

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/doc/ref.html.erb b/app/views/doc/ref.html.erb
@@ -13,7 +13,7 @@
     </p>
   </div>
   <div class="callout all-commands">
-    <a href="/docs/git#_git_commands">Complete list of all commands<a/>
+    <a href="/docs/git#_git_commands">Complete list of all commands</a>
   </div>
   <div class='reference-menu'>
     <div class='two-column'>

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