diff --git a/package-lock.json b/package-lock.json index 46bc53a..f87efb3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1055,6 +1055,12 @@ "integrity": "sha1-hkS8JbGUdXeae3wfwQS8CnlPRGU=", "dev": true }, + "@fortawesome/fontawesome-pro": { + "version": "5.12.1", + "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/5.12.1/fontawesome-pro-5.12.1.tgz", + "integrity": "sha512-rwVdMZQfTmN/6ExkA3sXN5fdiJWFYFuaDnBYCxhWEpgIzl14BYQMBLqRkQx/ITBnbITkoOLBpfJJHbZ0GKPjHw==", + "dev": true + }, "@types/anymatch": { "version": "1.3.1", "resolved": "https://registry.npm.taobao.org/@types/anymatch/download/@types/anymatch-1.3.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fanymatch%2Fdownload%2F%40types%2Fanymatch-1.3.1.tgz", @@ -1556,6 +1562,51 @@ "integrity": "sha1-TGYGkXPW/daO2FI5/CViJhgrLr4=", "dev": true }, + "adjust-sourcemap-loader": { + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/adjust-sourcemap-loader/download/adjust-sourcemap-loader-2.0.0.tgz", + "integrity": "sha1-ZHEUOvdewCM0shn1S8eXDFL7KaQ=", + "dev": true, + "requires": { + "assert": "1.4.1", + "camelcase": "5.0.0", + "loader-utils": "1.2.3", + "object-path": "0.11.4", + "regex-parser": "2.2.10" + }, + "dependencies": { + "assert": { + "version": "1.4.1", + "resolved": "https://registry.npm.taobao.org/assert/download/assert-1.4.1.tgz", + "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", + "dev": true, + "requires": { + "util": "0.10.3" + } + }, + "camelcase": { + "version": "5.0.0", + "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-5.0.0.tgz", + "integrity": "sha1-AylVJ9WL081Kp1Nj81sujZe+L0I=", + "dev": true + }, + "inherits": { + "version": "2.0.1", + "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.1.tgz?cache=0&sync_timestamp=1560975547815&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finherits%2Fdownload%2Finherits-2.0.1.tgz", + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "dev": true + }, + "util": { + "version": "0.10.3", + "resolved": "https://registry.npm.taobao.org/util/download/util-0.10.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Futil%2Fdownload%2Futil-0.10.3.tgz", + "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "dev": true, + "requires": { + "inherits": "2.0.1" + } + } + } + }, "ajv": { "version": "6.12.0", "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.0.tgz?cache=0&sync_timestamp=1582379605396&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.0.tgz", @@ -1673,6 +1724,12 @@ "sprintf-js": "~1.0.2" } }, + "arity-n": { + "version": "1.0.4", + "resolved": "https://registry.npm.taobao.org/arity-n/download/arity-n-1.0.4.tgz", + "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=", + "dev": true + }, "arr-diff": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", @@ -2604,6 +2661,15 @@ "integrity": "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A=", "dev": true }, + "compose-function": { + "version": "3.0.3", + "resolved": "https://registry.npm.taobao.org/compose-function/download/compose-function-3.0.3.tgz", + "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=", + "dev": true, + "requires": { + "arity-n": "^1.0.4" + } + }, "compressible": { "version": "2.0.18", "resolved": "https://registry.npm.taobao.org/compressible/download/compressible-2.0.18.tgz?cache=0&sync_timestamp=1578286264482&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcompressible%2Fdownload%2Fcompressible-2.0.18.tgz", @@ -2845,6 +2911,26 @@ "randomfill": "^1.0.3" } }, + "css": { + "version": "2.2.4", + "resolved": "https://registry.npm.taobao.org/css/download/css-2.2.4.tgz", + "integrity": "sha1-xkZ1XHOXHyu6amAeLPL9cbEpiSk=", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "source-map": "^0.6.1", + "source-map-resolve": "^0.5.2", + "urix": "^0.1.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true + } + } + }, "css-loader": { "version": "3.4.2", "resolved": "https://registry.npm.taobao.org/css-loader/download/css-loader-3.4.2.tgz", @@ -2934,6 +3020,16 @@ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=", "dev": true }, + "d": { + "version": "1.0.1", + "resolved": "https://registry.npm.taobao.org/d/download/d-1.0.1.tgz", + "integrity": "sha1-hpgJU3LVjb7jRv/Qxwk/mfj561o=", + "dev": true, + "requires": { + "es5-ext": "^0.10.50", + "type": "^1.0.1" + } + }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz", @@ -3412,6 +3508,38 @@ "is-symbol": "^1.0.2" } }, + "es5-ext": { + "version": "0.10.53", + "resolved": "https://registry.npm.taobao.org/es5-ext/download/es5-ext-0.10.53.tgz", + "integrity": "sha1-k8WjrP2+8nUiCtcmRK0C7hg2jeE=", + "dev": true, + "requires": { + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.3", + "next-tick": "~1.0.0" + } + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npm.taobao.org/es6-iterator/download/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", + "dev": true, + "requires": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "es6-symbol": { + "version": "3.1.3", + "resolved": "https://registry.npm.taobao.org/es6-symbol/download/es6-symbol-3.1.3.tgz", + "integrity": "sha1-utXTwbzawoJp9MszHkMceKxwXRg=", + "dev": true, + "requires": { + "d": "^1.0.1", + "ext": "^1.1.2" + } + }, "escape-html": { "version": "1.0.3", "resolved": "http://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz", @@ -4194,6 +4322,23 @@ } } }, + "ext": { + "version": "1.4.0", + "resolved": "https://registry.npm.taobao.org/ext/download/ext-1.4.0.tgz", + "integrity": "sha1-ia56BxWPedNVF4gpBDJAd+Q3kkQ=", + "dev": true, + "requires": { + "type": "^2.0.0" + }, + "dependencies": { + "type": { + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/type/download/type-2.0.0.tgz?cache=0&sync_timestamp=1570722772335&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftype%2Fdownload%2Ftype-2.0.0.tgz", + "integrity": "sha1-Xxb/bvLrRPJgSU2uJxAzspwJqcM=", + "dev": true + } + } + }, "extend": { "version": "3.0.2", "resolved": "https://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz", @@ -6912,6 +7057,12 @@ "integrity": "sha1-rCetpmFn+ohJpq3dg39rGJrSCBw=", "dev": true }, + "next-tick": { + "version": "1.0.0", + "resolved": "https://registry.npm.taobao.org/next-tick/download/next-tick-1.0.0.tgz", + "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", + "dev": true + }, "nice-try": { "version": "1.0.5", "resolved": "http://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz", @@ -7176,6 +7327,12 @@ "integrity": "sha1-HEfyct8nfzsdrwYWd9nILiMixg4=", "dev": true }, + "object-path": { + "version": "0.11.4", + "resolved": "https://registry.npm.taobao.org/object-path/download/object-path-0.11.4.tgz", + "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=", + "dev": true + }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", @@ -8114,6 +8271,12 @@ "safe-regex": "^1.1.0" } }, + "regex-parser": { + "version": "2.2.10", + "resolved": "https://registry.npm.taobao.org/regex-parser/download/regex-parser-2.2.10.tgz", + "integrity": "sha1-nmao9z2JoQdhbmOznU3t3+6RKzc=", + "dev": true + }, "regexp.prototype.flags": { "version": "1.3.0", "resolved": "https://registry.npm.taobao.org/regexp.prototype.flags/download/regexp.prototype.flags-1.3.0.tgz", @@ -8312,6 +8475,89 @@ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, + "resolve-url-loader": { + "version": "3.1.1", + "resolved": "https://registry.npm.taobao.org/resolve-url-loader/download/resolve-url-loader-3.1.1.tgz", + "integrity": "sha1-KJMYlfoeq5vgZH07KVjBAK48C/A=", + "dev": true, + "requires": { + "adjust-sourcemap-loader": "2.0.0", + "camelcase": "5.3.1", + "compose-function": "3.0.3", + "convert-source-map": "1.7.0", + "es6-iterator": "2.0.3", + "loader-utils": "1.2.3", + "postcss": "7.0.21", + "rework": "1.0.1", + "rework-visit": "1.0.0", + "source-map": "0.6.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz", + "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz", + "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=", + "dev": true + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1573282918610&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz", + "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "dependencies": { + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz", + "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "postcss": { + "version": "7.0.21", + "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.21.tgz?cache=0&sync_timestamp=1581994853208&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.21.tgz", + "integrity": "sha1-BrsHgkwZwgIcXQVtWxDDW5iffhc=", + "dev": true, + "requires": { + "chalk": "^2.4.2", + "source-map": "^0.6.1", + "supports-color": "^6.1.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "dev": true + }, + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz", + "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npm.taobao.org/restore-cursor/download/restore-cursor-3.1.0.tgz", @@ -8334,6 +8580,30 @@ "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", "dev": true }, + "rework": { + "version": "1.0.1", + "resolved": "https://registry.npm.taobao.org/rework/download/rework-1.0.1.tgz", + "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=", + "dev": true, + "requires": { + "convert-source-map": "^0.3.3", + "css": "^2.0.0" + }, + "dependencies": { + "convert-source-map": { + "version": "0.3.5", + "resolved": "https://registry.npm.taobao.org/convert-source-map/download/convert-source-map-0.3.5.tgz?cache=0&sync_timestamp=1573003637425&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fconvert-source-map%2Fdownload%2Fconvert-source-map-0.3.5.tgz", + "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=", + "dev": true + } + } + }, + "rework-visit": { + "version": "1.0.0", + "resolved": "https://registry.npm.taobao.org/rework-visit/download/rework-visit-1.0.0.tgz", + "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=", + "dev": true + }, "rimraf": { "version": "2.7.1", "resolved": "https://registry.npm.taobao.org/rimraf/download/rimraf-2.7.1.tgz", @@ -9672,6 +9942,12 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "dev": true }, + "type": { + "version": "1.2.0", + "resolved": "https://registry.npm.taobao.org/type/download/type-1.2.0.tgz?cache=0&sync_timestamp=1570722772335&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftype%2Fdownload%2Ftype-1.2.0.tgz", + "integrity": "sha1-hI3XaY2vo+VKbEeedZxLw/GIR6A=", + "dev": true + }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npm.taobao.org/type-check/download/type-check-0.3.2.tgz", diff --git a/package.json b/package.json index f74db69..fefa672 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@babel/preset-env": "^7.8.7", "@babel/preset-react": "^7.8.3", "@fortawesome/fontawesome-free": "^5.11.2", + "@fortawesome/fontawesome-pro": "^5.12.1", "@types/html-webpack-plugin": "^3.2.2", "@types/node": "^13.9.0", "@types/react": "^16.9.23", @@ -43,6 +44,7 @@ "html-webpack-plugin": "^3.2.0", "mini-css-extract-plugin": "^0.5.0", "node-sass": "^4.13.1", + "resolve-url-loader": "^3.1.1", "sass-loader": "^7.3.1", "style-loader": "^1.1.3", "ts-loader": "^6.2.1", @@ -53,5 +55,6 @@ "webpack-cli": "^3.3.11", "webpack-dev-server": "^3.10.3", "webpack-merge": "^4.2.2" - } -} \ No newline at end of file + }, + "dependencies": {} +} diff --git a/src/assets/images/badcable.png b/src/assets/images/badcable.png new file mode 100644 index 0000000..696661f Binary files /dev/null and b/src/assets/images/badcable.png differ diff --git a/src/assets/images/header-background.svg b/src/assets/images/container-background.svg similarity index 100% rename from src/assets/images/header-background.svg rename to src/assets/images/container-background.svg diff --git a/src/assets/images/graph-paper.svg b/src/assets/images/graph-paper.svg new file mode 100644 index 0000000..ec0f0c7 --- /dev/null +++ b/src/assets/images/graph-paper.svg @@ -0,0 +1 @@ + diff --git a/src/assets/images/plus.svg b/src/assets/images/plus.svg new file mode 100644 index 0000000..93b42d0 --- /dev/null +++ b/src/assets/images/plus.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/index.css b/src/index.css new file mode 100644 index 0000000..05d3996 --- /dev/null +++ b/src/index.css @@ -0,0 +1,62 @@ +@import '~@fortawesome/fontawesome-pro/css/fontawesome.css'; +@import '~@fortawesome/fontawesome-pro/css/brands.css'; +@import '~@fortawesome/fontawesome-pro/css/duotone.css'; +@import '~@fortawesome/fontawesome-pro/css/light.css'; +@import '~@fortawesome/fontawesome-pro/css/regular.css'; +@import '~@fortawesome/fontawesome-pro/css/solid.css'; +@import '~unsemantic/assets/sass/unsemantic-grid-responsive.scss'; + +@import 'stylesheets/chem-elements.css'; +@import 'stylesheets/footer.css'; +@import 'stylesheets/header.css'; +@import 'stylesheets/identities.css'; +@import 'stylesheets/intro.css'; +@import 'stylesheets/labels.css'; + +body { + background: url(./assets/images/plus.svg) #044F67; + background-size: 8em; + + font-size: 1em; + margin: 0; + min-height: 100vh; + padding: 5vh 0; + + display: flex; + flex-direction: column; + justify-content: center; +} + +html { + font-family: 'Helvetica Neue', Helvetica, Arial, PingFangTC-Light, 'Microsoft YaHei', 微软雅黑, 'STHeiti Light', STXihei, '华文细黑', Heiti, 黑体, sans-serif; + margin: 0; + padding: 0; +} + +#container { + background: url(./assets/images/container-background.svg) grey; + box-shadow: 0 0 0.15em 0.15em rgba(0, 0, 0, 0.125); + padding: 1em 0; + margin: 0 auto; + max-width: 64em; +} + +.no-wrap { + display: inline-block; +} + +#container, #container>*:first-child { + border-top-left-radius: 2em; +} + +#container, #container>*:last-child, #container>*:last-child>*:last-child { + border-bottom-right-radius: 2em; +} + +.header .small-labels .group::before, .header .small-labels .label::before { + color: #eee; +} + +.identities .small-labels .group::before, .identities .small-labels .label::before { + color: #333; +} diff --git a/src/index.html b/src/index.html index e33c7f0..00013ab 100644 --- a/src/index.html +++ b/src/index.html @@ -2,24 +2,23 @@ - + - about amphineko
-
+ -
+

@@ -33,7 +32,7 @@
language - + 汉语 漢語 @@ -43,7 +42,23 @@
- project + education + + + undergraduate + +
+ +
+ major + + + network engineering + +
+ +
+ home-lab Maeeko Laboratory @@ -57,12 +72,10 @@ AS205058 - AS396303 + AS396303
-
-
platforms @@ -77,102 +90,170 @@
+
+

-
- indents - - - spaces - +
+

who am i?

+ +
+
+

+ Has experience in full-stack projects (and DevOps).
+ Operating own Internet autonomous system.
+ Contact me if you're interested to hire me :D +

+

+ 过去有全栈项目开发的经验 (还是 DevOps)
+ 拥有自己的 Internet 自治系统
+ 如果你对我有兴趣的话,欢迎来招募我 +

+

+ 是一個討厭生活在沒有計劃當中的人,
+ 喜歡進行完備的考量。 +

+
+ +
-
-
-

- Cursed Network Engineering student.
- Has few experience in full-stack development.
- Operating own autonomous system.
- Contact me if you're interested to hire :D -

-
- - -
+

my playlist!

- Music Game is LIFE!
- Love FPS and Simulation Games.
- Ingress Mission Collector. + ardently love fps, simulation and avg games
+ rhythm game is LIFE!
+ ingress (mission collection only) agent +

+

+ 热衷于第一人称射击、模拟和文字冒险游戏
+ 音乐节奏是人生不可或缺的一部分!
+ 还是一个 Ingress (仅限任务收集) 探员 +

+

+ dream to be railroad driver and civil aviation pilot +
+ 曾经梦想过成为机车司机和民航飞行员

+
+
profiles
+ +
+
- music game + fps + + Counter-Strike Global Offensive + Rainbow Six Siege +
+ +
+ simulation + - - Arcade: NekoSauc + + Cities: Skylines - - osu! Rukatan + + Train Simulators + + + + 電車でGO! + + + + FS 9 & FS X + + + + X-Plane
- Steam - - - NekoSauce - - - CS:GO - -
+ rhythm -
- Uplay - - AtomicAkarin + + BEMANI (iidx, jubeat, sdvx, etc.) - R6:S + + SEGA (chunithm, etc.) -
- -
- Niantic - - Ingress [CODENAME REDACTED] + + TAITO (groove coaster)
@@ -191,7 +272,7 @@
diff --git a/src/index.scss b/src/index.scss deleted file mode 100644 index 3fbb557..0000000 --- a/src/index.scss +++ /dev/null @@ -1,64 +0,0 @@ -$fa-font-path: "~@fortawesome/fontawesome-free/webfonts" !default; -@import "~@fortawesome/fontawesome-free/scss/fontawesome.scss"; -@import "~@fortawesome/fontawesome-free/scss/brands.scss"; -@import "~@fortawesome/fontawesome-free/scss/regular.scss"; -@import "~@fortawesome/fontawesome-free/scss/solid.scss"; -@import "~unsemantic/assets/sass/unsemantic-grid-responsive.scss"; - -@import "stylesheets/chem-elements.scss"; -@import "stylesheets/footer.scss"; -@import "stylesheets/header.scss"; -@import "stylesheets/identities.scss"; -@import "stylesheets/intro.scss"; -@import "stylesheets/labels.scss"; - -body { - background: url('./assets/images/header-background.svg') #466685; - background-size: cover; - - font-size: 1em; - margin: 0; - min-height: 100vh; - padding: 0; - - display: flex; - flex-direction: column; - justify-content: center; -} - -html { - font-family: "Helvetica Neue", Helvetica, Arial, PingFangTC-Light, "Microsoft YaHei", 微软雅黑, "STHeiti Light", STXihei, "华文细黑", Heiti, 黑体, sans-serif; - margin: 0; - padding: 0; -} - -#container { - background-position: center; - box-shadow: 0 0 0.15em 0.15em rgba(0, 0, 0, 0.125); - margin: 0 auto; - margin-bottom: 1em; - margin-top: -1em; - max-width: 64em; -} - -.no-wrap { - display: inline-block; -} - -$section-border-radius: 2em; - -#container, #container>*:first-child { - border-top-left-radius: $section-border-radius; -} - -#container, #container>*:last-child, #container>*:last-child>*:last-child { - border-bottom-right-radius: $section-border-radius; -} - -.header .small-labels .group::before, .header .small-labels .label::before { - color: #eee; -} - -.identities .small-labels .group::before, .identities .small-labels .label::before { - color: #333; -} diff --git a/src/stylesheets/chem-elements.scss b/src/stylesheets/chem-elements.css similarity index 100% rename from src/stylesheets/chem-elements.scss rename to src/stylesheets/chem-elements.css diff --git a/src/stylesheets/footer.scss b/src/stylesheets/footer.css similarity index 100% rename from src/stylesheets/footer.scss rename to src/stylesheets/footer.css diff --git a/src/stylesheets/header.scss b/src/stylesheets/header.css similarity index 72% rename from src/stylesheets/header.scss rename to src/stylesheets/header.css index 1389906..b12f084 100644 --- a/src/stylesheets/header.scss +++ b/src/stylesheets/header.css @@ -1,7 +1,8 @@ .section.header { - background: rgba(0, 0, 0, 0.075); - // box-shadow: 0 0 0.15em 0.15em rgba(0, 0, 0, 0.125); - // margin-top: -3.2em; + background: url(../assets/images/badcable.png) rgba(0, 0, 0, 0.75); + background-position: bottom right; + background-repeat: no-repeat; + background-size: auto 40%; padding-top: 1.6em; padding-bottom: 1.4em; } @@ -10,6 +11,15 @@ padding: 0 1em; } +.section.header .splitter { + display: block; + border-left: 1em solid rgba(0, 0, 0, 0.15); + width: 1em; + + /* this should be calculated from right panel height */ + height: 24em; +} + .section.header .name { color: #f5f5f5; display: inline-block; diff --git a/src/stylesheets/identities.css b/src/stylesheets/identities.css new file mode 100644 index 0000000..3bf1c0d --- /dev/null +++ b/src/stylesheets/identities.css @@ -0,0 +1,68 @@ +figure.identities { + border-bottom: 0.1em solid rgba(0, 0, 0, 0.05); + margin: 0.75em 0; +} + +figure.identities:last-child { + border-bottom: none; +} + +figure.identities figcaption { + color: #777; + line-height: 1.5em; + padding: 0 1em; +} + +figure.identities ul { + margin: 0; + padding: 0; +} + +figure.identities ul li { + display: block; + list-style: none; + margin: 0.5em 0; +} + +figure.identities ul li a { + color: #333; + display: block; + font-size: 1.1em; + line-height: 1.75em; + padding: 0.5em 1em; + text-decoration: none; + transition-duration: .5s; +} + +figure.identities ul li a:hover { + background-color: rgba(0, 0, 0, .015); + box-shadow: 0.1em 0.1em 0.25em #01697c1a, -0.1em -0.1em 0.25em #01697c26; +} + +figure.identities ul li a i { + font-size: 1.1em; + text-align: center; + width: 1.5em; +} + +figure.identities ul li a .fake-link { + color: #317589; + float: right; +} + +/* shutdown */ + +figure.identities ul li.shutdown a { + background: rgba(0, 0, 0, 0.1); + cursor: not-allowed; + text-decoration: line-through; +} + +figure.identities ul li.shutdown a:hover { + background-color: rgba(0, 0, 0, 0.5); + color: #ddd; +} + +figure.identities ul li.shutdown a .fake-link { + text-decoration: line-through; +} diff --git a/src/stylesheets/identities.scss b/src/stylesheets/identities.scss deleted file mode 100644 index 84f9b94..0000000 --- a/src/stylesheets/identities.scss +++ /dev/null @@ -1,11 +0,0 @@ -.identities { - background: transparent; -} - -.identities .small-labels { - padding: 1em; -} - -.identities .small-labels .group::before, .identities .small-labels .label::before { - color: #333; -} diff --git a/src/stylesheets/intro.css b/src/stylesheets/intro.css new file mode 100644 index 0000000..0c8ca0a --- /dev/null +++ b/src/stylesheets/intro.css @@ -0,0 +1,53 @@ +.intro { + background: rgba(255, 255, 255, 0.98); + margin: 1.5em 0; + padding: 1em 0; +} + +.intro .block .split { + padding: 0 1em; +} + +.intro h2 { + font-weight: 300; + letter-spacing: 0.02em; + line-height: 2em; + margin: 0; +} + +.intro h2 i.fa { + margin: 0.25em; + text-align: center; + width: 1em; +} + +.intro p { + border-left: 0.25em solid #006080; + color: #555; + font-size: 1.2em; + font-weight: 300; + line-height: 1.75em; + margin: 1em 0; + overflow: auto; + padding: 0.5em 0.5em; +} + +.intro figure.identities + .label-group { + margin-top: 2em; +} + +.intro .label-group .header.alt { + color: #777; + margin-left: 1.5em; +} + +.intro .label-group .label { + background: transparent; + box-shadow: 0 0 0.1em rgba(0, 0, 0, 0.25); + transition-duration: .5s; +} + +.intro .label-group .label:hover { + background-color: rgba(0, 0, 0, .015); + box-shadow: 0.1em 0.1em 0.25em #01697c1a, -0.1em -0.1em 0.25em #01697c26; +} diff --git a/src/stylesheets/intro.scss b/src/stylesheets/intro.scss deleted file mode 100644 index dd4c1e7..0000000 --- a/src/stylesheets/intro.scss +++ /dev/null @@ -1,19 +0,0 @@ -.intro { - background: rgba(255, 255, 255, 0.98); - padding: 1em 0; -} - -.intro .block .split { - padding: 0 1em; -} - -.intro p { - border-left: 0.25em solid #006080; - color: #555; - font-size: 1.2em; - font-weight: 300; - line-height: 1.75em; - margin: 1em 0; - overflow: auto; - padding: 0.5em 0.5em; -} diff --git a/src/stylesheets/labels.scss b/src/stylesheets/labels.css similarity index 83% rename from src/stylesheets/labels.scss rename to src/stylesheets/labels.css index 011a61c..7fdb5d1 100644 --- a/src/stylesheets/labels.scss +++ b/src/stylesheets/labels.css @@ -30,17 +30,12 @@ padding: 0 0.6em; } -.label-group .label:last-child { - $radius: 0.5em; - - border-bottom-right-radius: $radius; - border-top-right-radius: $radius; -} - .label-group a.label { text-decoration: none; } .label-group .label i { + font-size: 1.2em; margin-right: 0.25em; + vertical-align: -0.05em; } diff --git a/src/stylesheets/icon-fall.scss b/src/stylesheets/links.css similarity index 100% rename from src/stylesheets/icon-fall.scss rename to src/stylesheets/links.css