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/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; + } } } 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/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", 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. 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 @@