# HG changeset patch # User Robert McIntyre # Date 1373699036 -3600 # Node ID 50eaf30eceec357e8455c130da366c21ff113957 # Parent b63a1bdb1d06e3af511f019833b9e05f852e17e3 resolving mess. diff -r b63a1bdb1d06 -r 50eaf30eceec Eyeball_Tutorial.pdf Binary file Eyeball_Tutorial.pdf has changed diff -r b63a1bdb1d06 -r 50eaf30eceec css/argentum-dark.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/css/argentum-dark.css Sat Jul 13 08:03:56 2013 +0100 @@ -0,0 +1,290 @@ + +/** RESETS **/ + +html,body,div,span,dl,dt,dd,ul,ol,li,a,table,h1,h2,h3,h4,h5,h6,p,pre,form,fieldset,blockquote,.src,.example{margin:0px;padding:0px;font-weight:normal;text-decoration:none;font-size:inherit;color:inherit;} + +.section-number-1,.section-number-2,.section-number-3,.section-number-4,.section-number-5,.section-number-6{font-weight:inherit;} + +.float-right{float:right;} + +.author{ +color:#666; +line-height:3em; +} + +body{ + font:87.5% "Georgia Serif", Times, Palatino, "Times New Roman", serif; +} +a{color:blue;} +html>body{font-size:14px;} + +body{ + width:54em; + padding:1.5em; + padding-top:6em; + +} + +p{ + line-height:1.5em; + font-size:1em; + margin-top:1.5em; + margin-bottom:1.5em; +} +.post_list{ + margin-top:1.5em; +} + +.title{text-align:left;} + + + +h1{font-size:2.5em;line-height:1.2em;} +h2{font-size:1.5em;line-height:1em;margin-top:2em;margin-bottom:1em;} +h3{ + font-size:1.1667em; + line-height: 1.286em; + margin-top:1.929em; + margin-bottom:0.643em; + font-weight:bolder; +} +h4{ + font-weight:bold; + line-height:3em; +} + + + + +/*p + dl{ + margin-top:-1.5em; + border:1px solid red; +}*/ +dt{font-weight:bold;} +dd{padding-left:1.5em;} + +li{ + font-size:100%; + line-height:1.5em; +} + + +div{margin:0!important;padding:0!important;} +/*table{display:none;}*/ +.src,.example{margin:0;padding:1em;font-size:1em;line-height:1.5em; +} +.src{background:#000;color:#fff;} +.example{background:#766;color:#fff;padding:.75em} + + + +.header{ + font-family:Arial,Helvetica,Verdana,sans-serif; + vertical-align:text-top; + position:absolute; + top:0px;left:0px; + right:0px; + background:#345; + padding:.75em 1.5em!important; + border-bottom:1.5em solid #EBD6D6; + border-bottom-color:#9FB8D3; + background:#0F4D92; + + border-bottom:1em solid #cdf; + background:#444; + background:#49A; + background:transparent; + background:#eef0ff; + + background:#933; + background:#A55; + + border-color:#EDD; + + /*background: #939; + border-color:#EDE;*/ + + /* background:#359; */ + /* border-color:#9AC; */ + +} + + + + + +.header h1{ +font:1.75em Arial,Helvetica,Verdana,sans-serif; +line-height:1.166em; +font-weight:bold; +color:#b90; +color:#06a; +color:#fff; + +text-shadow: #822 0px 0px 2px; + +font-weight:normal; +display:inline; +} +.header h1 em{ + color:#b90; + color:#fc2; + color:#b90; + color:#db2; + color:#fd4; + font-weight:bold; + font-style:normal; +} +.header * {vertical-align:middle;} + +.header ul { + display:inline; + padding-left:1.5em; + margin-left:0!important; +} +.header li { + display:inline; + padding:0 .75em; +} +.header li a{ + text-decoration:none; + color:#ffd; +} + + +/*dl{display:none;}*/ + + + +ol{margin-left:1.5em;} +ul{ + list-style-type: disc; + margin-left:1.5em; +} +ul ul{ + list-style-type:circle; +} + +#table-of-contents ul{list-style-type:none;} +#text-table-of-contents > ul:first-child > li > a{ font-weight:bold;} + + + + +#postamble p,#postamble a{ + font-size:.857em; + line-height:1.75em; + padding:0; + margin:0; +} +#postamble{ + margin:1.75em 0!important; + border-top:1px solid #888; +} + +blockquote{ + margin-left:1em; +} + + + + + + + + + + + +/*** blue **/ +a{} +.header a{background:inherit;} +h1,h2,h3,h4,h5,h6, #text-table-of-contents li{ + color:#026; + color:#0A3361; + font-weight:normal; +} +.header{background:#0F4D92;border-bottom-color:#AFC4DB +} + +/*.header h1{text-shadow: #228 0px 0px 2px;}*/ + + + + + + + + +h1,h2,h3,h4,h5,h6{ + color:#373737; + font-weight:bolder; +} + +h1.title{font-weight:normal;font-size:3em;line-height:1em;} + +body{width:48em;} +img{max-width:48em;} + +body{text-align:justify; + font:12px "Lucida Grande","Trebuchet MS","Bitstream Vera Sans",Verdana,Helvetica,sans-serif !important; + color:#272727; +} +code{ + font-weight:inherit; + color:#048; + color:black; + +} + +a{color:#00e} +a:visited{color:#551A8B} + + +.figure { + background:#ddd; + border:1px solid #ccc; + font-size:.90em; + line-height:1.666em; + padding:1.5em!important; + text-align:left!important; + margin-bottom:1.666em; +} + +.outline-2{ + margin:3em 0!important; +} + + +body{padding-top:9em;padding-left:3em;} +.header{ + padding-left:3!important; +} +.header h1, .header h1 em { + text-shadow:none; + font-size:1.5em!important; +} +/* + +.header { + background:transparent; + padding-left:3em!important; + border-bottom:none; + color:inherit!important; + background:#dde8ff; + border-bottom:1px solid #c3d9ff; +} +.header h1, .header h1 em { + text-shadow:none; + color:#06c; + + font-family:"Georgia Serif", Times, Palatino, "Times New Roman", serif; +} +.header li a { + color:inherit!important; + text-decoration:underline; +} + +#text-table-of-contents a { + +} \ No newline at end of file diff -r b63a1bdb1d06 -r 50eaf30eceec css/argentum-light.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/css/argentum-light.css Sat Jul 13 08:03:56 2013 +0100 @@ -0,0 +1,289 @@ + +/** RESETS **/ + +html,body,div,span,dl,dt,dd,ul,ol,li,a,table,h1,h2,h3,h4,h5,h6,p,pre,form,fieldset,blockquote,.src,.example{margin:0px;padding:0px;font-weight:normal;text-decoration:none;font-size:inherit;color:inherit;} + +.section-number-1,.section-number-2,.section-number-3,.section-number-4,.section-number-5,.section-number-6{font-weight:inherit;} + +.float-right{float:right;} + +.author{ +color:#666; +line-height:3em; +} + +body{ + font:87.5% "Georgia Serif", Times, Palatino, "Times New Roman", serif; +} +a{color:blue;} +html>body{font-size:14px;} + +body{ + width:54em; + padding:1.5em; + padding-top:6em; + +} + +p{ + line-height:1.5em; + font-size:1em; + margin-top:1.5em; + margin-bottom:1.5em; +} +.post_list{ + margin-top:1.5em; +} + +.title{text-align:left;} + + + +h1{font-size:2.5em;line-height:1.2em;} +h2{font-size:1.5em;line-height:1em;margin-top:2em;margin-bottom:1em;} +h3{ + font-size:1.1667em; + line-height: 1.286em; + margin-top:1.929em; + margin-bottom:0.643em; + font-weight:bolder; +} +h4{ + font-weight:bold; + line-height:3em; +} + + + + +/*p + dl{ + margin-top:-1.5em; + border:1px solid red; +}*/ +dt{font-weight:bold;} +dd{padding-left:1.5em;} + +li{ + font-size:100%; + line-height:1.5em; +} + + +div{margin:0!important;padding:0!important;} +/*table{display:none;}*/ +.src,.example{margin:0;padding:1em;font-size:1em;line-height:1.5em; +} +.example{background:#766;color:#fff;padding:.75em} + + + +.header{ + font-family:Arial,Helvetica,Verdana,sans-serif; + vertical-align:text-top; + position:absolute; + top:0px;left:0px; + right:0px; + background:#345; + padding:.75em 1.5em!important; + border-bottom:1.5em solid #EBD6D6; + border-bottom-color:#9FB8D3; + background:#0F4D92; + + border-bottom:1em solid #cdf; + background:#444; + background:#49A; + background:transparent; + background:#eef0ff; + + background:#933; + background:#A55; + + border-color:#EDD; + + /*background: #939; + border-color:#EDE;*/ + + /* background:#359; */ + /* border-color:#9AC; */ + +} + + + + + +.header h1{ +font:1.75em Arial,Helvetica,Verdana,sans-serif; +line-height:1.166em; +font-weight:bold; +color:#b90; +color:#06a; +color:#fff; + +text-shadow: #822 0px 0px 2px; + +font-weight:normal; +display:inline; +} +.header h1 em{ + color:#b90; + color:#fc2; + color:#b90; + color:#db2; + color:#fd4; + font-weight:bold; + font-style:normal; +} +.header * {vertical-align:middle;} + +.header ul { + display:inline; + padding-left:1.5em; + margin-left:0!important; +} +.header li { + display:inline; + padding:0 .75em; +} +.header li a{ + text-decoration:none; + color:#ffd; +} + + +/*dl{display:none;}*/ + + + +ol{margin-left:1.5em;} +ul{ + list-style-type: disc; + margin-left:1.5em; +} +ul ul{ + list-style-type:circle; +} + +#table-of-contents ul{list-style-type:none;} +#text-table-of-contents > ul:first-child > li > a{ font-weight:bold;} + + + + +#postamble p,#postamble a{ + font-size:.857em; + line-height:1.75em; + padding:0; + margin:0; +} +#postamble{ + margin:1.75em 0!important; + border-top:1px solid #888; +} + +blockquote{ + margin-left:1em; +} + + + + + + + + + + + +/*** blue **/ +a{} +.header a{background:inherit;} +h1,h2,h3,h4,h5,h6, #text-table-of-contents li{ + color:#026; + color:#0A3361; + font-weight:normal; +} +.header{background:#0F4D92;border-bottom-color:#AFC4DB +} + +/*.header h1{text-shadow: #228 0px 0px 2px;}*/ + + + + + + + + +h1,h2,h3,h4,h5,h6{ + color:#373737; + font-weight:bolder; +} + +h1.title{font-weight:normal;font-size:3em;line-height:1em;} + +body{width:48em;} +img{max-width:48em;} + +body{text-align:justify; + font:12px "Lucida Grande","Trebuchet MS","Bitstream Vera Sans",Verdana,Helvetica,sans-serif !important; + color:#272727; +} +code{ + font-weight:inherit; + color:#048; + color:black; + +} + +a{color:#00e} +a:visited{color:#551A8B} + + +.figure { + background:#ddd; + border:1px solid #ccc; + font-size:.90em; + line-height:1.666em; + padding:1.5em!important; + text-align:left!important; + margin-bottom:1.666em; +} + +.outline-2{ + margin:3em 0!important; +} + + +body{padding-top:9em;padding-left:3em;} +.header{ + padding-left:3!important; +} +.header h1, .header h1 em { + text-shadow:none; + font-size:1.5em!important; +} +/* + +.header { + background:transparent; + padding-left:3em!important; + border-bottom:none; + color:inherit!important; + background:#dde8ff; + border-bottom:1px solid #c3d9ff; +} +.header h1, .header h1 em { + text-shadow:none; + color:#06c; + + font-family:"Georgia Serif", Times, Palatino, "Times New Roman", serif; +} +.header li a { + color:inherit!important; + text-decoration:underline; +} + +#text-table-of-contents a { + +} \ No newline at end of file diff -r b63a1bdb1d06 -r 50eaf30eceec css/aurellem-dark.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/css/aurellem-dark.css Sat Jul 13 08:03:56 2013 +0100 @@ -0,0 +1,364 @@ + +html,body,div,span,dl,dt,dd,ul,ol,li,a,table,h1,h2,h3,h4,h5,h6,p,pre,form,fieldset,blockquote,.src,.example{margin:0px;padding:0px;font-weight:normal;text-decoration:none;font-size:inherit;color:inherit;} + +.section-number-1,.section-number-2,.section-number-3,.section-number-4,.section-number-5,.section-number-6{font-weight:inherit;} + +.float-right{float:right;} + +.author{ +color:#666; +line-height:3em; +} + +body{ + font:87.5% "Georgia Serif", Times, Palatino, "Times New Roman", serif; +} +a{color:blue;} +html>body{font-size:14px;} + +body{ + width:54em; + padding:1.5em; + padding-top:6em; + +} + +p{ + line-height:1.5em; + font-size:1em; + margin-top:1.5em; + margin-bottom:1.5em; +} +.post_list{ + margin-top:1.5em; +} + +.title{text-align:left;} + + + +h1{font-size:2.5em;line-height:1.2em;} +h2{font-size:1.5em;line-height:1em;margin-top:2em;margin-bottom:1em;} +h3{ + font-size:1.1667em; + line-height: 1.286em; + margin-top:1.929em; + margin-bottom:0.643em; + font-weight:bolder; +} +h4{ + font-weight:bold; + line-height:3em; +} + + + + +/*p + dl{ + margin-top:-1.5em; + border:1px solid red; +}*/ +dt{font-weight:bold;} +dd{padding-left:1.5em;} + +li{ + font-size:100%; + line-height:1.5em; +} + + +div{margin:0!important;padding:0!important;} +/*table{display:none;}*/ +.src,.example{margin:0;padding:1em;font-size:1em;line-height:1.5em; +} +.src{background:#444;color:#fff;} +.example{background:#766;color:#fff;padding:.75em} + + +.header{ + font-family:Arial,Helvetica,Verdana,sans-serif; + vertical-align:text-top; + position:absolute; + top:0px;left:0px; + right:0px; + background:#345; + padding:.75em 1.5em!important; + border-bottom:1.5em solid #EBD6D6; + border-bottom-color:#9FB8D3; + background:#0F4D92; + + border-bottom:1em solid #cdf; + background:#444; + background:#49A; + background:transparent; + background:#eef0ff; + + background:#933; + background:#A55; + + border-color:#EDD; + + /*background: #939; + border-color:#EDE;*/ + + /* background:#359; */ + /* border-color:#9AC; */ + +} + + + + + +.header h1{ +font:1.75em Arial,Helvetica,Verdana,sans-serif; +line-height:1.166em; +font-weight:bold; +color:#b90; +color:#06a; +color:#fff; + +text-shadow: #822 0px 0px 2px; + +font-weight:normal; +display:inline; +} +.header h1 em{ + color:#b90; + color:#fc2; + color:#b90; + color:#db2; + color:#fd4; + font-weight:bold; + font-style:normal; +} +.header * {vertical-align:middle;} + +.header ul { + display:inline; + padding-left:1.5em; + margin-left:0!important; +} +.header li { + display:inline; + padding:0 .75em; +} +.header li a{ + text-decoration:none; + color:#ffd; +} + +/*dl{display:none;}*/ + + + +ol{margin-left:1.5em;} +ul{ + list-style-type: disc; + margin-left:1.5em; +} +ul ul{ + list-style-type:circle; +} + +#table-of-contents ul{list-style-type:none;} +#text-table-of-contents > ul:first-child > li > a{ font-weight:bold;} + + + + +#postamble p,#postamble a{ + font-size:.857em; + line-height:1.75em; + padding:0; + margin:0; +} +#postamble{ + margin:1.75em 0!important; + border-top:1px solid #888; +} + +blockquote{ + margin-left:1em; +} + + + + + + + + + + + +/*** blue **/ +a{} +.header a{background:inherit;} +h1,h2,h3,h4,h5,h6, #text-table-of-contents li{ + color:#026; + color:#0A3361; + font-weight:normal; +} +.header{background:#0F4D92;border-bottom-color:#AFC4DB +} +.header h1{text-shadow: #228 0px 0px 2px;} + + +/** STOP CENSORSHIP! +*:nth-child(odd):before{content:"[censored] "} +h1:after{content:"[[ stopthewall.us ]]"} +.censor{ + position:fixed; + text-align:center; + top:4em; + background:black; + padding:1em; + text-shadow:none!important; + color:white!important; +} + +/* + + +ul ul {margin-left:1em;} + +dt{font-weight:normal;font-style:italic;} +dl{margin:0;padding:0;margin-left:2em;} + +.src{background:#555;color:white;margin:0;line-height:1.5em!important;} +.example{background:#766;color:white; +margin:0;overflow:hidden;} + + +body{ + font:14px Georgia Serif, Times, Palatino,"Times New Roman", serif; + font:13px Georgia, Times, "Times New Roman", Verdana, Tahoma, Helvetica; + width:600px; + margin:24px auto; + line-height:1.5em; + color:#111; +} + +code{} +a code{color:inherit;font-weight:inherit;} + +.float-right{float:right;} + + + + + + +/*** GLOBAL HEADER ** +div.header{margin-bottom:2em;} +.header h1{font-family:Ubuntu, Arial, Helvetica, Verdana, sans-serif;font-size:160%!important;margin:0!important;margin-bottom:6px!important;font-weight:normal!important;color:#983;} +.header .nav ul{display:inline;} +.header .nav li{display:inline;margin-right:0.75em;} +.header .nav li a:hover{text-decoration:underline;} +.header .nav li a{color:#555;} + +/*** ARTICLE CONTENT + h1{ + font-size:170%; + margin-top:2em; + margin-bottom:0.5em; + font-weight:bold; +} +h2{ + font-size:120%; + font-weight:bold; + margin-bottom:0.375em; + padding-top:1.6em; + border:0px solid red; +} +h4{font-size:100%;font-weight:bold;} + +h3{ + font-size:110%; + font-weight:bold; + margin-bottom:0.75em; + padding-top:1.8em; +} + +.section-number-1,.section-number-3,.section-number-2,.section-number-4{font-weight:inherit} + + +#table-of-contents{ + margin:1.5em 0; +} + +h1,h2,h3,h4,h5,h6,p{margin:2px 0;padding:0;} + +h2{margin-top:1.8em;} +p{margin-bottom:7px} + +/* +.header h1{font-family:Ubuntu,Arial,Helvetica,Verdana,sans-serif;} + +body{margin:24px 24px;font:14px Arial, Helvetia,Verdana, sans-serif;width:860px;margin:0px auto;} +h1,h2,h3,h4,h5,h6,.nav a{} +h1{font-size:200%;} +h2{} + +.header{margin-bottom:2em;} +.nav li{display:inline;padding-right:0.75em;} +.nav li a:hover{text-decoration:underline;} +.float-right{float:right;} +.header .float-right input{display:inline;} + +input[type="text"]{margin-right:4px;padding:3px;} + +.src {padding:4px; padding-left:2em;border:1px solid #777;background:#444;color:white;} + + + + +/*** ARTICLE CONTENT TEST ***/ + + + +/**ARTICLE + +#content{line-height:1.2em;} +#content h1{font-size:140%;font-size:180%;margin-bottom:1.6em;padding-bottom:.4em;text-align:left;border-bottom:1px solid transparent;} +#content h2{font-size:120%;font-weight:bold;margin-bottom:6px;margin-bottom:12px;margin-top:3em;} +#content p{margin-bottom:1em;} +#content p:first-letter{margin-left:2em;} + +#content h2 > #content p:first-letter{margin-left:0px;} + + + + + + +/*** LIGHT COLOR SCHEME +body{background:#fff;color:#222;} +h1{color:#982;} +.nav li a{color:#555;} +#article h1, #article h2, #article h3, #article h4 {color:#57e;color:#48b;color:#489;} + +#article h1{border-bottom-color:#e30;border-bottom-color:#888;} + + + +/*
+
+
+ +
+ +
+
+ +

aurellem ☉

+ +
+
+ +
+*/ \ No newline at end of file diff -r b63a1bdb1d06 -r 50eaf30eceec css/aurellem.css --- a/css/aurellem.css Sat Jul 13 03:01:04 2013 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,351 +0,0 @@ - -html,body,div,span,dl,dt,dd,ul,ol,li,a,table,h1,h2,h3,h4,h5,h6,p,pre,form,fieldset,blockquote,.src,.example{margin:0px;padding:0px;font-weight:normal;text-decoration:none;font-size:inherit;color:inherit;} - -.section-number-1,.section-number-2,.section-number-3,.section-number-4,.section-number-5,.section-number-6{font-weight:inherit;} - -.float-right{float:right;} - -.author{ -color:#666; -line-height:3em; -} - -body{ - font:87.5% "Georgia Serif", Times, Palatino, "Times New Roman", serif; -} -a{color:blue;} -html>body{font-size:14px;} - -body{ - width:54em; - padding:1.5em; - padding-top:6em; - -} - -p{ - line-height:1.5em; - font-size:1em; - margin-top:1.5em; - margin-bottom:1.5em; -} -.post_list{ - margin-top:1.5em; -} - -.title{text-align:left;} - - - -h1{font-size:2.5em;line-height:1.2em;} -h2{font-size:1.5em;line-height:1em;margin-top:2em;margin-bottom:1em;} -h3{ - font-size:1.1667em; - line-height: 1.286em; - margin-top:1.929em; - margin-bottom:0.643em; - font-weight:bolder; -} -h4{ - font-weight:bold; - line-height:3em; -} - - - - -/*p + dl{ - margin-top:-1.5em; - border:1px solid red; -}*/ -dt{font-weight:bold;} -dd{padding-left:1.5em;} - -li{ - font-size:100%; - line-height:1.5em; -} - - -div{margin:0!important;padding:0!important;} -/*table{display:none;}*/ -.src,.example{margin:0;padding:1em;font-size:1em;line-height:1.5em; -} -.src{background:#444;color:#fff;} -.example{background:#766;color:#fff;padding:.75em} - - -.header{ - font-family:Arial,Helvetica,Verdana,sans-serif; - vertical-align:text-top; - position:absolute; - top:0px;left:0px; - right:0px; - background:#345; - padding:.75em 1.5em!important; - border-bottom:1.5em solid #EBD6D6; - border-bottom-color:#9FB8D3; - background:#0F4D92; - - border-bottom:1em solid #cdf; - background:#444; - background:#49A; - background:transparent; - background:#eef0ff; - - background:#933; - background:#A55; - - border-color:#EDD; - - /*background: #939; - border-color:#EDE;*/ - - /* background:#359; */ - /* border-color:#9AC; */ - -} - - - - - -.header h1{ -font:1.75em Arial,Helvetica,Verdana,sans-serif; -line-height:1.166em; -font-weight:bold; -color:#b90; -color:#06a; -color:#fff; - -text-shadow: #822 0px 0px 2px; - -font-weight:normal; -display:inline; -} -.header h1 em{ - color:#b90; - color:#fc2; - color:#b90; - color:#db2; - color:#fd4; - font-weight:bold; - font-style:normal; -} -.header * {vertical-align:middle;} - -.header ul { - display:inline; - padding-left:1.5em; - margin-left:0!important; -} -.header li { - display:inline; - padding:0 .75em; -} -.header li a{ - text-decoration:none; - color:#ffd; -} - -/*dl{display:none;}*/ - - - -ol{margin-left:1.5em;} -ul{ - list-style-type: disc; - margin-left:1.5em; -} -ul ul{ - list-style-type:circle; -} - -#table-of-contents ul{list-style-type:none;} -#text-table-of-contents > ul:first-child > li > a{ font-weight:bold;} - - - - -#postamble p,#postamble a{ - font-size:.857em; - line-height:1.75em; - padding:0; - margin:0; -} -#postamble{ - margin:1.75em 0!important; - border-top:1px solid #888; -} - -blockquote{ - margin-left:1em; -} - - - - - - - - - - - -/*** blue **/ -a{} -.header a{background:inherit;} -h1,h2,h3,h4,h5,h6, #text-table-of-contents li{ - color:#026; - color:#0A3361; - font-weight:normal; -} -.header{background:#0F4D92;border-bottom-color:#AFC4DB -} -.header h1{text-shadow: #228 0px 0px 2px;} - - -/* - - -ul ul {margin-left:1em;} - -dt{font-weight:normal;font-style:italic;} -dl{margin:0;padding:0;margin-left:2em;} - -.src{background:#555;color:white;margin:0;line-height:1.5em!important;} -.example{background:#766;color:white; -margin:0;overflow:hidden;} - - -body{ - font:14px Georgia Serif, Times, Palatino,"Times New Roman", serif; - font:13px Georgia, Times, "Times New Roman", Verdana, Tahoma, Helvetica; - width:600px; - margin:24px auto; - line-height:1.5em; - color:#111; -} - -code{} -a code{color:inherit;font-weight:inherit;} - -.float-right{float:right;} - - - - - - -/*** GLOBAL HEADER ** -div.header{margin-bottom:2em;} -.header h1{font-family:Ubuntu, Arial, Helvetica, Verdana, sans-serif;font-size:160%!important;margin:0!important;margin-bottom:6px!important;font-weight:normal!important;color:#983;} -.header .nav ul{display:inline;} -.header .nav li{display:inline;margin-right:0.75em;} -.header .nav li a:hover{text-decoration:underline;} -.header .nav li a{color:#555;} - -/*** ARTICLE CONTENT - h1{ - font-size:170%; - margin-top:2em; - margin-bottom:0.5em; - font-weight:bold; -} -h2{ - font-size:120%; - font-weight:bold; - margin-bottom:0.375em; - padding-top:1.6em; - border:0px solid red; -} -h4{font-size:100%;font-weight:bold;} - -h3{ - font-size:110%; - font-weight:bold; - margin-bottom:0.75em; - padding-top:1.8em; -} - -.section-number-1,.section-number-3,.section-number-2,.section-number-4{font-weight:inherit} - - -#table-of-contents{ - margin:1.5em 0; -} - -h1,h2,h3,h4,h5,h6,p{margin:2px 0;padding:0;} - -h2{margin-top:1.8em;} -p{margin-bottom:7px} - -/* -.header h1{font-family:Ubuntu,Arial,Helvetica,Verdana,sans-serif;} - -body{margin:24px 24px;font:14px Arial, Helvetia,Verdana, sans-serif;width:860px;margin:0px auto;} -h1,h2,h3,h4,h5,h6,.nav a{} -h1{font-size:200%;} -h2{} - -.header{margin-bottom:2em;} -.nav li{display:inline;padding-right:0.75em;} -.nav li a:hover{text-decoration:underline;} -.float-right{float:right;} -.header .float-right input{display:inline;} - -input[type="text"]{margin-right:4px;padding:3px;} - -.src {padding:4px; padding-left:2em;border:1px solid #777;background:#444;color:white;} - - - - -/*** ARTICLE CONTENT ***/ - - - -/**ARTICLE - -#content{line-height:1.2em;} -#content h1{font-size:140%;font-size:180%;margin-bottom:1.6em;padding-bottom:.4em;text-align:left;border-bottom:1px solid transparent;} -#content h2{font-size:120%;font-weight:bold;margin-bottom:6px;margin-bottom:12px;margin-top:3em;} -#content p{margin-bottom:1em;} -#content p:first-letter{margin-left:2em;} - -#content h2 > #content p:first-letter{margin-left:0px;} - - - - - - -/*** LIGHT COLOR SCHEME -body{background:#fff;color:#222;} -h1{color:#982;} -.nav li a{color:#555;} -#article h1, #article h2, #article h3, #article h4 {color:#57e;color:#48b;color:#489;} - -#article h1{border-bottom-color:#e30;border-bottom-color:#888;} - - - -/*
-
-
- -
- -
-
- -

aurellem ☉

- -
-
- -
-*/ \ No newline at end of file diff -r b63a1bdb1d06 -r 50eaf30eceec org/index.org --- a/org/index.org Sat Jul 13 03:01:04 2013 -0400 +++ b/org/index.org Sat Jul 13 08:03:56 2013 +0100 @@ -8,9 +8,14 @@ #+OPTIONS: toc:nil, num:nil ** Adventures in coding +<<<<<<< local +- [[../abomination/html/no_parens.html][Calling it quits without parentheses]] +- [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]] +======= - [[../abomination/html/no_parens.html][Calling it quits without parentheses]] - [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]] +>>>>>>> other ** Academic - [[../dylan/html/quandary.html][Bugs in quantum mechanics]] - [[../dylan/html/visualizing-reason.html][A category-theoretic view of inductive reasoning]] @@ -18,6 +23,27 @@ - [[../cortex/html/ai-journal-review.html][Interesting Articles from /Artificial Intelligence/]] ** Cortex: a virtual world for sensate AI +<<<<<<< local +1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]] +2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]] +3. [[../cortex/html/world.html][Creating a Virtual World]] +4. [[../cortex/html/util.html][Utilities that Integrate jMonkeyEngine3 into Clojure ]] +5. [[../cortex/html/games.html][ Showing off: Games and Examples]] +6. *Sensors and effectors* + 1. [[../cortex/html/sense.html][Preamble: auxillary functions]] + 2. [[../cortex/html/body.html][Building a Body]] + 3. [[../cortex/html/vision.html][Vision]] + 4. [[../cortex/html/hearing.html][Hearing]] + 5. [[../cortex/html/touch.html][Touch]] + 6. [[../cortex/html/proprioception.html][Proprioception]] + 7. [[../cortex/html/movement.html][Movement]] + 8. [[../cortex/html/integration.html][Integration]] +7. [[../cortex/html/gabor.html][Gabor Filters]] + +** Quantitative design +- [[../dylan/resolution.svg][Display resolutions, simplified.]] Intended to become a replacement + for [[http://en.wikipedia.org/wiki/File:Vector_Video_Standards4.svg][this Wikipedia graphic]]. +======= 1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]] 2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]] 3. [[../cortex/html/world.html][Creating a Virtual World]] @@ -34,6 +60,7 @@ 8. [[../cortex/html/integration.html][Integration]] 7. [[../cortex/html/gabor.html][Gabor Filters]] +>>>>>>> other ** Pok\eacute{}mon - [[../pokemon-types/html/types.html][Best-first search for effective Pok\eacute{}mon types]] - [[../pokemon-types/html/lpsolve.html][Discovering effective Pok\eacute{}mon types using linear optimization.]] @@ -43,9 +70,16 @@ - [[./vba-clojure/html/total-control.html][Pok\eacute{}mon Yellow Total Control Hack]] ** Thoughts +<<<<<<< local +- [[../dylan/html/science.html][Science Minus Science]] +- [[../thoughts/html/man-years.html][A Universe of Human Experience]] +- [[../thoughts/html/emacs-password.html][Emacs Password Security]] +- [[../server/html/server.html][The Server Culture]] +- [[../thoughts/html/patents.html][Thoughts on Patents]] +======= - [[../dylan/html/science.html][Science Minus Science]] - [[../thoughts/html/man-years.html][A Universe of Human Experience]] - [[../thoughts/html/emacs-password.html][Emacs Password Security]] - [[../server/html/server.html][The Server Culture]] - [[../thoughts/html/patents.html][Thoughts on Patents]] - - [[../thoughts/html/ideas.html][Ideas]] \ No newline at end of file + - [[../thoughts/html/ideas.html][Ideas]]>>>>>>> other diff -r b63a1bdb1d06 -r 50eaf30eceec org/index.org.orig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/org/index.org.orig Sat Jul 13 08:03:56 2013 +0100 @@ -0,0 +1,52 @@ +#+title: Our Blog Entries +#+author: Robert McIntyre & Dylan Holmes +#+email: rlm@mit.edu +#+description: A Blog on AI, quantum mechanics, philosophy, and all sorts of coding goodies in clojure, java, C and more! +#+keywords: AI, clojure, quantum mechanics +#+SETUPFILE: ../../aurellem/org/setup.org +#+INCLUDE: ../../aurellem/org/level-0.org +#+OPTIONS: toc:nil, num:nil + +** Adventures in coding +- [[../abomination/html/no_parens.html][Calling it quits without parentheses]] +- [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]] +** Academic +- [[../dylan/html/quandary.html][Bugs in quantum mechanics]] +- [[../dylan/html/visualizing-reason.html][A category-theoretic view of inductive reasoning]] +- [[../jaynes/html/stat-mech.html][Jaynes' /Statistical Mechanics/]] +- [[../cortex/html/ai-journal-review.html][Interesting Articles from /Artificial Intelligence/]] + +** Cortex: a virtual world for sensate AI +1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]] +2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]] +3. [[../cortex/html/world.html][Creating a Virtual World]] +4. [[../cortex/html/util.html][Utilities that Integrate jMonkeyEngine3 into Clojure ]] +5. [[../cortex/html/games.html][ Showing off: Games and Examples]] +6. *Sensors and effectors* + 1. [[../cortex/html/sense.html][Preamble: auxillary functions]] + 2. [[../cortex/html/body.html][Building a Body]] + 3. [[../cortex/html/vision.html][Vision]] + 4. [[../cortex/html/hearing.html][Hearing]] + 5. [[../cortex/html/touch.html][Touch]] + 6. [[../cortex/html/proprioception.html][Proprioception]] + 7. [[../cortex/html/movement.html][Movement]] + 8. [[../cortex/html/integration.html][Integration]] +7. [[../cortex/html/gabor.html][Gabor Filters]] + +** Quantitative design +- [[../dylan/resolution.svg][Display resolutions, simplified.]] Intended to become a replacement + for [[http://en.wikipedia.org/wiki/File:Vector_Video_Standards4.svg][this Wikipedia graphic]]. +** Pok\eacute{}mon + - [[../pokemon-types/html/types.html][Best-first search for effective Pok\eacute{}mon types]] + - [[../pokemon-types/html/lpsolve.html][Discovering effective Pok\eacute{}mon types using linear optimization.]] + - [[../vba-clojure/html/rom.html][Notes on deconstructing Pok\eacute{}mon Yellow]] + - [[http://web.mit.edu/dxh/www/guess/][9 Questions with Pok\eacute{}mon]] (watch this space!) + - [[http://aurellem.org/pokeclass/html/idtree.html][How /9 Questions with Pok\eacute{}mon/ was made.]] (in progress) + - [[./vba-clojure/html/total-control.html][Pok\eacute{}mon Yellow Total Control Hack]] + +** Thoughts +- [[../dylan/html/science.html][Science Minus Science]] +- [[../thoughts/html/man-years.html][A Universe of Human Experience]] +- [[../thoughts/html/emacs-password.html][Emacs Password Security]] +- [[../server/html/server.html][The Server Culture]] +- [[../thoughts/html/patents.html][Thoughts on Patents]]