Several more updates to website * Removed Bootstrap/watch JS/CSS code as its now being served by CDN * Changed accumulo.css into sass file * Added syntax highlighting to accumulo.scss * Upgraded to version 99 of github-pages
Project: http://git-wip-us.apache.org/repos/asf/accumulo-website/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-website/commit/506b57c8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo-website/tree/506b57c8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo-website/diff/506b57c8 Branch: refs/heads/master Commit: 506b57c8b0ce25b8e7fd89a1ee901bf6a629fecd Parents: f690c6b Author: Mike Walch <[email protected]> Authored: Thu Oct 27 09:45:30 2016 -0400 Committer: Josh Elser <[email protected]> Committed: Thu Oct 27 10:49:28 2016 -0400 ---------------------------------------------------------------------- Gemfile | 2 +- Gemfile.lock | 41 +- _layouts/skeleton.html | 6 +- _sass/_syntax-highlighting.scss | 3 +- css/accumulo.css | 223 - css/accumulo.scss | 210 + css/bootstrap.css | 7520 ---------------------------------- css/bootstrap.min.css | 11 - js/bootstrap.js | 2377 ----------- js/bootstrap.min.js | 7 - 10 files changed, 237 insertions(+), 10163 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/506b57c8/Gemfile ---------------------------------------------------------------------- diff --git a/Gemfile b/Gemfile index 6c92ba1..2cc05cb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem 'github-pages', '93', group: :jekyll_plugins +gem 'github-pages', '99', group: :jekyll_plugins gem 'therubyracer' http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/506b57c8/Gemfile.lock ---------------------------------------------------------------------- diff --git a/Gemfile.lock b/Gemfile.lock index cd9531b..1a4bbfe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,7 +13,7 @@ GEM execjs coffee-script-source (1.10.0) colorator (1.1.0) - ethon (0.9.0) + ethon (0.9.1) ffi (>= 1.3.0) execjs (2.7.0) faraday (0.9.2) @@ -21,26 +21,27 @@ GEM ffi (1.9.14) forwardable-extended (2.6.0) gemoji (2.1.0) - github-pages (93) + github-pages (99) activesupport (= 4.2.7) github-pages-health-check (= 1.2.0) jekyll (= 3.2.1) jekyll-coffeescript (= 1.0.1) - jekyll-feed (= 0.5.1) + jekyll-feed (= 0.7.2) jekyll-gist (= 1.4.0) - jekyll-github-metadata (= 2.0.2) - jekyll-mentions (= 1.1.3) + jekyll-github-metadata (= 2.1.1) + jekyll-mentions (= 1.2.0) jekyll-paginate (= 1.1.0) jekyll-redirect-from (= 0.11.0) jekyll-sass-converter (= 1.3.0) jekyll-seo-tag (= 2.0.0) jekyll-sitemap (= 0.10.0) + jekyll-swiss (= 0.4.0) jemoji (= 0.7.0) kramdown (= 1.11.1) liquid (= 3.0.6) listen (= 3.0.6) mercenary (~> 0.3) - minima (= 1.0.1) + minima (= 1.2.0) rouge (= 1.11.1) terminal-table (~> 1.4) github-pages-health-check (1.2.0) @@ -65,13 +66,14 @@ GEM safe_yaml (~> 1.0) jekyll-coffeescript (1.0.1) coffee-script (~> 2.2) - jekyll-feed (0.5.1) + jekyll-feed (0.7.2) jekyll-gist (1.4.0) octokit (~> 4.2) - jekyll-github-metadata (2.0.2) + jekyll-github-metadata (2.1.1) jekyll (~> 3.1) octokit (~> 4.0) - jekyll-mentions (1.1.3) + jekyll-mentions (1.2.0) + activesupport (~> 4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-paginate (1.1.0) @@ -82,6 +84,7 @@ GEM jekyll-seo-tag (2.0.0) jekyll (~> 3.1) jekyll-sitemap (0.10.0) + jekyll-swiss (0.4.0) jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) jemoji (0.7.0) @@ -98,20 +101,18 @@ GEM rb-inotify (>= 0.9.7) mercenary (0.3.6) mini_portile2 (2.1.0) - minima (1.0.1) - minitest (5.9.0) + minima (1.2.0) + minitest (5.9.1) multipart-post (2.0.0) net-dns (0.8.0) - nokogiri (1.6.8) + nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - octokit (4.3.0) + octokit (4.4.1) sawyer (~> 0.7.0, >= 0.5.3) pathutil (0.14.0) forwardable-extended (~> 2.6) - pkg-config (1.1.7) public_suffix (1.5.3) - rb-fsevent (0.9.7) + rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0) ref (2.0.0) @@ -121,7 +122,8 @@ GEM sawyer (0.7.0) addressable (>= 2.3.5, < 2.5) faraday (~> 0.8, < 0.10) - terminal-table (1.6.0) + terminal-table (1.7.3) + unicode-display_width (~> 1.1.1) therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref @@ -130,13 +132,14 @@ GEM ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) + unicode-display_width (1.1.1) PLATFORMS ruby DEPENDENCIES - github-pages (= 93) + github-pages (= 99) therubyracer BUNDLED WITH - 1.12.5 + 1.13.5 http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/506b57c8/_layouts/skeleton.html ---------------------------------------------------------------------- diff --git a/_layouts/skeleton.html b/_layouts/skeleton.html index 53c26bf..209b543 100644 --- a/_layouts/skeleton.html +++ b/_layouts/skeleton.html @@ -20,15 +20,15 @@ <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> -<link href="{{ site.baseurl }}/css/bootstrap.min.css" rel="stylesheet"> -<link href="{{ site.baseurl }}/css/accumulo.css" rel="stylesheet" type="text/css"> +<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/paper/bootstrap.min.css"; rel="stylesheet" integrity="sha384-awusxf8AUojygHf2+joICySzB780jVvQaVCAt1clU3QsyAitLGul28Qxb2r1e5g+" crossorigin="anonymous"> <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet"> <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jqc-1.12.3/dt-1.10.12/datatables.min.css"/> +<link href="{{ site.baseurl }}/css/accumulo.css" rel="stylesheet" type="text/css"> <title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js";></script> -<script src="{{ site.baseurl }}/js/bootstrap.min.js"></script> +<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"; integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> <script type="text/javascript" src="https://cdn.datatables.net/v/bs-3.3.6/jqc-1.12.3/dt-1.10.12/datatables.min.js";></script> <script> http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/506b57c8/_sass/_syntax-highlighting.scss ---------------------------------------------------------------------- diff --git a/_sass/_syntax-highlighting.scss b/_sass/_syntax-highlighting.scss index 8fac597..b479b95 100644 --- a/_sass/_syntax-highlighting.scss +++ b/_sass/_syntax-highlighting.scss @@ -3,10 +3,9 @@ */ .highlight { background: #fff; - @extend %vertical-rhythm; .highlighter-rouge & { - background: #eef; + background: #f5f5f5; } .c { color: #998; font-style: italic } // Comment http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/506b57c8/css/accumulo.css ---------------------------------------------------------------------- diff --git a/css/accumulo.css b/css/accumulo.css deleted file mode 100644 index a50f31b..0000000 --- a/css/accumulo.css +++ /dev/null @@ -1,223 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one or more -* contributor license agreements. See the NOTICE file distributed with -* this work for additional information regarding copyright ownership. -* The ASF licenses this file to You under the Apache License, Version 2.0 -* (the "License"); you may not use this file except in compliance with -* the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -h1 { - font-size: 34px; -} - -h2 { - font-size: 28px; -} - -h3 { - font-size: 22px; -} - -h4 { - font-size: 18px; -} - -h5 { - font-size: 16px; -} - -h6 { - font-size: 15px; -} - -body { - font-size: 14px; -} - -code { - background-color: #f5f5f5; - color: #20b2aa; -} - -#nav-logo { - padding-top: 10px; - padding-bottom: 10px; -} - -.nav-link, li.dropdown { - padding-top: 5px; -} - -ul.nav li.dropdown:hover > ul.dropdown-menu { - /* so nav submenus open on hover */ - display: block; -} - -#home-description { - font-size: 17px; -} - -#sidebar { - font-size: 15px; -} - -.latest-news-item { - margin-bottom: 5px; -} - -.latest-news-item span { - font-size: 12px; -} - -#sociallinks td { - /* no lines in the link table */ - border-top: none; -} - -#bannertext { - margin-top: 10px; - text-align: left; -} - -.clear { - clear: both; -} - -#content { - padding: 0 8px 40px; -} - -#content h1 { - margin-bottom: 0.5em; -} - -#content h2 { - margin-bottom: 0.5em; - border-bottom: 1px solid #CCCCCC; - padding-bottom: 0.25em; -} -#content h3 { - margin-bottom: 0.5em; -} -#content img { - vertical-align: middle; -} -footer { - border-top: 1px solid #CCCCCC; - color: #666666; - font-size: 0.8em; - padding: 8px 8px; - text-align: center; -} -footer > p { - width: 60%; - margin-left: auto; - margin-right: auto; -} - -#asf-logo { - float: left; -} - -#release_notes_testing { - border-collapse:collapse; -} - -#release_notes_testing, #release_notes_testing tr, #release_notes_testing th, #release_notes_testing td { - border: 2px solid black; -} - -#release_notes_testing th, #release_notes_testing td { - padding: 5px; -} - -#download-button-sidebar { - width: 60%; - margin-left: auto; - margin-right: auto; -} - -#accumulo-summit-logo img { - height: 40px -} - -code { - /* override nowrap in bootstrap */ - white-space: normal; -} - -.header-link { - padding-left: 5px; - opacity: 0; - - \-webkit-transition: opacity 0.2s ease-in-out 0.1s; - \-moz-transition: opacity 0.2s ease-in-out 0.1s; - \-ms-transition: opacity 0.2s ease-in-out 0.1s; -} - -h2:hover .header-link, -h3:hover .header-link, -h4:hover .header-link, -h5:hover .header-link, -h6:hover .header-link { - opacity: 1; -} - -/* insert invisible space above header elements with an id attribute, so that - * if they are linked to, the actual content will appear below the nav menu */ -h1[id]::before, h2[id]::before, h3[id]::before, h4[id]::before, h5[id]::before, h6[id]::before { - display: block; - content: " "; - margin-top: -80px; - height: 80px; - visibility: hidden; -} - -/* Makes navbar collapse at larger width (1185px) */ -@media (max-width: 1185px) { - .navbar-header { - float: none; - } - .navbar-toggle { - display: block; - } - .navbar-collapse { - border-top: 1px solid transparent; - box-shadow: inset 0 1px 0 rgba(255,255,255,0.1); - } - .navbar-collapse.collapse { - display: none!important; - } - .navbar-nav { - float: none!important; - margin: 7.5px -15px; - } - .navbar-nav>li { - float: none; - } - .navbar-nav>li>a { - padding-top: 10px; - padding-bottom: 10px; - } - .navbar-text { - float: none; - margin: 15px 0; - } - /* since 3.1.0 */ - .navbar-collapse.collapse.in { - display: block!important; - } - .collapsing { - overflow: hidden!important; - } -} - http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/506b57c8/css/accumulo.scss ---------------------------------------------------------------------- diff --git a/css/accumulo.scss b/css/accumulo.scss new file mode 100644 index 0000000..f0e629c --- /dev/null +++ b/css/accumulo.scss @@ -0,0 +1,210 @@ +--- +--- + +@import "syntax-highlighting"; + +h1 { + font-size: 34px; +} + +h2 { + font-size: 28px; +} + +h3 { + font-size: 22px; +} + +h4 { + font-size: 18px; +} + +h5 { + font-size: 16px; +} + +h6 { + font-size: 15px; +} + +body { + font-size: 14px; +} + +code { + background-color: #f5f5f5; + color: #20b2aa; +} + +#nav-logo { + padding-top: 10px; + padding-bottom: 10px; +} + +.nav-link, li.dropdown { + padding-top: 5px; +} + +ul.nav li.dropdown:hover > ul.dropdown-menu { + /* so nav submenus open on hover */ + display: block; +} + +#home-description { + font-size: 17px; +} + +#sidebar { + font-size: 15px; +} + +.latest-news-item { + margin-bottom: 5px; +} + +.latest-news-item span { + font-size: 12px; +} + +#sociallinks td { + /* no lines in the link table */ + border-top: none; +} + +#bannertext { + margin-top: 10px; + text-align: left; +} + +.clear { + clear: both; +} + +#content { + padding: 0 8px 40px; +} + +#content h1 { + margin-bottom: 0.5em; +} + +#content h2 { + margin-bottom: 0.5em; + border-bottom: 1px solid #CCCCCC; + padding-bottom: 0.25em; +} +#content h3 { + margin-bottom: 0.5em; +} +#content img { + vertical-align: middle; +} +footer { + border-top: 1px solid #CCCCCC; + color: #666666; + font-size: 0.8em; + padding: 8px 8px; + text-align: center; +} +footer > p { + width: 60%; + margin-left: auto; + margin-right: auto; +} + +#asf-logo { + float: left; +} + +#release_notes_testing { + border-collapse:collapse; +} + +#release_notes_testing, #release_notes_testing tr, #release_notes_testing th, #release_notes_testing td { + border: 2px solid black; +} + +#release_notes_testing th, #release_notes_testing td { + padding: 5px; +} + +#download-button-sidebar { + width: 60%; + margin-left: auto; + margin-right: auto; +} + +#accumulo-summit-logo img { + height: 40px +} + +code { + /* override nowrap in bootstrap */ + white-space: normal; +} + +.header-link { + padding-left: 5px; + opacity: 0; + + \-webkit-transition: opacity 0.2s ease-in-out 0.1s; + \-moz-transition: opacity 0.2s ease-in-out 0.1s; + \-ms-transition: opacity 0.2s ease-in-out 0.1s; +} + +h2:hover .header-link, +h3:hover .header-link, +h4:hover .header-link, +h5:hover .header-link, +h6:hover .header-link { + opacity: 1; +} + +/* insert invisible space above header elements with an id attribute, so that + * if they are linked to, the actual content will appear below the nav menu */ +h1[id]::before, h2[id]::before, h3[id]::before, h4[id]::before, h5[id]::before, h6[id]::before { + display: block; + content: " "; + margin-top: -80px; + height: 80px; + visibility: hidden; +} + + +/* Makes navbar collapse at larger width (1185px) */ +@media (max-width: 1185px) { + .navbar-header { + float: none; + } + .navbar-toggle { + display: block; + } + .navbar-collapse { + border-top: 1px solid transparent; + box-shadow: inset 0 1px 0 rgba(255,255,255,0.1); + } + .navbar-collapse.collapse { + display: none!important; + } + .navbar-nav { + float: none!important; + margin: 7.5px -15px; + } + .navbar-nav>li { + float: none; + } + .navbar-nav>li>a { + padding-top: 10px; + padding-bottom: 10px; + } + .navbar-text { + float: none; + margin: 15px 0; + } + .navbar-collapse.collapse.in { + display: block!important; + } + .collapsing { + overflow: hidden!important; + } +}
