diff --git a/rebuild.sh b/rebuild.sh index 4557bfb..f345efe 100644 --- a/rebuild.sh +++ b/rebuild.sh @@ -6,7 +6,8 @@ THREADS=4 buildsite() { - local rebuild="$(realpath ./rebuild.php)" + local basedir="$(realpath .)" + local rebuild="${basedir}/rebuild.php" if [[ "$(uname -o)" == "Cygwin" ]] ; then rebuild="$(cygpath -w "$rebuild")" @@ -27,6 +28,7 @@ buildsite() { if [[ ! -d static ]] ; then mkdir static fi + cp "${basedir}/static_global/"* wwwroot || true cp static/* wwwroot || true for htm in footer header homepage_blurb ; do diff --git a/sites/codesite.example.com/static/no_image.png b/sites/codesite.example.com/static/no_image.png deleted file mode 100644 index 504b7e0..0000000 Binary files a/sites/codesite.example.com/static/no_image.png and /dev/null differ diff --git a/sites/codesite.example.com/static/normalize.css b/sites/codesite.example.com/static/normalize.css deleted file mode 100644 index c2de8df..0000000 --- a/sites/codesite.example.com/static/normalize.css +++ /dev/null @@ -1,406 +0,0 @@ -/*! normalize.css v2.1.3 | MIT License | git.io/normalize */ - -/* ========================================================================== - HTML5 display definitions - ========================================================================== */ - -/** - * Correct `block` display not defined in IE 8/9. - */ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -main, -nav, -section, -summary { - display: block; -} - -/** - * Correct `inline-block` display not defined in IE 8/9. - */ - -audio, -canvas, -video { - display: inline-block; -} - -/** - * Prevent modern browsers from displaying `audio` without controls. - * Remove excess height in iOS 5 devices. - */ - -audio:not([controls]) { - display: none; - height: 0; -} - -/** - * Address `[hidden]` styling not present in IE 8/9. - * Hide the `template` element in IE, Safari, and Firefox < 22. - */ - -[hidden], -template { - display: none; -} - -/* ========================================================================== - Base - ========================================================================== */ - -/** - * 1. Set default font family to sans-serif. - * 2. Prevent iOS text size adjust after orientation change, without disabling - * user zoom. - */ - -html { - font-family: sans-serif; /* 1 */ - -ms-text-size-adjust: 100%; /* 2 */ - -webkit-text-size-adjust: 100%; /* 2 */ -} - -/** - * Remove default margin. - */ - -body { - margin: 0; -} - -/* ========================================================================== - Links - ========================================================================== */ - -/** - * Remove the gray background color from active links in IE 10. - */ - -a { - background: transparent; -} - -/** - * Address `outline` inconsistency between Chrome and other browsers. - */ - -a:focus { - outline: thin dotted; -} - -/** - * Improve readability when focused and also mouse hovered in all browsers. - */ - -a:active, -a:hover { - outline: 0; -} - -/* ========================================================================== - Typography - ========================================================================== */ - -/** - * Address variable `h1` font-size and margin within `section` and `article` - * contexts in Firefox 4+, Safari 5, and Chrome. - */ - -h1 { - font-size: 2em; - margin: 0.67em 0; -} - -/** - * Address styling not present in IE 8/9, Safari 5, and Chrome. - */ - -abbr[title] { - border-bottom: 1px dotted; -} - -/** - * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. - */ - -b, -strong { - font-weight: bold; -} - -/** - * Address styling not present in Safari 5 and Chrome. - */ - -dfn { - font-style: italic; -} - -/** - * Address differences between Firefox and other browsers. - */ - -hr { - -moz-box-sizing: content-box; - box-sizing: content-box; - height: 0; -} - -/** - * Address styling not present in IE 8/9. - */ - -mark { - background: #ff0; - color: #000; -} - -/** - * Correct font family set oddly in Safari 5 and Chrome. - */ - -code, -kbd, -pre, -samp { - font-family: monospace, serif; - font-size: 1em; -} - -/** - * Improve readability of pre-formatted text in all browsers. - */ - -pre { - white-space: pre-wrap; -} - -/** - * Set consistent quote types. - */ - -q { - quotes: "\201C" "\201D" "\2018" "\2019"; -} - -/** - * Address inconsistent and variable font size in all browsers. - */ - -small { - font-size: 80%; -} - -/** - * Prevent `sub` and `sup` affecting `line-height` in all browsers. - */ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - -/* ========================================================================== - Embedded content - ========================================================================== */ - -/** - * Remove border when inside `a` element in IE 8/9. - */ - -img { - border: 0; -} - -/** - * Correct overflow displayed oddly in IE 9. - */ - -svg:not(:root) { - overflow: hidden; -} - -/* ========================================================================== - Figures - ========================================================================== */ - -/** - * Address margin not present in IE 8/9 and Safari 5. - */ - -figure { - margin: 0; -} - -/* ========================================================================== - Forms - ========================================================================== */ - -/** - * Define consistent border, margin, and padding. - */ - -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; -} - -/** - * 1. Correct `color` not being inherited in IE 8/9. - * 2. Remove padding so people aren't caught out if they zero out fieldsets. - */ - -legend { - border: 0; /* 1 */ - padding: 0; /* 2 */ -} - -/** - * 1. Correct font family not being inherited in all browsers. - * 2. Correct font size not being inherited in all browsers. - * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. - */ - -button, -input, -select, -textarea { - font-family: inherit; /* 1 */ - font-size: 100%; /* 2 */ - margin: 0; /* 3 */ -} - -/** - * Address Firefox 4+ setting `line-height` on `input` using `!important` in - * the UA stylesheet. - */ - -button, -input { - line-height: normal; -} - -/** - * Address inconsistent `text-transform` inheritance for `button` and `select`. - * All other form control elements do not inherit `text-transform` values. - * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. - * Correct `select` style inheritance in Firefox 4+ and Opera. - */ - -button, -select { - text-transform: none; -} - -/** - * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` - * and `video` controls. - * 2. Correct inability to style clickable `input` types in iOS. - * 3. Improve usability and consistency of cursor style between image-type - * `input` and others. - */ - -button, -html input[type="button"], /* 1 */ -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; /* 2 */ - cursor: pointer; /* 3 */ -} - -/** - * Re-set default cursor for disabled elements. - */ - -button[disabled], -html input[disabled] { - cursor: default; -} - -/** - * 1. Address box sizing set to `content-box` in IE 8/9/10. - * 2. Remove excess padding in IE 8/9/10. - */ - -input[type="checkbox"], -input[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ -} - -/** - * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. - * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome - * (include `-moz` to future-proof). - */ - -input[type="search"] { - -webkit-appearance: textfield; /* 1 */ - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; /* 2 */ - box-sizing: content-box; -} - -/** - * Remove inner padding and search cancel button in Safari 5 and Chrome - * on OS X. - */ - -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/** - * Remove inner padding and border in Firefox 4+. - */ - -button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; - padding: 0; -} - -/** - * 1. Remove default vertical scrollbar in IE 8/9. - * 2. Improve readability and alignment in all browsers. - */ - -textarea { - overflow: auto; /* 1 */ - vertical-align: top; /* 2 */ -} - -/* ========================================================================== - Tables - ========================================================================== */ - -/** - * Remove most spacing between table cells. - */ - -table { - border-collapse: collapse; - border-spacing: 0; -} diff --git a/sites/codesite.example.com/static/site.js b/sites/codesite.example.com/static/site.js deleted file mode 100644 index b65a989..0000000 --- a/sites/codesite.example.com/static/site.js +++ /dev/null @@ -1,46 +0,0 @@ -(function() { - "use strict"; - - var show_all = function() { - var tr = document.querySelectorAll(".projtable tr"); - for (var i = 0, e = tr.length; i !== e; ++i) { - tr[i].style.display = "table-row"; - } - - var warn = document.querySelector(".tag-filter-warn"); - warn.parentNode.removeChild(warn); - }; - - var show_tag = function(tag) { - if (document.querySelector(".tag-filter-warn") !== null) { - show_all(); - } - - var tr = document.querySelectorAll(".projtable tr"); - for (var i = 0, e = tr.length; i !== e; ++i) { - tr[i].style.display = (tr[i].className.split(" ").indexOf("taggedWith-"+tag) === -1) ? "none" : "table-row"; - } - - var div = document.createElement("div"); - div.className = "tag-filter-warn"; - div.innerHTML = "Filtering by tag. reset"; - document.body.appendChild(div); - - document.querySelector(".tag-filter-warn a").addEventListener('click', function() { - show_all(); - return false; - }); - }; - - var get_show_tag = function(tag) { - return function() { show_tag(tag); return false; }; - }; - - window.addEventListener('load', function() { - var taglinks = document.querySelectorAll(".tag-link"); - for (var i = 0, e = taglinks.length; i !== e; ++i) { - var tag = taglinks[i].getAttribute("data-tag"); - taglinks[i].addEventListener('click', get_show_tag(tag)); - } - }); -})(); \ No newline at end of file diff --git a/sites/code.ivysaur.me/static/no_image.png b/static_global/no_image.png similarity index 100% rename from sites/code.ivysaur.me/static/no_image.png rename to static_global/no_image.png diff --git a/sites/code.ivysaur.me/static/normalize.css b/static_global/normalize.css similarity index 100% rename from sites/code.ivysaur.me/static/normalize.css rename to static_global/normalize.css diff --git a/sites/code.ivysaur.me/static/site.js b/static_global/site.js similarity index 100% rename from sites/code.ivysaur.me/static/site.js rename to static_global/site.js