From 13d0fbb2c74b44104cee11f28661c6209ac9c1d2 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 4 Jan 2017 08:57:02 -0700 Subject: [PATCH 01/14] Initial commit --- .gitignore | 3 +++ LICENSE | 29 +++++++++++++++++++++++++++++ README.md | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..5c91b60c --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +_site/ +.sass-cache/ +.jekyll-metadata diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..2c2f7c11 --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright (c) 2017, NJOY +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md new file mode 100644 index 00000000..effddc06 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# jekyll-website +Common jekyll stuff for website From 2eb701e13fde6b44c9517363ce4dce829d47fe17 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 4 Jan 2017 09:14:23 -0700 Subject: [PATCH 02/14] Adding all the basic Jekyll stuff. --- LICENSE | 33 +---- LICENSE.md | 1 + README.md | 10 +- _config.yml | 31 ++++ _data/navigation.yml | 8 ++ _includes/footer.html | 38 +++++ _includes/head.html | 12 ++ _includes/header.html | 11 ++ _includes/icon-github.html | 1 + _includes/icon-github.svg | 1 + _includes/nav.html | 20 +++ _layouts/default.html | 20 +++ _layouts/home.html | 9 ++ _layouts/page.html | 14 ++ _layouts/post.html | 18 +++ _sass/_base.scss | 206 +++++++++++++++++++++++++++ _sass/_layout.scss | 242 ++++++++++++++++++++++++++++++++ _sass/_syntax-highlighting.scss | 71 ++++++++++ assets/main.scss | 39 +++++ 19 files changed, 757 insertions(+), 28 deletions(-) create mode 120000 LICENSE.md create mode 100644 _config.yml create mode 100644 _data/navigation.yml create mode 100644 _includes/footer.html create mode 100644 _includes/head.html create mode 100644 _includes/header.html create mode 100644 _includes/icon-github.html create mode 100644 _includes/icon-github.svg create mode 100644 _includes/nav.html create mode 100644 _layouts/default.html create mode 100644 _layouts/home.html create mode 100644 _layouts/page.html create mode 100644 _layouts/post.html create mode 100644 _sass/_base.scss create mode 100644 _sass/_layout.scss create mode 100644 _sass/_syntax-highlighting.scss create mode 100644 assets/main.scss diff --git a/LICENSE b/LICENSE index 2c2f7c11..df778cf6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,29 +1,10 @@ -BSD 3-Clause License - -Copyright (c) 2017, NJOY +Copyright (c) 2016, Los Alamos National Security, LLC All rights reserved. +Copyright 2016. Los Alamos National Security, LLC. This software was produced under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National Laboratory (LANL), which is operated by Los Alamos National Security, LLC for the U.S. Department of Energy. The U.S. Government has rights to use, reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR LOS ALAMOS NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified to produce derivative works, such modified software should be clearly marked, so as not to confuse it with the version available from LANL. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -* Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. +Additionally, redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +3. Neither the name of Los Alamos National Security, LLC, Los Alamos National Laboratory, LANL, the U.S. Government, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LOS ALAMOS NATIONAL SECURITY, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSE.md b/LICENSE.md new file mode 120000 index 00000000..7a694c96 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1 @@ +LICENSE \ No newline at end of file diff --git a/README.md b/README.md index effddc06..382a355e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,8 @@ -# jekyll-website -Common jekyll stuff for website +# Jekyll-website +This repository contains the required stuff to make the NJOY website and keep it consistent across all the projects. + +## Using jekyll-website +For all projects under the NJOY organization, this repository should be created as a git 'subtree' in the `docs` directory. This will ensure consistency across all the projects as well as make the documentation for each accessible from the website. + +## License +This repository---and all repositories under the NJOY organization---are licensed according to the [LICENSE](LICENSE.md) file diff --git a/_config.yml b/_config.yml new file mode 100644 index 00000000..ecb9c51a --- /dev/null +++ b/_config.yml @@ -0,0 +1,31 @@ +# Welcome to Jekyll! +# +# This config file is meant for settings that affect your whole blog, values +# which you are expected to set up once and rarely need to edit after that. +# For technical reasons, this file is *NOT* reloaded automatically when you use +# 'jekyll serve'. If you change this file, please restart the server process. + +# Site settings +title: NJOY +subtitle: Nuclear Data Processing-from Los Alamos National Laboratory +email: njoy@lanl.gov + +description: > # this means to ignore newlines until "baseurl:" + Website for documentation and code for the development of NJOY, a nuclear data + processing code from Los Alamos National Laboratory. + +url: "http://njoy.lanl.gov" # the base hostname & protocol for your site +#twitter_username: jekyllrb +github_username: njoy + +markdown: kramdown +timezone: America/Denver + +theme: minima + +# Serving +port: 8000 +baseurl: "" # the subpath of your site, e.g. /blog + +exclude: [vendor] +include: ['Developers', 'Build'] diff --git a/_data/navigation.yml b/_data/navigation.yml new file mode 100644 index 00000000..2874fe3f --- /dev/null +++ b/_data/navigation.yml @@ -0,0 +1,8 @@ + - title: "Getting NJOY" + url: "/Build/index.html" + + - title: "Developers" + url: "/Developers/index.html" + + - title: "About" + url: "/about/index.html" diff --git a/_includes/footer.html b/_includes/footer.html new file mode 100644 index 00000000..72239f1c --- /dev/null +++ b/_includes/footer.html @@ -0,0 +1,38 @@ +
+ +
+ +

{{ site.title }}

+ +
+
+ +
+ +
+ +
+ +
+

{{ site.description }}

+
+
+ +
+ +
diff --git a/_includes/head.html b/_includes/head.html new file mode 100644 index 00000000..3e8a6c52 --- /dev/null +++ b/_includes/head.html @@ -0,0 +1,12 @@ + + + + + + {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} + + + + + + diff --git a/_includes/header.html b/_includes/header.html new file mode 100644 index 00000000..98034304 --- /dev/null +++ b/_includes/header.html @@ -0,0 +1,11 @@ +
+ +
+ + {{ site.title }} + + {% include nav.html %} + +
+ +
diff --git a/_includes/icon-github.html b/_includes/icon-github.html new file mode 100644 index 00000000..e501a16b --- /dev/null +++ b/_includes/icon-github.html @@ -0,0 +1 @@ +{% include icon-github.svg %}{{ include.username }} diff --git a/_includes/icon-github.svg b/_includes/icon-github.svg new file mode 100644 index 00000000..4422c4f5 --- /dev/null +++ b/_includes/icon-github.svg @@ -0,0 +1 @@ + diff --git a/_includes/nav.html b/_includes/nav.html new file mode 100644 index 00000000..53d44fa2 --- /dev/null +++ b/_includes/nav.html @@ -0,0 +1,20 @@ + diff --git a/_layouts/default.html b/_layouts/default.html new file mode 100644 index 00000000..52085bfa --- /dev/null +++ b/_layouts/default.html @@ -0,0 +1,20 @@ + + + + {% include head.html %} + + + + {% include header.html %} + +
+
+ {{ content }} +
+
+ + {% include footer.html %} + + + + diff --git a/_layouts/home.html b/_layouts/home.html new file mode 100644 index 00000000..519eebb8 --- /dev/null +++ b/_layouts/home.html @@ -0,0 +1,9 @@ +--- +layout: default +--- + +
+ + {{ content }} + +
diff --git a/_layouts/page.html b/_layouts/page.html new file mode 100644 index 00000000..01e4b2a9 --- /dev/null +++ b/_layouts/page.html @@ -0,0 +1,14 @@ +--- +layout: default +--- +
+ +
+

{{ page.title | escape }}

+
+ +
+ {{ content }} +
+ +
diff --git a/_layouts/post.html b/_layouts/post.html new file mode 100644 index 00000000..1d36c282 --- /dev/null +++ b/_layouts/post.html @@ -0,0 +1,18 @@ +--- +layout: default +--- +
+ +
+

{{ page.title | escape }}

+

{% if page.author %} • {% endif %}

+
+ +
+ {{ content }} +
+ + {% if site.disqus.shortname %} + {% include disqus_comments.html %} + {% endif %} +
diff --git a/_sass/_base.scss b/_sass/_base.scss new file mode 100644 index 00000000..0883c3cd --- /dev/null +++ b/_sass/_base.scss @@ -0,0 +1,206 @@ +/** + * Reset some basic elements + */ +body, h1, h2, h3, h4, h5, h6, +p, blockquote, pre, hr, +dl, dd, ol, ul, figure { + margin: 0; + padding: 0; +} + + + +/** + * Basic styling + */ +body { + font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family; + color: $text-color; + background-color: $background-color; + -webkit-text-size-adjust: 100%; + -webkit-font-feature-settings: "kern" 1; + -moz-font-feature-settings: "kern" 1; + -o-font-feature-settings: "kern" 1; + font-feature-settings: "kern" 1; + font-kerning: normal; +} + + + +/** + * Set `margin-bottom` to maintain vertical rhythm + */ +h1, h2, h3, h4, h5, h6, +p, blockquote, pre, +ul, ol, dl, figure, +%vertical-rhythm { + margin-bottom: $spacing-unit / 2; +} + + + +/** + * Images + */ +img { + max-width: 100%; + vertical-align: middle; +} + + + +/** + * Figures + */ +figure > img { + display: block; +} + +figcaption { + font-size: $small-font-size; +} + + + +/** + * Lists + */ +ul, ol { + margin-left: $spacing-unit; +} + +li { + > ul, + > ol { + margin-bottom: 0; + } +} + + + +/** + * Headings + */ +h1, h2, h3, h4, h5, h6 { + font-weight: $base-font-weight; +} + + + +/** + * Links + */ +a { + color: $brand-color; + text-decoration: none; + + &:visited { + color: darken($brand-color, 15%); + } + + &:hover { + color: $text-color; + text-decoration: underline; + } +} + + + +/** + * Blockquotes + */ +blockquote { + color: $grey-color; + border-left: 4px solid $grey-color-light; + padding-left: $spacing-unit / 2; + font-size: 18px; + letter-spacing: -1px; + font-style: italic; + + > :last-child { + margin-bottom: 0; + } +} + + + +/** + * Code formatting + */ +pre, +code { + font-size: 15px; + border: 1px solid $grey-color-light; + border-radius: 3px; + background-color: #eef; +} + +code { + padding: 1px 5px; +} + +pre { + padding: 8px 12px; + overflow-x: auto; + + > code { + border: 0; + padding-right: 0; + padding-left: 0; + } +} + + + +/** + * Wrapper + */ +.wrapper { + max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2)); + max-width: calc(#{$content-width} - (#{$spacing-unit} * 2)); + margin-right: auto; + margin-left: auto; + padding-right: $spacing-unit; + padding-left: $spacing-unit; + @extend %clearfix; + + @include media-query($on-laptop) { + max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit})); + max-width: calc(#{$content-width} - (#{$spacing-unit})); + padding-right: $spacing-unit / 2; + padding-left: $spacing-unit / 2; + } +} + + + +/** + * Clearfix + */ +%clearfix { + + &:after { + content: ""; + display: table; + clear: both; + } +} + + + +/** + * Icons + */ +.icon { + + > svg { + display: inline-block; + width: 16px; + height: 16px; + vertical-align: middle; + + path { + fill: $grey-color; + } + } +} diff --git a/_sass/_layout.scss b/_sass/_layout.scss new file mode 100644 index 00000000..9cbfddef --- /dev/null +++ b/_sass/_layout.scss @@ -0,0 +1,242 @@ +/** + * Site header + */ +.site-header { + border-top: 5px solid $grey-color-dark; + border-bottom: 1px solid $grey-color-light; + min-height: 56px; + + // Positioning context for the mobile navigation icon + position: relative; +} + +.site-title { + font-size: 26px; + font-weight: 300; + line-height: 56px; + letter-spacing: -1px; + margin-bottom: 0; + float: left; + + &, + &:visited { + color: $grey-color-dark; + } +} + +.site-nav { + float: right; + line-height: 56px; + + .menu-icon { + display: none; + } + + .page-link { + color: $text-color; + line-height: $base-line-height; + + // Gaps between nav items, but not on the last one + &:not(:last-child) { + margin-right: 20px; + } + } + + @include media-query($on-palm) { + position: absolute; + top: 9px; + right: $spacing-unit / 2; + background-color: $background-color; + border: 1px solid $grey-color-light; + border-radius: 5px; + text-align: right; + + .menu-icon { + display: block; + float: right; + width: 36px; + height: 26px; + line-height: 0; + padding-top: 10px; + text-align: center; + + > svg { + width: 18px; + height: 15px; + + path { + fill: $grey-color-dark; + } + } + } + + .trigger { + clear: both; + display: none; + } + + &:hover .trigger { + display: block; + padding-bottom: 5px; + } + + .page-link { + display: block; + padding: 5px 10px; + + &:not(:last-child) { + margin-right: 0; + } + margin-left: 20px; + } + } +} + + + +/** + * Site footer + */ +.site-footer { + border-top: 1px solid $grey-color-light; + padding: $spacing-unit 0; +} + +.footer-heading { + font-size: 18px; + margin-bottom: $spacing-unit / 2; +} + +.contact-list, +.social-media-list { + list-style: none; + margin-left: 0; +} + +.footer-col-wrapper { + font-size: 15px; + color: $grey-color; + margin-left: -$spacing-unit / 2; + @extend %clearfix; +} + +.footer-col { + float: left; + margin-bottom: $spacing-unit / 2; + padding-left: $spacing-unit / 2; +} + +.footer-col-1 { + width: -webkit-calc(35% - (#{$spacing-unit} / 2)); + width: calc(35% - (#{$spacing-unit} / 2)); +} + +.footer-col-2 { + width: -webkit-calc(20% - (#{$spacing-unit} / 2)); + width: calc(20% - (#{$spacing-unit} / 2)); +} + +.footer-col-3 { + width: -webkit-calc(45% - (#{$spacing-unit} / 2)); + width: calc(45% - (#{$spacing-unit} / 2)); +} + +@include media-query($on-laptop) { + .footer-col-1, + .footer-col-2 { + width: -webkit-calc(50% - (#{$spacing-unit} / 2)); + width: calc(50% - (#{$spacing-unit} / 2)); + } + + .footer-col-3 { + width: -webkit-calc(100% - (#{$spacing-unit} / 2)); + width: calc(100% - (#{$spacing-unit} / 2)); + } +} + +@include media-query($on-palm) { + .footer-col { + float: none; + width: -webkit-calc(100% - (#{$spacing-unit} / 2)); + width: calc(100% - (#{$spacing-unit} / 2)); + } +} + + + +/** + * Page content + */ +.page-content { + padding: $spacing-unit 0; +} + +.page-heading { + font-size: 20px; +} + +.post-list { + margin-left: 0; + list-style: none; + + > li { + margin-bottom: $spacing-unit; + } +} + +.post-meta { + font-size: $small-font-size; + color: $grey-color; +} + +.post-link { + display: block; + font-size: 24px; +} + + + +/** + * Posts + */ +.post-header { + margin-bottom: $spacing-unit; +} + +.post-title { + font-size: 42px; + letter-spacing: -1px; + line-height: 1; + + @include media-query($on-laptop) { + font-size: 36px; + } +} + +.post-content { + margin-bottom: $spacing-unit; + + h2 { + font-size: 32px; + + @include media-query($on-laptop) { + font-size: 28px; + } + } + + h3 { + font-size: 26px; + + @include media-query($on-laptop) { + font-size: 22px; + } + } + + h4 { + font-size: 20px; + + @include media-query($on-laptop) { + font-size: 18px; + } + } +} diff --git a/_sass/_syntax-highlighting.scss b/_sass/_syntax-highlighting.scss new file mode 100644 index 00000000..8fac5977 --- /dev/null +++ b/_sass/_syntax-highlighting.scss @@ -0,0 +1,71 @@ +/** + * Syntax highlighting styles + */ +.highlight { + background: #fff; + @extend %vertical-rhythm; + + .highlighter-rouge & { + background: #eef; + } + + .c { color: #998; font-style: italic } // Comment + .err { color: #a61717; background-color: #e3d2d2 } // Error + .k { font-weight: bold } // Keyword + .o { font-weight: bold } // Operator + .cm { color: #998; font-style: italic } // Comment.Multiline + .cp { color: #999; font-weight: bold } // Comment.Preproc + .c1 { color: #998; font-style: italic } // Comment.Single + .cs { color: #999; font-weight: bold; font-style: italic } // Comment.Special + .gd { color: #000; background-color: #fdd } // Generic.Deleted + .gd .x { color: #000; background-color: #faa } // Generic.Deleted.Specific + .ge { font-style: italic } // Generic.Emph + .gr { color: #a00 } // Generic.Error + .gh { color: #999 } // Generic.Heading + .gi { color: #000; background-color: #dfd } // Generic.Inserted + .gi .x { color: #000; background-color: #afa } // Generic.Inserted.Specific + .go { color: #888 } // Generic.Output + .gp { color: #555 } // Generic.Prompt + .gs { font-weight: bold } // Generic.Strong + .gu { color: #aaa } // Generic.Subheading + .gt { color: #a00 } // Generic.Traceback + .kc { font-weight: bold } // Keyword.Constant + .kd { font-weight: bold } // Keyword.Declaration + .kp { font-weight: bold } // Keyword.Pseudo + .kr { font-weight: bold } // Keyword.Reserved + .kt { color: #458; font-weight: bold } // Keyword.Type + .m { color: #099 } // Literal.Number + .s { color: #d14 } // Literal.String + .na { color: #008080 } // Name.Attribute + .nb { color: #0086B3 } // Name.Builtin + .nc { color: #458; font-weight: bold } // Name.Class + .no { color: #008080 } // Name.Constant + .ni { color: #800080 } // Name.Entity + .ne { color: #900; font-weight: bold } // Name.Exception + .nf { color: #900; font-weight: bold } // Name.Function + .nn { color: #555 } // Name.Namespace + .nt { color: #000080 } // Name.Tag + .nv { color: #008080 } // Name.Variable + .ow { font-weight: bold } // Operator.Word + .w { color: #bbb } // Text.Whitespace + .mf { color: #099 } // Literal.Number.Float + .mh { color: #099 } // Literal.Number.Hex + .mi { color: #099 } // Literal.Number.Integer + .mo { color: #099 } // Literal.Number.Oct + .sb { color: #d14 } // Literal.String.Backtick + .sc { color: #d14 } // Literal.String.Char + .sd { color: #d14 } // Literal.String.Doc + .s2 { color: #d14 } // Literal.String.Double + .se { color: #d14 } // Literal.String.Escape + .sh { color: #d14 } // Literal.String.Heredoc + .si { color: #d14 } // Literal.String.Interpol + .sx { color: #d14 } // Literal.String.Other + .sr { color: #009926 } // Literal.String.Regex + .s1 { color: #d14 } // Literal.String.Single + .ss { color: #990073 } // Literal.String.Symbol + .bp { color: #999 } // Name.Builtin.Pseudo + .vc { color: #008080 } // Name.Variable.Class + .vg { color: #008080 } // Name.Variable.Global + .vi { color: #008080 } // Name.Variable.Instance + .il { color: #099 } // Literal.Number.Integer.Long +} diff --git a/assets/main.scss b/assets/main.scss new file mode 100644 index 00000000..c91fac8d --- /dev/null +++ b/assets/main.scss @@ -0,0 +1,39 @@ +--- +# Only the main Sass file needs front matter (the dashes are enough) +--- +@charset "utf-8"; + +// Our variables +$base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +$base-font-size: 16px; +$base-font-weight: 400; +$small-font-size: $base-font-size * 0.875; +$base-line-height: 1.5; + +$spacing-unit: 30px; + +$text-color: #111; +$background-color: #fdfdfd; +$brand-color: #2a7ae2; + +$grey-color: #828282; +$grey-color-light: lighten($grey-color, 40%); +$grey-color-dark: darken($grey-color, 25%); + +// Width of the content area +$content-width: 800px; + +$on-palm: 600px; +$on-laptop: 800px; + +// Minima also includes a mixin for defining media queries. +// Use media queries like this: +// @include media-query($on-palm) { +// .wrapper { +// padding-right: $spacing-unit / 2; +// padding-left: $spacing-unit / 2; +// } +// } + +// Import partials from the `minima` theme. +@import "minima"; From 06e582b325a11bb89d319fdf02a908d3c0114e0f Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 4 Jan 2017 09:25:29 -0700 Subject: [PATCH 03/14] Adding Gemfile. Not exactly sure if this is the right thing to do, but I'll try it. --- Gemfile | 26 ++++++++++++++++++++++++++ README.md | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 Gemfile diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..bc23b52f --- /dev/null +++ b/Gemfile @@ -0,0 +1,26 @@ +source "https://rubygems.org" +ruby RUBY_VERSION + +# Hello! This is where you manage which Jekyll version is used to run. +# When you want to use a different version, change it below, save the +# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: +# +# bundle exec jekyll serve +# +# This will help ensure the proper Jekyll version is running. +# Happy Jekylling! +# gem "jekyll", "3.3.1" + +# This is the default theme for new Jekyll sites. You may change this to anything you like. +gem "minima", "~> 2.0" + +gem "html-proofer" + +# If you want to use GitHub Pages, remove the "gem "jekyll"" above and +# uncomment the line below. To upgrade, run `bundle update github-pages`. +gem "github-pages", group: :jekyll_plugins + +# If you have any plugins, put them here! +# group :jekyll_plugins do +# gem "jekyll-feed", "~> 0.6" +# end diff --git a/README.md b/README.md index 382a355e..8965d666 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This repository contains the required stuff to make the NJOY website and keep it consistent across all the projects. ## Using jekyll-website -For all projects under the NJOY organization, this repository should be created as a git 'subtree' in the `docs` directory. This will ensure consistency across all the projects as well as make the documentation for each accessible from the website. +For all projects under the NJOY organization, this repository should be created as a git 'subtree' in the `docs` directory. This will ensure consistency across all the projects as well as make the documentation for each accessible from the website. ## License This repository---and all repositories under the NJOY organization---are licensed according to the [LICENSE](LICENSE.md) file From 15c529c55ef19de2f4a963942bb4544f2d06374a Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 4 Jan 2017 09:34:31 -0700 Subject: [PATCH 04/14] Renaming README so it doesn't conflict. --- README.md => README-jekyll.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.md => README-jekyll.md (100%) diff --git a/README.md b/README-jekyll.md similarity index 100% rename from README.md rename to README-jekyll.md From 52c657996c24ae358c525c8a11c71826173bf730 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 4 Jan 2017 11:51:13 -0700 Subject: [PATCH 05/14] Adding data for NJOY projects. --- _data/navigation.yml | 3 +++ _data/projects.yml | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 _data/projects.yml diff --git a/_data/navigation.yml b/_data/navigation.yml index 2874fe3f..248a9256 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -4,5 +4,8 @@ - title: "Developers" url: "/Developers/index.html" + - title: "Projects" + url: "/Projects.html" + - title: "About" url: "/about/index.html" diff --git a/_data/projects.yml b/_data/projects.yml new file mode 100644 index 00000000..611bf465 --- /dev/null +++ b/_data/projects.yml @@ -0,0 +1,3 @@ + - name: "utility" + url: "https://github.com/njoy/utility" + description: "Generic utilities used throughout all NJOY subprojects." From a7dbdedadec8a10a7f4d464ad7d6f57f42f778c5 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 4 Jan 2017 13:41:18 -0700 Subject: [PATCH 06/14] Changing location of DevelopersGuide. --- _data/navigation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/navigation.yml b/_data/navigation.yml index 248a9256..3cbd6636 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -2,7 +2,7 @@ url: "/Build/index.html" - title: "Developers" - url: "/Developers/index.html" + url: "/DevelopersGuide/" - title: "Projects" url: "/Projects.html" From 169ecf5e9167b4c2d41b021301111e4bd83cce12 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 4 Jan 2017 14:08:48 -0700 Subject: [PATCH 07/14] Removing projects.yml from this repository. --- _data/projects.yml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 _data/projects.yml diff --git a/_data/projects.yml b/_data/projects.yml deleted file mode 100644 index 611bf465..00000000 --- a/_data/projects.yml +++ /dev/null @@ -1,3 +0,0 @@ - - name: "utility" - url: "https://github.com/njoy/utility" - description: "Generic utilities used throughout all NJOY subprojects." From a048936e6056ed88d04217710f6a2f68900c6748 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Wed, 4 Jan 2017 14:33:05 -0700 Subject: [PATCH 08/14] Updating URL to Developer's Guide. --- _data/navigation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/navigation.yml b/_data/navigation.yml index 3cbd6636..b86e3e45 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -2,7 +2,7 @@ url: "/Build/index.html" - title: "Developers" - url: "/DevelopersGuide/" + url: "https://njoy.github.io/DevelopersGuide" - title: "Projects" url: "/Projects.html" From 0d23c3ccb45076c73ede69b58fa429dd9b2b7626 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 5 Jan 2017 13:14:10 -0700 Subject: [PATCH 09/14] Making link to license file in footer. --- LICENSE | 10 ---------- LICENSE.md | 14 +++++++++++++- _includes/footer.html | 14 +------------- _sass/_layout.scss | 12 ++++++------ 4 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 LICENSE mode change 120000 => 100644 LICENSE.md diff --git a/LICENSE b/LICENSE deleted file mode 100644 index df778cf6..00000000 --- a/LICENSE +++ /dev/null @@ -1,10 +0,0 @@ -Copyright (c) 2016, Los Alamos National Security, LLC -All rights reserved. -Copyright 2016. Los Alamos National Security, LLC. This software was produced under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National Laboratory (LANL), which is operated by Los Alamos National Security, LLC for the U.S. Department of Energy. The U.S. Government has rights to use, reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR LOS ALAMOS NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified to produce derivative works, such modified software should be clearly marked, so as not to confuse it with the version available from LANL. - -Additionally, redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -3. Neither the name of Los Alamos National Security, LLC, Los Alamos National Laboratory, LANL, the U.S. Government, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LOS ALAMOS NATIONAL SECURITY, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSE.md b/LICENSE.md deleted file mode 120000 index 7a694c96..00000000 --- a/LICENSE.md +++ /dev/null @@ -1 +0,0 @@ -LICENSE \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..95d1f419 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,13 @@ +--- +layout: page +--- +Copyright (c) 2016, Los Alamos National Security, LLC +All rights reserved. +Copyright 2016. Los Alamos National Security, LLC. This software was produced under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National Laboratory (LANL), which is operated by Los Alamos National Security, LLC for the U.S. Department of Energy. The U.S. Government has rights to use, reproduce, and distribute this software. NEITHER THE GOVERNMENT NOR LOS ALAMOS NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified to produce derivative works, such modified software should be clearly marked, so as not to confuse it with the version available from LANL. + +Additionally, redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +3. Neither the name of Los Alamos National Security, LLC, Los Alamos National Laboratory, LANL, the U.S. Government, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LOS ALAMOS NATIONAL SECURITY, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/_includes/footer.html b/_includes/footer.html index 72239f1c..3239ec9e 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -13,19 +13,7 @@

{{ site.title }}

- + All source code as part of the NJOY project---including this website---is covered by the BSD 3-clause license as detailed in the license file.
diff --git a/_sass/_layout.scss b/_sass/_layout.scss index 9cbfddef..661972ba 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -127,18 +127,18 @@ } .footer-col-1 { - width: -webkit-calc(35% - (#{$spacing-unit} / 2)); - width: calc(35% - (#{$spacing-unit} / 2)); + width: -webkit-calc(15% - (#{$spacing-unit} / 2)); + width: calc(15% - (#{$spacing-unit} / 2)); } .footer-col-2 { - width: -webkit-calc(20% - (#{$spacing-unit} / 2)); - width: calc(20% - (#{$spacing-unit} / 2)); + width: -webkit-calc(30% - (#{$spacing-unit} / 2)); + width: calc(30% - (#{$spacing-unit} / 2)); } .footer-col-3 { - width: -webkit-calc(45% - (#{$spacing-unit} / 2)); - width: calc(45% - (#{$spacing-unit} / 2)); + width: -webkit-calc(55% - (#{$spacing-unit} / 2)); + width: calc(55% - (#{$spacing-unit} / 2)); } @include media-query($on-laptop) { From f46cfc3b3edb070c35ba41e56cca4d6bf7963afb Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 5 Jan 2017 13:15:51 -0700 Subject: [PATCH 10/14] Updating config to [in/ex]clude some files. --- _config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index ecb9c51a..ead03d5b 100644 --- a/_config.yml +++ b/_config.yml @@ -27,5 +27,5 @@ theme: minima port: 8000 baseurl: "" # the subpath of your site, e.g. /blog -exclude: [vendor] -include: ['Developers', 'Build'] +exclude: [vendor, 'README-jekyll.md'] +include: ['Developers', 'Build', 'LICENSE.md'] From 11d8cfb70e1ad8177e599ff1d28210e294fcfca1 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 5 Jan 2017 13:44:07 -0700 Subject: [PATCH 11/14] Making some changes to the look. --- LICENSE.md | 2 +- README-jekyll.md | 3 +++ _config.yml | 6 ++++-- _includes/footer.html | 6 +----- _sass/_layout.scss | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 95d1f419..52aa97ae 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,5 +1,5 @@ --- -layout: page +layout: default --- Copyright (c) 2016, Los Alamos National Security, LLC All rights reserved. diff --git a/README-jekyll.md b/README-jekyll.md index 8965d666..b67dd8d1 100644 --- a/README-jekyll.md +++ b/README-jekyll.md @@ -1,3 +1,6 @@ +--- +layout: page +--- # Jekyll-website This repository contains the required stuff to make the NJOY website and keep it consistent across all the projects. diff --git a/_config.yml b/_config.yml index ead03d5b..b9d55ee7 100644 --- a/_config.yml +++ b/_config.yml @@ -12,7 +12,9 @@ email: njoy@lanl.gov description: > # this means to ignore newlines until "baseurl:" Website for documentation and code for the development of NJOY, a nuclear data - processing code from Los Alamos National Laboratory. + processing code from Los Alamos National Laboratory. All source code as part + of the NJOY project—including this website—is covered by the BSD, 3-clause + license, as detailed in the license file. url: "http://njoy.lanl.gov" # the base hostname & protocol for your site #twitter_username: jekyllrb @@ -27,5 +29,5 @@ theme: minima port: 8000 baseurl: "" # the subpath of your site, e.g. /blog -exclude: [vendor, 'README-jekyll.md'] +exclude: [vendor] include: ['Developers', 'Build', 'LICENSE.md'] diff --git a/_includes/footer.html b/_includes/footer.html index 3239ec9e..fab517e5 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -2,20 +2,16 @@
-

{{ site.title }}

+

{{ site.title }}

-
- All source code as part of the NJOY project---including this website---is covered by the BSD 3-clause license as detailed in the license file. -
-

{{ site.description }}

diff --git a/_sass/_layout.scss b/_sass/_layout.scss index 661972ba..1cedbf56 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -137,8 +137,8 @@ } .footer-col-3 { - width: -webkit-calc(55% - (#{$spacing-unit} / 2)); - width: calc(55% - (#{$spacing-unit} / 2)); + width: -webkit-calc(80% - (#{$spacing-unit} / 2)); + width: calc(80% - (#{$spacing-unit} / 2)); } @include media-query($on-laptop) { From 1ed48176cbf0310b2730b9ce743354063e7de21a Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 5 Jan 2017 13:49:22 -0700 Subject: [PATCH 12/14] Fixing link to LICENSE file. --- _config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index b9d55ee7..2737c927 100644 --- a/_config.yml +++ b/_config.yml @@ -14,7 +14,8 @@ description: > # this means to ignore newlines until "baseurl:" Website for documentation and code for the development of NJOY, a nuclear data processing code from Los Alamos National Laboratory. All source code as part of the NJOY project—including this website—is covered by the BSD, 3-clause - license, as detailed in the license file. + license, as detailed in the + license file. url: "http://njoy.lanl.gov" # the base hostname & protocol for your site #twitter_username: jekyllrb From e6a92f31ead3ea886ed39834990f7993eb2d8698 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 5 Jan 2017 14:23:26 -0700 Subject: [PATCH 13/14] Moving where description is derived. --- _config.yml | 7 +------ _includes/footer.html | 8 +++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/_config.yml b/_config.yml index 2737c927..64cfe235 100644 --- a/_config.yml +++ b/_config.yml @@ -10,12 +10,7 @@ title: NJOY subtitle: Nuclear Data Processing-from Los Alamos National Laboratory email: njoy@lanl.gov -description: > # this means to ignore newlines until "baseurl:" - Website for documentation and code for the development of NJOY, a nuclear data - processing code from Los Alamos National Laboratory. All source code as part - of the NJOY project—including this website—is covered by the BSD, 3-clause - license, as detailed in the - license file. +description: NJOY nuclear data processing from LANL url: "http://njoy.lanl.gov" # the base hostname & protocol for your site #twitter_username: jekyllrb diff --git a/_includes/footer.html b/_includes/footer.html index fab517e5..897501b1 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -13,7 +13,13 @@

{{ site.title }}

-

{{ site.description }}

+

{{ site.description }} + Website for documentation and code for the development of NJOY, a nuclear data + processing code from Los Alamos National Laboratory. All source code as part + of the NJOY project—including this website—is covered by the BSD, 3-clause + license, as detailed in the + license file. +

From 332563fc5904f2ea388e2532ee5700797e8e6b5a Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Thu, 5 Jan 2017 15:40:27 -0700 Subject: [PATCH 14/14] Updating navigation links. --- .gitignore | 1 + _data/navigation.yml | 6 +++--- _includes/footer.html | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5c91b60c..17e5238e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ _site/ .sass-cache/ .jekyll-metadata +Gemfile.lock diff --git a/_data/navigation.yml b/_data/navigation.yml index b86e3e45..f728e2e3 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -1,11 +1,11 @@ - title: "Getting NJOY" - url: "/Build/index.html" + url: "https://njoy.github.io/Build/index.html" - title: "Developers" url: "https://njoy.github.io/DevelopersGuide" - title: "Projects" - url: "/Projects.html" + url: "https://njoy.github.io/Projects.html" - title: "About" - url: "/about/index.html" + url: "https://njoy.github.io/about/index.html" diff --git a/_includes/footer.html b/_includes/footer.html index 897501b1..7bf1a07e 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -5,7 +5,6 @@
-

{{ site.title }}