This is an automated email from the git hooks/post-receive script.
bex pushed a change to branch master in repository fedora-budget.
from e924d63 Update styling to be more in line with docs.fp.o new f59f540 Revert "Update styling to be more in line with docs.fp.o"
The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
Summary of changes: _stylesheets/asciibinder.css | 18 +++++----------- _templates/page.html.erb | 50 ++++++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 38 deletions(-)
This is an automated email from the git hooks/post-receive script.
bex pushed a commit to branch master in repository fedora-budget.
commit f59f5401f3ff74fd4509abf3a915902a1df0e3b2 Author: Brian (bex) Exelbierd bex@pobox.com Date: Tue Nov 21 14:59:58 2017 +0100
Revert "Update styling to be more in line with docs.fp.o"
This reverts commit e924d63ac87534f3bd35beedf2125f6d20aa69d0. --- _stylesheets/asciibinder.css | 18 +++++----------- _templates/page.html.erb | 50 ++++++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 38 deletions(-)
diff --git a/_stylesheets/asciibinder.css b/_stylesheets/asciibinder.css index a7db2eb..0e17a3d 100644 --- a/_stylesheets/asciibinder.css +++ b/_stylesheets/asciibinder.css @@ -70,25 +70,19 @@ License: https://creativecommons.org/licenses/by/2.0/ .main h2, .main .h2 { border-top: 0px; padding-top: 10px; - font-size: 28px; }
.page-header { height: 100% !important; } -.page-header .img-responsive { - display: inline; -} -.page-header h2 { - font-size: 32px; - display: inline; - vertical-align: bottom; + +.page-header h2{ + font-size: 28px; }
.navbar-brand { padding: initial; height: initial; - padding: 12px; }
.nav > li > a.hover{ @@ -223,7 +217,6 @@ h6 > a.anchor:hover {
body, html { overflow-x: hidden; /* Prevent scroll on narrow devices */ - font-family: "Overpass", sans-serif; }
.toggle-nav { @@ -374,14 +367,13 @@ table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-si .exampleblock > .content h1, .exampleblock > .content h2, .exampleblock > .content h3, .exampleblock > .content #toctitle, .sidebarblock.exampleblock > .content > .title, .exampleblock > .content h4, .exampleblock > .content h5, .exampleblock > .content h6 { line-height: 1; margin-bottom: 0.625em; } .exampleblock > .content h1.subheader, .exampleblock > .content h2.subheader, .exampleblock > .content h3.subheader, .exampleblock > .content .subheader#toctitle, .sidebarblock.exampleblock > .content > .subheader.title, .exampleblock > .content h4.subheader, .exampleblock > .content h5.subheader, .exampleblock > .content h6.subheader { line-height: 1.4; } .exampleblock.result > .content { -webkit-box-shadow: 0 1px 8px #e3e3dd; box-shadow: 0 1px 8px #e3e3dd; } -.sidebarblock { border-style: solid; border-width: 1px; border-color: #e3e3dd; margin-top: -1.0em; margin-bottom: 1.6em; margin-left: 1em; padding: .5em; background: #F1F3F5; -webkit-border-radius: 4px; border-radius: 4px; overflow-x: auto; float: right; width: 40%; } +.sidebarblock { border-style: solid; border-width: 1px; border-color: #e3e3dd; margin-top: -1.0em; margin-bottom: 1.6em; padding: .5em; background: #F1F3F5; -webkit-border-radius: 4px; border-radius: 4px; overflow-x: auto; } .sidebarblock > :first-child { margin-top: 0; } .sidebarblock > :last-child { margin-bottom: 0; } .sidebarblock h1, .sidebarblock h2, .sidebarblock h3, .sidebarblock #toctitle, .sidebarblock > .content > .title, .sidebarblock h4, .sidebarblock h5, .sidebarblock h6, .sidebarblock p { color: #333333; } .sidebarblock h1, .sidebarblock h2, .sidebarblock h3, .sidebarblock #toctitle, .sidebarblock > .content > .title, .sidebarblock h4, .sidebarblock h5, .sidebarblock h6 { line-height: 1; margin-bottom: 0.625em; } .sidebarblock h1.subheader, .sidebarblock h2.subheader, .sidebarblock h3.subheader, .sidebarblock .subheader#toctitle, .sidebarblock > .content > .subheader.title, .sidebarblock h4.subheader, .sidebarblock h5.subheader, .sidebarblock h6.subheader { line-height: 1.4; } -.sidebarblock > .content > .title { color: inherit; font-size: 28px; font-weight: 500; margin-top: 0; line-height: 1.6; } -.width50 { width: 50% ! important} +.sidebarblock > .content > .title { color: #7a2518; margin-top: 0; line-height: 1.6; } .exampleblock > .content > :last-child > :last-child, .exampleblock > .content .olist > ol > li:last-child > :last-child, .exampleblock > .content .ulist > ul > li:last-child > :last-child, .exampleblock > .content .qlist > ol > li:last-child > :last-child, .sidebarblock > .content > :last-child > :last-child, .sidebarblock > .content .olist > ol > li:last-child > :last-child, .sidebarblock > .content .ulist > ul > li:last-child > :last-child, .sidebarblock > .content .qlist > ol > li:la [...] .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] { border: 0px; background-color: #F0F3F5; -webkit-border-radius: 5px; border-radius: 5px; padding: 1.5em 2.5em; word-wrap: break-word; } .literalblock pre.nowrap, .literalblock pre[class].nowrap, .listingblock pre.nowrap, .listingblock pre[class].nowrap { overflow-x: auto; white-space: pre; word-wrap: normal; } diff --git a/_templates/page.html.erb b/_templates/page.html.erb index 06f9674..fe016d1 100644 --- a/_templates/page.html.erb +++ b/_templates/page.html.erb @@ -7,13 +7,14 @@ <title><%= distro %> <%= version %> | <%= [group_title, subgroup_title, topic_title].compact.join(' | ') %></title>
<!-- Bootstrap --> - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css"> - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css"> - - <!-- Overpass Font --> - <link rel="stylesheet" href="http://overpass-30e2.kxcdn.com/overpass.css"> + <link href="https://apps.fedoraproject.org/global/fedora-bootstrap-1.0.2/fedora-bootstra..." +type="text/css" rel="stylesheet" /> +<!--<link href="https://apps.fedoraproject.org/global/fedora-bootstrap-fonts/open-sans.css" type="text/css" rel="stylesheet" /> +--> +<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
<%= render("_templates/_css.html.erb", :css_path => css_path) %> + <script src="<%= File.join(javascripts_path, "bootstrap-offcanvas.js") %>" type="text/javascript"></script>
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> @@ -27,32 +28,32 @@ <meta content="AsciiBinder" name="application-name"> </head> <body> - <div class="navbar navbar-default" role="navigation"> - <div class="container-fluid"> + <div class="masthead" role="navigation"> + <div class="container"> <div class="navbar-header"> <a href="<%= site_url %>"><img height=40px alt="<%= site_name %>" src="<%= File.join(images_path, "fedora_budget_logo.png") %>"></a> </div> </div> </div> + <div class="bodycontent pb-3"> + <div class="breadcrumb-wrapper mb-2"> + <div class="container"> + <ol class="breadcrumb pb-0"> + <li class="breadcrumb-item sitename"> + <a href="<%= site_home_path %>"><%= site_name %></a> + </li> + <%= breadcrumb_subgroup_block %> + <li class="breadcrumb-item hidden-xs active"> + <%= breadcrumb_topic %> + </li> + </ol> + </div> + </div> <div class="container"> - <p class="toggle-nav visible-xs pull-left"> + <!--<p class="toggle-nav visible-xs pull-left"> <button class="btn btn-default btn-sm" type="button" data-toggle="offcanvas">Toggle nav</button> - </p> - <ol class="breadcrumb"> - <li class="sitename"> - <a href="<%= site_home_path %>"><%= site_name %></a> - </li> - <li class="hidden-xs active"> - <%= breadcrumb_root %> - </li> - <li class="hidden-xs active"> - <%= breadcrumb_group %> - </li> - <%= breadcrumb_subgroup_block %> - <li class="hidden-xs active"> - <%= breadcrumb_topic %> - </li> - </ol> + </p>--> + <div class="row row-offcanvas row-offcanvas-left"> <div class="col-xs-8 col-sm-3 col-md-3 sidebar sidebar-offcanvas"> <%= render("_templates/_nav.html.erb", :navigation => navigation, :group_id => group_id, :topic_id => topic_id, :subgroup_id => subgroup_id, :subtopic_shim => subtopic_shim) %> @@ -71,7 +72,6 @@ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> <!-- Latest compiled and minified JavaScript --> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script> - <script src="<%= File.join(javascripts_path, "bootstrap-offcanvas.js") %>" type="text/javascript"></script> <script type="text/javascript"> /*<
git repository hosting