diff --git a/.gitignore b/.gitignore index 486b32c..12d7b90 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .sass-cache/ *.css.map +.log/ diff --git a/css/partials/_base.scss b/css/partials/_base.scss index 2a8f6dc..3871c79 100644 --- a/css/partials/_base.scss +++ b/css/partials/_base.scss @@ -383,89 +383,6 @@ legend{ display:inline; } -.wy-alert,#content .note,#content .attention,#content .caution,#content .danger,#content .error,#content .summary,#content .hint,#content .important,#content .tip,#content .warning,#content .question,#content .seealso,#content .admonitiontodo{ - padding:12px; - line-height:24px; - margin-bottom:24px; - /* background:#e7f2fa; */ -} - -.wy-alert-title,#content .admonition-title{ - color:#fff; - font-weight:bold; - display:block; - color:#fff; - /* background:#6ab0de; */ - /* margin:-12px; */ - padding:6px 12px; - margin-bottom:0px; -} - -#content .danger,#content .error{ - background:#fdf3f2; -} - -.wy-alert.wy-alert-warning,#content .wy-alert-warning.note,#content .attention,#content .caution,#content .wy-alert-warning.danger,#content .wy-alert-warning.error,#content .wy-alert-warning.summary,#content .wy-alert-warning.hint,#content .wy-alert-warning.important,#content .wy-alert-warning.tip,#content .warning,#content .wy-alert-warning.seealso,#content .admonitiontodo{ - background:#ffedcc; -} - -#content .admonition-title.warning:before, -#content .admonition-title.caution:before, -#content .admonition-title.attention:before, -#content .admonition-title.important:before, -#content .admonition-title.error:before, -#content .admonition-title.danger:before{ - font-family:FontAwesome; - content: "";; -} - -#content .admonition-title.question:before{ - font-family:FontAwesome; - content: "";; -} - -#content .admonition-title.note:before, -#content .admonition-title.seealso:before, -#content .admonition-title.tip:before, -#content .admonition-title.summary:before, -#content .admonition-title.hint:before{ - font-family:FontAwesome; - content: "";; -} - - -#content .note,#content .question,#content .seealso{ - background:#e7f2fa; -} - -.wy-alert p:last-child,#content .note p:last-child,#content .attention p:last-child,#content .caution p:last-child,#content .danger p:last-child,#content .error p:last-child,#content .summary p:last-child,#content .hint p:last-child,#content .important p:last-child,#content .tip p:last-child,#content .warning p:last-child,#content .question p:last-child,#content .seealso p:last-child,#content .admonitiontodo p:last-child{ - margin-bottom:0; -} - -#content .admonition-title.tip,#content .admonition-title.important,#content .admonition-title.summary,#content .admonition-title.hint{ - line-height: 1; - background:#1abc9c; -} - -#content .important,#content .tip,#content .summary,#content .hint{ - background:#dbfaf4; -} - -#content .admonition-title.note,#content .admonition-title.question,#content .admonition-title.seealso{ - line-height: 1; - background:#6ab0de; -} - -#content .admonition-title.warning,#content .admonition-title.caution,#content .admonition-title.attention{ - line-height: 1; - background:#F0B37E; -} - -#content .admonition-title.error,#content .admonition-title.danger{ - line-height: 1; - background:#f29f97; -} - legend{ display:block; width:100%; @@ -547,14 +464,6 @@ footer p{ font-style:italic; } -#content .note .last,#content .attention .last,#content .caution .last,#content .danger .last,#content .error .last,#content .hint .summary,#content .hint .last,#content .important .last,#content .tip .last,#content .warning .last,#content .question .last,#content .seealso .last,#content .admonitiontodo .last{ - margin-bottom:0; -} - -#content .admonition-title:before{ - margin-right:4px; -} - #content .section ol p,#content .section ul p{ margin-bottom:12px; } @@ -720,7 +629,7 @@ h2.footnotes{ // Font Awesome -.fa:before,#content .admonition-title:before,#content h1 .headerlink:before,#content h2 .headerlink:before,#content h3 .headerlink:before,#content h4 .headerlink:before,#content h5 .headerlink:before,#content h6 .headerlink:before,#content dl dt .headerlink:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-alert,#content .note,#content .attention,#content .caution,#content .danger,#content .error,#content .summary,#content .hint,#content .important,#content .tip,#content .warning,#content .question,#content .seealso,#content .admonitiontodo,.btn,input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"],select,textarea,#table-of-contents li.on a,#table-of-contents li.current>a,.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a,.wy-nav-top a{ +.fa:before,#content h1 .headerlink:before,#content h2 .headerlink:before,#content h3 .headerlink:before,#content h4 .headerlink:before,#content h5 .headerlink:before,#content h6 .headerlink:before,#content dl dt .headerlink:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-alert,.btn,input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"],select,textarea,#table-of-contents li.on a,#table-of-contents li.current>a,.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a,.wy-nav-top a{ -webkit-font-smoothing:antialiased; } @@ -773,20 +682,3 @@ h2.footnotes{ border-radius:.1em; } -.fa,#content .admonition-title{ - font-family:inherit; -} - -.fa:before,#content .admonition-title:before{ - font-family:"FontAwesome"; - display:inline-block; - font-style:normal; - font-weight:normal; - line-height:1; - text-decoration:inherit; -} - -a .fa,a #content .admonition-title,#content a .admonition-title{ - display:inline-block; - text-decoration:inherit; -} diff --git a/css/style.css b/css/style.css index 2f5ec37..51b6981 100644 --- a/css/style.css +++ b/css/style.css @@ -301,74 +301,6 @@ legend { .nav #content .admonition-title, #content .nav .admonition-title, .nav .icon { display: inline; } -.wy-alert, #content .note, #content .attention, #content .caution, #content .danger, #content .error, #content .summary, #content .hint, #content .important, #content .tip, #content .warning, #content .question, #content .seealso, #content .admonitiontodo { - padding: 12px; - line-height: 24px; - margin-bottom: 24px; - /* background:#e7f2fa; */ } - -.wy-alert-title, #content .admonition-title { - color: #fff; - font-weight: bold; - display: block; - color: #fff; - /* background:#6ab0de; */ - /* margin:-12px; */ - padding: 6px 12px; - margin-bottom: 0px; } - -#content .danger, #content .error { - background: #fdf3f2; } - -.wy-alert.wy-alert-warning, #content .wy-alert-warning.note, #content .attention, #content .caution, #content .wy-alert-warning.danger, #content .wy-alert-warning.error, #content .wy-alert-warning.summary, #content .wy-alert-warning.hint, #content .wy-alert-warning.important, #content .wy-alert-warning.tip, #content .warning, #content .wy-alert-warning.seealso, #content .admonitiontodo { - background: #ffedcc; } - -#content .admonition-title.warning:before, -#content .admonition-title.caution:before, -#content .admonition-title.attention:before, -#content .admonition-title.important:before, -#content .admonition-title.error:before, -#content .admonition-title.danger:before { - font-family: FontAwesome; - content: ""; } - -#content .admonition-title.question:before { - font-family: FontAwesome; - content: ""; } - -#content .admonition-title.note:before, -#content .admonition-title.seealso:before, -#content .admonition-title.tip:before, -#content .admonition-title.summary:before, -#content .admonition-title.hint:before { - font-family: FontAwesome; - content: ""; } - -#content .note, #content .question, #content .seealso { - background: #e7f2fa; } - -.wy-alert p:last-child, #content .note p:last-child, #content .attention p:last-child, #content .caution p:last-child, #content .danger p:last-child, #content .error p:last-child, #content .summary p:last-child, #content .hint p:last-child, #content .important p:last-child, #content .tip p:last-child, #content .warning p:last-child, #content .question p:last-child, #content .seealso p:last-child, #content .admonitiontodo p:last-child { - margin-bottom: 0; } - -#content .admonition-title.tip, #content .admonition-title.important, #content .admonition-title.summary, #content .admonition-title.hint { - line-height: 1; - background: #1abc9c; } - -#content .important, #content .tip, #content .summary, #content .hint { - background: #dbfaf4; } - -#content .admonition-title.note, #content .admonition-title.question, #content .admonition-title.seealso { - line-height: 1; - background: #6ab0de; } - -#content .admonition-title.warning, #content .admonition-title.caution, #content .admonition-title.attention { - line-height: 1; - background: #F0B37E; } - -#content .admonition-title.error, #content .admonition-title.danger { - line-height: 1; - background: #f29f97; } - legend { display: block; width: 100%; @@ -434,12 +366,6 @@ footer p { padding: 6px 20px; font-style: italic; } -#content .note .last, #content .attention .last, #content .caution .last, #content .danger .last, #content .error .last, #content .hint .summary, #content .hint .last, #content .important .last, #content .tip .last, #content .warning .last, #content .question .last, #content .seealso .last, #content .admonitiontodo .last { - margin-bottom: 0; } - -#content .admonition-title:before { - margin-right: 4px; } - #content .section ol p, #content .section ul p { margin-bottom: 12px; } @@ -578,7 +504,7 @@ h2.footnotes { margin-bottom: 24px; font-family: "Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif; } -.fa:before, #content .admonition-title:before, #content h1 .headerlink:before, #content h2 .headerlink:before, #content h3 .headerlink:before, #content h4 .headerlink:before, #content h5 .headerlink:before, #content h6 .headerlink:before, #content dl dt .headerlink:before, .icon:before, .wy-dropdown .caret:before, .wy-inline-validate.wy-inline-validate-success .wy-input-context:before, .wy-inline-validate.wy-inline-validate-danger .wy-input-context:before, .wy-inline-validate.wy-inline-validate-warning .wy-input-context:before, .wy-inline-validate.wy-inline-validate-info .wy-input-context:before, .wy-alert, #content .note, #content .attention, #content .caution, #content .danger, #content .error, #content .summary, #content .hint, #content .important, #content .tip, #content .warning, #content .question, #content .seealso, #content .admonitiontodo, .btn, input[type="text"], input[type="password"], input[type="email"], input[type="url"], input[type="date"], input[type="month"], input[type="time"], input[type="datetime"], input[type="datetime-local"], input[type="week"], input[type="number"], input[type="search"], input[type="tel"], input[type="color"], select, textarea, #table-of-contents li.on a, #table-of-contents li.current > a, .wy-side-nav-search > a, .wy-side-nav-search .wy-dropdown > a, .wy-nav-top a { +.fa:before, #content h1 .headerlink:before, #content h2 .headerlink:before, #content h3 .headerlink:before, #content h4 .headerlink:before, #content h5 .headerlink:before, #content h6 .headerlink:before, #content dl dt .headerlink:before, .icon:before, .wy-dropdown .caret:before, .wy-inline-validate.wy-inline-validate-success .wy-input-context:before, .wy-inline-validate.wy-inline-validate-danger .wy-input-context:before, .wy-inline-validate.wy-inline-validate-warning .wy-input-context:before, .wy-inline-validate.wy-inline-validate-info .wy-input-context:before, .wy-alert, .btn, input[type="text"], input[type="password"], input[type="email"], input[type="url"], input[type="date"], input[type="month"], input[type="time"], input[type="datetime"], input[type="datetime-local"], input[type="week"], input[type="number"], input[type="search"], input[type="tel"], input[type="color"], select, textarea, #table-of-contents li.on a, #table-of-contents li.current > a, .wy-side-nav-search > a, .wy-side-nav-search .wy-dropdown > a, .wy-nav-top a { -webkit-font-smoothing: antialiased; } /*! @@ -623,21 +549,6 @@ h2.footnotes { border: solid 0.08em #eee; border-radius: .1em; } -.fa, #content .admonition-title { - font-family: inherit; } - -.fa:before, #content .admonition-title:before { - font-family: "FontAwesome"; - display: inline-block; - font-style: normal; - font-weight: normal; - line-height: 1; - text-decoration: inherit; } - -a .fa, a #content .admonition-title, #content a .admonition-title { - display: inline-block; - text-decoration: inherit; } - #org-div-home-and-up { text-align: right; max-width: 1200px; @@ -882,6 +793,184 @@ ul.nav > li.active > a { margin: 25mm 25mm 25mm 25mm; } body { margin: 0px; } } +.note { + padding: 12px; + line-height: 24px; + margin-bottom: 24px; + -webkit-font-smoothing: antialiased; + background: #f0f0f0; } + .note p:last-child, .note .last { + margin-bottom: 0; } + .note.admonition-title { + line-height: 1; + background: #a3a3a3; + margin-bottom: 0px; } + .note.admonition-title:before { + font-family: FontAwesome; + content: ""; } + +.seealso { + padding: 12px; + line-height: 24px; + margin-bottom: 24px; + -webkit-font-smoothing: antialiased; + background: #f0f0f0; } + .seealso p:last-child, .seealso .last { + margin-bottom: 0; } + .seealso.admonition-title { + line-height: 1; + background: #a3a3a3; + margin-bottom: 0px; } + .seealso.admonition-title:before { + font-family: FontAwesome; + content: ""; } + +.definition { + padding: 12px; + line-height: 24px; + margin-bottom: 24px; + -webkit-font-smoothing: antialiased; + background: #f9e6e6; } + .definition p:last-child, .definition .last { + margin-bottom: 0; } + .definition.admonition-title { + line-height: 1; + background: #db6b6b; + margin-bottom: 0px; } + .definition.admonition-title:before { + font-family: FontAwesome; + content: ""; } + +.exampl { + padding: 12px; + line-height: 24px; + margin-bottom: 24px; + -webkit-font-smoothing: antialiased; + background: #e6f9ef; } + .exampl p:last-child, .exampl .last { + margin-bottom: 0; } + .exampl.admonition-title { + line-height: 1; + background: #6bdb9f; + margin-bottom: 0px; } + .exampl.admonition-title:before { + font-family: FontAwesome; + content: ""; } + +.question { + padding: 12px; + line-height: 24px; + margin-bottom: 24px; + -webkit-font-smoothing: antialiased; + background: #f9f9e6; } + .question p:last-child, .question .last { + margin-bottom: 0; } + .question.admonition-title { + line-height: 1; + background: #dbd96b; + margin-bottom: 0px; } + .question.admonition-title:before { + font-family: FontAwesome; + content: ""; } + +.summary { + padding: 12px; + line-height: 24px; + margin-bottom: 24px; + -webkit-font-smoothing: antialiased; + background: #e6f2f9; } + .summary p:last-child, .summary .last { + margin-bottom: 0; } + .summary.admonition-title { + line-height: 1; + background: #6baedb; + margin-bottom: 0px; } + .summary.admonition-title:before { + font-family: FontAwesome; + content: ""; } + +.hint { + padding: 12px; + line-height: 24px; + margin-bottom: 24px; + -webkit-font-smoothing: antialiased; + background: #f0f0f0; } + .hint p:last-child, .hint .last { + margin-bottom: 0; } + .hint.admonition-title { + line-height: 1; + background: #a3a3a3; + margin-bottom: 0px; } + .hint.admonition-title:before { + font-family: FontAwesome; + content: ""; } + +.important { + padding: 12px; + line-height: 24px; + margin-bottom: 24px; + -webkit-font-smoothing: antialiased; + background: #f9f3e6; } + .important p:last-child, .important .last { + margin-bottom: 0; } + .important.admonition-title { + line-height: 1; + background: #dbba6b; + margin-bottom: 0px; } + .important.admonition-title:before { + font-family: FontAwesome; + content: ""; } + +.caution { + padding: 12px; + line-height: 24px; + margin-bottom: 24px; + -webkit-font-smoothing: antialiased; + background: #f9f3e6; } + .caution p:last-child, .caution .last { + margin-bottom: 0; } + .caution.admonition-title { + line-height: 1; + background: #dbba6b; + margin-bottom: 0px; } + .caution.admonition-title:before { + font-family: FontAwesome; + content: ""; } + +.warning { + padding: 12px; + line-height: 24px; + margin-bottom: 24px; + -webkit-font-smoothing: antialiased; + background: #f9f3e6; } + .warning p:last-child, .warning .last { + margin-bottom: 0; } + .warning.admonition-title { + line-height: 1; + background: #dbba6b; + margin-bottom: 0px; } + .warning.admonition-title:before { + font-family: FontAwesome; + content: ""; } + +#content .admonition-title { + color: #fff; + font-weight: bold; + display: block; + color: #fff; + padding: 6px 12px; + margin-bottom: 0px; + font-family: inherit; + -webkit-font-smoothing: antialiased; } + #content .admonition-title:before { + margin-right: 4px; + font-family: "FontAwesome"; + display: inline-block; + font-style: normal; + font-weight: normal; + line-height: 1; + text-decoration: inherit; } + .org-src-container > pre { margin-top: 1.5em; position: relative; diff --git a/css/style.scss b/css/style.scss index b47c072..5510a2d 100644 --- a/css/style.scss +++ b/css/style.scss @@ -5,6 +5,7 @@ @import 'partials/_postamble.scss'; @import 'partials/_print.scss'; +@import 'partials/_boxes.scss'; @import 'partials/_codes.scss'; @import 'partials/_figures.scss'; @import 'partials/_tables.scss'; diff --git a/js/script.js b/js/script.js index fb9f602..2cfd240 100644 --- a/js/script.js +++ b/js/script.js @@ -11,16 +11,14 @@ if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires j var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.4",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=a(document.body).height();"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);$(function() { $('.note').before("

Note

"); $('.seealso').before("

See also

"); - $('.warning').before("

Warning

"); - $('.caution').before("

Caution

"); - $('.attention').before("

Attention

"); - $('.tip').before("

Tip

"); - $('.important').before("

Important

"); - $('.hint').before("

Hint

"); - $('.error').before("

Error

"); - $('.danger').before("

Danger

"); + $('.definition').before("

Definition

"); + $('.exampl').before("

Example

"); $('.question').before("

Question

"); - $('.summary').before("

Summary

"); + $('.summary').before("

Summary

"); + $('.hint').before("

Hint

"); + $('.important').before("

Important

"); + $('.caution').before("

Caution

"); + $('.warning').before("

Warning

"); }); $( document ).ready(function() {