Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some fixes for bugs noticed while migrating to Hugo #1855

Merged
merged 5 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions app/assets/stylesheets/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 8 additions & 0 deletions app/assets/stylesheets/man-pages.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}

Expand Down
6 changes: 0 additions & 6 deletions app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions app/models/book.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion app/views/books/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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>.
Expand Down
2 changes: 1 addition & 1 deletion app/views/doc/ref.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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'>
Expand Down
26 changes: 0 additions & 26 deletions app/views/shared/_banner.html.erb

This file was deleted.

Loading