Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1C544200ABE for ; Fri, 20 May 2016 09:31:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1AFEE1609AF; Fri, 20 May 2016 07:31:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EFE7A160A2B for ; Fri, 20 May 2016 09:31:55 +0200 (CEST) Received: (qmail 24282 invoked by uid 500); 20 May 2016 07:31:55 -0000 Mailing-List: contact commits-help@mynewt.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@mynewt.incubator.apache.org Delivered-To: mailing list commits@mynewt.incubator.apache.org Received: (qmail 24262 invoked by uid 99); 20 May 2016 07:31:55 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2016 07:31:55 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id BFC0918062B for ; Fri, 20 May 2016 07:31:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id NJO7j07unmMM for ; Fri, 20 May 2016 07:31:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 5514A5FB46 for ; Fri, 20 May 2016 07:31:51 +0000 (UTC) Received: (qmail 23430 invoked by uid 99); 20 May 2016 07:31:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2016 07:31:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A50A0E08B6; Fri, 20 May 2016 07:31:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aditi@apache.org To: commits@mynewt.incubator.apache.org Date: Fri, 20 May 2016 07:31:59 -0000 Message-Id: <380882123be84b7bb4fd0c6ef5c993b9@git.apache.org> In-Reply-To: <32e4fce3a72a4cb38f3b535d47c75f5b@git.apache.org> References: <32e4fce3a72a4cb38f3b535d47c75f5b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/18] incubator-mynewt-site git commit: clean up table of contents archived-at: Fri, 20 May 2016 07:31:57 -0000 clean up table of contents Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/commit/a5571dc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/a5571dc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/a5571dc1 Branch: refs/heads/master Commit: a5571dc163f855c3ac1ba34e1063c12e9d5d3702 Parents: b7c596d Author: Gavin Jefferies Authored: Thu May 19 15:20:18 2016 -0700 Committer: Gavin Jefferies Committed: Thu May 19 15:20:18 2016 -0700 ---------------------------------------------------------------------- custom-theme/base.html | 11 +-- custom-theme/breadcrumbs.html | 2 +- custom-theme/css/base.css | 91 -------------------- custom-theme/css/custom.css | 172 ++----------------------------------- custom-theme/css/v2.css | 30 +++++++ custom-theme/nested_toc.html | 20 ++--- custom-theme/toc.html | 13 ++- docs/extra.css | 22 ----- 8 files changed, 55 insertions(+), 306 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/base.html ---------------------------------------------------------------------- diff --git a/custom-theme/base.html b/custom-theme/base.html index 44dce79..905f4d2 100644 --- a/custom-theme/base.html +++ b/custom-theme/base.html @@ -69,19 +69,16 @@ {% elif page_title == 'Events' %} {% include "events.html" %} {% else %} -
- +
+
{% include "toc.html" %}
-
+
-
- {% include 'manual_links.html' %} -
-
+
{% include 'breadcrumbs.html' %}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/breadcrumbs.html ---------------------------------------------------------------------- diff --git a/custom-theme/breadcrumbs.html b/custom-theme/breadcrumbs.html index 95df937..32c8476 100644 --- a/custom-theme/breadcrumbs.html +++ b/custom-theme/breadcrumbs.html @@ -1,5 +1,5 @@
-
    +
    • Docs
      • {% if current_page %} {% for doc in current_page.ancestors %} http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/css/base.css ---------------------------------------------------------------------- diff --git a/custom-theme/css/base.css b/custom-theme/css/base.css index 08eeb9a..f571a49 100644 --- a/custom-theme/css/base.css +++ b/custom-theme/css/base.css @@ -13,97 +13,6 @@ ul.nav li.main { font-weight: bold; } -div.col-md-9 { - padding-bottom: 100px; -} - div.source-links { float: right; } - -/* - * Side navigation - * - * Scrollspy and affixed enhanced navigation to highlight sections and secondary - * sections of docs content. - */ - -/* By default it's not affixed in mobile views, so undo that */ -.bs-sidebar.affix { - position: static; -} - -.bs-sidebar.well { - padding: 0; -} - -/* First level of nav */ -.bs-sidenav { - margin-top: 30px; - margin-bottom: 30px; - padding-top: 10px; - padding-bottom: 10px; - border-radius: 5px; -} - -/* All levels of nav */ -.bs-sidebar .nav > li > a { - display: block; - padding: 5px 20px; - z-index: 1; -} -.bs-sidebar .nav > li > a:hover, -.bs-sidebar .nav > li > a:focus { - text-decoration: none; - border-right: 1px solid; -} -.bs-sidebar .nav > .active > a, -.bs-sidebar .nav > .active:hover > a, -.bs-sidebar .nav > .active:focus > a { - font-weight: bold; - background-color: transparent; - border-right: 1px solid; -} - -/* Nav: second level (shown on .active) */ -.bs-sidebar .nav .nav { - display: none; /* Hide by default, but at >768px, show it */ - margin-bottom: 8px; -} -.bs-sidebar .nav .nav > li > a { - padding-top: 3px; - padding-bottom: 3px; - padding-left: 30px; - font-size: 90%; -} - -/* Show and affix the side nav when space allows it */ -@media (min-width: 992px) { - .bs-sidebar .nav > .active > ul { - display: block; - } - /* Widen the fixed sidebar */ - .bs-sidebar.affix, - .bs-sidebar.affix-bottom { - width: 213px; - } - .bs-sidebar.affix { - position: fixed; /* Undo the static from mobile first approach */ - top: 80px; - } - .bs-sidebar.affix-bottom { - position: absolute; /* Undo the static from mobile first approach */ - } - .bs-sidebar.affix-bottom .bs-sidenav, - .bs-sidebar.affix .bs-sidenav { - margin-top: 0; - margin-bottom: 0; - } -} -@media (min-width: 1200px) { - /* Widen the fixed sidebar again */ - .bs-sidebar.affix-bottom, - .bs-sidebar.affix { - width: 263px; - } -} http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/css/custom.css ---------------------------------------------------------------------- diff --git a/custom-theme/css/custom.css b/custom-theme/css/custom.css index bed1a90..189d04f 100644 --- a/custom-theme/css/custom.css +++ b/custom-theme/css/custom.css @@ -1,9 +1,3 @@ -/*body * { - font-size: 12pt; - font-weight: 300; - word-wrap: break-word; -}*/ - .content { margin-bottom: 15px; } @@ -20,28 +14,6 @@ background-color: #959696; } -.main-banner h3 { - font-size: 22px; -} - -/*h1 { - font-size: 28px; - font-weight: 500; - color: #42567E; -} - -h2, h3 { - color: #42567E; - font-weight: 300; -}*/ - -hsp{ - color: #42567E; - font-weight: 600; - margin-top: 2px; - margin-bottom: 2px; -} - .navbar { background-color: #42567E; font-size: 12pt; @@ -106,10 +78,6 @@ hsp{ @media (max-width: 992px) { - .sm-extra-padding { - padding: 20px; - } - .sidebar-container { display: none; } @@ -121,7 +89,6 @@ hsp{ .logo-container { display: block; - background-color: #F6F7F9; position: absolute; top: 0; left: 20px; @@ -138,10 +105,6 @@ hsp{ @media (min-width: 992px) { - .main-banner img { - width: 15%; - } - .documentation-viewer { padding: 1%; } @@ -160,32 +123,10 @@ hsp{ } } -.navbar-nav li { - padding: 5px 10px; -} - -.bs-sidebar a { - color: #111 !important; -} - -.navbar a { - color: #fff !important; -} - -.bs-sidebar a:hover, -.navbar a:hover { - text-decoration: underline !important; -} - -.bs-sidebar { - width: 100% !important; - border-radius: 0; - font-size: 14px; -} - -.bs-sidebar li { - background-color: #f6f7f9; - margin-bottom: 0px; +.sidebar-container { + padding-left: 0; + padding-right: 0; + background: #F6F7F9; } .documentation-viewer { @@ -204,58 +145,19 @@ hsp{ color: #333; } -/*.row { - margin-left: 0px; - margin-right: 0px; -}*/ - .navbar { margin-bottom: 0px; } - .sidebar-top { - background-color: #F6F7F9; padding: 0px; } .logo-small { display: block; - margin: 10px auto 20px auto; - max-width: 280px; -} - -#search-input { - background-color: #fff; - box-shadow: none; - border-radius: 0; - -webkit-appearance: none; -} - -#rtd-search-form input, -#rtd-search-form button { - border: 1px solid #BFBFBF; -} - -#rtd-search-form input { - border-right: 0; - width: 80%; - padding: 6px 10px; - height: 44px; - font-size: 16px; -} - -#rtd-search-form button { - background-color: #ffffff; - border-left: 0; - color: #42567E; - font-size: 20px; - width: 15%; - height: 44px; - margin-left: -10px; - position: relative; - top: 2px; - padding: 6px 10px; + height: 150px; + margin-left: auto; + margin-right: auto; } .home .search-container { @@ -304,17 +206,6 @@ footer .footnote { margin: 0 auto; } -.main-banner { - background: #F6F7F9; - text-align: center; - padding: 20px 20px 15px; - /* margin-bottom: 40px; */ -} - -/*.home h2 { - font-size: 13pt; -}*/ - .goal p { max-width: 350px; display: block; @@ -415,18 +306,6 @@ footer .footnote { text-decoration: none; } -.current-toc li { - list-style-type: none; - background: none; - padding: 2px 0; -} - -.sidebar-container { - padding-left: 0; - padding-right: 0; - background: #F6F7F9; -} - .navbar-default .navbar-toggle { border: none; } @@ -622,43 +501,6 @@ code { font-family: "Courier New"; } -li.toctree-l3 { - padding-left: 20px; -} - -li.active { - background-color: #F2853F !important; -} - .doc-header .col-sm-6 { padding-left: 0px; } - -ul.nav-pills li.active a { - background-color: #42567E; -} - -.navbar ul.dropdown-menu { - background-color: #42567E; -} - -.navbar ul.dropdown-menu li.active { - background-color: #F2853F; -} - -.navbar ul.dropdown-menu li.active a { - background-color: #F2853F; - color: black !important; -} - -.navbar ul.dropdown-menu li a:hover { - background-color: #F2853F; -} - -.navbar ul.dropdown-menu li:hover { - background-color: #F2853F; -} - -.navbar .nav .open>a, .navbar .nav .open>a:hover, .navbar .nav .open>a:focus { - background-color: #42567E; -} http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/css/v2.css ---------------------------------------------------------------------- diff --git a/custom-theme/css/v2.css b/custom-theme/css/v2.css index 9ea21c7..928cffc 100644 --- a/custom-theme/css/v2.css +++ b/custom-theme/css/v2.css @@ -49,3 +49,33 @@ .v2-landing .updates img { width: 100%; } + +.v2-sidebar > div { + background-color: #F6F7F9; + padding-left: 15px; + padding-bottom: 15px; +} + +.v2-sidebar .form-group { + margin-right: 15px; +} + +.v2-sidebar ul.toc-nav { + list-style: none; + padding-left: 0; +} + +.v2-sidebar .toc-nav ul { + list-style: none; + padding-left: 20px; +} + +.v2-sidebar .toc-nav a { + display: block; + padding: 2px; +} + +.v2-sidebar .toc-nav .active > a { + background-color: #eee; + border-right: 1px solid black; +} http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/nested_toc.html ---------------------------------------------------------------------- diff --git a/custom-theme/nested_toc.html b/custom-theme/nested_toc.html index 037617e..9323766 100644 --- a/custom-theme/nested_toc.html +++ b/custom-theme/nested_toc.html @@ -1,28 +1,22 @@ {% if nav_item.children %} {% set child=nav_item.children[0] %} {% if child.title == "toc" %} -
    • {{ nav_item.title }}
      • +
    • {{ nav_item.title }} {% else %}
    • {{ nav_item.title }} {% endif %} - {% if nav_item.active %} -
        + {% if nav_item.active %} +
          {% for nav_item in nav_item.children %} {% if nav_item.title != "toc" %} {% include "nested_toc.html" %} {% endif %} {% endfor %} -
        - {% endif %} - -{% else %} - {% if nav_item.active %} -
      • - {{ nav_item.title }} +
      + {% endif %}
      • - {% else %} -
    • +{% else %} +
    • {{ nav_item.title }}
      • - {% endif %} {% endif %} http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/a5571dc1/custom-theme/toc.html ---------------------------------------------------------------------- diff --git a/custom-theme/toc.html b/custom-theme/toc.html index f3b5c43..c62fe57 100644 --- a/custom-theme/toc.html +++ b/custom-theme/toc.html @@ -1,16 +1,15 @@ -