diff --git a/.gitignore b/.gitignore index 1e195e989..7743a48f7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ build dist venv lektor/admin/static/gen +assets/static/gen node_modules gui/build diff --git a/.lektorproject b/.lektorproject index 10238b13a..85b1678ce 100644 --- a/.lektorproject +++ b/.lektorproject @@ -1,9 +1,10 @@ [project] -name = creativecommons.github.io +name = akriti.github.io [servers.ghpages] -target = ghpages+https://creativecommons/creativecommons.github.io +target = ghpages+https://akriticode/akriticode.github.io [packages] lektor-markdown-header-anchors = 0.3.1 lektor-google-analytics = 0.1.3 +lektor-webpack-support = 0.5 diff --git a/.travis.yml b/.travis.yml index 01f68a9b3..60fab5f75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ cache: install: - pip install pipenv - pipenv install -script: lektor build +script: lektor build -f webpack deploy: provider: script script: lektor deploy ghpages diff --git a/README.md b/README.md index 349fd897f..1ef3918ba 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ REPO DIRECTLY**. ## Overview -This site is built using [Lektor][lektor]. All changes to +This site //jas is built using [Lektor][lektor]. All changes to [https://creativecommons.github.io][ccgithubio] must be made **here** and deployed via lektor (see [Deployment](#deployment), below). @@ -35,7 +35,7 @@ deployed via lektor (see [Deployment](#deployment), below). message if the project’s virtual environment is broken][pipenverror]). If all else fails, try removing the virtual environment and reinstalling: 1. `pipenv --rm` -2. `pipenv install` +2. `pipenv install` [pipenverror]:https://github.com/pypa/pipenv/issues/1918 diff --git a/assets/static/gen/script.js b/assets/static/gen/script.js deleted file mode 100644 index 77b23b741..000000000 --- a/assets/static/gen/script.js +++ /dev/null @@ -1,122 +0,0 @@ -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) { -/******/ return installedModules[moduleId].exports; -/******/ } -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter }); -/******/ } -/******/ }; -/******/ -/******/ // define __esModule on exports -/******/ __webpack_require__.r = function(exports) { -/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { -/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); -/******/ } -/******/ Object.defineProperty(exports, '__esModule', { value: true }); -/******/ }; -/******/ -/******/ // create a fake namespace object -/******/ // mode & 1: value is a module id, require it -/******/ // mode & 2: merge all properties of value into the ns -/******/ // mode & 4: return value when already ns object -/******/ // mode & 8|1: behave like require -/******/ __webpack_require__.t = function(value, mode) { -/******/ if(mode & 1) value = __webpack_require__(value); -/******/ if(mode & 8) return value; -/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; -/******/ var ns = Object.create(null); -/******/ __webpack_require__.r(ns); -/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); -/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); -/******/ return ns; -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 0); -/******/ }) -/************************************************************************/ -/******/ ({ - -/***/ "./js/main.js": -/*!********************!*\ - !*** ./js/main.js ***! - \********************/ -/*! no static exports found */ -/***/ (function(module, exports) { - -eval("$(document).ready(function() {\n $(window).scroll(function() {\n if ($(this).scrollTop() > 500) {\n $('#back-to-top').fadeIn();\n } else {\n $('#back-to-top').fadeOut();\n }\n });\n});\n\n\n//# sourceURL=webpack:///./js/main.js?"); - -/***/ }), - -/***/ "./sass/main.scss": -/*!************************!*\ - !*** ./sass/main.scss ***! - \************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -eval("module.exports = __webpack_require__.p + \"style.css\";\n\n//# sourceURL=webpack:///./sass/main.scss?"); - -/***/ }), - -/***/ 0: -/*!*******************************************!*\ - !*** multi ./js/main.js ./sass/main.scss ***! - \*******************************************/ -/*! no static exports found */ -/***/ (function(module, exports, __webpack_require__) { - -eval("__webpack_require__(/*! ./js/main.js */\"./js/main.js\");\nmodule.exports = __webpack_require__(/*! ./sass/main.scss */\"./sass/main.scss\");\n\n\n//# sourceURL=webpack:///multi_./js/main.js_./sass/main.scss?"); - -/***/ }) - -/******/ }); \ No newline at end of file diff --git a/assets/static/gen/style.css b/assets/static/gen/style.css deleted file mode 100644 index 7f6b9e72b..000000000 --- a/assets/static/gen/style.css +++ /dev/null @@ -1,119 +0,0 @@ -body { - font-family: 'Source Sans Pro', sans-serif; - color: #333333; } - -h2 { - font-weight: 600; - padding-bottom: 0.5rem; } - -.page-content { - position: relative; - min-height: calc(100vh - 21vh); - padding-bottom: 3rem; } - -.main-header { - background-color: #EE5B32; } - .main-header .navbar-brand { - margin-right: 2rem; } - .main-header .navbar-brand img { - width: 250px; } - .main-header .navbar-brand .legend { - display: block; - font-size: .9rem; - letter-spacing: .15rem; } - -.footer { - bottom: 0; } - -.card-columns { - -webkit-column-count: 2; - column-count: 2; } - -.navbar { - background-image: linear-gradient(90deg, #EE5B32, #FB7928, #EE5B32); - background-size: 100% 130px; - background-position-y: bottom; } - -.page-title { - background-color: #fff; - border-bottom-style: solid; - border-color: #EE5B32; - border-width: 10px; - padding-left: 0px; - font-weight: 600; - color: #333333; } - -.featured-project-card { - background-color: #fff; - border-left-color: #00b5da !important; - border-left-width: 10px; - padding-left: 0px; - min-width: 20rem; - max-width: 20rem; } - -.project-idea-header { - background-color: #fff; - border-left-color: #00b5da !important; - border-left-width: 10px; - padding-left: 0px; - font-size: 1.5em; } - -.badge-featured-project { - background-color: #00b5da; - color: #fff; - font-size: 0.8rem; } - -#back-to-top { - cursor: pointer; - position: fixed; - bottom: 20px; - right: 20px; - display: none; - background-color: #00b5da; - border: none; } - -.dropdown-item { - font-size: 1.2em; - text-align: center; } - -.dropdown:hover:hover .dropdown-menu { - display: block; } - -.dropdown-menu { - margin-top: 0px; } - -.navbar-dark .navbar-nav .nav-item.active .nav-link { - background: #e15803 !important; } - -.navbar-dark .navbar-nav .nav-item { - font-size: 1.2em; - text-align: center; } - .navbar-dark .navbar-nav .nav-item:hover { - background: #e15803 !important; } - .navbar-dark .navbar-nav .nav-item .nav-link { - color: #fff; - line-height: 1rem; - border-left: 1px solid rgba(255, 255, 255, 0.6); } - -.navbar-dark .navbar-toggler { - border-color: #fff; } - -@media only screen and (max-width: 1200px) { - .navbar-dark .navbar-nav .nav-item .nav-link { - border: None; - text-align: center; } } - -.toc-card { - width: 18rem; - margin-bottom: 1rem; - float: right; - margin: 1rem; } - -.toc { - margin-bottom: 0; } - -.main-footer .footer small { - display: flex; - align-items: center; } - .main-footer .footer small .text-muted { - margin-left: 2rem; } diff --git a/content/community/code-of-conduct/contents.lr b/content/community/code-of-conduct/contents.lr index c55610848..ab1de019b 100644 --- a/content/community/code-of-conduct/contents.lr +++ b/content/community/code-of-conduct/contents.lr @@ -77,11 +77,4 @@ members of the project's leadership. ## Attribution -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html. - -[homepage]: https://www.contributor-covenant.org - -For answers to common questions about this code of conduct, see -https://www.contributor-covenant.org/faq. - +Jinjnfsjk diff --git a/webpack/package-lock.json b/webpack/package-lock.json index df61d3833..857bc9e35 100644 --- a/webpack/package-lock.json +++ b/webpack/package-lock.json @@ -2106,12 +2106,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2126,17 +2128,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2253,7 +2258,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2265,6 +2271,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2279,6 +2286,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2286,12 +2294,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2310,6 +2320,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2390,7 +2401,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2402,6 +2414,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2523,6 +2536,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/webpack/sass/main.scss b/webpack/sass/main.scss index 71c8d4ce8..253b11279 100644 --- a/webpack/sass/main.scss +++ b/webpack/sass/main.scss @@ -56,7 +56,7 @@ h2 { .navbar { background: { - image: linear-gradient(90deg, $brand-theme, $brand-theme-light , $brand-theme); + image: linear-gradient(90deg, $brand-theme, #333333 , $brand-theme); size: 100% 130px; position-y: bottom; }