A bunch of updates

python-update-and-others
JD Cantrell 6 years ago
parent 15b4147e9e
commit 3520288190

@ -22,4 +22,4 @@ ankh = {git = "https://github.com/jdcantrell/ankh.git", ref = "master"}
[requires]
python_version = "3.6"
python_version = "3.7"

106
Pipfile.lock generated

@ -1,24 +1,11 @@
{
"_meta": {
"hash": {
"sha256": "bec0f67c0eda383e7a9caf7e7ddeefbb180dd8a2ab4a51cdc53937fde2dfcb2a"
},
"host-environment-markers": {
"implementation_name": "cpython",
"implementation_version": "3.6.5",
"os_name": "posix",
"platform_machine": "x86_64",
"platform_python_implementation": "CPython",
"platform_release": "17.5.0",
"platform_system": "Darwin",
"platform_version": "Darwin Kernel Version 17.5.0: Fri Apr 13 19:32:32 PDT 2018; root:xnu-4570.51.2~1/RELEASE_X86_64",
"python_full_version": "3.6.5",
"python_version": "3.6",
"sys_platform": "darwin"
"sha256": "95996bcf0edae1e4361cabfb1198c3bf98c1ce41f6458e5868eb28ec9d895c57"
},
"pipfile-spec": 6,
"requires": {
"python_version": "3.6"
"python_version": "3.7"
},
"sources": [
{
@ -31,54 +18,57 @@
"default": {
"ankh": {
"git": "https://github.com/jdcantrell/ankh.git",
"ref": "master"
"ref": "9cbc6fae2833fc8035bb9a6774b23f30e88e51d4"
},
"certifi": {
"hashes": [
"sha256:9fa520c1bacfb634fa7af20a76bcbd3d5fb390481724c597da32c719a7dca4b0",
"sha256:13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7"
"sha256:4c1d68a1408dd090d2f3a869aa94c3947cc1d967821d1ed303208c9f41f0f2f4",
"sha256:b6e8b28b2b7e771a41ecdd12d4d43262ecab52adebbafa42c77d6b57fb6ad3a4"
],
"version": "==2018.4.16"
"version": "==2018.8.13"
},
"chardet": {
"hashes": [
"sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691",
"sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"
"sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
"sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
],
"version": "==3.0.4"
},
"idna": {
"hashes": [
"sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4",
"sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f"
"sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e",
"sha256:684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16"
],
"version": "==2.6"
"version": "==2.7"
},
"jinja2": {
"hashes": [
"sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd",
"sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"
],
"index": "pypi",
"version": "==2.10"
},
"libsass": {
"hashes": [
"sha256:0f2e421d3e5a53833243e0a5f2cf7ebe9812725a7f27a797c38f3c7190ce2a82",
"sha256:1b74aff85f1560d629a070552ec67f9f0ff9a47446ffafddafad9944f7589ae1",
"sha256:1cf80c04a77d36fd77f00b1ae0a269eee780d971fabd9d493b15d30de9857ae5",
"sha256:1d55dfe8e91a15a7d72d7f8aca16e74da36899e70d911af66d7184f1c82e2b39",
"sha256:a0ffca466b35fb57f2afe1f1c5fd39b4c51a4107596d28ef8c0d3bb0962244b5",
"sha256:62771c8ead9227579891814dd714be645243741aa23e5cb232ac0c245cf29a37",
"sha256:cbd5ee83d3603a2b2c2937d8f06acc07b30fd22642ea2460c966d4fd6217f1d0",
"sha256:7b9e7179b5f4fc32bc716f86e9ccaeb48ab90e7eb6648b339440346733af8828",
"sha256:0f2e421d3e5a53833243e0a5f2cf7ebe9812725a7f27a797c38f3c7190ce2a82",
"sha256:4dcd5b546bed977276f97eb7a2a13cb7cbf0a38d672e7b5525b7587c8cabcf27",
"sha256:e00b6c6d75a6e912990cbc23d48ddfdbfefc3e400c20be6593988839292248c5",
"sha256:23755425149fe0f576fd0ab7bcd151fe09400b2d980fe176c28f6c19e053c830",
"sha256:1b74aff85f1560d629a070552ec67f9f0ff9a47446ffafddafad9944f7589ae1",
"sha256:4a434d5b713b97c4141fb71c59341d4ebff8669114b14c626af51e145a48710e",
"sha256:4dcd5b546bed977276f97eb7a2a13cb7cbf0a38d672e7b5525b7587c8cabcf27",
"sha256:62771c8ead9227579891814dd714be645243741aa23e5cb232ac0c245cf29a37",
"sha256:727fb84326ffa930bc09fad8b706e77ada4d13b3adf35cce134962a434d7eccb",
"sha256:7b9e7179b5f4fc32bc716f86e9ccaeb48ab90e7eb6648b339440346733af8828",
"sha256:a0ffca466b35fb57f2afe1f1c5fd39b4c51a4107596d28ef8c0d3bb0962244b5",
"sha256:bb9735066391189b3c0383254d20d59aaafb438d632d7de551c264f16486e773",
"sha256:cbd5ee83d3603a2b2c2937d8f06acc07b30fd22642ea2460c966d4fd6217f1d0",
"sha256:de1eae502764b3dde294d6652a0046489cf31008de190c4dd8d05e7f4b5e0d71",
"sha256:ed8beef197efc6e6ab0ad03cea0885b31cc11f226290783649b4dafe1fb2ea27",
"sha256:727fb84326ffa930bc09fad8b706e77ada4d13b3adf35cce134962a434d7eccb"
"sha256:e00b6c6d75a6e912990cbc23d48ddfdbfefc3e400c20be6593988839292248c5",
"sha256:ed8beef197efc6e6ab0ad03cea0885b31cc11f226290783649b4dafe1fb2ea27"
],
"index": "pypi",
"version": "==0.14.5"
},
"markupsafe": {
@ -92,6 +82,7 @@
"sha256:b4c512ce2fc99e5a62eb95a4aba4b73e5f90264115c40b70a21e1f7d4e0eac91",
"sha256:bc10c33bfdcaa4e749b779f62f60d6e12f8215c46a292d05e486b869ae306619"
],
"index": "pypi",
"version": "==0.8.3"
},
"pygments": {
@ -99,47 +90,48 @@
"sha256:78f3f434bcc5d6ee09020f92ba487f95ba50f1e3ef83ae96b9d5ffa1bab25c5d",
"sha256:dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc"
],
"index": "pypi",
"version": "==2.2.0"
},
"pyyaml": {
"hashes": [
"sha256:3262c96a1ca437e7e4763e2843746588a965426550f3797a79fca9c6199c431f",
"sha256:16b20e970597e051997d90dc2cddc713a2876c47e3d92d59ee198700c5427736",
"sha256:e863072cdf4c72eebf179342c94e6989c67185842d9997960b3e69290b2fa269",
"sha256:bc6bced57f826ca7cb5125a10b23fd0f2fff3b7c4701d64c439a300ce665fff8",
"sha256:c01b880ec30b5a6e6aa67b09a2fe3fb30473008c85cd6a67359a1b15ed6d83a4",
"sha256:827dc04b8fa7d07c44de11fabbc888e627fa8293b695e0f99cb544fdfa1bf0d1",
"sha256:592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab",
"sha256:5f84523c076ad14ff5e6c037fe1c89a7f73a3e04cf0377cb4d017014976433f3",
"sha256:0c507b7f74b3d2dd4d1322ec8a94794927305ab4cebbe89cc47fe5e81541e6e8",
"sha256:b4c423ab23291d3945ac61346feeb9a0dc4184999ede5e7c43e1ffb975130ae6",
"sha256:ca233c64c6e40eaa6c66ef97058cdc80e8d0157a443655baa1b2966e812807ca",
"sha256:4474f8ea030b5127225b8894d626bb66c01cda098d47a2b0d3429b6700af9fd8",
"sha256:326420cbb492172dec84b0f65c80942de6cedb5233c413dd824483989c000608",
"sha256:5ac82e411044fb129bae5cfbeb3ba626acb2af31a8d17d175004b70862a741a7"
"sha256:3d7da3009c0f3e783b2c873687652d83b1bbfd5c88e9813fb7e5b03c0dd3108b",
"sha256:3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf",
"sha256:40c71b8e076d0550b2e6380bada1f1cd1017b882f7e16f09a65be98e017f211a",
"sha256:558dd60b890ba8fd982e05941927a3911dc409a63dcb8b634feaa0cda69330d3",
"sha256:a7c28b45d9f99102fa092bb213aa12e0aaf9a6a1f5e395d36166639c1f96c3a1",
"sha256:aa7dd4a6a427aed7df6fb7f08a580d68d9b118d90310374716ae90b710280af1",
"sha256:bc558586e6045763782014934bfaf39d48b8ae85a2713117d16c39864085c613",
"sha256:d46d7982b62e0729ad0175a9bc7e10a566fc07b224d2c79fafb5e032727eaa04",
"sha256:d5eef459e30b09f5a098b9cea68bebfeb268697f78d647bd255a085371ac7f3f",
"sha256:e01d3203230e1786cd91ccfdc8f8454c8069c91bee3962ad93b87a4b2860f537",
"sha256:e170a9e6fcfd19021dd29845af83bb79236068bf5fd4df3327c1be18182b2531"
],
"version": "==3.12"
"index": "pypi",
"version": "==3.13"
},
"requests": {
"hashes": [
"sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b",
"sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e"
"sha256:63b52e3c866428a224f97cab011de738c36aec0185aa91cfacd418b5d58911d1",
"sha256:ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a"
],
"version": "==2.18.4"
"index": "pypi",
"version": "==2.19.1"
},
"six": {
"hashes": [
"sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb",
"sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"
"sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9",
"sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb"
],
"version": "==1.11.0"
},
"urllib3": {
"hashes": [
"sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b",
"sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f"
"sha256:a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf",
"sha256:b5725a0bd4ba422ab0e66e89e030c806576753ea3ee08554382c14e685d117b5"
],
"version": "==1.22"
"markers": "python_version != '3.0.*' and python_version != '3.1.*' and python_version != '3.3.*' and python_version >= '2.6' and python_version < '4' and python_version != '3.2.*'",
"version": "==1.23"
}
},
"develop": {}

@ -88,5 +88,11 @@ case "$1" in
;;
*)
red "Sorry, I don't know that command :-("
echo ' publish server - build and sync to server'
echo ' sync server - sync to server'
echo ' generate - generate everything'
echo ' generate - only the site (not stream pages)'
echo ' css - generate css'
echo ' link - symlink the labs folder'
;;
esac

@ -1,12 +1,13 @@
button, .button
color: $font-color
background-color: $button-background-color
border-radius: $border-radius
border: $border
border-radius: 2px
border-width: 2px
border-style: solid
border-color: $button-border-color
font-family: $font-family
font-size: $font-size
padding: map-get($paddings, m)
padding: 3px 6px
cursor: pointer
&:hover
@ -14,36 +15,38 @@ button, .button
&:active, &.active
background-color: $button-background-color-active
border-color: $button-border-color-active
&.primary
background-color: $button-primary-background-color
border-radius: $border-radius
padding: map-get($paddings, m)
border-radius: 2px
padding: 3px 6px
color: $button-primary-color
border: $border
border-color: darken($button-primary-background-color, 20%)
border-color: $button-border-color-primary
&:hover
background-color: $button-primary-background-color-highlight
&:active, &.active
background-color: $button-primary-background-color-active
border-color: $button-border-color-primary-active
.button-group
font-size: 0
display: inline-block
button, .button
border-radius: 0
border-left-width: 0
border-right-width: 0
border-left-width: 1px
border-right-width: 1px
&:first-child
border-top-left-radius: $border-radius
border-bottom-left-radius: $border-radius
border-left-width: 1px !important
border-top-left-radius: 2px
border-bottom-left-radius: 2px
border-left-width: 2px !important
&:last-child
border-top-right-radius: $border-radius
border-bottom-right-radius: $border-radius
border-right-width: 1px !important
border-top-right-radius: 2px
border-bottom-right-radius: 2px
border-right-width: 2px !important

@ -7,3 +7,44 @@ input
select
padding: 0px 4px
.checkbox
display: inline-block
input[type=checkbox]
cursor: pointer
opacity: 0
& + label::after
content: none
&:checked + label::after
content: "x"
&:focus + label::before
background-color: $input-background-color
label
cursor: pointer
position: relative
left: -36px
display: inline-block
padding-left: 32px
&::before
cursor: pointer
font-weight: bold
position: absolute
display: inline-block
left: 0
top: 0
content: "[ ]"
&::after
cursor: pointer
font-weight: bold
position: absolute
display: inline-block
content: "x"
left: 1ch;
top: 0px;

@ -6,9 +6,10 @@ ul
list-style: disc
.list-inline
padding: 0
margin: 0
display: flex
display: inline-flex
li
display: inline-block
@ -17,4 +18,25 @@ ul
.list-separate
list-style-type: ' | '
.list-nav
padding: 0
margin: 0
display: inline-flex
li
display: inline-block
margin-right: 3ch
&.current
background-color: $c05
padding-left: .5ch
padding-right: .5ch
margin-right: 2.5ch
margin-left: -.5ch
&:hover
background-color: $c05
padding-left: .5ch
padding-right: .5ch
margin-right: 2.5ch
margin-left: -.5ch

@ -42,7 +42,7 @@ input, select
text-align: center
.page-header-title
padding: 0 1em
padding: 0 1ch
color: $page-header-title-color
display: block
background-color: $page-header-title-background-color
@ -51,11 +51,19 @@ input, select
a
color: $page-header-title-color
.page-sub-title
padding: 0 1ch
margin-left: -1ch
color: $page-sub-header-title-color
display: block
background-color: $page-sub-header-title-background-color
font-weight: bold
@media (min-width: 500px)
.page-header
.page-header, .page-sub-header
text-align: left
.page-header-title
.page-header-title, .page-sub-title
display: inline-block

@ -21,6 +21,20 @@ $button-primary-color: $c00
$button-primary-background-color-active: lighten($button-primary-background-color, 15%)
$button-primary-background-color-highlight: lighten($button-primary-background-color, 10%)
$button-lowlight: darken($button-background-color, 15%)
$button-highlight: lighten($button-background-color, 10%)
$button-border-color: $button-highlight $button-lowlight $button-lowlight $button-highlight
$button-border-color-active: $button-lowlight $button-highlight $button-highlight $button-lowlight
$button-lowlight-primary: darken($button-primary-background-color, 20%)
$button-highlight-primary: lighten($button-primary-background-color, 20%)
$button-border-color-primary: $button-highlight-primary $button-lowlight-primary $button-lowlight-primary $button-highlight-primary
$button-border-color-primary-active: $button-lowlight-primary $button-highlight-primary $button-highlight-primary $button-lowlight-primary
$caption-color: $c08
$input-background-color: $c01

@ -26,6 +26,8 @@ $page-header-background-color: $c01
$page-header-color: $c06
$page-header-title-background-color: $c12
$page-header-title-color: $c07
$page-sub-header-title-background-color: $c12
$page-sub-header-title-color: $c07
$page-footer-background-color: $c01
$page-footer-color: $c06

@ -23,8 +23,12 @@ $font-family: Menlo, Consolas, monospace
$page-header-background-color: $c06
$page-header-color: $c02
$page-header-title-background-color: $c12
$page-sub-header-title-background-color: $c11
$page-header-title-color: $c00
$page-sub-header-title-color: $c00
$page-footer-background-color: $c06
$page-footer-color: $c02

@ -9,7 +9,18 @@
<body class="readable-content">
<header class="page-header">
<span class="page-header-title">goodrobot</span>
- A simple style guide
<span class="page-sub-title">labs</span>
<ul class="list-nav">
<li><a href="/lab/chaos">Chaos</a></li>
<li><a href="/lab/ifs">IFS</a></li>
<li class="current"><a href="/lab/gxl">Styles</a></li>
<li><a href="/lab/mandelbrot">Mandelbrot</a></li>
<li><a href="/lab/rogue">Rogue</a></li>
<li><a href="/lab/sera">Sera</a></li>
</ul>
</header>
<div class="content">
<div>
@ -118,6 +129,16 @@
<label for="pw">Login: </label>
<input type="password" placeholder="Type here!" id="pw" name="pw">
<div class="checkbox">
<input checked id="news" value="news" type="checkbox">
<label for="news" class="checkbox"> Newsletter!</label>
</div>
</label>
<div class="checkbox">
<input id="follow" value="follow" type="checkbox">
<label for="follow" class="checkbox">Follow!</label>
</div>
</section>
<footer>
<input class="button primary" type="submit" value="Submit">

@ -170,7 +170,10 @@
<button v-on:click="addTransform">Add Transformation</button>
<button v-on:click="removeTransform">Remove Last Transformation</button>
<label><input v-model="playground" type="checkbox">Playground Mode</label>
<div class="checkbox">
<input id="playground" v-model="playground" value="playground" type="checkbox">
<label for="playground">Playground Mode</label>
</div>
</div>
</div>
</div>

@ -0,0 +1,6 @@
tricks:
# - watchdog.tricks.LoggerTrick:
# patterns: ["*.sass"]
- watchdog.tricks.ShellCommandTrick:
patterns: ["*.sass"]
shell_command: "./go.sh css"
Loading…
Cancel
Save