diff --git a/Pipfile b/Pipfile index b6d8ba8..f4b01f8 100644 --- a/Pipfile +++ b/Pipfile @@ -4,10 +4,10 @@ verify_ssl = true name = "Tabletop Simulator Knowledge Base" [packages] -mkdocs-material = "~= 3.0.4" -mkdocs = "~=1.0.4" -pygments = "~=2.2.0" -pymdown-extensions = "~=5.0" +mkdocs = "~=1.1.2" +mkdocs-material = "~= 7.0.4" +mkdocs-material-extensions = "~= 1.0.1" +pymdown-extensions = "~=8.1.1" [requires] python_version = "3.6" diff --git a/Pipfile.lock b/Pipfile.lock index 5a2240f..fd056d5 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "bad16acd0afcefecdc3a11b86039486b5b37a0659639dfbbb1e4d8278091ae40" + "sha256": "da5f6f9ee34eef043ab5e69887eb285b372f0f5fae5da7b698deb19ef750f79d" }, "pipfile-spec": 6, "requires": { @@ -24,21 +24,36 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==7.1.2" }, + "future": { + "hashes": [ + "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d" + ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==0.18.2" + }, "importlib-metadata": { "hashes": [ - "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771", - "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d" + "sha256:742add720a20d0467df2f444ae41704000f50e1234f46174b51f9c6031a1bd71", + "sha256:b74159469b464a99cb8cc3e21973e4d96e05d3024d337313fedb618a6e86e6f4" ], "markers": "python_version < '3.8'", - "version": "==3.4.0" + "version": "==3.7.3" }, "jinja2": { "hashes": [ - "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", - "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" + "sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419", + "sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==2.11.2" + "version": "==2.11.3" + }, + "joblib": { + "hashes": [ + "sha256:9c17567692206d2f3fb9ecf5e991084254fe631665c450b443761c4186a613f7", + "sha256:feeb1ec69c4d45129954f1b7034954241eedfd6ba39b5e9e4b6883be3332d5e5" + ], + "markers": "python_version >= '3.6'", + "version": "==1.0.1" }, "livereload": { "hashes": [ @@ -46,13 +61,23 @@ ], "version": "==2.6.3" }, + "lunr": { + "extras": [ + "languages" + ], + "hashes": [ + "sha256:aab3f489c4d4fab4c1294a257a30fec397db56f0a50273218ccc3efdbf01d6ca", + "sha256:c4fb063b98eff775dd638b3df380008ae85e6cb1d1a24d1cd81a10ef6391c26e" + ], + "version": "==0.5.8" + }, "markdown": { "hashes": [ - "sha256:5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18", - "sha256:c109c15b7dc20a9ac454c9e6025927d44460b85bd039da028d85e2b6d0bcc328" + "sha256:31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49", + "sha256:96c3ba1261de2f7547b46a00ea8463832c921d3f9d6aba3f255a6f71386db20c" ], "markers": "python_version >= '3.6'", - "version": "==3.3.3" + "version": "==3.3.4" }, "markupsafe": { "hashes": [ @@ -114,35 +139,49 @@ }, "mkdocs": { "hashes": [ - "sha256:17d34329aad75d5de604b9ed4e31df3a4d235afefdc46ce7b1964fddb2e1e939", - "sha256:8cc8b38325456b9e942c981a209eaeb1e9f3f77b493ad755bfef889b9c8d356a" + "sha256:096f52ff52c02c7e90332d2e53da862fde5c062086e1b5356a6e392d5d60f5e9", + "sha256:f0b61e5402b99d7789efa032c7a74c90a20220a9c81749da06dbfbcbd52ffb39" ], "index": "Tabletop Simulator Knowledge Base", - "version": "==1.0.4" + "version": "==1.1.2" }, "mkdocs-material": { "hashes": [ - "sha256:47f3931462afa0378bc5704996f702fdef16d44ae8b698249497cf19c2b7f087", - "sha256:ca5ee59e2745ae566f0475e2c596b437d2a9ad6fdac46808bc7c808808b25b74" + "sha256:a89f8a08a5f0a5ecce2c7a4a61a1ddd2c2cbac86f17978264eb8b8ce2ca5411b", + "sha256:e1423286dcb2ac6b9417e9e04a3f63a97f12f7f64802af09c8257561e9f3a319" ], "index": "Tabletop Simulator Knowledge Base", - "version": "==3.0.6" + "version": "==7.0.6" }, - "pygments": { + "mkdocs-material-extensions": { "hashes": [ - "sha256:78f3f434bcc5d6ee09020f92ba487f95ba50f1e3ef83ae96b9d5ffa1bab25c5d", - "sha256:dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc" + "sha256:6947fb7f5e4291e3c61405bad3539d81e0b3cd62ae0d66ced018128af509c68f", + "sha256:d90c807a88348aa6d1805657ec5c0b2d8d609c110e62b9dce4daf7fa981fa338" ], "index": "Tabletop Simulator Knowledge Base", - "version": "==2.2.0" + "version": "==1.0.1" + }, + "nltk": { + "hashes": [ + "sha256:845365449cd8c5f9731f7cb9f8bd6fd0767553b9d53af9eb1b3abf7700936b35" + ], + "version": "==3.5" + }, + "pygments": { + "hashes": [ + "sha256:2656e1a6edcdabf4275f9a3640db59fd5de107d88e8663c5d4e9a0fa62f77f94", + "sha256:534ef71d539ae97d4c3a4cf7d6f110f214b0e687e92f9cb9d2a3b0d3101289c8" + ], + "markers": "python_version >= '3.5'", + "version": "==2.8.1" }, "pymdown-extensions": { "hashes": [ - "sha256:2e1d8f4a4c351cfa6c5ad88a0f2f4a3a30af481a942fdf8f9db0936e12ff37c2", - "sha256:54675680f6ad3ee8242fcb8926703b30ea3dcbeb9e21b7f7f19077f0ec982a82" + "sha256:478b2c04513fbb2db61688d5f6e9030a92fb9be14f1f383535c43f7be9dff95b", + "sha256:632371fa3bf1b21a0e3f4063010da59b41db049f261f4c0b0872069a9b6d1735" ], "index": "Tabletop Simulator Knowledge Base", - "version": "==5.0" + "version": "==8.1.1" }, "pyyaml": { "hashes": [ @@ -158,19 +197,73 @@ "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018", "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e", "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253", + "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347", "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183", + "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541", "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb", "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185", + "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc", "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db", + "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa", "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46", + "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122", "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b", "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63", "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df", - "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc" + "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc", + "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247", + "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6", + "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", "version": "==5.4.1" }, + "regex": { + "hashes": [ + "sha256:07ef35301b4484bce843831e7039a84e19d8d33b3f8b2f9aab86c376813d0139", + "sha256:13f50969028e81765ed2a1c5fcfdc246c245cf8d47986d5172e82ab1a0c42ee5", + "sha256:14de88eda0976020528efc92d0a1f8830e2fb0de2ae6005a6fc4e062553031fa", + "sha256:159fac1a4731409c830d32913f13f68346d6b8e39650ed5d704a9ce2f9ef9cb3", + "sha256:18e25e0afe1cf0f62781a150c1454b2113785401ba285c745acf10c8ca8917df", + "sha256:201e2619a77b21a7780580ab7b5ce43835e242d3e20fef50f66a8df0542e437f", + "sha256:360a01b5fa2ad35b3113ae0c07fb544ad180603fa3b1f074f52d98c1096fa15e", + "sha256:39c44532d0e4f1639a89e52355b949573e1e2c5116106a395642cbbae0ff9bcd", + "sha256:3d9356add82cff75413bec360c1eca3e58db4a9f5dafa1f19650958a81e3249d", + "sha256:3d9a7e215e02bd7646a91fb8bcba30bc55fd42a719d6b35cf80e5bae31d9134e", + "sha256:4651f839dbde0816798e698626af6a2469eee6d9964824bb5386091255a1694f", + "sha256:486a5f8e11e1f5bbfcad87f7c7745eb14796642323e7e1829a331f87a713daaa", + "sha256:4b8a1fb724904139149a43e172850f35aa6ea97fb0545244dc0b805e0154ed68", + "sha256:4c0788010a93ace8a174d73e7c6c9d3e6e3b7ad99a453c8ee8c975ddd9965643", + "sha256:4c2e364491406b7888c2ad4428245fc56c327e34a5dfe58fd40df272b3c3dab3", + "sha256:575a832e09d237ae5fedb825a7a5bc6a116090dd57d6417d4f3b75121c73e3be", + "sha256:5770a51180d85ea468234bc7987f5597803a4c3d7463e7323322fe4a1b181578", + "sha256:633497504e2a485a70a3268d4fc403fe3063a50a50eed1039083e9471ad0101c", + "sha256:63f3ca8451e5ff7133ffbec9eda641aeab2001be1a01878990f6c87e3c44b9d5", + "sha256:709f65bb2fa9825f09892617d01246002097f8f9b6dde8d1bb4083cf554701ba", + "sha256:808404898e9a765e4058bf3d7607d0629000e0a14a6782ccbb089296b76fa8fe", + "sha256:882f53afe31ef0425b405a3f601c0009b44206ea7f55ee1c606aad3cc213a52c", + "sha256:8bd4f91f3fb1c9b1380d6894bd5b4a519409135bec14c0c80151e58394a4e88a", + "sha256:8e65e3e4c6feadf6770e2ad89ad3deb524bcb03d8dc679f381d0568c024e0deb", + "sha256:976a54d44fd043d958a69b18705a910a8376196c6b6ee5f2596ffc11bff4420d", + "sha256:a0d04128e005142260de3733591ddf476e4902c0c23c1af237d9acf3c96e1b38", + "sha256:a0df9a0ad2aad49ea3c7f65edd2ffb3d5c59589b85992a6006354f6fb109bb18", + "sha256:a2ee026f4156789df8644d23ef423e6194fad0bc53575534101bb1de5d67e8ce", + "sha256:a59a2ee329b3de764b21495d78c92ab00b4ea79acef0f7ae8c1067f773570afa", + "sha256:b97ec5d299c10d96617cc851b2e0f81ba5d9d6248413cd374ef7f3a8871ee4a6", + "sha256:b98bc9db003f1079caf07b610377ed1ac2e2c11acc2bea4892e28cc5b509d8d5", + "sha256:b9d8d286c53fe0cbc6d20bf3d583cabcd1499d89034524e3b94c93a5ab85ca90", + "sha256:bcd945175c29a672f13fce13a11893556cd440e37c1b643d6eeab1988c8b209c", + "sha256:c66221e947d7207457f8b6f42b12f613b09efa9669f65a587a2a71f6a0e4d106", + "sha256:c782da0e45aff131f0bed6e66fbcfa589ff2862fc719b83a88640daa01a5aff7", + "sha256:cb4ee827857a5ad9b8ae34d3c8cc51151cb4a3fe082c12ec20ec73e63cc7c6f0", + "sha256:d47d359545b0ccad29d572ecd52c9da945de7cd6cf9c0cfcb0269f76d3555689", + "sha256:dc9963aacb7da5177e40874585d7407c0f93fb9d7518ec58b86e562f633f36cd", + "sha256:ea2f41445852c660ba7c3ebf7d70b3779b20d9ca8ba54485a17740db49f46932", + "sha256:f5d0c921c99297354cecc5a416ee4280bd3f20fd81b9fb671ca6be71499c3fdf", + "sha256:f85d6f41e34f6a2d1607e312820971872944f1661a73d33e1e82d35ea3305e14" + ], + "version": "==2021.3.17" + }, "six": { "hashes": [ "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", @@ -226,6 +319,14 @@ "markers": "python_version >= '3.5'", "version": "==6.1" }, + "tqdm": { + "hashes": [ + "sha256:9fdf349068d047d4cfbe24862c425883af1db29bcddf4b0eeb2524f6fbdb23c7", + "sha256:d666ae29164da3e517fcf125e41d4fe96e5bb375cd87ff9763f6b38b5592fe33" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==4.59.0" + }, "typing-extensions": { "hashes": [ "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918", @@ -237,11 +338,11 @@ }, "zipp": { "hashes": [ - "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108", - "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb" + "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76", + "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098" ], "markers": "python_version >= '3.6'", - "version": "==3.4.0" + "version": "==3.4.1" } }, "develop": {} diff --git a/docs/css/i_icons.css b/docs/css/i_icons.css deleted file mode 100644 index a64ef54..0000000 --- a/docs/css/i_icons.css +++ /dev/null @@ -1,10 +0,0 @@ -/*Styling the i icons that link to details*/ - -.i:after { - font-family: "Material Icons"; - content: "\E88F"; - font-size: 22px; - - position: relative; - right: 2px; -} diff --git a/docs/css/player_color_table.css b/docs/css/player_color_table.css index 24e9cf6..0d6e0ae 100644 --- a/docs/css/player_color_table.css +++ b/docs/css/player_color_table.css @@ -6,7 +6,7 @@ table.playerColorTable { border-collapse: collapse; border-color: grey; border-spacing: 1px; - border-radius: .2rem; + border-radius: .1rem; box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12), 0 3px 1px -2px rgba(0,0,0,.2); } table.playerColorTable td { diff --git a/docs/css/theme.css b/docs/css/theme.css index 9c9a1a4..1822fd0 100644 --- a/docs/css/theme.css +++ b/docs/css/theme.css @@ -1,16 +1,6 @@ -/*Changing icon for permalinks*/ -.headerlink:after { - font-family: "Material Icons"; - content: "\E157"; -} -.headerlink { - font-family: "Helvetica Neue,Helvetica,Arial,sans-serif"; -} - - /*Disable top bar shdow fade-in*/ .md-header { - transition: initial !important; + box-shadow: 0 0 .2rem rgba(0,0,0,.1),0 .2rem .4rem rgba(0,0,0,.2); } /*Increase width/height of icon on top bar*/ @@ -37,42 +27,42 @@ .md-typeset h1 { color: #000000; font-weight: 600; - font-size: 3.2rem; + font-size: 1.6rem; text-transform: none; font-family: "Roboto","Helvetica Neue",Helvetica,Arial,sans-serif; } .md-typeset h2{ color: #202020; font-weight: 500; - font-size: 2.9rem; + font-size: 1.45rem; text-transform: none; font-family: "Roboto","Helvetica Neue",Helvetica,Arial,sans-serif; } .md-typeset h3 { color: #404040; font-weight: 500; - font-size: 2.6rem; + font-size: 1.3rem; text-transform: none; font-family: "Roboto","Helvetica Neue",Helvetica,Arial,sans-serif; } .md-typeset h4 { color: #606060; font-weight: 400; - font-size: 2.3rem; + font-size: 1.15rem; text-transform: none; font-family: "Roboto","Helvetica Neue",Helvetica,Arial,sans-serif; } .md-typeset h5 { color: #808080; font-weight: 300; - font-size: 2rem; + font-size: 1rem; text-transform: none; font-family: "Roboto","Helvetica Neue",Helvetica,Arial,sans-serif; } .md-typeset h6 { color: #A0A0A0; font-weight: 200; - font-size: 1.7rem; + font-size: 0.85rem; text-transform: none; font-family: "Roboto","Helvetica Neue",Helvetica,Arial,sans-serif; } @@ -87,14 +77,6 @@ color: #f4641d !important; } -/*anchor offset*/ -.anchor:before { - content:""; - display:block; - height:130px; /* fixed header height*/ - margin:-130px 0 0; /* negative fixed header height */ -} - /*prevent left/right scrollbar .md-typeset .admonition, .md-typeset details { overflow-x:hidden; @@ -103,7 +85,7 @@ disabled due to lack of need currently, but works*/ /*Make lines across pages solid*/ .md-typeset hr { - border-bottom: .1rem solid rgba(0,0,0,.26); + border-bottom: .05rem solid rgba(0,0,0,.26); } /*Adds padding to bottom of nav bar so you can see Go To link*/ @@ -124,8 +106,8 @@ disabled due to lack of need currently, but works*/ .custom-link { color:#bb0c0d; position:relative; - left:1.3rem; - top:-0.5rem; + left:0.65rem; + top:-0.25rem; } /*Image Borders*/ @@ -135,11 +117,23 @@ img { box-shadow: 2px 2px 4px #aaa; } /*Overwrite for header bar icon, removing its border*/ -.md-header-nav__button.md-logo * { +.md-header__button.md-logo img, +.md-header__button.md-logo svg { border:0px !important; box-shadow: 0px 0px 0px #aaa !important; } +.md-header__button.md-logo { + margin: 0 0.2rem 0 0.2rem; + padding: 0; +} + +/* Override scrollbar colors */ +[class$=__scrollwrap]:hover, +.md-typeset pre > code:hover { + scrollbar-color: #f4641d transparent; +} + .borderdisable { border:0px !important; box-shadow: 0px 0px 0px #aaa !important; diff --git a/docs/css/type_icons.css b/docs/css/type_icons.css index 52fb36f..84982bf 100644 --- a/docs/css/type_icons.css +++ b/docs/css/type_icons.css @@ -3,7 +3,7 @@ font-family: 'Inconsolata', 'Monaco', 'Consolas', 'Courier New', 'Courier'; font-weight: normal; text-align: center; - font-size: 1rem; + font-size: 0.5rem; display: inline; padding: 2px 4px; border-radius:5px; @@ -26,7 +26,7 @@ /*background-color:rgba(1, 0, 0, 0.2);*/ font-style: italic; text-align: center; - font-size: 1rem; + font-size: 0.5rem; /*padding: 1px 4px; box-shadow: 2px 2px #696969; border-radius: 6px;*/ diff --git a/mkdocs.yml b/mkdocs.yml index 66c250c..d3f9dfc 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -25,7 +25,8 @@ markdown_extensions: - pymdownx.critic - pymdownx.details - pymdownx.emoji: - emoji_generator: !!python/name:pymdownx.emoji.to_svg + emoji_index: !!python/name:materialx.emoji.twemoji + emoji_generator: !!python/name:materialx.emoji.to_svg - pymdownx.inlinehilite - pymdownx.magiclink - pymdownx.mark @@ -35,20 +36,20 @@ markdown_extensions: custom_checkbox: true - pymdownx.tilde - toc: - permalink: "\u0020" + permalink: true repo_name: 'GitHub Source' repo_url: 'https://github.com/Berserk-Games/Tabletop-Simulator-Knowledge-Base' extra: social: - - type: 'reddit' + - icon: fontawesome/brands/reddit link: 'https://www.reddit.com/r/tabletopsimulator/' - - type: 'twitter' + - icon: fontawesome/brands/twitter link: 'https://twitter.com/tabletopsim' - - type: 'facebook' + - icon: fontawesome/brands/facebook link: 'https://www.facebook.com/tabletopsimulator' - - type: 'youtube' + - icon: fontawesome/brands/youtube link: 'https://www.youtube.com/user/berserkgames' diff --git a/theme/partials/_die_nav-item.html b/theme/partials/_die_nav-item.html deleted file mode 100644 index c9580ea..0000000 --- a/theme/partials/_die_nav-item.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - -{% set class = "md-nav__item" %} -{% if nav_item.active %} - {% set class = "md-nav__item md-nav__item--active" %} -{% endif %} - - - -{% if nav_item.children %} -
-
  • - - - {% if nav_item.active %} - - {% else %} - - {% endif %} - - - - -
  • - - -{% elif nav_item == page %} -
  • - {% set toc_ = page.toc %} - - - - - - {% if toc_ | first is defined and "\x3ch1 id=" in page.content %} - {% set toc_ = (toc_ | first).children %} - {% endif %} - - - {% if toc_ | first is defined %} - - {% endif %} - - {{ nav_item.title }} - - - - {% if toc_ | first is defined %} - {% include "partials/toc.html" %} - {% endif %} -
  • - - -{% else %} -
  • - - {{ nav_item.title }} - -
  • -{% endif %} diff --git a/theme/partials/nav.html b/theme/partials/nav.html deleted file mode 100644 index 8298b53..0000000 --- a/theme/partials/nav.html +++ /dev/null @@ -1,63 +0,0 @@ - - - -