[tianocore-docs][ATBB-Memory_Protection_in_UEFI_BIOS][Patch 2/2] Update to match template and enable GitBook action
|
Michael D Kinney
* Add layout directory to match template
* Update CSS styles to match template * Add GitBook Action Cc: Jiewen Yao <jiewen.yao@...> Cc: Vincent Zimmer <vincent.zimmer@...> Cc: Laurie Jarlstrom <laurie.jarlstrom@...> Cc: Kevin Shaw <kevin.w.shaw@...> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney <michael.d.kinney@...> --- .bookignore | 3 + .github/workflows/gitbook-action.yml | 39 +++++ .gitignore | 10 +- _layouts/ebook/page.html | 42 +++++ _layouts/ebook/pdf_footer.html | 17 ++ _layouts/ebook/pdf_header.html | 14 ++ _layouts/ebook/summary.html | 98 ++++++++++++ _layouts/layout.html | 27 ++++ _layouts/website/footer.html | 17 ++ _layouts/website/header.html | 31 ++++ _layouts/website/languages.html | 19 +++ _layouts/website/layout.html | 28 ++++ _layouts/website/page.html | 86 +++++++++++ _layouts/website/summary.html | 61 ++++++++ styles/epub.css | 221 ++------------------------ styles/mobi.css | 50 ++++++ styles/pdf.css | 221 +++----------------------- styles/website.css | 223 +++------------------------ 18 files changed, 591 insertions(+), 616 deletions(-) create mode 100644 .bookignore create mode 100644 .github/workflows/gitbook-action.yml create mode 100644 _layouts/ebook/page.html create mode 100644 _layouts/ebook/pdf_footer.html create mode 100644 _layouts/ebook/pdf_header.html create mode 100644 _layouts/ebook/summary.html create mode 100644 _layouts/layout.html create mode 100644 _layouts/website/footer.html create mode 100644 _layouts/website/header.html create mode 100644 _layouts/website/languages.html create mode 100644 _layouts/website/layout.html create mode 100644 _layouts/website/page.html create mode 100644 _layouts/website/summary.html create mode 100644 styles/mobi.css diff --git a/.bookignore b/.bookignore new file mode 100644 index 0000000..ed716f0 --- /dev/null +++ b/.bookignore @@ -0,0 +1,3 @@ +/.github +.gitignore +.bookignore diff --git a/.github/workflows/gitbook-action.yml b/.github/workflows/gitbook-action.yml new file mode 100644 index 0000000..917b0d7 --- /dev/null +++ b/.github/workflows/gitbook-action.yml @@ -0,0 +1,39 @@ +name: 'Gitbook Action Build' +on: + push: + branches: + - master + - release/* + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout action + uses: actions/checkout@v2 + - name: Get Branch + run: | + raw=$(git branch -r --contains ${{ github.ref }}) + branch=${raw/ origin\/} + pubdir=${branch/master/draft} + pubdir=${pubdir////-} + echo "ON_PUSH_BRANCH_NAME=$branch" >> $GITHUB_ENV + echo "ON_PUSH_PUBDIR=$pubdir" >> $GITHUB_ENV + - name: Gitbook Action + uses: zanderzhao/gitbook-action@....4 + with: + token: ${{secrets.GITBOOK_ACTION_PERSONAL_TOKEN}} + source_branch: ${{env.ON_PUSH_BRANCH_NAME}} + publish_branch: gh-pages + publish_dir: ${{env.ON_PUSH_PUBDIR}} + publish_remove_last_build: true + gitbook_pdf: true + gitbook_pdf_dir: / + gitbook_pdf_name: ${{ github.event.repository.name }}-${{env.ON_PUSH_PUBDIR}} + gitbook_epub: true + gitbook_epub_dir: / + gitbook_epub_name: ${{ github.event.repository.name }}-${{env.ON_PUSH_PUBDIR}} + gitbook_mobi: true + gitbook_mobi_dir: / + gitbook_mobi_name: ${{ github.event.repository.name }}-${{env.ON_PUSH_PUBDIR}} diff --git a/.gitignore b/.gitignore index 1a366fb..e9c50d9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,12 +5,12 @@ ## Dependency directory ## Commenting this out is preferred by some people, see ## https://docs.npmjs.com/misc/faq#should-i-check-my-node_modules-folder-into-git -node_modules +/node_modules # Book build output -_book +/_book # eBook build output -*.epub -*.mobi \ No newline at end of file +/book.epub +/book.mobi +/book.pdf \ No newline at end of file diff --git a/_layouts/ebook/page.html b/_layouts/ebook/page.html new file mode 100644 index 0000000..9dec3b5 --- /dev/null +++ b/_layouts/ebook/page.html @@ -0,0 +1,42 @@ +{% extends "layout.html" %} + +{% block title %}{{ page.title }}{% endblock %} +{% block description %}{{ page.description }}{% endblock %} + +{% block style %} + {### Include theme css before plugins css ###} + {% if not fileExists(config.styles.print) %} + {% if options.format %} + <link rel="stylesheet" href="{{ (options.format + ".css")|resolveAsset }}"> + {% else %} + <link rel="stylesheet" href="{{ "ebook.css"|resolveAsset }}"> + {% endif %} + {% endif %} + + {{ super() }} + + {### Custom stylesheets for the book ###} + + {% for type, style in config.styles %} + {% if fileExists(style) and (type == "ebook" or type == "print" or type == options.format) %} + <link rel="stylesheet" href="{{ style|resolveFile }}"> + {% endif %} + {% endfor %} +{% endblock %} + +{% block body %} +<div class="page"> + {% block page %} + <h1 class="book-chapter book-chapter-{{ page.depth }}">{{ page.title }}</h1> + {% if options.format == "mobi" %} + <div> + {{ page.content|safe }} + </div> + {% else %} + <div class="section"> + {{ page.content|safe }} + </div> + {% endif %} + {% endblock %} +</div> +{% endblock %} diff --git a/_layouts/ebook/pdf_footer.html b/_layouts/ebook/pdf_footer.html new file mode 100644 index 0000000..709fa57 --- /dev/null +++ b/_layouts/ebook/pdf_footer.html @@ -0,0 +1,17 @@ +{% extends "./page.html" %} + +{% block body %} +<div class="pdf-footer"> + {% if book.draft %} + <p> + <div style="position:absolute;text-align:left">DRAFT FOR REVIEW [{{ gitbook.time|date('MM/DD/YYYY hh:mm:ss') }}]</div> + <div style="text-align:right">{{ page.num }}</div> + </p> + {% else %} + <p> + <div style="position:absolute;text-align:left">{{ book.version }}</div> + <div style="text-align:right">{{ page.num }}</div> + </p> + {% endif %} +</div> +{% endblock %} diff --git a/_layouts/ebook/pdf_header.html b/_layouts/ebook/pdf_header.html new file mode 100644 index 0000000..05c7450 --- /dev/null +++ b/_layouts/ebook/pdf_header.html @@ -0,0 +1,14 @@ +{% extends "./page.html" %} + +{% block body %} +<div class="pdf-header"> + <p> + {% if book.draft %} + <div style="position:absolute;text-align:left">{{ book.title }}[DRAFT]</div> + {% else %} + <div style="position:absolute;text-align:left">{{ book.title }}</div> + {% endif %} + <div style="text-align:right">{{ page.title }}</div> + </p> +</div> +{% endblock %} diff --git a/_layouts/ebook/summary.html b/_layouts/ebook/summary.html new file mode 100644 index 0000000..946e8cb --- /dev/null +++ b/_layouts/ebook/summary.html @@ -0,0 +1,98 @@ +{% extends "./page.html" %} + +{% block title %}{{ "SUMMARY"|t }}{% endblock %} + +{% macro articles(_articles) %} + {% for article in _articles %} + {% if options.format == "mobi" %} + <blockquote> + {% else %} + <li> + {% endif %} + <span class="inner"> + {% if article.path or article.url %} + {% if article.path %} + <a href="{{ article.path|contentURL }}{{ article.anchor }}">{{ article.title }}</a> + {% else %} + <a target="_blank" href="{{ article.url }}">{{ article.title }}</a> + {% endif %} + {% else %} + <span>{{ article.title }}</span> + {% endif %} + {% if 0 %} + <span class="page">{{ article.level }}</span> + {% endif %} + </span> + {% if article.articles.length > 0 %} + {% if options.format == "mobi" %} + <blockquote> + {{ articles(article.articles) }} + </blockquote> + {% else %} + <ol> + {{ articles(article.articles) }} + </ol> + {% endif %} + {% endif %} + {% if options.format == "mobi" %} + </blockquote> + {% else %} + </li> + {% endif %} + {% endfor %} +{% endmacro %} + +{% block page %} +{% if options.format == "mobi" %} +<div> +{% else %} +<div class="section toc"> +{% endif %} + <h1>{{ "SUMMARY"|t }}</h1> + {% if options.format == "mobi" %} + <blockquote> + {% else %} + <ol> + {% endif %} + {% for part in summary.parts %} + {% if part.title %} + {% if options.format == "mobi" %} + <blockquote> + <span>{{ part.title }}</span> + </blockquote> + {% else %} + <li class="part-title"> + <span>{{ part.title }}</span> + </li> + {% endif %} + {% endif %} + {{ articles(part.articles) }} + + {% if not loop.last and not options.format == "mobi" %} + <li class="divider"></li> + {% endif %} + {% endfor %} + + {% if glossary.path %} + {% if options.format == "mobi" %} + <blockquote> + <span class="inner"> + <a href="{{ ('/' + glossary.path)|contentURL }}">{{ "GLOSSARY"|t }}</a> + </span> + </blockquote> + {% else %} + <li> + <span class="inner"> + <a href="{{ ('/' + glossary.path)|contentURL }}">{{ "GLOSSARY"|t }}</a> + </span> + </li> + {% endif %} + {% endif %} + {% if options.format == "mobi" %} + </blockquote> + {% else %} + </ol> + {% endif %} +</div> +{% endblock %} + diff --git a/_layouts/layout.html b/_layouts/layout.html new file mode 100644 index 0000000..884574c --- /dev/null +++ b/_layouts/layout.html @@ -0,0 +1,27 @@ +<!DOCTYPE HTML> +<html lang="{{ config.language }}" {% if page.dir == "rtl" %}dir="rtl"{% endif %}> + <head> + <meta charset="UTF-8"> + <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> + <title>{% block title %}{{ config.title|d("GitBook", true) }}{% endblock %}</title> + <meta http-equiv="X-UA-Compatible" content="IE=edge" /> + <meta name="description" content="{% block description %}{% endblock %}"> + <meta name="generator" content="GitBook {{ gitbook.version }}"> + {% if config.author %}<meta name="author" content="{{ config.author }}">{% endif %} + {% if config.isbn %}<meta name="identifier" content="{{ config.isbn }}" scheme="ISBN">{% endif %} + {% block style %} + {% for resource in plugins.resources.css %} + {% if resource.url %} + <link rel="stylesheet" href="{{ resource.url }}"> + {% else %} + <link rel="stylesheet" href="{{ resource.path|resolveAsset }}"> + {% endif %} + {% endfor %} + {% endblock %} + {% block head %}{% endblock %} + </head> + <body> + {% block body %}{% endblock %} + {% block javascript %}{% endblock %} + </body> +</html> diff --git a/_layouts/website/footer.html b/_layouts/website/footer.html new file mode 100644 index 0000000..c37da01 --- /dev/null +++ b/_layouts/website/footer.html @@ -0,0 +1,17 @@ +{% block book_footer %} +<div> + <hr> + {% if book.draft %} + <h2> + <div style="position:absolute;text-align:left">{{ book.title }}</div> + <div style="position:absolute;width:100%;text-align:center">DRAFT [{{ gitbook.time|date('MM/DD/YYYY hh:mm:ss') }}]</div> + <div style="text-align:right">{{ book.version }}</div> + </h2> + {% else %} + <h2> + <div style="position:absolute;text-align:left">{{ book.title }}</div> + <div style="text-align:right">{{ book.version }}</div> + </h2> + {% endif %} +</div> +{% endblock %} diff --git a/_layouts/website/header.html b/_layouts/website/header.html new file mode 100644 index 0000000..2e5971c --- /dev/null +++ b/_layouts/website/header.html @@ -0,0 +1,31 @@ +{% block book_header %} +<div class="book-header" role="navigation"> + {% if glossary.path %} + <a href="{{ ('/' + glossary.path)|resolveFile }}" class="btn pull-left" aria-label="{{ "GLOSSARY_OPEN"|t }}"><i class="fa fa-sort-alpha-asc"></i></a> + {% endif %} + + <!-- Title --> + <h1> + <i class="fa fa-circle-o-notch fa-spin"></i> + <a href="{{ "/"|resolveFile }}" >{{ page.title }}</a> + </h1> +</div> +<div> + <!-- + <img style="float:left; align:middle; height:2em" src="media/TianocoreTitlePageLogo.jpg"/> + --> + {% if book.draft %} + <h2> + <div style="position:absolute;text-align:left">{{ book.title }}</div> + <div style="position:absolute;width:100%;text-align:center">DRAFT [{{ gitbook.time|date('MM/DD/YYYY hh:mm:ss') }}]</div> + <div style="text-align:right">{{ book.version }}</div> + </h2> + {% else %} + <h2> + <div style="position:absolute;text-align:left">{{ book.title }}</div> + <div style="text-align:right">{{ book.version }}</div> + </h2> + {% endif %} + <hr> +</div> +{% endblock %} diff --git a/_layouts/website/languages.html b/_layouts/website/languages.html new file mode 100644 index 0000000..a9d43be --- /dev/null +++ b/_layouts/website/languages.html @@ -0,0 +1,19 @@ +{% extends "./layout.html" %} + +{% block title %}{{ "LANGS_CHOOSE"|t }} · {{ super() }}{% endblock %} + +{% block body %} +<div class="book-langs-index" role="navigation"> + <div class="inner"> + <h3>{{ "LANGS_CHOOSE"|t }}</h3> + + <ul class="languages"> + {% for lang in languages.list %} + <li> + <a href="{{ (lang.id + "/README.md")|contentURL }}">{{ lang.title }}</a> + </li> + {% endfor %} + </ul> + </div> +</div> +{% endblock %} diff --git a/_layouts/website/layout.html b/_layouts/website/layout.html new file mode 100644 index 0000000..5fa7fe8 --- /dev/null +++ b/_layouts/website/layout.html @@ -0,0 +1,28 @@ +{% extends "layout.html" %} + +{% block head %} + {{ super() }} + <meta name="HandheldFriendly" content="true"/> + <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"> + <meta name="apple-mobile-web-app-capable" content="yes"> + <meta name="apple-mobile-web-app-status-bar-style" content="black"> + <link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ "images/apple-touch-icon-precomposed-152.png"|resolveAsset }}"> + <link rel="shortcut icon" href="{{ "images/favicon.ico"|resolveAsset }}" type="image/x-icon"> +{% endblock %} + +{% block style %} + {### Include theme css before plugins css ###} + <link rel="stylesheet" href="{{ "style.css"|resolveAsset }}"> + + {{ super() }} + + {### Custom stylesheets for the book ###} + + {% for type, style in config.styles %} + {% if fileExists(style) and type == "website" %} + <link rel="stylesheet" href="{{ style|resolveFile }}"> + {% endif %} + {% endfor %} +{% endblock %} + +{% block body %}{% endblock %} diff --git a/_layouts/website/page.html b/_layouts/website/page.html new file mode 100644 index 0000000..d78a348 --- /dev/null +++ b/_layouts/website/page.html @@ -0,0 +1,86 @@ +{% extends "./layout.html" %} + +{% block title %}{{ page.title }} · {{ super() }}{% endblock %} + +{% block description %}{{ page.description }}{% endblock %} + +{% block head %} + {{ super() }} + {% if page.next and page.next.path %} + <link rel="next" href="{{ page.next.path|resolveFile }}" /> + {% endif %} + {% if page.previous and page.previous.path %} + <link rel="prev" href="{{ page.previous.path|resolveFile }}" /> + {% endif %} +{% endblock %} + +{% block javascript %} + <script src="{{ "gitbook.js"|resolveAsset }}"></script> + <script src="{{ "theme.js"|resolveAsset }}"></script> + {% for resource in plugins.resources.js %} + {% if resource.url %} + <script src="{{ resource.url }}"></script> + {% else %} + <script src="{{ resource.path|resolveAsset }}"></script> + {% endif %} + {% endfor %} +{% endblock %} + +{% block body %} +<div class="book"> + <div class="book-summary"> + {% block book_sidebar %} + {% block search_input %}{% endblock %} + {% block book_summary %} + <nav role="navigation"> + {% include "website/summary.html" %} + </nav> + {% endblock %} + {% endblock %} + </div> + + <div class="book-body"> + {% block book_body %} + <div class="body-inner"> + {% block book_inner %} + {% include "website/header.html" %} + + <div class="page-wrapper" tabindex="-1" role="main"> + <div class="page-inner"> + {% block search_results %} + <section class="normal markdown-section"> + {% block page %} + {{ page.content|safe }} + {% endblock %} + </section> + {% endblock %} + </div> + </div> + + {% include "website/footer.html" %} + {% endblock %} + </div> + + {% block book_navigation %} + {% if page.previous and page.previous.path %} + <a href="{{ page.previous.path|resolveFile }}{{ page.previous.anchor }}" class="navigation navigation-prev {% if not (page.next and page.next.path) %}navigation-unique{% endif %}" aria-label="Previous page: {{ page.previous.title }}"> + <i class="fa fa-angle-left"></i> + </a> + {% endif %} + {% if page.next and page.next.path %} + <a href="{{ page.next.path|resolveFile }}{{ page.next.anchor }}" class="navigation navigation-next {% if not (page.previous and page.previous.path) %}navigation-unique{% endif %}" aria-label="Next page: {{ page.next.title }}"> + <i class="fa fa-angle-right"></i> + </a> + {% endif %} + {% endblock %} + {% endblock %} + </div> + + <script> + var gitbook = gitbook || []; + gitbook.push(function() { + gitbook.page.hasChanged({{ template.getJSContext()|dump|safe }}); + }); + </script> +</div> +{% endblock %} diff --git a/_layouts/website/summary.html b/_layouts/website/summary.html new file mode 100644 index 0000000..e43c954 --- /dev/null +++ b/_layouts/website/summary.html @@ -0,0 +1,61 @@ +{% macro articles(_articles) %} + {% for article in _articles %} + <li class="chapter {% if article.path == file.path and not article.anchor %}active{% endif %}" data-level="{{ article.level }}" {% if article.path %}data-path="{{ article.path|resolveFile }}"{% endif %}> + {% if article.path and getPageByPath(article.path) %} + <a href="{{ article.path|resolveFile }}{{ article.anchor }}"> + {% elif article.url %} + <a target="_blank" href="{{ article.url }}"> + {% else %} + <span> + {% endif %} + {% if article.level != "0" and config.pluginsConfig['theme-default'].showLevel %} + <b>{{ article.level }}.</b> + {% endif %} + {{ article.title }} + {% if article.path or article.url %} + </a> + {% else %} + </span> + {% endif %} + + {% if article.articles.length > 0 %} + <ul class="articles"> + {{ articles(article.articles, file, config) }} + </ul> + {% endif %} + </li> + {% endfor %} +{% endmacro %} + +<ul class="summary"> + {% set _divider = false %} + {% if config.links.sidebar %} + {% for linkTitle, link in config.links.sidebar %} + {% set _divider = true %} + <li> + <a href="{{ link }}" target="_blank" class="custom-link">{{ linkTitle }}</a> + </li> + {% endfor %} + {% endif %} + + {% if _divider %} + <li class="divider"></li> + {% endif %} + + {% for part in summary.parts %} + {% if part.title %} + <li class="header">{{ part.title }}</li> + {% elif not loop.first %} + <li class="divider"></li> + {% endif %} + {{ articles(part.articles, file, config) }} + {% endfor %} + + <li class="divider"></li> + + <li> + <a href="https://www.gitbook.com" target="blank" class="gitbook-link"> + {{ "GITBOOK_LINK"|t }} + </a> + </li> +</ul> diff --git a/styles/epub.css b/styles/epub.css index b9729f1..56f8394 100644 --- a/styles/epub.css +++ b/styles/epub.css @@ -1,235 +1,48 @@ -/* CSS for pdf */ - -body { - background: #f1f1f1; - border-top: 10px solid #999999; - font-size: 12pt; -} - -#mainbody { - margin-left: auto; - margin-right: auto; - width: 60em; -} - -#topbar { - top: 0; - left: 0; - bottom: 0; - width: 60em; - background: url("../images/header-bg.jpg") no-repeat; - border-top: 10px solid #ff6600; - margin-top: -10px; - float: left; -} - -#topbar.front-page { - height: 13em; -} - -#topbar #logo { - position: relative; - top: 85px; - left: 20px; -} - -#topbar #small-logo { - position: relative; - left: 20px; - padding: 0.1em 0 0.1em 0; - height: 3em; -} - -#sidebar { - float: left; - z-index: 1; - top: 0; - left: 0; - bottom: 0; - padding: 2em 0.5em 0 0.5em; - width: 9em; -} - -div.main-page.content { - float: left; - width: 35em; -} - -div.main-page.news { - float: right; - width: 20em; -} - -div.main-page.news h2 { - border-top: 10px solid #365f91; - border-bottom: 1px solid #333333; - color: #333333; - padding: 0.5em; - margin: 0; -} - -div.main-page.news ul { - margin: 0; - list-style: none; - list-style-image: none; -} - -div.main-page.news ul li { - border-bottom: 1px solid #333333; - padding: 0.5em; - color: #777777; -} - -div.main-page.news ul li a { - font-weight: bold; -} - -div.news-page.news-item { - border-top: 1px solid #777777; - width: 100%; - padding: 0; - margin: 0; -} - -#content { - margin: 0px; - padding: 2em 1em; - font-family: Helvetica; - color: #40494d; - background-color: #fff; - width: 100%; - max-width: 60em; - display: block; - float: left; -} - -#content #buttons a { - background: #ff6600; - color: #333333; - font-family: "Helvetica"; - text-transform: uppercase; - font-size: 15px; - display: inline-block; - padding: 8px 25px; - margin: 10px 20px 10px 0; -} - -#footer { - background: #999999; - margin-bottom: 60px; - width: 100%; - float: left; - padding: 0.5em 1em; -} -#footer #footer-inner { - height: 2em; - background: url("../images/footer-icon.svg") no-repeat right center; -} -#footer #footer-inner a { - color: white; - font-size: 14px; -} -@media (min-width: 0em) and (max-width: 63.9375em) { - #footer #footer-inner { - padding: 10px 20px; - background-position: right 20px center; - } -} -@media (min-width: 64em) { - #page-wrapper #page #footer-inner { - -sgs-span-settings: ("span": 3, "location": 2, "grid": 20px 630px 20px 310px 20px, "gutter": 0.25, "style": "opposite", "start row": false, "end row": false, "fixed gutter": true, "split gutter": false, "gutter property": "padding", "options": (("both": null))); - width: 96%; - float: left; - margin-right: -100%; - margin-left: 2%; - clear: none; - padding-right: 0.25; - } -} -@media (min-width: 0em) and (max-width: 63.9375em) { - #page-wrapper #page #footer-inner { - -sgs-span-settings: ("span": 1, "location": 1, "grid": 1, "gutter": 0.25, "style": "opposite", "start row": true, "end row": true, "fixed gutter": false, "split gutter": false, "gutter property": "margin", "options": ((null: null))); - width: 100%; - float: right; - margin-left: 0; - margin-right: 0; - clear: none; - } -} - -ul { - font-family: sans-serif; - list-style-type: square; - padding: 0 0 0 0; - margin: 0.3em 0 0 1.5em; -} - -.site-menu { - color: #a0a0a0; -} - -a.site-menu:hover { - color: #4048c0; -} - -a { - color: #0860A8; - text-decoration: none; -} - -a:hover { - color: #0860A8; - text-decoration: underline; +p { + font-family: sans, sans-serif, Arial; } -p { - margin: .4em 0 .5em 0; - line-height: 1.5em; +body { + font-family: sans, sans-serif, Arial; } h1 { color: #0860A8; - font-family: "Helvetica"; font-weight: normal; font-size: 190%; text-transform: uppercase; - margin-top: 0; - margin-bottom: 0; } h2 { color: #0860A8; - font-family: "Helvetica"; font-size: 130% } h3 { color: #0860A8; font-weight: bold; - font-size: 90% + font-size: 100% } h4 { color: #0860A8; - font-weight: bold; font-size: 90% } -.t_projects th { - background-color: #DBEBFF; +h5 { + color: #0860A8; + font-weight: bold; + font-size: 90%; } -.t_projects table, th, td { - border: 1px solid #ccc; - font-size: 80%; +h6 { + font-weight: bold; + font-size: 90%; + text-align: center; } -.section.toc { - display: none; +img { + max-width: 100%; + height: auto; } - -/* TODO: Consider css for - * - * .posts .site .header .title .meta .footer .contact .rss .post - */ - \ No newline at end of file + diff --git a/styles/mobi.css b/styles/mobi.css new file mode 100644 index 0000000..efa36c5 --- /dev/null +++ b/styles/mobi.css @@ -0,0 +1,50 @@ +p { + font-family: sans, sans-serif, Arial; +} + +body { + font-family: sans, sans-serif, Arial; +} + +h1 { + color: #0860A8; + font-weight: bold; + font-size: 170%; + text-transform: uppercase; +} + +h2 { + color: #0860A8; + font-weight: bold; + font-size: 160% +} + +h3 { + color: #0860A8; + font-weight: bold; + font-size: 150% +} + +h4 { + color: #0860A8; + font-weight: bold; + font-size: 140% +} + +h5 { + color: #0860A8; + font-weight: bold; + font-size: 130%; +} + +h6 { + font-weight: bold; + font-size: 100%; + text-align: center; +} + +img { + max-width: 100%; + height: auto; +} + diff --git a/styles/pdf.css b/styles/pdf.css index 56f3448..56f8394 100644 --- a/styles/pdf.css +++ b/styles/pdf.css @@ -1,233 +1,48 @@ -/* CSS for pdf */ - -body { - background: #f1f1f1; - border-top: 10px solid #999999; - font-size: 12pt; -} - -#mainbody { - margin-left: auto; - margin-right: auto; - width: 60em; -} - -#topbar { - top: 0; - left: 0; - bottom: 0; - width: 60em; - background: url("../images/header-bg.jpg") no-repeat; - border-top: 10px solid #ff6600; - margin-top: -10px; - float: left; -} - -#topbar.front-page { - height: 13em; -} - -#topbar #logo { - position: relative; - top: 85px; - left: 20px; -} - -#topbar #small-logo { - position: relative; - left: 20px; - padding: 0.1em 0 0.1em 0; - height: 3em; -} - -#sidebar { - float: left; - z-index: 1; - top: 0; - left: 0; - bottom: 0; - padding: 2em 0.5em 0 0.5em; - width: 9em; -} - -div.main-page.content { - float: left; - width: 35em; -} - -div.main-page.news { - float: right; - width: 20em; -} - -div.main-page.news h2 { - border-top: 10px solid #365f91; - border-bottom: 1px solid #333333; - color: #333333; - padding: 0.5em; - margin: 0; -} - -div.main-page.news ul { - margin: 0; - list-style: none; - list-style-image: none; -} - -div.main-page.news ul li { - border-bottom: 1px solid #333333; - padding: 0.5em; - color: #777777; -} - -div.main-page.news ul li a { - font-weight: bold; -} - -div.news-page.news-item { - border-top: 1px solid #777777; - width: 100%; - padding: 0; - margin: 0; -} - -#content { - margin: 0px; - padding: 2em 1em; - font-family: Helvetica; - color: #40494d; - background-color: #fff; - width: 100%; - max-width: 60em; - display: block; - float: left; -} - -#content #buttons a { - background: #ff6600; - color: #333333; - font-family: "Helvetica"; - text-transform: uppercase; - font-size: 15px; - display: inline-block; - padding: 8px 25px; - margin: 10px 20px 10px 0; -} - -#footer { - background: #999999; - margin-bottom: 60px; - width: 100%; - float: left; - padding: 0.5em 1em; -} -#footer #footer-inner { - height: 2em; - background: url("../images/footer-icon.svg") no-repeat right center; -} -#footer #footer-inner a { - color: white; - font-size: 14px; -} -@media (min-width: 0em) and (max-width: 63.9375em) { - #footer #footer-inner { - padding: 10px 20px; - background-position: right 20px center; - } -} -@media (min-width: 64em) { - #page-wrapper #page #footer-inner { - -sgs-span-settings: ("span": 3, "location": 2, "grid": 20px 630px 20px 310px 20px, "gutter": 0.25, "style": "opposite", "start row": false, "end row": false, "fixed gutter": true, "split gutter": false, "gutter property": "padding", "options": (("both": null))); - width: 96%; - float: left; - margin-right: -100%; - margin-left: 2%; - clear: none; - padding-right: 0.25; - } -} -@media (min-width: 0em) and (max-width: 63.9375em) { - #page-wrapper #page #footer-inner { - -sgs-span-settings: ("span": 1, "location": 1, "grid": 1, "gutter": 0.25, "style": "opposite", "start row": true, "end row": true, "fixed gutter": false, "split gutter": false, "gutter property": "margin", "options": ((null: null))); - width: 100%; - float: right; - margin-left: 0; - margin-right: 0; - clear: none; - } -} - -ul { - font-family: sans-serif; - list-style-type: square; - padding: 0 0 0 0; - margin: 0.3em 0 0 1.5em; -} - -.site-menu { - color: #a0a0a0; -} - -a.site-menu:hover { - color: #4048c0; -} - -a { - color: #0860A8; - text-decoration: none; -} - -a:hover { - color: #0860A8; - text-decoration: underline; +p { + font-family: sans, sans-serif, Arial; } -p { - margin: .4em 0 .5em 0; - line-height: 1.5em; +body { + font-family: sans, sans-serif, Arial; } h1 { color: #0860A8; - font-family: "Helvetica"; font-weight: normal; font-size: 190%; text-transform: uppercase; - margin-top: 0; - margin-bottom: 0; } h2 { color: #0860A8; - font-family: "Helvetica"; font-size: 130% } h3 { color: #0860A8; font-weight: bold; - font-size: 90% + font-size: 100% } h4 { color: #0860A8; - font-weight: bold; font-size: 90% } - -.t_projects th { - background-color: #DBEBFF; +h5 { + color: #0860A8; + font-weight: bold; + font-size: 90%; } -.t_projects table, th, td { - border: 1px solid #ccc; - font-size: 80%; +h6 { + font-weight: bold; + font-size: 90%; + text-align: center; } - -/* TODO: Consider css for - * - * .posts .site .header .title .meta .footer .contact .rss .post - */ - \ No newline at end of file +img { + max-width: 100%; + height: auto; +} + diff --git a/styles/website.css b/styles/website.css index a0df36a..56f8394 100644 --- a/styles/website.css +++ b/styles/website.css @@ -1,233 +1,48 @@ -/* CSS for website */ -/* CSS for website */ - -body { - background: #f1f1f1; - border-top: 10px solid #999999; - font-size: 12pt; -} - -#mainbody { - margin-left: auto; - margin-right: auto; - width: 60em; -} - -#topbar { - top: 0; - left: 0; - bottom: 0; - width: 60em; - background: url("../images/header-bg.jpg") no-repeat; - border-top: 10px solid #ff6600; - margin-top: -10px; - float: left; -} - -#topbar.front-page { - height: 13em; -} - -#topbar #logo { - position: relative; - top: 85px; - left: 20px; -} - -#topbar #small-logo { - position: relative; - left: 20px; - padding: 0.1em 0 0.1em 0; - height: 3em; -} - -#sidebar { - float: left; - z-index: 1; - top: 0; - left: 0; - bottom: 0; - padding: 2em 0.5em 0 0.5em; - width: 9em; -} - -div.main-page.content { - float: left; - width: 35em; -} - -div.main-page.news { - float: right; - width: 20em; -} - -div.main-page.news h2 { - border-top: 10px solid #365f91; - border-bottom: 1px solid #333333; - color: #333333; - padding: 0.5em; - margin: 0; -} - -div.main-page.news ul { - margin: 0; - list-style: none; - list-style-image: none; -} - -div.main-page.news ul li { - border-bottom: 1px solid #333333; - padding: 0.5em; - color: #777777; -} - -div.main-page.news ul li a { - font-weight: bold; -} - -div.news-page.news-item { - border-top: 1px solid #777777; - width: 100%; - padding: 0; - margin: 0; -} - -#content { - margin: 0px; - padding: 2em 1em; - font-family: Helvetica; - color: #40494d; - background-color: #fff; - width: 100%; - max-width: 60em; - display: block; - float: left; -} - -#content #buttons a { - background: #ff6600; - color: #333333; - font-family: "Helvetica"; - text-transform: uppercase; - font-size: 15px; - display: inline-block; - padding: 8px 25px; - margin: 10px 20px 10px 0; -} - -#footer { - background: #999999; - margin-bottom: 60px; - width: 100%; - float: left; - padding: 0.5em 1em; -} -#footer #footer-inner { - height: 2em; - background: url("../images/footer-icon.svg") no-repeat right center; -} -#footer #footer-inner a { - color: white; - font-size: 14px; -} -@media (min-width: 0em) and (max-width: 63.9375em) { - #footer #footer-inner { - padding: 10px 20px; - background-position: right 20px center; - } -} -@media (min-width: 64em) { - #page-wrapper #page #footer-inner { - -sgs-span-settings: ("span": 3, "location": 2, "grid": 20px 630px 20px 310px 20px, "gutter": 0.25, "style": "opposite", "start row": false, "end row": false, "fixed gutter": true, "split gutter": false, "gutter property": "padding", "options": (("both": null))); - width: 96%; - float: left; - margin-right: -100%; - margin-left: 2%; - clear: none; - padding-right: 0.25; - } -} -@media (min-width: 0em) and (max-width: 63.9375em) { - #page-wrapper #page #footer-inner { - -sgs-span-settings: ("span": 1, "location": 1, "grid": 1, "gutter": 0.25, "style": "opposite", "start row": true, "end row": true, "fixed gutter": false, "split gutter": false, "gutter property": "margin", "options": ((null: null))); - width: 100%; - float: right; - margin-left: 0; - margin-right: 0; - clear: none; - } -} - -ul { - font-family: sans-serif; - list-style-type: square; - padding: 0 0 0 0; - margin: 0.3em 0 0 1.5em; -} - -.site-menu { - color: #a0a0a0; -} - -a.site-menu:hover { - color: #4048c0; -} - -a { - color: #0860A8; - text-decoration: none; -} - -a:hover { - color: #0860A8; - text-decoration: underline; +p { + font-family: sans, sans-serif, Arial; } -p { - margin: .4em 0 .5em 0; - line-height: 1.5em; +body { + font-family: sans, sans-serif, Arial; } h1 { color: #0860A8; - font-family: "Helvetica"; font-weight: normal; font-size: 190%; text-transform: uppercase; - margin-top: 0; - margin-bottom: 0; } h2 { color: #0860A8; - font-family: "Helvetica"; font-size: 130% } h3 { color: #0860A8; font-weight: bold; - font-size: 90% + font-size: 100% } + h4 { color: #0860A8; - font-weight: bold; font-size: 90% } - -.t_projects th { - background-color: #DBEBFF; +h5 { + color: #0860A8; + font-weight: bold; + font-size: 90%; } -.t_projects table, th, td { - border: 1px solid #ccc; - font-size: 80%; +h6 { + font-weight: bold; + font-size: 90%; + text-align: center; } - -/* TODO: Consider css for - * - * .posts .site .header .title .meta .footer .contact .rss .post - */ - +img { + max-width: 100%; + height: auto; +} + -- 2.29.2.windows.2
|
|
|