From 8b666819296e1109a3a9d92175ef507b46700e85 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Tue, 1 Jan 2013 14:09:43 +1300 Subject: Much-needed facelift for the docs. --- doc-src/01-bootstrap.min.css | 940 ++++++++++++++++++++++++++++++++++ doc-src/01-reset-fonts-grids-base.css | 8 - doc-src/02-docstyle.css | 137 ----- doc-src/_layout.html | 101 +++- doc-src/admin.html | 7 - doc-src/index.html | 48 -- doc-src/index.py | 3 +- doc-src/transparent.html | 2 + doc-src/transparent/index.py | 1 - doc-src/transparent/openbsd.html | 0 10 files changed, 1017 insertions(+), 230 deletions(-) create mode 100644 doc-src/01-bootstrap.min.css delete mode 100644 doc-src/01-reset-fonts-grids-base.css delete mode 100644 doc-src/02-docstyle.css delete mode 100644 doc-src/admin.html delete mode 100644 doc-src/transparent/openbsd.html (limited to 'doc-src') diff --git a/doc-src/01-bootstrap.min.css b/doc-src/01-bootstrap.min.css new file mode 100644 index 00000000..34d8b87d --- /dev/null +++ b/doc-src/01-bootstrap.min.css @@ -0,0 +1,940 @@ +@import url('https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700'); +article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} +audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} +audio:not([controls]){display:none;} +html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} +a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +a:hover,a:active{outline:0;} +sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;} +sup{top:-0.5em;} +sub{bottom:-0.25em;} +img{max-width:100%;width:auto\9;height:auto;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic;} +#map_canvas img,.google-maps img{max-width:none;} +button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;} +button,input{*overflow:visible;line-height:normal;} +button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;} +button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;} +label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer;} +input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield;} +input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;} +textarea{overflow:auto;vertical-align:top;} +@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important;} a,a:visited{text-decoration:underline;} a[href]:after{content:" (" attr(href) ")";} abbr[title]:after{content:" (" attr(title) ")";} .ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:"";} pre,blockquote{border:1px solid #999;page-break-inside:avoid;} thead{display:table-header-group;} tr,img{page-break-inside:avoid;} img{max-width:100% !important;} @page {margin:0.5cm;}p,h2,h3{orphans:3;widows:3;} h2,h3{page-break-after:avoid;}}.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0;} +.clearfix:after{clear:both;} +.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;} +.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} +body{margin:0;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:14px;line-height:20px;color:#555555;background-color:#ffffff;} +a{color:#007fff;text-decoration:none;} +a:hover{color:#0066cc;text-decoration:underline;} +.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} +.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);} +.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px;} +.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";line-height:0;} +.row:after{clear:both;} +[class*="span"]{float:left;min-height:1px;margin-left:20px;} +.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;} +.span12{width:940px;} +.span11{width:860px;} +.span10{width:780px;} +.span9{width:700px;} +.span8{width:620px;} +.span7{width:540px;} +.span6{width:460px;} +.span5{width:380px;} +.span4{width:300px;} +.span3{width:220px;} +.span2{width:140px;} +.span1{width:60px;} +.offset12{margin-left:980px;} +.offset11{margin-left:900px;} +.offset10{margin-left:820px;} +.offset9{margin-left:740px;} +.offset8{margin-left:660px;} +.offset7{margin-left:580px;} +.offset6{margin-left:500px;} +.offset5{margin-left:420px;} +.offset4{margin-left:340px;} +.offset3{margin-left:260px;} +.offset2{margin-left:180px;} +.offset1{margin-left:100px;} +.row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0;} +.row-fluid:after{clear:both;} +.row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;} +.row-fluid [class*="span"]:first-child{margin-left:0;} +.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%;} +.row-fluid .span12{width:100%;*width:99.94680851063829%;} +.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%;} +.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%;} +.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%;} +.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%;} +.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%;} +.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%;} +.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%;} +.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%;} +.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%;} +.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%;} +.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%;} +.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%;} +.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%;} +.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%;} +.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%;} +.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%;} +.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%;} +.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%;} +.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%;} +.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%;} +.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%;} +.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%;} +.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%;} +.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%;} +.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%;} +.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%;} +.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%;} +.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%;} +.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%;} +.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%;} +.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%;} +.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%;} +.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%;} +.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%;} +.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%;} +[class*="span"].hide,.row-fluid [class*="span"].hide{display:none;} +[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right;} +.container{margin-right:auto;margin-left:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";line-height:0;} +.container:after{clear:both;} +.container-fluid{padding-right:20px;padding-left:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";line-height:0;} +.container-fluid:after{clear:both;} +p{margin:0 0 10px;} +.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px;} +small{font-size:85%;} +strong{font-weight:bold;} +em{font-style:italic;} +cite{font-style:normal;} +.muted{color:#dfdfdf;} +a.muted:hover{color:#c6c6c6;} +.text-warning{color:#ffffff;} +a.text-warning:hover{color:#e6e6e6;} +.text-error{color:#ffffff;} +a.text-error:hover{color:#e6e6e6;} +.text-info{color:#ffffff;} +a.text-info:hover{color:#e6e6e6;} +.text-success{color:#ffffff;} +a.text-success:hover{color:#e6e6e6;} +h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:300;line-height:20px;color:#080808;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#dfdfdf;} +h1,h2,h3{line-height:40px;} +h1{font-size:38.5px;} +h2{font-size:31.5px;} +h3{font-size:24.5px;} +h4{font-size:17.5px;} +h5{font-size:14px;} +h6{font-size:11.9px;} +h1 small{font-size:24.5px;} +h2 small{font-size:17.5px;} +h3 small{font-size:14px;} +h4 small{font-size:14px;} +.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eeeeee;} +ul,ol{padding:0;margin:0 0 10px 25px;} +ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} +li{line-height:20px;} +ul.unstyled,ol.unstyled{margin-left:0;list-style:none;} +ul.inline,ol.inline{margin-left:0;list-style:none;}ul.inline >li,ol.inline >li{display:inline-block;padding-left:5px;padding-right:5px;} +dl{margin-bottom:20px;} +dt,dd{line-height:20px;} +dt{font-weight:bold;} +dd{margin-left:10px;} +.dl-horizontal{*zoom:1;}.dl-horizontal:before,.dl-horizontal:after{display:table;content:"";line-height:0;} +.dl-horizontal:after{clear:both;} +.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} +.dl-horizontal dd{margin-left:180px;} +hr{margin:20px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} +abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #dfdfdf;} +abbr.initialism{font-size:90%;text-transform:uppercase;} +blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:25px;} +blockquote small{display:block;line-height:20px;color:#dfdfdf;}blockquote small:before{content:'\2014 \00A0';} +blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eeeeee;border-left:0;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} +blockquote.pull-right small:before{content:'';} +blockquote.pull-right small:after{content:'\00A0 \2014';} +q:before,q:after,blockquote:before,blockquote:after{content:"";} +address{display:block;margin-bottom:20px;font-style:normal;line-height:20px;} +code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;white-space:nowrap;} +pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;}pre.prettyprint{margin-bottom:20px;} +pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0;} +.pre-scrollable{max-height:340px;overflow-y:scroll;} +form{margin:0 0 20px;} +fieldset{padding:0;margin:0;border:0;} +legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#999999;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:15px;color:#dfdfdf;} +label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px;} +input,button,select,textarea{font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;} +label{display:block;margin-bottom:5px;} +select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#bbbbbb;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;vertical-align:middle;} +input,textarea,.uneditable-input{width:206px;} +textarea{height:auto;} +textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#ffffff;border:1px solid #bbbbbb;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear .2s, box-shadow linear .2s;-moz-transition:border linear .2s, box-shadow linear .2s;-o-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);} +input[type="radio"],input[type="checkbox"]{margin:4px 0 0;*margin-top:0;margin-top:1px \9;line-height:normal;} +input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto;} +select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px;} +select{width:220px;border:1px solid #bbbbbb;background-color:#ffffff;} +select[multiple],select[size]{height:auto;} +select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +.uneditable-input,.uneditable-textarea{color:#dfdfdf;background-color:#fcfcfc;border-color:#bbbbbb;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} +.uneditable-input{overflow:hidden;white-space:nowrap;} +.uneditable-textarea{width:auto;height:auto;} +input:-moz-placeholder,textarea:-moz-placeholder{color:#bbbbbb;} +input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#bbbbbb;} +input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#bbbbbb;} +.radio,.checkbox{min-height:20px;padding-left:20px;} +.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px;} +.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;} +.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;} +.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;} +.input-mini{width:60px;} +.input-small{width:90px;} +.input-medium{width:150px;} +.input-large{width:210px;} +.input-xlarge{width:270px;} +.input-xxlarge{width:530px;} +input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0;} +.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block;} +input,textarea,.uneditable-input{margin-left:0;} +.controls-row [class*="span"]+[class*="span"]{margin-left:20px;} +input.span12, textarea.span12, .uneditable-input.span12{width:926px;} +input.span11, textarea.span11, .uneditable-input.span11{width:846px;} +input.span10, textarea.span10, .uneditable-input.span10{width:766px;} +input.span9, textarea.span9, .uneditable-input.span9{width:686px;} +input.span8, textarea.span8, .uneditable-input.span8{width:606px;} +input.span7, textarea.span7, .uneditable-input.span7{width:526px;} +input.span6, textarea.span6, .uneditable-input.span6{width:446px;} +input.span5, textarea.span5, .uneditable-input.span5{width:366px;} +input.span4, textarea.span4, .uneditable-input.span4{width:286px;} +input.span3, textarea.span3, .uneditable-input.span3{width:206px;} +input.span2, textarea.span2, .uneditable-input.span2{width:126px;} +input.span1, textarea.span1, .uneditable-input.span1{width:46px;} +.controls-row{*zoom:1;}.controls-row:before,.controls-row:after{display:table;content:"";line-height:0;} +.controls-row:after{clear:both;} +.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left;} +.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px;} +input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eeeeee;} +input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent;} +.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#ffffff;} +.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#ffffff;} +.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#ffffff;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#e6e6e6;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;} +.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#ffffff;background-color:#ff7518;border-color:#ffffff;} +.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#ffffff;} +.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#ffffff;} +.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#ffffff;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#e6e6e6;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;} +.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#ffffff;background-color:#ff0039;border-color:#ffffff;} +.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#ffffff;} +.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#ffffff;} +.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#ffffff;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#e6e6e6;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;} +.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#ffffff;background-color:#3fb618;border-color:#ffffff;} +.control-group.info .control-label,.control-group.info .help-block,.control-group.info .help-inline{color:#ffffff;} +.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#ffffff;} +.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#ffffff;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#e6e6e6;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ffffff;} +.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#ffffff;background-color:#9954bb;border-color:#ffffff;} +input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} +.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";line-height:0;} +.form-actions:after{clear:both;} +.help-block,.help-inline{color:#7b7b7b;} +.help-block{display:block;margin-bottom:10px;} +.help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} +.input-append,.input-prepend{margin-bottom:5px;font-size:0;white-space:nowrap;}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu{font-size:14px;} +.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 0px 0px 0;-moz-border-radius:0 0px 0px 0;border-radius:0 0px 0px 0;}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2;} +.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#eeeeee;border:1px solid #ccc;} +.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.input-append .active,.input-prepend .active{background-color:#96ed7a;border-color:#3fb618;} +.input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} +.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:0px 0 0 0px;-moz-border-radius:0px 0 0 0px;border-radius:0px 0 0 0px;} +.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:0px 0 0 0px;-moz-border-radius:0px 0 0 0px;border-radius:0px 0 0 0px;}.input-append input+.btn-group .btn:last-child,.input-append select+.btn-group .btn:last-child,.input-append .uneditable-input+.btn-group .btn:last-child{-webkit-border-radius:0 0px 0px 0;-moz-border-radius:0 0px 0px 0;border-radius:0 0px 0px 0;} +.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px;} +.input-append .add-on:last-child,.input-append .btn:last-child,.input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 0px 0px 0;-moz-border-radius:0 0px 0px 0;border-radius:0 0px 0px 0;} +.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 0px 0px 0;-moz-border-radius:0 0px 0px 0;border-radius:0 0px 0px 0;} +.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:0px 0 0 0px;-moz-border-radius:0px 0 0 0px;border-radius:0px 0 0 0px;} +.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 0px 0px 0;-moz-border-radius:0 0px 0px 0;border-radius:0 0px 0px 0;} +.input-prepend.input-append .btn-group:first-child{margin-left:0;} +input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} +.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px;} +.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0;} +.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0;} +.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px;} +.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;*zoom:1;margin-bottom:0;vertical-align:middle;} +.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none;} +.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block;} +.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0;} +.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle;} +.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0;} +.control-group{margin-bottom:10px;} +legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate;} +.form-horizontal .control-group{margin-bottom:20px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";line-height:0;} +.form-horizontal .control-group:after{clear:both;} +.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right;} +.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0;}.form-horizontal .controls:first-child{*padding-left:180px;} +.form-horizontal .help-block{margin-bottom:0;} +.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px;} +.form-horizontal .form-actions{padding-left:180px;} +table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0;} +.table{width:100%;margin-bottom:20px;}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;} +.table th{font-weight:bold;} +.table thead th{vertical-align:bottom;} +.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;} +.table tbody+tbody{border-top:2px solid #dddddd;} +.table .table{background-color:#ffffff;} +.table-condensed th,.table-condensed td{padding:4px 5px;} +.table-bordered{border:1px solid #dddddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;}.table-bordered th,.table-bordered td{border-left:1px solid #dddddd;} +.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;} +.table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child{-webkit-border-top-left-radius:0px;-moz-border-radius-topleft:0px;border-top-left-radius:0px;} +.table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child{-webkit-border-top-right-radius:0px;-moz-border-radius-topright:0px;border-top-right-radius:0px;} +.table-bordered thead:last-child tr:last-child>th:first-child,.table-bordered tbody:last-child tr:last-child>td:first-child,.table-bordered tfoot:last-child tr:last-child>td:first-child{-webkit-border-bottom-left-radius:0px;-moz-border-radius-bottomleft:0px;border-bottom-left-radius:0px;} +.table-bordered thead:last-child tr:last-child>th:last-child,.table-bordered tbody:last-child tr:last-child>td:last-child,.table-bordered tfoot:last-child tr:last-child>td:last-child{-webkit-border-bottom-right-radius:0px;-moz-border-radius-bottomright:0px;border-bottom-right-radius:0px;} +.table-bordered tfoot+tbody:last-child tr:last-child td:first-child{-webkit-border-bottom-left-radius:0;-moz-border-radius-bottomleft:0;border-bottom-left-radius:0;} +.table-bordered tfoot+tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:0;-moz-border-radius-bottomright:0;border-bottom-right-radius:0;} +.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:0px;-moz-border-radius-topleft:0px;border-top-left-radius:0px;} +.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:0px;-moz-border-radius-topright:0px;border-top-right-radius:0px;} +.table-striped tbody>tr:nth-child(odd)>td,.table-striped tbody>tr:nth-child(odd)>th{background-color:#f9f9f9;} +.table-hover tbody tr:hover td,.table-hover tbody tr:hover th{background-color:#e8f8fd;} +table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0;} +.table td.span1,.table th.span1{float:none;width:44px;margin-left:0;} +.table td.span2,.table th.span2{float:none;width:124px;margin-left:0;} +.table td.span3,.table th.span3{float:none;width:204px;margin-left:0;} +.table td.span4,.table th.span4{float:none;width:284px;margin-left:0;} +.table td.span5,.table th.span5{float:none;width:364px;margin-left:0;} +.table td.span6,.table th.span6{float:none;width:444px;margin-left:0;} +.table td.span7,.table th.span7{float:none;width:524px;margin-left:0;} +.table td.span8,.table th.span8{float:none;width:604px;margin-left:0;} +.table td.span9,.table th.span9{float:none;width:684px;margin-left:0;} +.table td.span10,.table th.span10{float:none;width:764px;margin-left:0;} +.table td.span11,.table th.span11{float:none;width:844px;margin-left:0;} +.table td.span12,.table th.span12{float:none;width:924px;margin-left:0;} +.table tbody tr.success td{background-color:#3fb618;} +.table tbody tr.error td{background-color:#ff0039;} +.table tbody tr.warning td{background-color:#ff7518;} +.table tbody tr.info td{background-color:#9954bb;} +.table-hover tbody tr.success:hover td{background-color:#379f15;} +.table-hover tbody tr.error:hover td{background-color:#e60033;} +.table-hover tbody tr.warning:hover td{background-color:#fe6600;} +.table-hover tbody tr.info:hover td{background-color:#8d46b0;} +[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px;} +.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png");} +.icon-glass{background-position:0 0;} +.icon-music{background-position:-24px 0;} +.icon-search{background-position:-48px 0;} +.icon-envelope{background-position:-72px 0;} +.icon-heart{background-position:-96px 0;} +.icon-star{background-position:-120px 0;} +.icon-star-empty{background-position:-144px 0;} +.icon-user{background-position:-168px 0;} +.icon-film{background-position:-192px 0;} +.icon-th-large{background-position:-216px 0;} +.icon-th{background-position:-240px 0;} +.icon-th-list{background-position:-264px 0;} +.icon-ok{background-position:-288px 0;} +.icon-remove{background-position:-312px 0;} +.icon-zoom-in{background-position:-336px 0;} +.icon-zoom-out{background-position:-360px 0;} +.icon-off{background-position:-384px 0;} +.icon-signal{background-position:-408px 0;} +.icon-cog{background-position:-432px 0;} +.icon-trash{background-position:-456px 0;} +.icon-home{background-position:0 -24px;} +.icon-file{background-position:-24px -24px;} +.icon-time{background-position:-48px -24px;} +.icon-road{background-position:-72px -24px;} +.icon-download-alt{background-position:-96px -24px;} +.icon-download{background-position:-120px -24px;} +.icon-upload{background-position:-144px -24px;} +.icon-inbox{background-position:-168px -24px;} +.icon-play-circle{background-position:-192px -24px;} +.icon-repeat{background-position:-216px -24px;} +.icon-refresh{background-position:-240px -24px;} +.icon-list-alt{background-position:-264px -24px;} +.icon-lock{background-position:-287px -24px;} +.icon-flag{background-position:-312px -24px;} +.icon-headphones{background-position:-336px -24px;} +.icon-volume-off{background-position:-360px -24px;} +.icon-volume-down{background-position:-384px -24px;} +.icon-volume-up{background-position:-408px -24px;} +.icon-qrcode{background-position:-432px -24px;} +.icon-barcode{background-position:-456px -24px;} +.icon-tag{background-position:0 -48px;} +.icon-tags{background-position:-25px -48px;} +.icon-book{background-position:-48px -48px;} +.icon-bookmark{background-position:-72px -48px;} +.icon-print{background-position:-96px -48px;} +.icon-camera{background-position:-120px -48px;} +.icon-font{background-position:-144px -48px;} +.icon-bold{background-position:-167px -48px;} +.icon-italic{background-position:-192px -48px;} +.icon-text-height{background-position:-216px -48px;} +.icon-text-width{background-position:-240px -48px;} +.icon-align-left{background-position:-264px -48px;} +.icon-align-center{background-position:-288px -48px;} +.icon-align-right{background-position:-312px -48px;} +.icon-align-justify{background-position:-336px -48px;} +.icon-list{background-position:-360px -48px;} +.icon-indent-left{background-position:-384px -48px;} +.icon-indent-right{background-position:-408px -48px;} +.icon-facetime-video{background-position:-432px -48px;} +.icon-picture{background-position:-456px -48px;} +.icon-pencil{background-position:0 -72px;} +.icon-map-marker{background-position:-24px -72px;} +.icon-adjust{background-position:-48px -72px;} +.icon-tint{background-position:-72px -72px;} +.icon-edit{background-position:-96px -72px;} +.icon-share{background-position:-120px -72px;} +.icon-check{background-position:-144px -72px;} +.icon-move{background-position:-168px -72px;} +.icon-step-backward{background-position:-192px -72px;} +.icon-fast-backward{background-position:-216px -72px;} +.icon-backward{background-position:-240px -72px;} +.icon-play{background-position:-264px -72px;} +.icon-pause{background-position:-288px -72px;} +.icon-stop{background-position:-312px -72px;} +.icon-forward{background-position:-336px -72px;} +.icon-fast-forward{background-position:-360px -72px;} +.icon-step-forward{background-position:-384px -72px;} +.icon-eject{background-position:-408px -72px;} +.icon-chevron-left{background-position:-432px -72px;} +.icon-chevron-right{background-position:-456px -72px;} +.icon-plus-sign{background-position:0 -96px;} +.icon-minus-sign{background-position:-24px -96px;} +.icon-remove-sign{background-position:-48px -96px;} +.icon-ok-sign{background-position:-72px -96px;} +.icon-question-sign{background-position:-96px -96px;} +.icon-info-sign{background-position:-120px -96px;} +.icon-screenshot{background-position:-144px -96px;} +.icon-remove-circle{background-position:-168px -96px;} +.icon-ok-circle{background-position:-192px -96px;} +.icon-ban-circle{background-position:-216px -96px;} +.icon-arrow-left{background-position:-240px -96px;} +.icon-arrow-right{background-position:-264px -96px;} +.icon-arrow-up{background-position:-289px -96px;} +.icon-arrow-down{background-position:-312px -96px;} +.icon-share-alt{background-position:-336px -96px;} +.icon-resize-full{background-position:-360px -96px;} +.icon-resize-small{background-position:-384px -96px;} +.icon-plus{background-position:-408px -96px;} +.icon-minus{background-position:-433px -96px;} +.icon-asterisk{background-position:-456px -96px;} +.icon-exclamation-sign{background-position:0 -120px;} +.icon-gift{background-position:-24px -120px;} +.icon-leaf{background-position:-48px -120px;} +.icon-fire{background-position:-72px -120px;} +.icon-eye-open{background-position:-96px -120px;} +.icon-eye-close{background-position:-120px -120px;} +.icon-warning-sign{background-position:-144px -120px;} +.icon-plane{background-position:-168px -120px;} +.icon-calendar{background-position:-192px -120px;} +.icon-random{background-position:-216px -120px;width:16px;} +.icon-comment{background-position:-240px -120px;} +.icon-magnet{background-position:-264px -120px;} +.icon-chevron-up{background-position:-288px -120px;} +.icon-chevron-down{background-position:-313px -119px;} +.icon-retweet{background-position:-336px -120px;} +.icon-shopping-cart{background-position:-360px -120px;} +.icon-folder-close{background-position:-384px -120px;} +.icon-folder-open{background-position:-408px -120px;width:16px;} +.icon-resize-vertical{background-position:-432px -119px;} +.icon-resize-horizontal{background-position:-456px -118px;} +.icon-hdd{background-position:0 -144px;} +.icon-bullhorn{background-position:-24px -144px;} +.icon-bell{background-position:-48px -144px;} +.icon-certificate{background-position:-72px -144px;} +.icon-thumbs-up{background-position:-96px -144px;} +.icon-thumbs-down{background-position:-120px -144px;} +.icon-hand-right{background-position:-144px -144px;} +.icon-hand-left{background-position:-168px -144px;} +.icon-hand-up{background-position:-192px -144px;} +.icon-hand-down{background-position:-216px -144px;} +.icon-circle-arrow-right{background-position:-240px -144px;} +.icon-circle-arrow-left{background-position:-264px -144px;} +.icon-circle-arrow-up{background-position:-288px -144px;} +.icon-circle-arrow-down{background-position:-312px -144px;} +.icon-globe{background-position:-336px -144px;} +.icon-wrench{background-position:-360px -144px;} +.icon-tasks{background-position:-384px -144px;} +.icon-filter{background-position:-408px -144px;} +.icon-briefcase{background-position:-432px -144px;} +.icon-fullscreen{background-position:-456px -144px;} +.dropup,.dropdown{position:relative;} +.dropdown-toggle{*margin-bottom:-3px;} +.dropdown-toggle:active,.open .dropdown-toggle{outline:0;} +.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000000;border-right:4px solid transparent;border-left:4px solid transparent;content:"";} +.dropdown .caret{margin-top:8px;margin-left:2px;} +.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#ffffff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;} +.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} +.dropdown-menu li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#999999;white-space:nowrap;} +.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{text-decoration:none;color:#ffffff;background-color:#007af5;background-image:-moz-linear-gradient(top, #007fff, #0072e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#007fff), to(#0072e6));background-image:-webkit-linear-gradient(top, #007fff, #0072e6);background-image:-o-linear-gradient(top, #007fff, #0072e6);background-image:linear-gradient(to bottom, #007fff, #0072e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff007fff', endColorstr='#ff0072e6', GradientType=0);} +.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;outline:0;background-color:#007af5;background-image:-moz-linear-gradient(top, #007fff, #0072e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#007fff), to(#0072e6));background-image:-webkit-linear-gradient(top, #007fff, #0072e6);background-image:-o-linear-gradient(top, #007fff, #0072e6);background-image:linear-gradient(to bottom, #007fff, #0072e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff007fff', endColorstr='#ff0072e6', GradientType=0);} +.dropdown-menu .disabled>a,.dropdown-menu .disabled>a:hover{color:#dfdfdf;} +.dropdown-menu .disabled>a:hover{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:default;} +.open{*z-index:1000;}.open >.dropdown-menu{display:block;} +.pull-right>.dropdown-menu{right:0;left:auto;} +.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"";} +.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;} +.dropdown-submenu{position:relative;} +.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} +.dropdown-submenu:hover>.dropdown-menu{display:block;} +.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0;} +.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#cccccc;margin-top:5px;margin-right:-10px;} +.dropdown-submenu:hover>a:after{border-left-color:#ffffff;} +.dropdown-submenu.pull-left{float:none;}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;} +.dropdown .dropdown-menu .nav-header{padding-left:20px;padding-right:20px;} +.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;} +.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#eeeeee;border:1px solid #dcdcdc;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} +.well-large{padding:24px;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;} +.well-small{padding:9px;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;} +.fade{opacity:0;-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;}.fade.in{opacity:1;} +.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;}.collapse.in{height:auto;} +.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);} +button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;} +.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:0;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#999999;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#dfdfdf;background-image:-moz-linear-gradient(top, #eeeeee, #c8c8c8);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#eeeeee), to(#c8c8c8));background-image:-webkit-linear-gradient(top, #eeeeee, #c8c8c8);background-image:-o-linear-gradient(top, #eeeeee, #c8c8c8);background-image:linear-gradient(to bottom, #eeeeee, #c8c8c8);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffc8c8c8', GradientType=0);border-color:#c8c8c8 #c8c8c8 #a2a2a2;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#c8c8c8;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #bbbbbb;*border:0;border-bottom-color:#a2a2a2;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#999999;background-color:#c8c8c8;*background-color:#bbbbbb;} +.btn:active,.btn.active{background-color:#aeaeae \9;} +.btn:first-child{*margin-left:0;} +.btn:hover{color:#999999;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} +.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} +.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);} +.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn-large{padding:22px 30px;font-size:17.5px;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;} +.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px;} +.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;} +.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0;} +.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px;} +.btn-mini{padding:2px 6px;font-size:10.5px;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;} +.btn-block{display:block;width:100%;padding-left:0;padding-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} +.btn-block+.btn-block{margin-top:5px;} +input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%;} +.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);} +.btn{border-color:#c5c5c5;border-color:rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);} +.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0f82f5;background-image:-moz-linear-gradient(top, #1a8cff, #0072e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#1a8cff), to(#0072e6));background-image:-webkit-linear-gradient(top, #1a8cff, #0072e6);background-image:-o-linear-gradient(top, #1a8cff, #0072e6);background-image:linear-gradient(to bottom, #1a8cff, #0072e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff1a8cff', endColorstr='#ff0072e6', GradientType=0);border-color:#0072e6 #0072e6 #004c99;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#0072e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#0072e6;*background-color:#0066cc;} +.btn-primary:active,.btn-primary.active{background-color:#0059b3 \9;} +.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#fe781e;background-image:-moz-linear-gradient(top, #ff8432, #fe6600);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ff8432), to(#fe6600));background-image:-webkit-linear-gradient(top, #ff8432, #fe6600);background-image:-o-linear-gradient(top, #ff8432, #fe6600);background-image:linear-gradient(to bottom, #ff8432, #fe6600);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff8432', endColorstr='#fffe6600', GradientType=0);border-color:#fe6600 #fe6600 #b14700;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#fe6600;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#fe6600;*background-color:#e45c00;} +.btn-warning:active,.btn-warning.active{background-color:#cb5200 \9;} +.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#f50f43;background-image:-moz-linear-gradient(top, #ff1a4d, #e60033);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ff1a4d), to(#e60033));background-image:-webkit-linear-gradient(top, #ff1a4d, #e60033);background-image:-o-linear-gradient(top, #ff1a4d, #e60033);background-image:linear-gradient(to bottom, #ff1a4d, #e60033);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffff1a4d', endColorstr='#ffe60033', GradientType=0);border-color:#e60033 #e60033 #990022;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e60033;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#e60033;*background-color:#cc002e;} +.btn-danger:active,.btn-danger.active{background-color:#b30028 \9;} +.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#41bb19;background-image:-moz-linear-gradient(top, #47cd1b, #379f15);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#47cd1b), to(#379f15));background-image:-webkit-linear-gradient(top, #47cd1b, #379f15);background-image:-o-linear-gradient(top, #47cd1b, #379f15);background-image:linear-gradient(to bottom, #47cd1b, #379f15);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff47cd1b', endColorstr='#ff379f15', GradientType=0);border-color:#379f15 #379f15 #205c0c;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#379f15;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#ffffff;background-color:#379f15;*background-color:#2f8912;} +.btn-success:active,.btn-success.active{background-color:#28720f \9;} +.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#9b59bb;background-image:-moz-linear-gradient(top, #a466c2, #8d46b0);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#a466c2), to(#8d46b0));background-image:-webkit-linear-gradient(top, #a466c2, #8d46b0);background-image:-o-linear-gradient(top, #a466c2, #8d46b0);background-image:linear-gradient(to bottom, #a466c2, #8d46b0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffa466c2', endColorstr='#ff8d46b0', GradientType=0);border-color:#8d46b0 #8d46b0 #613079;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#8d46b0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#ffffff;background-color:#8d46b0;*background-color:#7e3f9d;} +.btn-info:active,.btn-info.active{background-color:#6f378b \9;} +.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#080808;background-image:-moz-linear-gradient(top, #0d0d0d, #000000);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0d0d0d), to(#000000));background-image:-webkit-linear-gradient(top, #0d0d0d, #000000);background-image:-o-linear-gradient(top, #0d0d0d, #000000);background-image:linear-gradient(to bottom, #0d0d0d, #000000);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0d0d0d', endColorstr='#ff000000', GradientType=0);border-color:#000000 #000000 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#000000;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#000000;*background-color:#000000;} +.btn-inverse:active,.btn-inverse.active{background-color:#000000 \9;} +button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;} +button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;} +button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;} +button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;} +.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn-link{border-color:transparent;cursor:pointer;color:#007fff;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.btn-link:hover{color:#0066cc;text-decoration:underline;background-color:transparent;} +.btn-link[disabled]:hover{color:#999999;text-decoration:none;} +.btn-group{position:relative;display:inline-block;*display:inline;*zoom:1;font-size:0;vertical-align:middle;white-space:nowrap;*margin-left:.3em;}.btn-group:first-child{*margin-left:0;} +.btn-group+.btn-group{margin-left:5px;} +.btn-toolbar{font-size:0;margin-top:10px;margin-bottom:10px;}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px;} +.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.btn-group>.btn+.btn{margin-left:-1px;} +.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px;} +.btn-group>.btn-mini{font-size:10.5px;} +.btn-group>.btn-small{font-size:11.9px;} +.btn-group>.btn-large{font-size:17.5px;} +.btn-group>.btn:first-child{margin-left:0;-webkit-border-top-left-radius:0px;-moz-border-radius-topleft:0px;border-top-left-radius:0px;-webkit-border-bottom-left-radius:0px;-moz-border-radius-bottomleft:0px;border-bottom-left-radius:0px;} +.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:0px;-moz-border-radius-topright:0px;border-top-right-radius:0px;-webkit-border-bottom-right-radius:0px;-moz-border-radius-bottomright:0px;border-bottom-right-radius:0px;} +.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:0px;-moz-border-radius-topleft:0px;border-top-left-radius:0px;-webkit-border-bottom-left-radius:0px;-moz-border-radius-bottomleft:0px;border-bottom-left-radius:0px;} +.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:0px;-moz-border-radius-topright:0px;border-top-right-radius:0px;-webkit-border-bottom-right-radius:0px;-moz-border-radius-bottomright:0px;border-bottom-right-radius:0px;} +.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2;} +.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;} +.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);*padding-top:5px;*padding-bottom:5px;} +.btn-group>.btn-mini+.dropdown-toggle{padding-left:5px;padding-right:5px;*padding-top:2px;*padding-bottom:2px;} +.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px;} +.btn-group>.btn-large+.dropdown-toggle{padding-left:12px;padding-right:12px;*padding-top:7px;*padding-bottom:7px;} +.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);} +.btn-group.open .btn.dropdown-toggle{background-color:#c8c8c8;} +.btn-group.open .btn-primary.dropdown-toggle{background-color:#0072e6;} +.btn-group.open .btn-warning.dropdown-toggle{background-color:#fe6600;} +.btn-group.open .btn-danger.dropdown-toggle{background-color:#e60033;} +.btn-group.open .btn-success.dropdown-toggle{background-color:#379f15;} +.btn-group.open .btn-info.dropdown-toggle{background-color:#8d46b0;} +.btn-group.open .btn-inverse.dropdown-toggle{background-color:#000000;} +.btn .caret{margin-top:8px;margin-left:0;} +.btn-mini .caret,.btn-small .caret,.btn-large .caret{margin-top:6px;} +.btn-large .caret{border-left-width:5px;border-right-width:5px;border-top-width:5px;} +.dropup .btn-large .caret{border-bottom-width:5px;} +.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} +.btn-group-vertical{display:inline-block;*display:inline;*zoom:1;} +.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.btn-group-vertical>.btn+.btn{margin-left:0;margin-top:-1px;} +.btn-group-vertical>.btn:first-child{-webkit-border-radius:0px 0px 0 0;-moz-border-radius:0px 0px 0 0;border-radius:0px 0px 0 0;} +.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 0px 0px;-moz-border-radius:0 0 0px 0px;border-radius:0 0 0px 0px;} +.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:0px 0px 0 0;-moz-border-radius:0px 0px 0 0;border-radius:0px 0px 0 0;} +.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 0px 0px;-moz-border-radius:0 0 0px 0px;border-radius:0 0 0px 0px;} +.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#ff7518;border:1px solid transparent;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;} +.alert,.alert h4{color:#ffffff;} +.alert h4{margin:0;} +.alert .close{position:relative;top:-2px;right:-21px;line-height:20px;} +.alert-success{background-color:#3fb618;border-color:transparent;color:#ffffff;} +.alert-success h4{color:#ffffff;} +.alert-danger,.alert-error{background-color:#ff0039;border-color:transparent;color:#ffffff;} +.alert-danger h4,.alert-error h4{color:#ffffff;} +.alert-info{background-color:#9954bb;border-color:transparent;color:#ffffff;} +.alert-info h4{color:#ffffff;} +.alert-block{padding-top:14px;padding-bottom:14px;} +.alert-block>p,.alert-block>ul{margin-bottom:0;} +.alert-block p+p{margin-top:5px;} +.nav{margin-left:0;margin-bottom:20px;list-style:none;} +.nav>li>a{display:block;} +.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} +.nav>li>a>img{max-width:none;} +.nav>.pull-right{float:right;} +.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#dfdfdf;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} +.nav li+.nav-header{margin-top:9px;} +.nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;} +.nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} +.nav-list>li>a{padding:3px 15px;} +.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#007fff;} +.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px;} +.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} +.nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";line-height:0;} +.nav-tabs:after,.nav-pills:after{clear:both;} +.nav-tabs>li,.nav-pills>li{float:left;} +.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} +.nav-tabs{border-bottom:1px solid #ddd;} +.nav-tabs>li{margin-bottom:-1px;} +.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;} +.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#bbbbbb;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} +.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} +.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#007fff;} +.nav-stacked>li{float:none;} +.nav-stacked>li>a{margin-right:0;} +.nav-tabs.nav-stacked{border-bottom:0;} +.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;} +.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} +.nav-tabs.nav-stacked>li>a:hover{border-color:#ddd;z-index:2;} +.nav-pills.nav-stacked>li>a{margin-bottom:3px;} +.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;} +.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;} +.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} +.nav .dropdown-toggle .caret{border-top-color:#007fff;border-bottom-color:#007fff;margin-top:6px;} +.nav .dropdown-toggle:hover .caret{border-top-color:#0066cc;border-bottom-color:#0066cc;} +.nav-tabs .dropdown-toggle .caret{margin-top:8px;} +.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff;} +.nav-tabs .active .dropdown-toggle .caret{border-top-color:#bbbbbb;border-bottom-color:#bbbbbb;} +.nav>.dropdown.active>a:hover{cursor:pointer;} +.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{color:#ffffff;background-color:#dfdfdf;border-color:#dfdfdf;} +.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:1;filter:alpha(opacity=100);} +.tabs-stacked .open>a:hover{border-color:#dfdfdf;} +.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";line-height:0;} +.tabbable:after{clear:both;} +.tab-content{overflow:auto;} +.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0;} +.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} +.tab-content>.active,.pill-content>.active{display:block;} +.tabs-below>.nav-tabs{border-top:1px solid #ddd;} +.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0;} +.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below>.nav-tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;} +.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd;} +.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none;} +.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;} +.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;} +.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} +.tabs-left>.nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;} +.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;} +.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;} +.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} +.tabs-right>.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} +.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} +.nav>.disabled>a{color:#dfdfdf;} +.nav>.disabled>a:hover{text-decoration:none;background-color:transparent;cursor:default;} +.navbar{overflow:visible;margin-bottom:20px;*position:relative;*z-index:2;} +.navbar-inner{min-height:50px;padding-left:20px;padding-right:20px;background-color:#080808;background-image:-moz-linear-gradient(top, #080808, #080808);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#080808), to(#080808));background-image:-webkit-linear-gradient(top, #080808, #080808);background-image:-o-linear-gradient(top, #080808, #080808);background-image:linear-gradient(to bottom, #080808, #080808);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff080808', GradientType=0);border:1px solid transparent;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;-webkit-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);-moz-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);*zoom:1;}.navbar-inner:before,.navbar-inner:after{display:table;content:"";line-height:0;} +.navbar-inner:after{clear:both;} +.navbar .container{width:auto;} +.nav-collapse.collapse{height:auto;overflow:visible;} +.navbar .brand{float:left;display:block;padding:15px 20px 15px;margin-left:-20px;font-size:20px;font-weight:200;color:#ffffff;text-shadow:0 1px 0 #080808;}.navbar .brand:hover{text-decoration:none;} +.navbar-text{margin-bottom:0;line-height:50px;color:#ffffff;} +.navbar-link{color:#ffffff;}.navbar-link:hover{color:#bbbbbb;} +.navbar .divider-vertical{height:50px;margin:0 9px;border-left:1px solid #080808;border-right:1px solid #080808;} +.navbar .btn,.navbar .btn-group{margin-top:10px;} +.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn{margin-top:0;} +.navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";line-height:0;} +.navbar-form:after{clear:both;} +.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:10px;} +.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0;} +.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;} +.navbar-form .input-append,.navbar-form .input-prepend{margin-top:5px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;} +.navbar-search{position:relative;float:left;margin-top:10px;margin-bottom:0;}.navbar-search .search-query{margin-bottom:0;padding:4px 14px;font-family:"Open Sans",Calibri,Candara,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} +.navbar-static-top{position:static;margin-bottom:0;}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;} +.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px;} +.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0;} +.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;} +.navbar-fixed-top{top:0;} +.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,.1);box-shadow:0 1px 10px rgba(0,0,0,.1);} +.navbar-fixed-bottom{bottom:0;}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,.1);box-shadow:0 -1px 10px rgba(0,0,0,.1);} +.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;} +.navbar .nav.pull-right{float:right;margin-right:0;} +.navbar .nav>li{float:left;} +.navbar .nav>li>a{float:none;padding:15px 15px 15px;color:#ffffff;text-decoration:none;text-shadow:0 1px 0 #080808;} +.navbar .nav .dropdown-toggle .caret{margin-top:8px;} +.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{background-color:rgba(0, 0, 0, 0.05);color:#bbbbbb;text-decoration:none;} +.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#ffffff;text-decoration:none;background-color:transparent;-webkit-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);-moz-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);} +.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#000000;background-image:-moz-linear-gradient(top, #000000, #000000);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#000000), to(#000000));background-image:-webkit-linear-gradient(top, #000000, #000000);background-image:-o-linear-gradient(top, #000000, #000000);background-image:linear-gradient(to bottom, #000000, #000000);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff000000', endColorstr='#ff000000', GradientType=0);border-color:#000000 #000000 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#000000;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#ffffff;background-color:#000000;*background-color:#000000;} +.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#000000 \9;} +.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);} +.btn-navbar .icon-bar+.icon-bar{margin-top:3px;} +.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;} +.navbar .nav>li>.dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;} +.navbar-fixed-bottom .nav>li>.dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0, 0, 0, 0.2);border-bottom:0;bottom:-7px;top:auto;} +.navbar-fixed-bottom .nav>li>.dropdown-menu:after{border-top:6px solid #ffffff;border-bottom:0;bottom:-6px;top:auto;} +.navbar .nav li.dropdown>a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} +.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{background-color:transparent;color:#ffffff;} +.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} +.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} +.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{left:auto;right:0;}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{left:auto;right:12px;} +.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{left:auto;right:13px;} +.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{left:auto;right:100%;margin-left:0;margin-right:-1px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;} +.navbar-inverse .navbar-inner{background-color:#007fff;background-image:-moz-linear-gradient(top, #007fff, #007fff);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#007fff), to(#007fff));background-image:-webkit-linear-gradient(top, #007fff, #007fff);background-image:-o-linear-gradient(top, #007fff, #007fff);background-image:linear-gradient(to bottom, #007fff, #007fff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff007fff', endColorstr='#ff007fff', GradientType=0);border-color:transparent;} +.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover{color:#ffffff;} +.navbar-inverse .brand{color:#ffffff;} +.navbar-inverse .navbar-text{color:#ffffff;} +.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{background-color:rgba(0, 0, 0, 0.05);color:#ffffff;} +.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#ffffff;background-color:#007fff;} +.navbar-inverse .navbar-link{color:#ffffff;}.navbar-inverse .navbar-link:hover{color:#ffffff;} +.navbar-inverse .divider-vertical{border-left-color:#007fff;border-right-color:#007fff;} +.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{background-color:#007fff;color:#ffffff;} +.navbar-inverse .nav li.dropdown>a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} +.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} +.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} +.navbar-inverse .navbar-search .search-query{color:#ffffff;background-color:#80bfff;border-color:#007fff;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none;}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#999999;} +.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#999999;} +.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#999999;} +.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#999999;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} +.navbar-inverse .btn-navbar{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0072e6;background-image:-moz-linear-gradient(top, #0072e6, #0072e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0072e6), to(#0072e6));background-image:-webkit-linear-gradient(top, #0072e6, #0072e6);background-image:-o-linear-gradient(top, #0072e6, #0072e6);background-image:linear-gradient(to bottom, #0072e6, #0072e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0072e6', endColorstr='#ff0072e6', GradientType=0);border-color:#0072e6 #0072e6 #004c99;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#0072e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#ffffff;background-color:#0072e6;*background-color:#0066cc;} +.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#0059b3 \9;} +.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;}.breadcrumb>li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;}.breadcrumb>li>.divider{padding:0 5px;color:#ccc;} +.breadcrumb>.active{color:#dfdfdf;} +.pagination{margin:20px 0;} +.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} +.pagination ul>li{display:inline;} +.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#dfdfdf;border:1px solid transparent;border-left-width:0;} +.pagination ul>li>a:hover,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#007fff;} +.pagination ul>.active>a,.pagination ul>.active>span{color:#dfdfdf;cursor:default;} +.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover{color:#dfdfdf;background-color:transparent;cursor:default;} +.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-top-left-radius:0px;-moz-border-radius-topleft:0px;border-top-left-radius:0px;-webkit-border-bottom-left-radius:0px;-moz-border-radius-bottomleft:0px;border-bottom-left-radius:0px;} +.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:0px;-moz-border-radius-topright:0px;border-top-right-radius:0px;-webkit-border-bottom-right-radius:0px;-moz-border-radius-bottomright:0px;border-bottom-right-radius:0px;} +.pagination-centered{text-align:center;} +.pagination-right{text-align:right;} +.pagination-large ul>li>a,.pagination-large ul>li>span{padding:22px 30px;font-size:17.5px;} +.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-top-left-radius:0px;-moz-border-radius-topleft:0px;border-top-left-radius:0px;-webkit-border-bottom-left-radius:0px;-moz-border-radius-bottomleft:0px;border-bottom-left-radius:0px;} +.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:0px;-moz-border-radius-topright:0px;border-top-right-radius:0px;-webkit-border-bottom-right-radius:0px;-moz-border-radius-bottomright:0px;border-bottom-right-radius:0px;} +.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-top-left-radius:0px;-moz-border-radius-topleft:0px;border-top-left-radius:0px;-webkit-border-bottom-left-radius:0px;-moz-border-radius-bottomleft:0px;border-bottom-left-radius:0px;} +.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:0px;-moz-border-radius-topright:0px;border-top-right-radius:0px;-webkit-border-bottom-right-radius:0px;-moz-border-radius-bottomright:0px;border-bottom-right-radius:0px;} +.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px;} +.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:2px 6px;font-size:10.5px;} +.pager{margin:20px 0;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";line-height:0;} +.pager:after{clear:both;} +.pager li{display:inline;} +.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} +.pager li>a:hover{text-decoration:none;background-color:#f5f5f5;} +.pager .next>a,.pager .next>span{float:right;} +.pager .previous>a,.pager .previous>span{float:left;} +.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>span{color:#dfdfdf;background-color:#fff;cursor:default;} +.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;} +.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);} +.modal{position:fixed;top:10%;left:50%;z-index:1050;width:560px;margin-left:-280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;outline:none;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} +.modal.fade.in{top:10%;} +.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;} +.modal-header h3{margin:0;line-height:30px;} +.modal-body{position:relative;overflow-y:auto;max-height:400px;padding:15px;} +.modal-form{margin-bottom:0;} +.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";line-height:0;} +.modal-footer:after{clear:both;} +.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0;} +.modal-footer .btn-group .btn+.btn{margin-left:-1px;} +.modal-footer .btn-block+.btn-block{margin-left:0;} +.tooltip{position:absolute;z-index:1030;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);} +.tooltip.top{margin-top:-3px;} +.tooltip.right{margin-left:3px;} +.tooltip.bottom{margin-top:3px;} +.tooltip.left{margin-left:-3px;} +.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;} +.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid;} +.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000000;} +.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000000;} +.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000000;} +.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000000;} +.popover{position:absolute;top:0;left:0;z-index:1010;display:none;width:236px;padding:1px;text-align:left;background-color:#ff7518;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);white-space:normal;}.popover.top{margin-top:-10px;} +.popover.right{margin-left:10px;} +.popover.bottom{margin-top:10px;} +.popover.left{margin-left:-10px;} +.popover-title{margin:0;padding:8px 14px;font-size:14px;font-weight:normal;line-height:18px;background-color:#ff7518;border-bottom:1px solid #fe6600;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;} +.popover-content{padding:9px 14px;} +.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid;} +.popover .arrow{border-width:16px;} +.popover .arrow:after{border-width:15px;content:"";} +.popover.top .arrow{left:50%;margin-left:-16px;border-bottom-width:0;border-top-color:#999;border-top-color:transparent;bottom:-16px;}.popover.top .arrow:after{bottom:1px;margin-left:-15px;border-bottom-width:0;border-top-color:#ff7518;} +.popover.right .arrow{top:50%;left:-16px;margin-top:-16px;border-left-width:0;border-right-color:#999;border-right-color:transparent;}.popover.right .arrow:after{left:1px;bottom:-15px;border-left-width:0;border-right-color:#ff7518;} +.popover.bottom .arrow{left:50%;margin-left:-16px;border-top-width:0;border-bottom-color:#999;border-bottom-color:transparent;top:-16px;}.popover.bottom .arrow:after{top:1px;margin-left:-15px;border-top-width:0;border-bottom-color:#ff7518;} +.popover.left .arrow{top:50%;right:-16px;margin-top:-16px;border-right-width:0;border-left-color:#999;border-left-color:transparent;}.popover.left .arrow:after{right:1px;border-right-width:0;border-left-color:#ff7518;bottom:-15px;} +.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";line-height:0;} +.thumbnails:after{clear:both;} +.row-fluid .thumbnails{margin-left:0;} +.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px;} +.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;} +a.thumbnail:hover{border-color:#007fff;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} +.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;} +.thumbnail .caption{padding:9px;color:#bbbbbb;} +.media,.media-body{overflow:hidden;*overflow:visible;zoom:1;} +.media,.media .media{margin-top:15px;} +.media:first-child{margin-top:0;} +.media-object{display:block;} +.media-heading{margin:0 0 5px;} +.media .pull-left{margin-right:10px;} +.media .pull-right{margin-left:10px;} +.media-list{margin-left:0;list-style:none;} +.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#ffffff;vertical-align:baseline;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#dfdfdf;} +.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +.badge{padding-left:9px;padding-right:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;} +.label:empty,.badge:empty{display:none;} +a.label:hover,a.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} +.label-important,.badge-important{background-color:#ffffff;} +.label-important[href],.badge-important[href]{background-color:#e6e6e6;} +.label-warning,.badge-warning{background-color:#ff7518;} +.label-warning[href],.badge-warning[href]{background-color:#e45c00;} +.label-success,.badge-success{background-color:#ffffff;} +.label-success[href],.badge-success[href]{background-color:#e6e6e6;} +.label-info,.badge-info{background-color:#ffffff;} +.label-info[href],.badge-info[href]{background-color:#e6e6e6;} +.label-inverse,.badge-inverse{background-color:#999999;} +.label-inverse[href],.badge-inverse[href]{background-color:#808080;} +.btn .label,.btn .badge{position:relative;top:-1px;} +.btn-mini .label,.btn-mini .badge{top:0;} +@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-o-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}.progress{overflow:hidden;height:20px;margin-bottom:20px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(to bottom, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;} +.progress .bar{width:0%;height:100%;color:#ffffff;float:left;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(to bottom, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;} +.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);} +.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;} +.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;} +.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(to bottom, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);} +.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(to bottom, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);} +.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(to bottom, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);} +.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.progress-warning .bar,.progress .bar-warning{background-color:#ff9046;background-image:-moz-linear-gradient(top, #ffa365, #ff7518);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffa365), to(#ff7518));background-image:-webkit-linear-gradient(top, #ffa365, #ff7518);background-image:-o-linear-gradient(top, #ffa365, #ff7518);background-image:linear-gradient(to bottom, #ffa365, #ff7518);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffa365', endColorstr='#ffff7518', GradientType=0);} +.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#ffa365;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.accordion{margin-bottom:20px;} +.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;} +.accordion-heading{border-bottom:0;} +.accordion-heading .accordion-toggle{display:block;padding:8px 15px;} +.accordion-toggle{cursor:pointer;} +.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;} +.carousel{position:relative;margin-bottom:20px;line-height:1;} +.carousel-inner{overflow:hidden;width:100%;position:relative;} +.carousel-inner>.item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;} +.carousel-inner>.item>img{display:block;line-height:1;} +.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block;} +.carousel-inner>.active{left:0;} +.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%;} +.carousel-inner>.next{left:100%;} +.carousel-inner>.prev{left:-100%;} +.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0;} +.carousel-inner>.active.left{left:-100%;} +.carousel-inner>.active.right{left:100%;} +.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#080808;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;} +.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} +.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:15px;background:#999999;background:rgba(0, 0, 0, 0.75);} +.carousel-caption h4,.carousel-caption p{color:#ffffff;line-height:20px;} +.carousel-caption h4{margin:0 0 5px;} +.carousel-caption p{margin-bottom:0;} +.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} +.hero-unit li{line-height:30px;} +.pull-right{float:right;} +.pull-left{float:left;} +.hide{display:none;} +.show{display:block;} +.invisible{visibility:hidden;} +.affix{position:fixed;} +body{font-weight:300;} +h1{font-size:50px;} +h2,h3{font-size:26px;} +h4{font-size:14px;} +h5,h6{font-size:11px;} +blockquote{padding:10px 15px;background-color:#eeeeee;border-left-color:#bbbbbb;}blockquote.pull-right{padding:10px 15px;border-right-color:#bbbbbb;} +blockquote small{color:#bbbbbb;} +.muted{color:#bbbbbb;} +.navbar .navbar-inner{background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.navbar .brand:hover{color:#bbbbbb;} +.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:rgba(0, 0, 0, 0.05);} +.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{color:#ffffff;}.navbar .nav li.dropdown.open>.dropdown-toggle:hover,.navbar .nav li.dropdown.active>.dropdown-toggle:hover,.navbar .nav li.dropdown.open.active>.dropdown-toggle:hover{color:#eeeeee;} +.navbar .navbar-search .search-query{line-height:normal;} +.navbar-inverse .brand,.navbar-inverse .nav>li>a{text-shadow:none;} +.navbar-inverse .brand:hover,.navbar-inverse .nav>.active>a,.navbar-inverse .nav>.active>a:hover,.navbar-inverse .nav>.active>a:focus{background-color:rgba(0, 0, 0, 0.05);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;color:#ffffff;} +.navbar-inverse .navbar-search .search-query{color:#080808;} +div.subnav{background-color:#dfdfdf;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}div.subnav .nav{background-color:transparent;} +div.subnav .nav>li>a{border-color:transparent;} +div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover{border-color:transparent;background-color:#000000;color:#ffffff;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +div.subnav-fixed{top:50px;} +.nav .open .dropdown-toggle,.nav >li.dropdown.open.active>a:hover{color:#007fff;} +.nav-tabs >li>a{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.nav-tabs.nav-stacked >li>a:hover{background-color:#007fff;color:#ffffff;} +.nav-tabs.nav-stacked >.active>a,.nav-tabs.nav-stacked >.active>a:hover{background-color:#ffffff;color:#bbbbbb;} +.nav-tabs.nav-stacked >li:first-child>a,.nav-tabs.nav-stacked >li:last-child>a{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.nav-pills >li>a{background-color:#dfdfdf;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;color:#000000;}.nav-pills >li>a:hover{background-color:#000000;color:#ffffff;} +.nav-pills >.disabled>a,.nav-pills >.disabled>a:hover{background-color:#eeeeee;color:#999999;} +.nav-list >li>a{color:#080808;}.nav-list >li>a:hover{background-color:#007fff;color:#ffffff;text-shadow:none;} +.nav-list .nav-header{color:#080808;} +.nav-list .divider{background-color:#bbbbbb;border-bottom:none;} +.pagination ul{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.pagination ul >li>a,.pagination ul >li>span{margin-right:6px;color:#080808;}.pagination ul >li>a:hover,.pagination ul >li>span:hover{background-color:#080808;color:#ffffff;} +.pagination ul >li:last-child>a,.pagination ul >li:last-child>span{margin-right:0;} +.pagination ul >.active>a,.pagination ul >.active>span{color:#ffffff;} +.pagination ul >.disabled>span,.pagination ul >.disabled>a,.pagination ul >.disabled>a:hover{background-color:#eeeeee;color:#999999;} +.pager li>a,.pager li>span{background-color:#dfdfdf;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;color:#080808;}.pager li>a:hover,.pager li>span:hover{background-color:#080808;color:#ffffff;} +.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>span{background-color:#eeeeee;color:#999999;} +.breadcrumb{background-color:#dfdfdf;}.breadcrumb li{text-shadow:none;} +.breadcrumb .divider,.breadcrumb .active{color:#080808;text-shadow:none;} +.btn{padding:5px 12px;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;text-shadow:none;}.btn.disabled{box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);} +.btn-large{padding:22px 30px;} +.btn-small{padding:2px 10px;} +.btn-mini{padding:2px 6px;} +.btn-group >.btn:first-child,.btn-group >.btn:last-child,.btn-group >.dropdown-toggle{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.btn-group >.btn+.dropdown-toggle{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.table tbody tr.success td{color:#ffffff;} +.table tbody tr.error td{color:#ffffff;} +.table tbody tr.info td{color:#ffffff;} +.table-bordered{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child,.table-bordered tfoot:last-child tr:last-child td:first-child{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"]{color:#080808;} +.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#ff7518;} +.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#ff7518;color:#080808;} +.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#ff0039;} +.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#ff0039;color:#080808;} +.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#3fb618;} +.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#3fb618;color:#080808;} +legend{border-bottom:none;color:#080808;} +.form-actions{border-top:none;background-color:#eeeeee;} +.dropdown-menu{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} +.alert{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;text-shadow:none;}.alert-heading,.alert h1,.alert h2,.alert h3,.alert h4,.alert h5,.alert h6{color:#ffffff;} +.label{min-width:80px;min-height:80px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;font-weight:300;text-shadow:none;}.label-success{background-color:#3fb618;} +.label-important{background-color:#ff0039;} +.label-info{background-color:#9954bb;} +.label-inverse{background-color:#000000;} +.badge{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;font-weight:300;text-shadow:none;}.badge-success{background-color:#3fb618;} +.badge-important{background-color:#ff0039;} +.badge-info{background-color:#9954bb;} +.badge-inverse{background-color:#000000;} +.hero-unit{border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.well{border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +[class^="icon-"],[class*=" icon-"]{margin:0 2px;vertical-align:-2px;} +a.thumbnail{background-color:#dfdfdf;}a.thumbnail:hover{background-color:#bbbbbb;border-color:transparent;} +.progress{height:6px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-color:#eeeeee;background-image:none;}.progress .bar{background-color:#007fff;background-image:none;} +.progress-info{background-color:#9954bb;} +.progress-success{background-color:#3fb618;} +.progress-warning{background-color:#ff7518;} +.progress-danger{background-color:#ff0039;} +.modal{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.modal-header{border-bottom:none;} +.modal-footer{border-top:none;background-color:transparent;} +.popover{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;color:#ffffff;}.popover-title{border-bottom:none;color:#ffffff;} +.pull-right{float:right;} +.pull-left{float:left;} +.hide{display:none;} +.show{display:block;} +.invisible{visibility:hidden;} +.affix{position:fixed;} diff --git a/doc-src/01-reset-fonts-grids-base.css b/doc-src/01-reset-fonts-grids-base.css deleted file mode 100644 index 32f5f8bf..00000000 --- a/doc-src/01-reset-fonts-grids-base.css +++ /dev/null @@ -1,8 +0,0 @@ -/* -Copyright (c) 2009, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.net/yui/license.txt -version: 2.7.0 -*/ -html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea,button{font:99% arial,helvetica,clean,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;}body{text-align:center;}#doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;}#doc2{width:73.076em;*width:71.25em;}#doc3{margin:auto 10px;width:auto;}#doc4{width:74.923em;*width:73.05em;}.yui-b{position:relative;}.yui-b{_position:static;}#yui-main .yui-b{position:static;}#yui-main,.yui-g .yui-u .yui-g{width:100%;}.yui-t1 #yui-main,.yui-t2 #yui-main,.yui-t3 #yui-main{float:right;margin-left:-25em;}.yui-t4 #yui-main,.yui-t5 #yui-main,.yui-t6 #yui-main{float:left;margin-right:-25em;}.yui-t1 .yui-b{float:left;width:12.30769em;*width:12.00em;}.yui-t1 #yui-main .yui-b{margin-left:13.30769em;*margin-left:13.05em;}.yui-t2 .yui-b{float:left;width:13.8461em;*width:13.50em;}.yui-t2 #yui-main .yui-b{margin-left:14.8461em;*margin-left:14.55em;}.yui-t3 .yui-b{float:left;width:23.0769em;*width:22.50em;}.yui-t3 #yui-main .yui-b{margin-left:24.0769em;*margin-left:23.62em;}.yui-t4 .yui-b{float:right;width:13.8456em;*width:13.50em;}.yui-t4 #yui-main .yui-b{margin-right:14.8456em;*margin-right:14.55em;}.yui-t5 .yui-b{float:right;width:18.4615em;*width:18.00em;}.yui-t5 #yui-main .yui-b{margin-right:19.4615em;*margin-right:19.125em;}.yui-t6 .yui-b{float:right;width:23.0769em;*width:22.50em;}.yui-t6 #yui-main .yui-b{margin-right:24.0769em;*margin-right:23.62em;}.yui-t7 #yui-main .yui-b{display:block;margin:0 0 1em 0;}#yui-main .yui-b{float:none;width:auto;}.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{float:left;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf,.yui-gc .yui-u,.yui-gd .yui-g,.yui-g .yui-gc .yui-u,.yui-ge .yui-u,.yui-ge .yui-g,.yui-gf .yui-g,.yui-gf .yui-u{float:right;}.yui-g div.first,.yui-gb div.first,.yui-gc div.first,.yui-gd div.first,.yui-ge div.first,.yui-gf div.first,.yui-g .yui-gc div.first,.yui-g .yui-ge div.first,.yui-gc div.first div.first{float:left;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf{width:49.1%;}.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{width:32%;margin-left:1.99%;}.yui-gb .yui-u{*margin-left:1.9%;*width:31.9%;}.yui-gc div.first,.yui-gd .yui-u{width:66%;}.yui-gd div.first{width:32%;}.yui-ge div.first,.yui-gf .yui-u{width:74.2%;}.yui-ge .yui-u,.yui-gf div.first{width:24%;}.yui-g .yui-gb div.first,.yui-gb div.first,.yui-gc div.first,.yui-gd div.first{margin-left:0;}.yui-g .yui-g .yui-u,.yui-gb .yui-g .yui-u,.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u,.yui-ge .yui-g .yui-u,.yui-gf .yui-g .yui-u{width:49%;*width:48.1%;*margin-left:0;}.yui-g .yui-g .yui-u{width:48.1%;}.yui-g .yui-gb div.first,.yui-gb .yui-gb div.first{*margin-right:0;*width:32%;_width:31.7%;}.yui-g .yui-gc div.first,.yui-gd .yui-g{width:66%;}.yui-gb .yui-g div.first{*margin-right:4%;_margin-right:1.3%;}.yui-gb .yui-gc div.first,.yui-gb .yui-gd div.first{*margin-right:0;}.yui-gb .yui-gb .yui-u,.yui-gb .yui-gc .yui-u{*margin-left:1.8%;_margin-left:4%;}.yui-g .yui-gb .yui-u{_margin-left:1.0%;}.yui-gb .yui-gd .yui-u{*width:66%;_width:61.2%;}.yui-gb .yui-gd div.first{*width:31%;_width:29.5%;}.yui-g .yui-gc .yui-u,.yui-gb .yui-gc .yui-u{width:32%;_float:right;margin-right:0;_margin-left:0;}.yui-gb .yui-gc div.first{width:66%;*float:left;*margin-left:0;}.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf .yui-u{margin:0;}.yui-gb .yui-gb .yui-u{_margin-left:.7%;}.yui-gb .yui-g div.first,.yui-gb .yui-gb div.first{*margin-left:0;}.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u{*width:48.1%;*margin-left:0;}.yui-gb .yui-gd div.first{width:32%;}.yui-g .yui-gd div.first{_width:29.9%;}.yui-ge .yui-g{width:24%;}.yui-gf .yui-g{width:74.2%;}.yui-gb .yui-ge div.yui-u,.yui-gb .yui-gf div.yui-u{float:right;}.yui-gb .yui-ge div.first,.yui-gb .yui-gf div.first{float:left;}.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf div.first{*width:24%;_width:20%;}.yui-gb .yui-ge div.first,.yui-gb .yui-gf .yui-u{*width:73.5%;_width:65.5%;}.yui-ge div.first .yui-gd .yui-u{width:65%;}.yui-ge div.first .yui-gd div.first{width:32%;}#hd:after,#bd:after,#ft:after,.yui-g:after,.yui-gb:after,.yui-gc:after,.yui-gd:after,.yui-ge:after,.yui-gf:after{content:".";display:block;height:0;clear:both;visibility:hidden;}#hd,#bd,#ft,.yui-g,.yui-gb,.yui-gc,.yui-gd,.yui-ge,.yui-gf{zoom:1;} -body{margin:10px;}h1{font-size:138.5%;}h2{font-size:123.1%;}h3{font-size:108%;}h1,h2,h3{margin:1em 0;}h1,h2,h3,h4,h5,h6,strong,dt{font-weight:bold;}optgroup{font-weight:normal;}abbr,acronym{border-bottom:1px dotted #000;cursor:help;}em{font-style:italic;}del{text-decoration:line-through;}blockquote,ul,ol,dl{margin:1em;}ol,ul,dl{margin-left:2em;}ol li{list-style:decimal outside;}ul li{list-style:disc outside;}dl dd{margin-left:1em;}th,td{border:1px solid #000;padding:.5em;}th{font-weight:bold;text-align:center;}caption{margin-bottom:.5em;text-align:center;}sup{vertical-align:super;}sub{vertical-align:sub;}p,fieldset,table,pre{margin-bottom:1em;}button,input[type="checkbox"],input[type="radio"],input[type="reset"],input[type="submit"]{padding:1px;} diff --git a/doc-src/02-docstyle.css b/doc-src/02-docstyle.css deleted file mode 100644 index 4eb0c101..00000000 --- a/doc-src/02-docstyle.css +++ /dev/null @@ -1,137 +0,0 @@ - -a { - color: #3F8ED8; - text-decoration: none; -} - - -#hd.doc { - -x-system-font:none; - font-family: Helvetica,Arial,Tahoma,Verdana,Sans-Serif; - color: #444444; - margin: 0; - margin-bottom: 1em; -} - -#hd.doc h1 { - letter-spacing: 3px; - font-size: 2.5em; - margin: 0.3em 0; - font-weight: normal; -} - -#nav { - float: right; -} - - -#bd { - font: 16px/21px "HelveticaNeue","Helvetica Neue",Helvetica,Arial,sans-serif; - line-height: 1.5; - color: #444444; -} - -#bd h1, #bd h2, #bd h3 { - font-family: "Georgia","Times New Roman",Helvetica,Arial,sans-serif; - font-weight: normal; - color: #181818; -} - -#bd h1 { - font-size: 1.9em; - border-bottom: 2px solid #ff7033; - margin-top: 5px; - margin-bottom: 5px; -} - -#bd h2 { - font-size: 1.4em; - border-bottom: 1px solid #cccccc; - margin-top: 5px; - margin-bottom: 5px; -} - - -#bd h3 { - margin-bottom: 0px; -} - -#bd p { - margin: 1em 0; - margin-top: 0.5em; -} - -/* Keyboard shortcuts */ -#bd em { - font-weight: bold; - color: #00A700; - font-style: normal; -} - -#ft.doc { - color: #aaa; - border-top: 1px solid #aaa; - clear: both; - margin-top: 2em; - font-size: 0.8em; - letter-spacing: 0.5px; -} - -.faq .question { - font-size: 1.1em; - font-weight: bold; -} - -pre { - font-size: 0.9em; - line-height: 1.4; - padding: 10px; - background-color: #dddddd; - margin: 1em 0; -} - -.terminal { - color: #c0c0c0; - font-size: 1em; - background: #000000; -} - -.docindex { - font-size: 1.3em; - line-height: 1.3; - margin-top: 0.1em; - margin-bottom: 0; - margin-left: 0px; -} - -.docindex li { - list-style-position: inside; - margin-left: 0; -} - -.docindex ul { - margin-left: 2em; - margin-top: 0.1em; - margin-bottom: 0.1em; -} - -li a { - text-decoration: none; -} - -.highlight { - font-size: 14px; -} -.example_legend{ - line-height: 1; - font-size: 12px; -} -.example pre { - margin: 0; -} - -.kvtable th { - text-align: left; - white-space: nowrap; -} - diff --git a/doc-src/_layout.html b/doc-src/_layout.html index d7637194..1ea11bf2 100644 --- a/doc-src/_layout.html +++ b/doc-src/_layout.html @@ -1,30 +1,75 @@ -
-
- - - - $!nav if this.title!="docs" else ""!$ -

mitmproxy 0.9 docs

-
-
-
-
- $!title if this.title!="docs" else ""!$ - $!body!$ -
-
-
-
-

@!copyright!@

+
+
+
+ + + + + + mitmproxy 0.9 docs +
+
+ +
+
+
+
+ + + + + +
+
+
+ $!body!$ +
+
+ +
+ +
+

@!copyright!@

+
+ +
diff --git a/doc-src/admin.html b/doc-src/admin.html deleted file mode 100644 index b89cd8bc..00000000 --- a/doc-src/admin.html +++ /dev/null @@ -1,7 +0,0 @@ - -Please send any comments, suggestions and bug reports to $!docMaintainerEmail!$. - -__mitmproxy__ is licensed under Version 3 of the Gnu General Public License, -the full text of which can be found in the LICENSE file in the source -distribution. - diff --git a/doc-src/index.html b/doc-src/index.html index 3b6d122d..8b137891 100644 --- a/doc-src/index.html +++ b/doc-src/index.html @@ -1,49 +1 @@ - diff --git a/doc-src/index.py b/doc-src/index.py index 27faf602..2c4aa992 100644 --- a/doc-src/index.py +++ b/doc-src/index.py @@ -80,9 +80,10 @@ pages = [ Page("anticache.html", "Anticache"), Page("filters.html", "Filter expressions"), Page("ssl.html", "Setting up SSL interception"), + Page("transparent.html", "Transparent Proxying"), Directory("certinstall"), Directory("scripting"), Directory("tutorials"), + Directory("transparent"), Page("faq.html", "FAQ"), - Page("admin.html", "Administrivia") ] diff --git a/doc-src/transparent.html b/doc-src/transparent.html index e69de29b..9e77d70d 100644 --- a/doc-src/transparent.html +++ b/doc-src/transparent.html @@ -0,0 +1,2 @@ + +Foo diff --git a/doc-src/transparent/index.py b/doc-src/transparent/index.py index fa2a67da..d277d708 100644 --- a/doc-src/transparent/index.py +++ b/doc-src/transparent/index.py @@ -3,5 +3,4 @@ from countershape import Page pages = [ Page("linux.html", "Linux"), Page("osx.html", "OSX"), - Page("openbsd.html", "OpenBSD"), ] diff --git a/doc-src/transparent/openbsd.html b/doc-src/transparent/openbsd.html deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3 From 6f1fa30bc6bc0081917dbabe7da34c2a7ee9ea61 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Tue, 1 Jan 2013 15:30:02 +1300 Subject: Docs: make nav sidebar work --- doc-src/_layout.html | 56 ++++++++++++++++++++++++++-------------------------- doc-src/index.py | 15 +++++++++++--- 2 files changed, 40 insertions(+), 31 deletions(-) (limited to 'doc-src') diff --git a/doc-src/_layout.html b/doc-src/_layout.html index 1ea11bf2..ecc10736 100644 --- a/doc-src/_layout.html +++ b/doc-src/_layout.html @@ -19,42 +19,42 @@
    -
  • Introduction
    • -
  • Installation
    • -
  • mitmproxy
    • -
  • mitmdump
    • -
  • FAQ
    • + $!nav("intro.html", this, state)!$ + $!nav("install.html", this, state)!$ + $!nav("mitmproxy.html", this, state)!$ + $!nav("mitmdump.html", this, state)!$ + $!nav("faq.html", this, state)!$
  • Features
    • -
  • Client-side replay
    • -
  • Server-side replay
    • -
  • Sticky cookies and auth
    • -
  • Reverse proxy mode
    • -
  • Upstream Certs
    • -
  • Replacements
    • -
  • Anticache
    • -
  • Filter expressions
    • - -
  • Scripting mitmproxy
    • -
  • Inline Scripts
    • -
  • libmproxy
    • + $!nav("clientreplay.html", this, state)!$ + $!nav("serverreplay.html", this, state)!$ + $!nav("sticky.html", this, state)!$ + $!nav("reverseproxy.html", this, state)!$ + $!nav("upstreamcerts.html", this, state)!$ + $!nav("replacements.html", this, state)!$ + $!nav("anticache.html", this, state)!$ + $!nav("filters.html", this, state)!$
  • SSL interception
    • -
  • Overview
    • -
  • Firefox
    • -
  • OSX
    • -
  • Windows 7
    • -
  • iPhone/iPad
    • -
  • Android
    • + $!nav("ssl.html", this, state)!$ + $!nav("certinstall/firefox.html", this, state)!$ + $!nav("certinstall/osx.html", this, state)!$ + $!nav("certinstall/windows7.html", this, state)!$ + $!nav("certinstall/ios.html", this, state)!$ + $!nav("certinstall/android.html", this, state)!$
  • Transparent Proxying
    • -
  • Overview
    • -
  • Linux
    • -
  • OSX
    • + $!nav("transparent.html", this, state)!$ + $!nav("transparent/linux.html", this, state)!$ + $!nav("transparent/osx.html", this, state)!$
  • Tutorials
    • -
  • Client replay: a 30 second example
    • -
  • Setting highscores on Apple's GameCenter
    • + $!nav("tutorials/30second.html", this, state)!$ + $!nav("tutorials/gamecenter.html", this, state)!$ + +
  • Scripting mitmproxy
    • + $!nav("scripting/inlinescripts.html", this, state)!$ + $!nav("scripting/libmproxy.html", this, state)!$
diff --git a/doc-src/index.py b/doc-src/index.py index 2c4aa992..5b6fcc5e 100644 --- a/doc-src/index.py +++ b/doc-src/index.py @@ -1,6 +1,6 @@ import os, sys import countershape -from countershape import Page, Directory, PythonModule, markup +from countershape import Page, Directory, PythonModule, markup, model import countershape.template sys.path.insert(0, "..") from libmproxy import filt @@ -64,6 +64,15 @@ filt_help.extend( ns.filt_help = filt_help +def nav(page, current, state): + if current.match(page, False): + pre = '
  • ' + else: + pre = "
  • " + p = state.application.getPage(page) + return pre + '%s
    • '%(model.UrlTo(page), p.title) +ns.nav = nav + pages = [ Page("index.html", "docs"), @@ -79,8 +88,8 @@ pages = [ Page("reverseproxy.html", "Reverse proxy mode"), Page("anticache.html", "Anticache"), Page("filters.html", "Filter expressions"), - Page("ssl.html", "Setting up SSL interception"), - Page("transparent.html", "Transparent Proxying"), + Page("ssl.html", "SSL Overview"), + Page("transparent.html", "Transparent Overview"), Directory("certinstall"), Directory("scripting"), Directory("tutorials"), -- cgit v1.2.3 From 8b768983a7130c1c1b5fa4dc135592282c2baa48 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Tue, 1 Jan 2013 15:55:15 +1300 Subject: Preliminary changelog. --- doc-src/_layout.html | 78 +++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 40 deletions(-) (limited to 'doc-src') diff --git a/doc-src/_layout.html b/doc-src/_layout.html index ecc10736..d2d73249 100644 --- a/doc-src/_layout.html +++ b/doc-src/_layout.html @@ -16,54 +16,52 @@
    +
      + $!nav("intro.html", this, state)!$ + $!nav("install.html", this, state)!$ + $!nav("mitmproxy.html", this, state)!$ + $!nav("mitmdump.html", this, state)!$ + $!nav("faq.html", this, state)!$ +
    • Features
      • + $!nav("clientreplay.html", this, state)!$ + $!nav("serverreplay.html", this, state)!$ + $!nav("sticky.html", this, state)!$ + $!nav("reverseproxy.html", this, state)!$ + $!nav("upstreamcerts.html", this, state)!$ + $!nav("replacements.html", this, state)!$ + $!nav("anticache.html", this, state)!$ + $!nav("filters.html", this, state)!$ -
        - $!nav("intro.html", this, state)!$ - $!nav("install.html", this, state)!$ - $!nav("mitmproxy.html", this, state)!$ - $!nav("mitmdump.html", this, state)!$ - $!nav("faq.html", this, state)!$ +
      • SSL interception
        • + $!nav("ssl.html", this, state)!$ + $!nav("certinstall/firefox.html", this, state)!$ + $!nav("certinstall/osx.html", this, state)!$ + $!nav("certinstall/windows7.html", this, state)!$ + $!nav("certinstall/ios.html", this, state)!$ + $!nav("certinstall/android.html", this, state)!$ -
      • Features
        • - $!nav("clientreplay.html", this, state)!$ - $!nav("serverreplay.html", this, state)!$ - $!nav("sticky.html", this, state)!$ - $!nav("reverseproxy.html", this, state)!$ - $!nav("upstreamcerts.html", this, state)!$ - $!nav("replacements.html", this, state)!$ - $!nav("anticache.html", this, state)!$ - $!nav("filters.html", this, state)!$ +
      • Transparent Proxying
        • + $!nav("transparent.html", this, state)!$ + $!nav("transparent/linux.html", this, state)!$ + $!nav("transparent/osx.html", this, state)!$ -
      • SSL interception
        • - $!nav("ssl.html", this, state)!$ - $!nav("certinstall/firefox.html", this, state)!$ - $!nav("certinstall/osx.html", this, state)!$ - $!nav("certinstall/windows7.html", this, state)!$ - $!nav("certinstall/ios.html", this, state)!$ - $!nav("certinstall/android.html", this, state)!$ - -
      • Transparent Proxying
        • - $!nav("transparent.html", this, state)!$ - $!nav("transparent/linux.html", this, state)!$ - $!nav("transparent/osx.html", this, state)!$ - -
      • Tutorials
        • - $!nav("tutorials/30second.html", this, state)!$ - $!nav("tutorials/gamecenter.html", this, state)!$ - -
      • Scripting mitmproxy
        • - $!nav("scripting/inlinescripts.html", this, state)!$ - $!nav("scripting/libmproxy.html", this, state)!$ - -
      +
    • Tutorials
      • + $!nav("tutorials/30second.html", this, state)!$ + $!nav("tutorials/gamecenter.html", this, state)!$ +
    • Scripting mitmproxy
      • + $!nav("scripting/inlinescripts.html", this, state)!$ + $!nav("scripting/libmproxy.html", this, state)!$ +
    +
    +
    -
    -
    +

    @!pageTitle!@

    $!body!$ -
    + +
    -- cgit v1.2.3 From e93b343ac4917979f912afe5a2f0bbc8be0b28d7 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Tue, 1 Jan 2013 16:35:52 +1300 Subject: Docs and Readme - Don't keep a full duplicate readme just for pypi. Pypi really needs to learn to read markdown. - Style and content adjustments --- doc-src/02-docstyle.css | 5 +++++ doc-src/_layout.html | 4 ++-- doc-src/index.html | 3 +++ doc-src/index.py | 25 +++++-------------------- doc-src/install.html | 2 +- doc-src/intro.html | 4 ---- 6 files changed, 16 insertions(+), 27 deletions(-) create mode 100644 doc-src/02-docstyle.css delete mode 100644 doc-src/intro.html (limited to 'doc-src') diff --git a/doc-src/02-docstyle.css b/doc-src/02-docstyle.css new file mode 100644 index 00000000..ad2235e7 --- /dev/null +++ b/doc-src/02-docstyle.css @@ -0,0 +1,5 @@ +.terminal { + color: #c0c0c0; + font-size: 1em; + background: #000000; +} diff --git a/doc-src/_layout.html b/doc-src/_layout.html index d2d73249..826279ef 100644 --- a/doc-src/_layout.html +++ b/doc-src/_layout.html @@ -17,7 +17,7 @@
      - $!nav("intro.html", this, state)!$ + $!nav("index.html", this, state)!$ $!nav("install.html", this, state)!$ $!nav("mitmproxy.html", this, state)!$ $!nav("mitmdump.html", this, state)!$ @@ -58,7 +58,7 @@
    -

    @!pageTitle!@

    +

    @!this.title!@

    $!body!$
    diff --git a/doc-src/index.html b/doc-src/index.html index 8b137891..79687ec6 100644 --- a/doc-src/index.html +++ b/doc-src/index.html @@ -1 +1,4 @@ +@!index_contents!@ + + diff --git a/doc-src/index.py b/doc-src/index.py index 5b6fcc5e..9684306b 100644 --- a/doc-src/index.py +++ b/doc-src/index.py @@ -6,37 +6,24 @@ sys.path.insert(0, "..") from libmproxy import filt MITMPROXY_SRC = "~/git/public/mitmproxy" - -if ns.options.website: - ns.title = countershape.template.Template(None, "

    @!this.title!@

    ") - this.layout = countershape.Layout("_websitelayout.html") -else: - ns.title = countershape.template.Template(None, "

    @!this.title!@

    ") - this.layout = countershape.Layout("_layout.html") - +this.layout = countershape.Layout("_layout.html") +this.titlePrefix = "mitmproxy 0.9 - " this.markup = markup.Markdown() + ns.docMaintainer = "Aldo Cortesi" ns.docMaintainerEmail = "aldo@corte.si" -ns.copyright = u"\u00a9 mitmproxy project, 2012" - -ns.index = countershape.widgets.SiblingPageIndex('/index.html', divclass="pageindex") +ns.copyright = u"\u00a9 mitmproxy project, 2013" def mpath(p): p = os.path.join(MITMPROXY_SRC, p) return os.path.expanduser(p) -ns.license = file(mpath("LICENSE")).read() ns.index_contents = file(mpath("README.mkd")).read() - - -top = os.path.abspath(os.getcwd()) def example(s): d = file(mpath(s)).read() extemp = """
    %s
    (%s)
    """ return extemp%(countershape.template.Syntax("py")(d), s) - - ns.example = example filt_help = [] @@ -73,10 +60,8 @@ def nav(page, current, state): return pre + '%s'%(model.UrlTo(page), p.title) ns.nav = nav - pages = [ - Page("index.html", "docs"), - Page("intro.html", "Introduction"), + Page("index.html", "Introduction"), Page("install.html", "Installation"), Page("mitmproxy.html", "mitmproxy"), Page("mitmdump.html", "mitmdump"), diff --git a/doc-src/install.html b/doc-src/install.html index 0968cd66..6f4bc530 100644 --- a/doc-src/install.html +++ b/doc-src/install.html @@ -13,7 +13,7 @@ sudo pip install mitmproxy ## From Source - When installing from source, you will need to install the -[dependencies](@!urlTo("intro.html")!@) by hand. +[dependencies](@!urlTo("index.html")!@) by hand. - Then run the following command from the base of the source distribution: 
    diff --git a/doc-src/intro.html b/doc-src/intro.html
deleted file mode 100644
index 79687ec6..00000000
--- a/doc-src/intro.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
-@!index_contents!@
-
-
-- 
cgit v1.2.3


From 7b3d3dc85e9618f4b16f2c81a37429ebdaf5ebf2 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi 
Date: Wed, 2 Jan 2013 14:02:41 +1300
Subject: Documentation, setup.py updates, styling.

---
 doc-src/02-docstyle.css   |  4 ++++
 doc-src/_layout.html      | 10 +++++---
 doc-src/anticache.html    |  6 ++---
 doc-src/clientreplay.html |  5 ++--
 doc-src/filters.html      |  4 +++-
 doc-src/index.py          | 14 +++++++----
 doc-src/install.html      | 61 ++++++++++++++++++++++-------------------------
 doc-src/proxyauth.html    |  2 ++
 doc-src/setheaders.html   |  2 ++
 9 files changed, 60 insertions(+), 48 deletions(-)
 create mode 100644 doc-src/proxyauth.html
 create mode 100644 doc-src/setheaders.html

(limited to 'doc-src')

diff --git a/doc-src/02-docstyle.css b/doc-src/02-docstyle.css
index ad2235e7..855899f6 100644
--- a/doc-src/02-docstyle.css
+++ b/doc-src/02-docstyle.css
@@ -3,3 +3,7 @@
     font-size: 1em;
     background: #000000;
 }
+
+pre {
+    color: #333;
+}
diff --git a/doc-src/_layout.html b/doc-src/_layout.html
index 826279ef..a4e84bcc 100644
--- a/doc-src/_layout.html
+++ b/doc-src/_layout.html
@@ -24,14 +24,16 @@
             $!nav("faq.html", this, state)!$
 
             
  • Features
    • 
+                    $!nav("anticache.html", this, state)!$
                     $!nav("clientreplay.html", this, state)!$
+                    $!nav("filters.html", this, state)!$
+                    $!nav("proxyauth.html", this, state)!$
+                    $!nav("replacements.html", this, state)!$
                     $!nav("serverreplay.html", this, state)!$
+                    $!nav("setheaders.html", this, state)!$
                     $!nav("sticky.html", this, state)!$
                     $!nav("reverseproxy.html", this, state)!$
                     $!nav("upstreamcerts.html", this, state)!$
-                    $!nav("replacements.html", this, state)!$
-                    $!nav("anticache.html", this, state)!$
-                    $!nav("filters.html", this, state)!$
 
             
  • SSL interception
    • 
                     $!nav("ssl.html", this, state)!$
@@ -58,7 +60,9 @@
    +

    @!this.title!@

    +
    $!body!$
    diff --git a/doc-src/anticache.html b/doc-src/anticache.html index 79f0683d..d97e9f5f 100644 --- a/doc-src/anticache.html +++ b/doc-src/anticache.html @@ -5,6 +5,6 @@ When the __anticache__ option is passed to mitmproxy, it removes headers (__if-none-match__ and __if-modified-since__) that might elicit a 304-not-modified response from the server. This is useful when you want to make -sure you capture an HTTP exchange in its totality, and during [client -replay](@!urlTo("clientreplay.html")!@). - +sure you capture an HTTP exchange in its totality. It's also often used during +[client replay](@!urlTo("clientreplay.html")!@), when you want to make sure the +server responds with complete data. diff --git a/doc-src/clientreplay.html b/doc-src/clientreplay.html index d4b1c3ff..c94f5034 100644 --- a/doc-src/clientreplay.html +++ b/doc-src/clientreplay.html @@ -9,6 +9,5 @@ before starting the next request. This might differ from the recorded conversation, where requests may have been made concurrently. You may want to use client-side replay in conjunction with the -[anticache](@!urlTo("anticache.html")!@) option. - - +[anticache](@!urlTo("anticache.html")!@) option, to make sure the server +responds with complete data. diff --git a/doc-src/filters.html b/doc-src/filters.html index 2424c6f8..c7f0f78b 100644 --- a/doc-src/filters.html +++ b/doc-src/filters.html @@ -2,13 +2,15 @@ Many commands in __mitmproxy__ and __mitmdump__ take a filter expression. Filter expressions consist of the following operators: - +
    + +
    @!i[0]!@ @!i[1]!@
    - Regexes are Python-style diff --git a/doc-src/index.py b/doc-src/index.py index 9684306b..f2a07db8 100644 --- a/doc-src/index.py +++ b/doc-src/index.py @@ -65,16 +65,20 @@ pages = [ Page("install.html", "Installation"), Page("mitmproxy.html", "mitmproxy"), Page("mitmdump.html", "mitmdump"), + + Page("anticache.html", "Anticache"), Page("clientreplay.html", "Client-side replay"), + Page("filters.html", "Filter expressions"), + Page("setheaders.html", "Set Headers"), Page("serverreplay.html", "Server-side replay"), Page("sticky.html", "Sticky cookies and auth"), - Page("upstreamcerts.html", "Upstream Certs"), + Page("proxyauth.html", "Proxy Authentication"), Page("replacements.html", "Replacements"), Page("reverseproxy.html", "Reverse proxy mode"), - Page("anticache.html", "Anticache"), - Page("filters.html", "Filter expressions"), - Page("ssl.html", "SSL Overview"), - Page("transparent.html", "Transparent Overview"), + Page("upstreamcerts.html", "Upstream Certs"), + + Page("ssl.html", "Overview"), + Page("transparent.html", "Overview"), Directory("certinstall"), Directory("scripting"), Directory("tutorials"), diff --git a/doc-src/install.html b/doc-src/install.html index 6f4bc530..30e2774d 100644 --- a/doc-src/install.html +++ b/doc-src/install.html @@ -1,54 +1,49 @@ -## Using Pip +The preferred way to install mitmproxy - whether you're installing the latest +release or from source - is to use [pip](http://www.pip-installer.org/). If you +don't already have pip on your system, you can find installation instructions +[here](http://www.pip-installer.org/en/latest/installing.html). -The preferred way to install mitmproxy is to use -[pip](http://pypi.python.org/pypi/pip). A single command will install the -latest release of mitmproxy, along with all its dependencies: -
    -sudo pip install mitmproxy
+## Installing the latest release
+
+A single command will download and install the latest release of mitmproxy,
+along with all its dependencies:
+
+
    +pip install mitmproxy
 
    
 
 
-## From Source
+## Installing from source
 
-- When installing from source, you will need to install the
-[dependencies](@!urlTo("index.html")!@) by hand. 
-- Then run the following command from the base of the source distribution:
+When installing from source, the easiest method is still to use pip. In this
+case run:
     
-
    -sudo python setup.py install
+
    +pip install /path/to/source
 
    
 
+Note that if you're installing current git master, you will also have to
+install the current git master of [netlib](http://github.com/cortesi/netlib) by
+hand.
 
 ## OSX
 
+- If you're running a Python interpreter installed with homebrew (or similar),
+you may have to install some dependencies by hand. 
 - Make sure that XCode is installed from the App Store, and that the
 command-line tools have been downloaded (XCode/Preferences/Downloads).
-- Install __pip__ using the following command:
-    
-
    -sudo easy_install pip
-
    
-
-- Now use __pip__ to set up the dependencies and do the install:
-
-
    -sudo pip install mitmproxy
-
    
-
-This procedure may vary if, for instance, you've installed Python from an
-external source like [homebrew](http://mxcl.github.com/homebrew/). In that
-case, the easiest way to proceed is to first install __easy_install__, then
-continue as above.
+- Now use __pip__ to do the installation, as above.
 
 There are a few bits of customization you might want to do to make mitmproxy
-comfortable to use. At the moment, mitmproxy's color scheme is optimized for a
-dark background terminal, so you probably want to change the default. You can
-use the OSX open program to create a simple and effective
-~/.mailcap file to view HTTP bodies:
+comfortable to use on OSX. The default color scheme is optimized for a dark
+background terminal, but you can select a palette for a light terminal
+background with the --palette option. You can use the OSX open program
+to create a simple and effective ~/.mailcap file to view request and
+response bodies:
 
-
    +
     application/*; /usr/bin/open -Wn %s
 audio/*; /usr/bin/open -Wn %s
 image/*; /usr/bin/open -Wn %s
diff --git a/doc-src/proxyauth.html b/doc-src/proxyauth.html
new file mode 100644
index 00000000..224b9e2d
--- /dev/null
+++ b/doc-src/proxyauth.html
@@ -0,0 +1,2 @@
+
+Proxy auth.
diff --git a/doc-src/setheaders.html b/doc-src/setheaders.html
new file mode 100644
index 00000000..d000e95b
--- /dev/null
+++ b/doc-src/setheaders.html
@@ -0,0 +1,2 @@
+
+Setheaders.
-- 
cgit v1.2.3


From 8e6fabd69a124cc5b5ae763b58587ee6ee6ab3da Mon Sep 17 00:00:00 2001
From: Aldo Cortesi 
Date: Wed, 2 Jan 2013 21:57:39 +1300
Subject: Docs - features.

---
 doc-src/anticache.html     | 14 +++++++++++---
 doc-src/clientreplay.html  | 15 ++++++++++++---
 doc-src/proxyauth.html     | 25 ++++++++++++++++++++++++-
 doc-src/replacements.html  | 19 ++++++++++++++++---
 doc-src/reverseproxy.html  | 15 ++++++++++++---
 doc-src/sticky.html        | 44 ++++++++++++++++++++++++++++++++++++--------
 doc-src/upstreamcerts.html | 32 +++++++++++++++++++-------------
 7 files changed, 130 insertions(+), 34 deletions(-)

(limited to 'doc-src')

diff --git a/doc-src/anticache.html b/doc-src/anticache.html
index d97e9f5f..f42903e8 100644
--- a/doc-src/anticache.html
+++ b/doc-src/anticache.html
@@ -1,10 +1,18 @@
 
-- command-line: _--anticache_ 
-- mitmproxy shortcut: _o_, then _a_
-
 When the __anticache__ option is passed to mitmproxy, it removes headers
 (__if-none-match__ and __if-modified-since__) that might elicit a
 304-not-modified response from the server. This is useful when you want to make
 sure you capture an HTTP exchange in its totality. It's also often used during
 [client replay](@!urlTo("clientreplay.html")!@), when you want to make sure the
 server responds with complete data.
+
+
+    
+        
+            
+        
+        
+            
+        
+    
+
    command-line --anticache
    mitmproxy shortcut o then a
    
diff --git a/doc-src/clientreplay.html b/doc-src/clientreplay.html
index c94f5034..6638d078 100644
--- a/doc-src/clientreplay.html
+++ b/doc-src/clientreplay.html
@@ -1,7 +1,4 @@
 
-- command-line: _-c path_ 
-- mitmproxy shortcut: _c_
-
 Client-side replay does what it says on the tin: you provide a previously saved
 HTTP conversation, and mitmproxy replays the client requests one by one. Note
 that mitmproxy serializes the requests, waiting for a response from the server
@@ -11,3 +8,15 @@ conversation, where requests may have been made concurrently.
 You may want to use client-side replay in conjunction with the
 [anticache](@!urlTo("anticache.html")!@) option, to make sure the server
 responds with complete data. 
+
+
+
+    
+        
+            
+        
+        
+            
+        
+    
+
    command-line -c path
    mitmproxy shortcut c
    
diff --git a/doc-src/proxyauth.html b/doc-src/proxyauth.html
index 224b9e2d..0618ee68 100644
--- a/doc-src/proxyauth.html
+++ b/doc-src/proxyauth.html
@@ -1,2 +1,25 @@
 
-Proxy auth.
+
+Asks the user for authentication before they are permitted to use the proxy.
+Authentication headers are stripped from the flows, so they are not passed to
+upstream servers. For now, only HTTP Basic authentication is supported.
+
+
+    
+        
+            
+            
+        
+    
+
    command-line
+                
      
+                    
    • --nonanonymous
      • 
+
+                    
    • --singleuser USER
      • 
+
+                    
    • --htpasswd PATH
      • 
+                
    
+            
    
+
+
+
diff --git a/doc-src/replacements.html b/doc-src/replacements.html
index 986e773a..c10fe2c3 100644
--- a/doc-src/replacements.html
+++ b/doc-src/replacements.html
@@ -1,6 +1,3 @@
-- command-line: _--replace_, _--replace-from-file_
-- mitmproxy shortcut: _R_
-
 Mitmproxy lets you specify an arbitrary number of patterns that define text
 replacements within flows. Each pattern has 3 components: a filter that defines
 which flows a replacement applies to, a regular expression that defines what
@@ -59,3 +56,19 @@ The _R_ shortcut key in mitmproxy lets you add and edit replacement hooks using
 a built-in editor. The context-sensitive help (_h_) has complete usage
 information.
 
+
+    
+        
+            
+            
+        
+        
+            
+        
+    
+
    command-line
+                
      
+                    
    • --replace
      • 
+                    
    • --replace-from-file
      • 
+                
    
+            
    mitmproxy shortcut R
    
diff --git a/doc-src/reverseproxy.html b/doc-src/reverseproxy.html
index 4160b5c6..524df083 100644
--- a/doc-src/reverseproxy.html
+++ b/doc-src/reverseproxy.html
@@ -1,8 +1,17 @@
 
-- command-line: _-P_ http[s]://hostname[:port]
-- mitmproxy shortcut: _P_
-
 In reverse proxy mode, mitmproxy acts as a standard HTTP server and forwards
 all requests to the specified upstream server. Note that the displayed URL for
 flows in this mode will use the value of the __Host__ header field from the
 request, not the reverse proxy server.
+
+
+
+    
+        
+            
+        
+        
+            
+        
+    
+
    command-line -P http[s]://hostname[:port]
    mitmproxy shortcut P
    
diff --git a/doc-src/sticky.html b/doc-src/sticky.html
index 6208f658..1b79f922 100644
--- a/doc-src/sticky.html
+++ b/doc-src/sticky.html
@@ -1,10 +1,6 @@
 
 ## Sticky cookies
 
-- command-line: _-t_ (sticky cookies on all requests)
-- command-line: _-T filt_ (sticky cookies on requests matching filt)
-- mitmproxy shortcut: _t_
-
 When the sticky cookie option is set, __mitmproxy__ will add the cookie most
 recently set by the server to any cookie-less request. Consider a service that
 sets a cookie to track the session after authentication. Using sticky cookies,
@@ -20,15 +16,47 @@ replay](@!urlTo("clientreplay.html")!@) - you can record the authentication
 process once, and simply replay it on startup every time you need to interact
 with the secured resources.
 
+
+    
+        
+            
+            
+        
+        
+            
+        
+    
+
    command-line
+                
      
+                    
    • -t (sticky cookies on all requests)
      • 
+                    
    • -T FILTER (sticky cookies on requests matching filter
      • 
+                
    
+            
    mitmproxy shortcut t
    
 
-## Sticky auth
 
-- command-line: _-u_ (sticky auth on all requests)
-- command-line: _-U filt_ (sticky auth on requests matching filt)
-- mitmproxy shortcut: _u_
+## Sticky auth
 
 The sticky auth option is analogous to the sticky cookie option, in that HTTP
 __Authorization__ headers are simply replayed to the server once they have been
 seen. This is enough to allow you to access a server resource using HTTP Basic
 authentication through the proxy. Note that __mitmproxy__ doesn't (yet) support
 replay of HTTP Digest authentication. 
+
+
+    
+        
+            
+            
+        
+        
+            
+        
+    
+
    command-line
+                
      
+                    
    • -u (sticky auth on all requests)
      • 
+                    
    • -U FILTER (sticky auth on requests matching filter
      • 
+                
    
+            
    mitmproxy shortcut u
    
+
+
diff --git a/doc-src/upstreamcerts.html b/doc-src/upstreamcerts.html
index 32a13a9a..8de75ee3 100644
--- a/doc-src/upstreamcerts.html
+++ b/doc-src/upstreamcerts.html
@@ -1,15 +1,21 @@
-- command-line: _--upstream-cert_ 
-- mitmproxy shortcut: _o_, then _u_
+When mitmproxy receives a connection destined for an SSL-protected service, it
+freezes the connection before reading its request data, and makes a connection
+to the upstream server to "sniff" the contents of its SSL certificate. The
+information gained - the __Common Name__ and __Subject Alternative Names__ - is
+then used to generate the interception certificate, which is sent to the client
+so the connection can continue.
 
-Normally, mitmproxy uses the target domain specified in a client's proxy
-request to generate an interception certificate. When __upstream-cert__ mode is
-activated a different procedure is followed: a connection is made to the
-specified remote server to retrieve its __Common Name__ and __Subject
-Alternative Names__. This feature is especially useful when the client
-specifies an IP address rather than a host name in the proxy request. If this
-is the case, we can only generate a certificate if we can establish the __CN__
-and __SANs__ from the upstream server.
+This rather intricate little dance lets us seamlessly generate correct
+certificates even if the client has specifed only an IP address rather than the
+hostname. It also means that we don't need to sniff additional data to generate
+certs in transparent mode.
 
-Note that __upstream-cert__ mode does not work when the remote server relies on
-[Server Name Indication](http://en.wikipedia.org/wiki/Server_Name_Indication).
-Luckily, SNI is still not very widely used.
+Upstream cert sniffing is on by default, and can optionally be turned off.
+
+
+    
+        
+            
+        
+    
+
    command-line --no-upstream-cert
    
-- 
cgit v1.2.3


From f578d68e555ff202a51b9f8672e540a964e31fed Mon Sep 17 00:00:00 2001
From: Aldo Cortesi 
Date: Thu, 3 Jan 2013 08:20:51 +1300
Subject: Docs: Set Headers

---
 doc-src/setheaders.html | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'doc-src')

diff --git a/doc-src/setheaders.html b/doc-src/setheaders.html
index d000e95b..b74525df 100644
--- a/doc-src/setheaders.html
+++ b/doc-src/setheaders.html
@@ -1,2 +1,18 @@
 
-Setheaders.
+This feature lets you specify a set of headers to be added to requests or
+responses, based on a filter pattern. You can specify these either on the
+command-line, or through an interactive editor in mitmproxy.
+
+
+    
+        
+            
+            
+        
+        
+            
+        
+    
+
    command-line
+                --setheader PATTERN
+            
    mitmproxy shortcut H
    
-- 
cgit v1.2.3


From 101f92b2566adea605b9db69dba29e575414cbba Mon Sep 17 00:00:00 2001
From: Aldo Cortesi 
Date: Thu, 3 Jan 2013 08:25:24 +1300
Subject: Docs: move features into their own directory

---
 doc-src/anticache.html              | 18 ---------
 doc-src/clientreplay.html           | 22 -----------
 doc-src/features/anticache.html     | 18 +++++++++
 doc-src/features/clientreplay.html  | 22 +++++++++++
 doc-src/features/filters.html       | 36 ++++++++++++++++++
 doc-src/features/index.py           | 14 +++++++
 doc-src/features/proxyauth.html     | 25 +++++++++++++
 doc-src/features/replacements.html  | 74 +++++++++++++++++++++++++++++++++++++
 doc-src/features/reverseproxy.html  | 17 +++++++++
 doc-src/features/serverreplay.html  | 35 ++++++++++++++++++
 doc-src/features/setheaders.html    | 18 +++++++++
 doc-src/features/sticky.html        | 62 +++++++++++++++++++++++++++++++
 doc-src/features/upstreamcerts.html | 21 +++++++++++
 doc-src/filters.html                | 36 ------------------
 doc-src/index.py                    | 11 ------
 doc-src/proxyauth.html              | 25 -------------
 doc-src/replacements.html           | 74 -------------------------------------
 doc-src/reverseproxy.html           | 17 ---------
 doc-src/serverreplay.html           | 35 ------------------
 doc-src/setheaders.html             | 18 ---------
 doc-src/sticky.html                 | 62 -------------------------------
 doc-src/upstreamcerts.html          | 21 -----------
 22 files changed, 342 insertions(+), 339 deletions(-)
 delete mode 100644 doc-src/anticache.html
 delete mode 100644 doc-src/clientreplay.html
 create mode 100644 doc-src/features/anticache.html
 create mode 100644 doc-src/features/clientreplay.html
 create mode 100644 doc-src/features/filters.html
 create mode 100644 doc-src/features/index.py
 create mode 100644 doc-src/features/proxyauth.html
 create mode 100644 doc-src/features/replacements.html
 create mode 100644 doc-src/features/reverseproxy.html
 create mode 100644 doc-src/features/serverreplay.html
 create mode 100644 doc-src/features/setheaders.html
 create mode 100644 doc-src/features/sticky.html
 create mode 100644 doc-src/features/upstreamcerts.html
 delete mode 100644 doc-src/filters.html
 delete mode 100644 doc-src/proxyauth.html
 delete mode 100644 doc-src/replacements.html
 delete mode 100644 doc-src/reverseproxy.html
 delete mode 100644 doc-src/serverreplay.html
 delete mode 100644 doc-src/setheaders.html
 delete mode 100644 doc-src/sticky.html
 delete mode 100644 doc-src/upstreamcerts.html

(limited to 'doc-src')

diff --git a/doc-src/anticache.html b/doc-src/anticache.html
deleted file mode 100644
index f42903e8..00000000
--- a/doc-src/anticache.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-When the __anticache__ option is passed to mitmproxy, it removes headers
-(__if-none-match__ and __if-modified-since__) that might elicit a
-304-not-modified response from the server. This is useful when you want to make
-sure you capture an HTTP exchange in its totality. It's also often used during
-[client replay](@!urlTo("clientreplay.html")!@), when you want to make sure the
-server responds with complete data.
-
-
-    
-        
-            
-        
-        
-            
-        
-    
-
    command-line --anticache
    mitmproxy shortcut o then a
    
diff --git a/doc-src/clientreplay.html b/doc-src/clientreplay.html
deleted file mode 100644
index 6638d078..00000000
--- a/doc-src/clientreplay.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Client-side replay does what it says on the tin: you provide a previously saved
-HTTP conversation, and mitmproxy replays the client requests one by one. Note
-that mitmproxy serializes the requests, waiting for a response from the server
-before starting the next request. This might differ from the recorded
-conversation, where requests may have been made concurrently.
-
-You may want to use client-side replay in conjunction with the
-[anticache](@!urlTo("anticache.html")!@) option, to make sure the server
-responds with complete data. 
-
-
-
-    
-        
-            
-        
-        
-            
-        
-    
-
    command-line -c path
    mitmproxy shortcut c
    
diff --git a/doc-src/features/anticache.html b/doc-src/features/anticache.html
new file mode 100644
index 00000000..f42903e8
--- /dev/null
+++ b/doc-src/features/anticache.html
@@ -0,0 +1,18 @@
+
+When the __anticache__ option is passed to mitmproxy, it removes headers
+(__if-none-match__ and __if-modified-since__) that might elicit a
+304-not-modified response from the server. This is useful when you want to make
+sure you capture an HTTP exchange in its totality. It's also often used during
+[client replay](@!urlTo("clientreplay.html")!@), when you want to make sure the
+server responds with complete data.
+
+
+    
+        
+            
+        
+        
+            
+        
+    
+
    command-line --anticache
    mitmproxy shortcut o then a
    
diff --git a/doc-src/features/clientreplay.html b/doc-src/features/clientreplay.html
new file mode 100644
index 00000000..6638d078
--- /dev/null
+++ b/doc-src/features/clientreplay.html
@@ -0,0 +1,22 @@
+
+Client-side replay does what it says on the tin: you provide a previously saved
+HTTP conversation, and mitmproxy replays the client requests one by one. Note
+that mitmproxy serializes the requests, waiting for a response from the server
+before starting the next request. This might differ from the recorded
+conversation, where requests may have been made concurrently.
+
+You may want to use client-side replay in conjunction with the
+[anticache](@!urlTo("anticache.html")!@) option, to make sure the server
+responds with complete data. 
+
+
+
+    
+        
+            
+        
+        
+            
+        
+    
+
    command-line -c path
    mitmproxy shortcut c
    
diff --git a/doc-src/features/filters.html b/doc-src/features/filters.html
new file mode 100644
index 00000000..c7f0f78b
--- /dev/null
+++ b/doc-src/features/filters.html
@@ -0,0 +1,36 @@
+
+Many commands in __mitmproxy__ and __mitmdump__ take a filter expression.
+Filter expressions consist of the following operators:
+
+
+    
+    
+        
+            
+            
+        
+    
+    
+
    @!i[0]!@@!i[1]!@
    
+
+- Regexes are Python-style
+- Regexes can be specified as quoted strings
+- Header matching (~h, ~hq, ~hs) is against a string of the form "name: value".
+- Strings with no operators are matched against the request URL.
+- The default binary operator is &.
+
+Examples
+========
+
+URL containing "google.com":
+
+    google\.com
+
+Requests whose body contains the string "test":
+
+    ~q ~b test
+
+Anything but requests with a text/html content type:
+
+    !(~q & ~t \"text/html\")
+
diff --git a/doc-src/features/index.py b/doc-src/features/index.py
new file mode 100644
index 00000000..f7efc23a
--- /dev/null
+++ b/doc-src/features/index.py
@@ -0,0 +1,14 @@
+from countershape import Page
+
+pages = [
+    Page("anticache.html", "Anticache"),
+    Page("clientreplay.html", "Client-side replay"),
+    Page("filters.html", "Filter expressions"),
+    Page("setheaders.html", "Set Headers"),
+    Page("serverreplay.html", "Server-side replay"),
+    Page("sticky.html", "Sticky cookies and auth"),
+    Page("proxyauth.html", "Proxy Authentication"),
+    Page("replacements.html", "Replacements"),
+    Page("reverseproxy.html", "Reverse proxy mode"),
+    Page("upstreamcerts.html", "Upstream Certs"),
+]
diff --git a/doc-src/features/proxyauth.html b/doc-src/features/proxyauth.html
new file mode 100644
index 00000000..0618ee68
--- /dev/null
+++ b/doc-src/features/proxyauth.html
@@ -0,0 +1,25 @@
+
+
+Asks the user for authentication before they are permitted to use the proxy.
+Authentication headers are stripped from the flows, so they are not passed to
+upstream servers. For now, only HTTP Basic authentication is supported.
+
+
+    
+        
+            
+            
+        
+    
+
    command-line
+                
      
+                    
    • --nonanonymous
      • 
+
+                    
    • --singleuser USER
      • 
+
+                    
    • --htpasswd PATH
      • 
+                
    
+            
    
+
+
+
diff --git a/doc-src/features/replacements.html b/doc-src/features/replacements.html
new file mode 100644
index 00000000..c10fe2c3
--- /dev/null
+++ b/doc-src/features/replacements.html
@@ -0,0 +1,74 @@
+Mitmproxy lets you specify an arbitrary number of patterns that define text
+replacements within flows. Each pattern has 3 components: a filter that defines
+which flows a replacement applies to, a regular expression that defines what
+gets replaced, and a target value that defines what is substituted in.
+
+Replace hooks fire when either a client request or a server response is
+received. Only the matching flow component is affected: so, for example, if a
+replace hook is triggered on server response, the replacement is only run on
+the Response object leaving the Request intact. You control whether the hook
+triggers on the request, response or both using the filter pattern. If you need
+finer-grained control than this, it's simple to create a script using the
+replacement API on Flow components. 
+
+Replacement hooks are extremely handy in interactive testing of applications.
+For instance you can use a replace hook to replace the text "XSS" with a
+complicated XSS exploit, and then "inject" the exploit simply by interacting
+with the application through the browser. When used with tools like Firebug and
+mitmproxy's own interception abilities, replacement hooks can be an amazingly
+flexible and powerful feature. 
+
+
+## On the command-line
+
+The replacement hook command-line options use a compact syntax to make it easy
+to specify all three components at once. The general form is as follows:
+
+    /patt/regex/replacement
+
+Here, __patt__ is a mitmproxy filter expression, __regex__ is a valid Python
+regular expression, and __replacement__ is a string literal. The first
+character in the expression (__/__ in this case) defines what the separation
+character is. Here's an example of a valid expression that replaces "foo" with
+"bar" in all requests:
+
+    :~q:foo:bar
+
+In practice, it's pretty common for the replacement literal to be long and
+complex. For instance, it might be an XSS exploit that weighs in at hundreds or
+thousands of characters. To cope with this, there's a variation of the
+replacement hook specifier that lets you load the replacement text from a file.
+So, you might start __mitmdump__ as follows:
+
+
    +mitmdump --replace-from-file :~q:foo:~/xss-exploit
+
    
+
+This will load the replacement text from the file __~/xss-exploit__.
+
+Both the _--replace_ and _--replace-from-file_ flags can be passed multiple
+times.
+
+
+## Interactively
+
+The _R_ shortcut key in mitmproxy lets you add and edit replacement hooks using
+a built-in editor. The context-sensitive help (_h_) has complete usage
+information.
+
+
+    
+        
+            
+            
+        
+        
+            
+        
+    
+
    command-line
+                
      
+                    
    • --replace
      • 
+                    
    • --replace-from-file
      • 
+                
    
+            
    mitmproxy shortcut R
    
diff --git a/doc-src/features/reverseproxy.html b/doc-src/features/reverseproxy.html
new file mode 100644
index 00000000..524df083
--- /dev/null
+++ b/doc-src/features/reverseproxy.html
@@ -0,0 +1,17 @@
+
+In reverse proxy mode, mitmproxy acts as a standard HTTP server and forwards
+all requests to the specified upstream server. Note that the displayed URL for
+flows in this mode will use the value of the __Host__ header field from the
+request, not the reverse proxy server.
+
+
+
+    
+        
+            
+        
+        
+            
+        
+    
+
    command-line -P http[s]://hostname[:port]
    mitmproxy shortcut P
    
diff --git a/doc-src/features/serverreplay.html b/doc-src/features/serverreplay.html
new file mode 100644
index 00000000..1282be06
--- /dev/null
+++ b/doc-src/features/serverreplay.html
@@ -0,0 +1,35 @@
+
+- command-line: _-S path_ 
+- mitmproxy shortcut: _S_
+
+Server-side replay lets us replay server responses from a saved HTTP
+conversation.
+
+Matching requests with responses
+--------------------------------
+
+By default, __mitmproxy__ excludes request headers when matching incoming
+requests with responses from the replay file. This works in most circumstances,
+and makes it possible to replay server responses in situations where request
+headers would naturally vary, e.g. using a different user agent. The _--rheader
+headername_ command-line option allows you to override this behaviour by
+specifying individual headers that should be included in matching.
+
+
+Response refreshing
+-------------------
+
+Simply replaying server responses without modification will often result in
+unexpected behaviour. For example cookie timeouts that were in the future at
+the time a conversation was recorded might be in the past at the time it is
+replayed. By default, __mitmproxy__ refreshes server responses before sending
+them to the client. The __date__, __expires__ and __last-modified__ headers are
+all updated to have the same relative time offset as they had at the time of
+recording. So, if they were in the past at the time of recording, they will be
+in the past at the time of replay, and vice versa. Cookie expiry times are
+updated in a similar way.
+
+You can turn off response refreshing using the _--norefresh_ argument, or using
+the _o_ options shortcut within __mitmproxy__.
+
+
diff --git a/doc-src/features/setheaders.html b/doc-src/features/setheaders.html
new file mode 100644
index 00000000..b74525df
--- /dev/null
+++ b/doc-src/features/setheaders.html
@@ -0,0 +1,18 @@
+
+This feature lets you specify a set of headers to be added to requests or
+responses, based on a filter pattern. You can specify these either on the
+command-line, or through an interactive editor in mitmproxy.
+
+
+    
+        
+            
+            
+        
+        
+            
+        
+    
+
    command-line
+                --setheader PATTERN
+            
    mitmproxy shortcut H
    
diff --git a/doc-src/features/sticky.html b/doc-src/features/sticky.html
new file mode 100644
index 00000000..1b79f922
--- /dev/null
+++ b/doc-src/features/sticky.html
@@ -0,0 +1,62 @@
+
+## Sticky cookies
+
+When the sticky cookie option is set, __mitmproxy__ will add the cookie most
+recently set by the server to any cookie-less request. Consider a service that
+sets a cookie to track the session after authentication. Using sticky cookies,
+you can fire up mitmproxy, and authenticate to a service as you usually would
+using a browser. After authentication, you can request authenticated resources
+through mitmproxy as if they were unauthenticated, because mitmproxy will
+automatically add the session tracking cookie to requests. Among other things,
+this lets you script interactions with authenticated resources (using tools
+like wget or curl) without having to worry about authentication. 
+
+Sticky cookies are especially powerful when used in conjunction with [client
+replay](@!urlTo("clientreplay.html")!@) - you can record the authentication
+process once, and simply replay it on startup every time you need to interact
+with the secured resources.
+
+
+    
+        
+            
+            
+        
+        
+            
+        
+    
+
    command-line
+                
      
+                    
    • -t (sticky cookies on all requests)
      • 
+                    
    • -T FILTER (sticky cookies on requests matching filter
      • 
+                
    
+            
    mitmproxy shortcut t
    
+
+
+## Sticky auth
+
+The sticky auth option is analogous to the sticky cookie option, in that HTTP
+__Authorization__ headers are simply replayed to the server once they have been
+seen. This is enough to allow you to access a server resource using HTTP Basic
+authentication through the proxy. Note that __mitmproxy__ doesn't (yet) support
+replay of HTTP Digest authentication. 
+
+
+    
+        
+            
+            
+        
+        
+            
+        
+    
+
    command-line
+                
      
+                    
    • -u (sticky auth on all requests)
      • 
+                    
    • -U FILTER (sticky auth on requests matching filter
      • 
+                
    
+            
    mitmproxy shortcut u
    
+
+
diff --git a/doc-src/features/upstreamcerts.html b/doc-src/features/upstreamcerts.html
new file mode 100644
index 00000000..8de75ee3
--- /dev/null
+++ b/doc-src/features/upstreamcerts.html
@@ -0,0 +1,21 @@
+When mitmproxy receives a connection destined for an SSL-protected service, it
+freezes the connection before reading its request data, and makes a connection
+to the upstream server to "sniff" the contents of its SSL certificate. The
+information gained - the __Common Name__ and __Subject Alternative Names__ - is
+then used to generate the interception certificate, which is sent to the client
+so the connection can continue.
+
+This rather intricate little dance lets us seamlessly generate correct
+certificates even if the client has specifed only an IP address rather than the
+hostname. It also means that we don't need to sniff additional data to generate
+certs in transparent mode.
+
+Upstream cert sniffing is on by default, and can optionally be turned off.
+
+
+    
+        
+            
+        
+    
+
    command-line --no-upstream-cert
    
diff --git a/doc-src/filters.html b/doc-src/filters.html
deleted file mode 100644
index c7f0f78b..00000000
--- a/doc-src/filters.html
+++ /dev/null
@@ -1,36 +0,0 @@
-
-Many commands in __mitmproxy__ and __mitmdump__ take a filter expression.
-Filter expressions consist of the following operators:
-
-
-    
-    
-        
-            
-            
-        
-    
-    
-
    @!i[0]!@@!i[1]!@
    
-
-- Regexes are Python-style
-- Regexes can be specified as quoted strings
-- Header matching (~h, ~hq, ~hs) is against a string of the form "name: value".
-- Strings with no operators are matched against the request URL.
-- The default binary operator is &.
-
-Examples
-========
-
-URL containing "google.com":
-
-    google\.com
-
-Requests whose body contains the string "test":
-
-    ~q ~b test
-
-Anything but requests with a text/html content type:
-
-    !(~q & ~t \"text/html\")
-
diff --git a/doc-src/index.py b/doc-src/index.py
index f2a07db8..01b9363d 100644
--- a/doc-src/index.py
+++ b/doc-src/index.py
@@ -66,17 +66,6 @@ pages = [
     Page("mitmproxy.html", "mitmproxy"),
     Page("mitmdump.html", "mitmdump"),
 
-    Page("anticache.html", "Anticache"),
-    Page("clientreplay.html", "Client-side replay"),
-    Page("filters.html", "Filter expressions"),
-    Page("setheaders.html", "Set Headers"),
-    Page("serverreplay.html", "Server-side replay"),
-    Page("sticky.html", "Sticky cookies and auth"),
-    Page("proxyauth.html", "Proxy Authentication"),
-    Page("replacements.html", "Replacements"),
-    Page("reverseproxy.html", "Reverse proxy mode"),
-    Page("upstreamcerts.html", "Upstream Certs"),
-
     Page("ssl.html", "Overview"),
     Page("transparent.html", "Overview"),
     Directory("certinstall"),
diff --git a/doc-src/proxyauth.html b/doc-src/proxyauth.html
deleted file mode 100644
index 0618ee68..00000000
--- a/doc-src/proxyauth.html
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-Asks the user for authentication before they are permitted to use the proxy.
-Authentication headers are stripped from the flows, so they are not passed to
-upstream servers. For now, only HTTP Basic authentication is supported.
-
-
-    
-        
-            
-            
-        
-    
-
    command-line
-                
      
-                    
    • --nonanonymous
      • 
-
-                    
    • --singleuser USER
      • 
-
-                    
    • --htpasswd PATH
      • 
-                
    
-            
    
-
-
-
diff --git a/doc-src/replacements.html b/doc-src/replacements.html
deleted file mode 100644
index c10fe2c3..00000000
--- a/doc-src/replacements.html
+++ /dev/null
@@ -1,74 +0,0 @@
-Mitmproxy lets you specify an arbitrary number of patterns that define text
-replacements within flows. Each pattern has 3 components: a filter that defines
-which flows a replacement applies to, a regular expression that defines what
-gets replaced, and a target value that defines what is substituted in.
-
-Replace hooks fire when either a client request or a server response is
-received. Only the matching flow component is affected: so, for example, if a
-replace hook is triggered on server response, the replacement is only run on
-the Response object leaving the Request intact. You control whether the hook
-triggers on the request, response or both using the filter pattern. If you need
-finer-grained control than this, it's simple to create a script using the
-replacement API on Flow components. 
-
-Replacement hooks are extremely handy in interactive testing of applications.
-For instance you can use a replace hook to replace the text "XSS" with a
-complicated XSS exploit, and then "inject" the exploit simply by interacting
-with the application through the browser. When used with tools like Firebug and
-mitmproxy's own interception abilities, replacement hooks can be an amazingly
-flexible and powerful feature. 
-
-
-## On the command-line
-
-The replacement hook command-line options use a compact syntax to make it easy
-to specify all three components at once. The general form is as follows:
-
-    /patt/regex/replacement
-
-Here, __patt__ is a mitmproxy filter expression, __regex__ is a valid Python
-regular expression, and __replacement__ is a string literal. The first
-character in the expression (__/__ in this case) defines what the separation
-character is. Here's an example of a valid expression that replaces "foo" with
-"bar" in all requests:
-
-    :~q:foo:bar
-
-In practice, it's pretty common for the replacement literal to be long and
-complex. For instance, it might be an XSS exploit that weighs in at hundreds or
-thousands of characters. To cope with this, there's a variation of the
-replacement hook specifier that lets you load the replacement text from a file.
-So, you might start __mitmdump__ as follows:
-
-
    -mitmdump --replace-from-file :~q:foo:~/xss-exploit
-
    
-
-This will load the replacement text from the file __~/xss-exploit__.
-
-Both the _--replace_ and _--replace-from-file_ flags can be passed multiple
-times.
-
-
-## Interactively
-
-The _R_ shortcut key in mitmproxy lets you add and edit replacement hooks using
-a built-in editor. The context-sensitive help (_h_) has complete usage
-information.
-
-
-    
-        
-            
-            
-        
-        
-            
-        
-    
-
    command-line
-                
      
-                    
    • --replace
      • 
-                    
    • --replace-from-file
      • 
-                
    
-            
    mitmproxy shortcut R
    
diff --git a/doc-src/reverseproxy.html b/doc-src/reverseproxy.html
deleted file mode 100644
index 524df083..00000000
--- a/doc-src/reverseproxy.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-In reverse proxy mode, mitmproxy acts as a standard HTTP server and forwards
-all requests to the specified upstream server. Note that the displayed URL for
-flows in this mode will use the value of the __Host__ header field from the
-request, not the reverse proxy server.
-
-
-
-    
-        
-            
-        
-        
-            
-        
-    
-
    command-line -P http[s]://hostname[:port]
    mitmproxy shortcut P
    
diff --git a/doc-src/serverreplay.html b/doc-src/serverreplay.html
deleted file mode 100644
index 1282be06..00000000
--- a/doc-src/serverreplay.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-- command-line: _-S path_ 
-- mitmproxy shortcut: _S_
-
-Server-side replay lets us replay server responses from a saved HTTP
-conversation.
-
-Matching requests with responses
---------------------------------
-
-By default, __mitmproxy__ excludes request headers when matching incoming
-requests with responses from the replay file. This works in most circumstances,
-and makes it possible to replay server responses in situations where request
-headers would naturally vary, e.g. using a different user agent. The _--rheader
-headername_ command-line option allows you to override this behaviour by
-specifying individual headers that should be included in matching.
-
-
-Response refreshing
--------------------
-
-Simply replaying server responses without modification will often result in
-unexpected behaviour. For example cookie timeouts that were in the future at
-the time a conversation was recorded might be in the past at the time it is
-replayed. By default, __mitmproxy__ refreshes server responses before sending
-them to the client. The __date__, __expires__ and __last-modified__ headers are
-all updated to have the same relative time offset as they had at the time of
-recording. So, if they were in the past at the time of recording, they will be
-in the past at the time of replay, and vice versa. Cookie expiry times are
-updated in a similar way.
-
-You can turn off response refreshing using the _--norefresh_ argument, or using
-the _o_ options shortcut within __mitmproxy__.
-
-
diff --git a/doc-src/setheaders.html b/doc-src/setheaders.html
deleted file mode 100644
index b74525df..00000000
--- a/doc-src/setheaders.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-This feature lets you specify a set of headers to be added to requests or
-responses, based on a filter pattern. You can specify these either on the
-command-line, or through an interactive editor in mitmproxy.
-
-
-    
-        
-            
-            
-        
-        
-            
-        
-    
-
    command-line
-                --setheader PATTERN
-            
    mitmproxy shortcut H
    
diff --git a/doc-src/sticky.html b/doc-src/sticky.html
deleted file mode 100644
index 1b79f922..00000000
--- a/doc-src/sticky.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-## Sticky cookies
-
-When the sticky cookie option is set, __mitmproxy__ will add the cookie most
-recently set by the server to any cookie-less request. Consider a service that
-sets a cookie to track the session after authentication. Using sticky cookies,
-you can fire up mitmproxy, and authenticate to a service as you usually would
-using a browser. After authentication, you can request authenticated resources
-through mitmproxy as if they were unauthenticated, because mitmproxy will
-automatically add the session tracking cookie to requests. Among other things,
-this lets you script interactions with authenticated resources (using tools
-like wget or curl) without having to worry about authentication. 
-
-Sticky cookies are especially powerful when used in conjunction with [client
-replay](@!urlTo("clientreplay.html")!@) - you can record the authentication
-process once, and simply replay it on startup every time you need to interact
-with the secured resources.
-
-
-    
-        
-            
-            
-        
-        
-            
-        
-    
-
    command-line
-                
      
-                    
    • -t (sticky cookies on all requests)
      • 
-                    
    • -T FILTER (sticky cookies on requests matching filter
      • 
-                
    
-            
    mitmproxy shortcut t
    
-
-
-## Sticky auth
-
-The sticky auth option is analogous to the sticky cookie option, in that HTTP
-__Authorization__ headers are simply replayed to the server once they have been
-seen. This is enough to allow you to access a server resource using HTTP Basic
-authentication through the proxy. Note that __mitmproxy__ doesn't (yet) support
-replay of HTTP Digest authentication. 
-
-
-    
-        
-            
-            
-        
-        
-            
-        
-    
-
    command-line
-                
      
-                    
    • -u (sticky auth on all requests)
      • 
-                    
    • -U FILTER (sticky auth on requests matching filter
      • 
-                
    
-            
    mitmproxy shortcut u
    
-
-
diff --git a/doc-src/upstreamcerts.html b/doc-src/upstreamcerts.html
deleted file mode 100644
index 8de75ee3..00000000
--- a/doc-src/upstreamcerts.html
+++ /dev/null
@@ -1,21 +0,0 @@
-When mitmproxy receives a connection destined for an SSL-protected service, it
-freezes the connection before reading its request data, and makes a connection
-to the upstream server to "sniff" the contents of its SSL certificate. The
-information gained - the __Common Name__ and __Subject Alternative Names__ - is
-then used to generate the interception certificate, which is sent to the client
-so the connection can continue.
-
-This rather intricate little dance lets us seamlessly generate correct
-certificates even if the client has specifed only an IP address rather than the
-hostname. It also means that we don't need to sniff additional data to generate
-certs in transparent mode.
-
-Upstream cert sniffing is on by default, and can optionally be turned off.
-
-
-    
-        
-            
-        
-    
-
    command-line --no-upstream-cert
    
-- 
cgit v1.2.3


From 04552375a9b34564878854d7222cebf74f99c489 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi 
Date: Thu, 3 Jan 2013 08:30:22 +1300
Subject: Docs: remove proxydroid instructions from Android.

The "official way" is now to just use transparent mode.
---
 doc-src/certinstall/android-proxydroidinstall.png  | Bin 124917 -> 0 bytes
 doc-src/certinstall/android-proxydroidsettings.png | Bin 54150 -> 0 bytes
 doc-src/certinstall/android.html                   |  58 ++-------------------
 3 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 doc-src/certinstall/android-proxydroidinstall.png
 delete mode 100644 doc-src/certinstall/android-proxydroidsettings.png

(limited to 'doc-src')

diff --git a/doc-src/certinstall/android-proxydroidinstall.png b/doc-src/certinstall/android-proxydroidinstall.png
deleted file mode 100644
index f84c9eef..00000000
Binary files a/doc-src/certinstall/android-proxydroidinstall.png and /dev/null differ
diff --git a/doc-src/certinstall/android-proxydroidsettings.png b/doc-src/certinstall/android-proxydroidsettings.png
deleted file mode 100644
index 70a73d2d..00000000
Binary files a/doc-src/certinstall/android-proxydroidsettings.png and /dev/null differ
diff --git a/doc-src/certinstall/android.html b/doc-src/certinstall/android.html
index 3f57c39e..852938ce 100644
--- a/doc-src/certinstall/android.html
+++ b/doc-src/certinstall/android.html
@@ -4,9 +4,9 @@ embarrasment](http://code.google.com/p/android/issues/detail?id=1273).  It's
 scarcely credible, but Android didn't have a global proxy setting at all until
 quite recently, and it's still not supported on many common Android versions.
 In the meantime the app ecosystem has grown used to life without this basic
-necessity, and many apps merrily ignore it even if it's there. The upshot is
-that in many cases the only way to make interception work on Android is to do
-it without relying on the proxy settings.
+necessity, and many apps merrily ignore it even if it's there. This situation
+is improving, but in many circumstances using [transparent
+mode](@!urlTo("transparent.html")!@) is mandatory for testing Android apps.
 
 We used an Asus Transformer Prime TF201 with Android 4.0.3 in the examples
 below - your device may differ, but the broad process should be similar. 
@@ -16,7 +16,7 @@ Installing the mitmproxy certificate
 ====================================
 
 The first step is to install mitmproxy's interception certificate on the
-Android device. In your ~/.mitmproxy directory, there should be a file called
+Android device. In your ~/.mitmproxy directory, there is a file called
 __mitmproxy-ca-cert.cer__ - we need to transfer this file to
 __/sdcard/Downloads__ on the Android device. If this file doesn't exist for
 you, your certs were generated with an older version of mitmproxy - just copy
@@ -51,53 +51,3 @@ settings, you're just about done - simply configure the settings to point at
 mitmproxy. If not, proceed to the next step...
 
 
-Working around Android's proxy shortcomings
-===========================================
-
-In response to Android's proxy situation, a number of apps have been created to
-duct-tape proxy support onto the OS. These tools work by running a rudimentary
-local proxy on the device, and forwarding all traffic destined for HTTP/S ports
-to it using iptables. Since the proxy is running locally, it can detect what
-the final IP address of the redirected traffic would have been. The local proxy
-then connects to a user-configured upstream proxy, and initiates a proxy
-CONNECT request to the destination IP.
-
-Now, if the configured upstream proxy is mitmproxy, we have a slight problem.
-Proxy requests from the Android device in this scheme will specify only the
-destination IP address, __not__ the destination domain. Mitmproxy needs the
-target domain to generate a valid interception certificate. The solution is
-mitmproxy's [upstream certificate](@!urlTo("upstreamcerts.html")!@) option.
-When this is active, mitmproxy makes a connection to the upstream server to
-obtain the certificate Common Name and Subject Alternative Names. 
-
-Adding all this together, we can achieve reliable Android interception with
-only a few more minutes of setup. The instructions below show how to set up an
-Android device with
-[ProxyDroid](https://play.google.com/store/apps/details?id=org.proxydroid) (the
-local "duct-tape" proxy implementation) to achieve interception.
-
-Install ProxyDroid
-------------------
-
-First, root your device - this is required to install ProxyDroid. Then install
-ProxyDroid from the Google Play store:
-
-
-
-You will be prompted for super-user access, which you must allow. Next, enter
-the ProxyDroid settings, and change the proxy settings to point to your
-mitmproxy instance. When you're done, it should look something like this:
-
-
-
-In this case, our mitmproxy instance is at the host __maru.otago.ac.nz__,
-running on port __8080__.
-
-When you start mitmproxy, make sure that the upstream certificate option is set
-(use the _--upstream-cert_ command-line option, or enable it interactively
-using the _o_ shortcut):
-
-
    -mitmproxy --upstream-cert
-
    
-
-- 
cgit v1.2.3


From f5e49ef598f46257cc783e52ef4223a3461f1d84 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi 
Date: Thu, 3 Jan 2013 17:26:59 +1300
Subject: First draft of "How mitmproxy works", a complete guide to the
 mechanics of the proxy process

---
 doc-src/02-docstyle.css                        |    7 +
 doc-src/_explicit.graffle/data.plist           |  572 +++++++++++++
 doc-src/_explicit.graffle/image3.icns          |  Bin 0 -> 97327 bytes
 doc-src/_explicit.graffle/image6.tiff          |  Bin 0 -> 5075704 bytes
 doc-src/_explicit_https.graffle/data.plist     | 1054 +++++++++++++++++++++++
 doc-src/_explicit_https.graffle/image3.icns    |  Bin 0 -> 97327 bytes
 doc-src/_explicit_https.graffle/image6.tiff    |  Bin 0 -> 5075704 bytes
 doc-src/_layout.html                           |   53 +-
 doc-src/_transparent.graffle/data.plist        |  771 +++++++++++++++++
 doc-src/_transparent.graffle/image3.icns       |  Bin 0 -> 97327 bytes
 doc-src/_transparent.graffle/image6.tiff       |  Bin 0 -> 5075704 bytes
 doc-src/_transparent_https.graffle/data.plist  | 1096 ++++++++++++++++++++++++
 doc-src/_transparent_https.graffle/image3.icns |  Bin 0 -> 97327 bytes
 doc-src/_transparent_https.graffle/image6.tiff |  Bin 0 -> 5075704 bytes
 doc-src/explicit.png                           |  Bin 0 -> 65305 bytes
 doc-src/explicit_https.png                     |  Bin 0 -> 78951 bytes
 doc-src/howmitmproxy.html                      |  341 ++++++++
 doc-src/index.py                               |    3 +-
 doc-src/transparent.html                       |    2 -
 doc-src/transparent.png                        |  Bin 0 -> 69375 bytes
 doc-src/transparent_https.png                  |  Bin 0 -> 79758 bytes
 21 files changed, 3871 insertions(+), 28 deletions(-)
 create mode 100644 doc-src/_explicit.graffle/data.plist
 create mode 100644 doc-src/_explicit.graffle/image3.icns
 create mode 100644 doc-src/_explicit.graffle/image6.tiff
 create mode 100644 doc-src/_explicit_https.graffle/data.plist
 create mode 100644 doc-src/_explicit_https.graffle/image3.icns
 create mode 100644 doc-src/_explicit_https.graffle/image6.tiff
 create mode 100644 doc-src/_transparent.graffle/data.plist
 create mode 100644 doc-src/_transparent.graffle/image3.icns
 create mode 100644 doc-src/_transparent.graffle/image6.tiff
 create mode 100644 doc-src/_transparent_https.graffle/data.plist
 create mode 100644 doc-src/_transparent_https.graffle/image3.icns
 create mode 100644 doc-src/_transparent_https.graffle/image6.tiff
 create mode 100644 doc-src/explicit.png
 create mode 100644 doc-src/explicit_https.png
 create mode 100644 doc-src/howmitmproxy.html
 create mode 100644 doc-src/transparent.png
 create mode 100644 doc-src/transparent_https.png

(limited to 'doc-src')

diff --git a/doc-src/02-docstyle.css b/doc-src/02-docstyle.css
index 855899f6..ed83708a 100644
--- a/doc-src/02-docstyle.css
+++ b/doc-src/02-docstyle.css
@@ -4,6 +4,13 @@
     background: #000000;
 }
 
+
 pre {
+    margin-top: 10px;
     color: #333;
 }
+
+
+.tablenum {
+    font-weight: bold;
+}
diff --git a/doc-src/_explicit.graffle/data.plist b/doc-src/_explicit.graffle/data.plist
new file mode 100644
index 00000000..bc5ef104
--- /dev/null
+++ b/doc-src/_explicit.graffle/data.plist
@@ -0,0 +1,572 @@
+
+
+
+
+	ActiveLayerIndex
+	0
+	ApplicationVersion
+	
+		com.omnigroup.OmniGraffle.MacAppStore
+		139.16
+	
+	AutoAdjust
+	
+	BackgroundGraphic
+	
+		Bounds
+		{{0, 0}, {559.19998741149902, 782.79998779296875}}
+		Class
+		SolidGraphic
+		ID
+		2
+		Style
+		
+			shadow
+			
+				Draws
+				NO
+			
+			stroke
+			
+				Draws
+				NO
+			
+		
+	
+	BaseZoom
+	0
+	CanvasOrigin
+	{0, 0}
+	ColumnAlign
+	1
+	ColumnSpacing
+	36
+	CreationDate
+	2013-01-02 19:31:53 +0000
+	Creator
+	Aldo Cortesi
+	DisplayScale
+	1.000 cm = 1.000 cm
+	GraphDocumentVersion
+	8
+	GraphicsList
+	
+		
+			Class
+			LineGraphic
+			ID
+			4074
+			Points
+			
+				{300.4483540852865, 420.70833897590637}
+				{344.88497416178387, 420.70833897590654}
+				{362.21830749511713, 420.04167230923986}
+				{413.55166625976557, 419.70833905537921}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Class
+			LineGraphic
+			ID
+			4070
+			Points
+			
+				{84.896692911783873, 420.66667453447985}
+				{129.33331298828122, 420.66667453448002}
+				{146.66664632161454, 420.00000786781334}
+				{198.00000508626297, 419.66667461395269}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Bounds
+			{{326.00000000000023, 391.39999198913591}, {62, 24}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4063
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 2: Forwarded \
+Request}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{110, 403.39997863769622}, {49, 12}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4061
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 1: Request}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{430.83098347981803, 515.99999999999989}, {36, 14}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			ID
+			4026
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 Server}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{40.499999999999993, 486.66666666666663}, {31, 14}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			ID
+			4025
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 Client}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{417.16432189941418, 323.90565299479198}, {63.333332061767578, 185.52200317382812}}
+			Class
+			ShapedGraphic
+			ID
+			4004
+			ImageID
+			6
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+		
+		
+			Bounds
+			{{205.34386889139773, 289.33333333333331}, {84, 248.66667175292969}}
+			Class
+			ShapedGraphic
+			ID
+			4023
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Color
+					
+						b
+						0
+						g
+						0.463735
+						r
+						1
+					
+				
+			
+			Text
+			
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red37\green17\blue0;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf2 mitmproxy}
+			
+		
+		
+			Bounds
+			{{4.6666666467984399, 351.33332316080771}, {102.66666412353516, 130.66667175292969}}
+			Class
+			ShapedGraphic
+			ID
+			134
+			ImageID
+			3
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+		
+	
+	GridInfo
+	
+	GuidesLocked
+	NO
+	GuidesVisible
+	YES
+	HPages
+	1
+	ImageCounter
+	7
+	ImageLinkBack
+	
+		
+		
+	
+	ImageList
+	
+		image6.tiff
+		image3.icns
+	
+	KeepToScale
+	
+	Layers
+	
+		
+			Lock
+			NO
+			Name
+			Layer 1
+			Print
+			YES
+			View
+			YES
+		
+	
+	LayoutInfo
+	
+		Animate
+		NO
+		circoMinDist
+		18
+		circoSeparation
+		0.0
+		layoutEngine
+		dot
+		neatoSeparation
+		0.0
+		twopiSeparation
+		0.0
+	
+	LinksVisible
+	NO
+	MagnetsVisible
+	NO
+	MasterSheets
+	
+	ModificationDate
+	2013-01-03 02:27:49 +0000
+	Modifier
+	Aldo Cortesi
+	NotesVisible
+	NO
+	Orientation
+	2
+	OriginVisible
+	NO
+	PageBreaks
+	YES
+	PrintInfo
+	
+		NSBottomMargin
+		
+			float
+			41
+		
+		NSHorizonalPagination
+		
+			coded
+			BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG
+		
+		NSLeftMargin
+		
+			float
+			18
+		
+		NSPaperSize
+		
+			size
+			{595.19998741149902, 841.79998779296875}
+		
+		NSPrintReverseOrientation
+		
+			int
+			0
+		
+		NSRightMargin
+		
+			float
+			18
+		
+		NSTopMargin
+		
+			float
+			18
+		
+	
+	PrintOnePage
+	
+	ReadOnly
+	NO
+	RowAlign
+	1
+	RowSpacing
+	36
+	SheetTitle
+	Canvas 1
+	SmartAlignmentGuidesActive
+	YES
+	SmartDistanceGuidesActive
+	YES
+	UniqueID
+	1
+	UseEntirePage
+	
+	VPages
+	1
+	WindowInfo
+	
+		CurrentSheet
+		0
+		ExpandedCanvases
+		
+			
+				name
+				Canvas 1
+			
+		
+		Frame
+		{{300, 236}, {974, 874}}
+		ListView
+		
+		OutlineWidth
+		142
+		RightSidebar
+		
+		ShowRuler
+		
+		Sidebar
+		
+		SidebarWidth
+		120
+		VisibleRegion
+		{{0, 202}, {550, 469.33333333333337}}
+		Zoom
+		1.5
+		ZoomValues
+		
+			
+				Canvas 1
+				1.5
+				1
+			
+		
+	
+
+
diff --git a/doc-src/_explicit.graffle/image3.icns b/doc-src/_explicit.graffle/image3.icns
new file mode 100644
index 00000000..964df4b8
Binary files /dev/null and b/doc-src/_explicit.graffle/image3.icns differ
diff --git a/doc-src/_explicit.graffle/image6.tiff b/doc-src/_explicit.graffle/image6.tiff
new file mode 100644
index 00000000..bd6ed534
Binary files /dev/null and b/doc-src/_explicit.graffle/image6.tiff differ
diff --git a/doc-src/_explicit_https.graffle/data.plist b/doc-src/_explicit_https.graffle/data.plist
new file mode 100644
index 00000000..306630a0
--- /dev/null
+++ b/doc-src/_explicit_https.graffle/data.plist
@@ -0,0 +1,1054 @@
+
+
+
+
+	ActiveLayerIndex
+	0
+	ApplicationVersion
+	
+		com.omnigroup.OmniGraffle.MacAppStore
+		139.16
+	
+	AutoAdjust
+	
+	BackgroundGraphic
+	
+		Bounds
+		{{0, 0}, {559.19998741149902, 782.79998779296875}}
+		Class
+		SolidGraphic
+		ID
+		2
+		Style
+		
+			shadow
+			
+				Draws
+				NO
+			
+			stroke
+			
+				Draws
+				NO
+			
+		
+	
+	BaseZoom
+	0
+	CanvasOrigin
+	{0, 0}
+	ColumnAlign
+	1
+	ColumnSpacing
+	36
+	CreationDate
+	2013-01-02 19:31:53 +0000
+	Creator
+	Aldo Cortesi
+	DisplayScale
+	1.000 cm = 1.000 cm
+	GraphDocumentVersion
+	8
+	GraphicsList
+	
+		
+			Class
+			LineGraphic
+			ID
+			4075
+			Points
+			
+				{299.94835408528644, 473.66668184598285}
+				{344.38497416178376, 473.66668184598302}
+				{361.71830749511713, 473.00001517931634}
+				{413.05166625976557, 472.66668192545569}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Class
+			LineGraphic
+			ID
+			4074
+			Points
+			
+				{300.4483540852865, 420.70833897590637}
+				{344.88497416178387, 420.70833897590654}
+				{362.21830749511713, 420.04167230923986}
+				{413.55166625976557, 419.70833905537921}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					0
+					Legacy
+					
+					TailArrow
+					FilledArrow
+				
+			
+		
+		
+			Class
+			LineGraphic
+			ID
+			4073
+			Points
+			
+				{300.44835408528655, 367.66666611035561}
+				{344.88497416178393, 367.66666611035578}
+				{362.21830749511719, 366.99999944368909}
+				{413.55166625976568, 366.66666618982845}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Class
+			LineGraphic
+			ID
+			4072
+			Points
+			
+				{84.896697998046875, 526.66670727729809}
+				{129.33331807454422, 526.6667072772982}
+				{146.66665140787754, 526.00004061063157}
+				{198.00001017252598, 525.66670735677087}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Class
+			LineGraphic
+			ID
+			4071
+			Points
+			
+				{84.896687825520942, 472.91668446858688}
+				{197.99999491373694, 472.66668319702148}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					0
+					Legacy
+					
+					TailArrow
+					FilledArrow
+				
+			
+		
+		
+			Class
+			LineGraphic
+			ID
+			4070
+			Points
+			
+				{84.896692911783873, 420.66667453447985}
+				{129.33331298828122, 420.66667453448002}
+				{146.66664632161454, 420.00000786781334}
+				{198.00000508626297, 419.66667461395269}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Bounds
+			{{316.49998792012531, 326.66665395100904}, {65, 36}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4069
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 4: Initiate SSL \
+handshake \
+with SNI}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{317.00000000000006, 456.66707356770831}, {49, 12}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4067
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 8: Request}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{94.187746683756515, 509.33333333333331}, {49, 12}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4066
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 7: Request}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{94.1877466837567, 441.50006103515642}, {76, 24}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4065
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 6: Complete SSL\
+handshake}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{316.99998982747411, 403.66686820983904}, {64, 12}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4063
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 5: CN & SANs}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{94.187741597493542, 380.00018183390387}, {65, 36}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4061
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 3: Initiate SSL \
+handshake \
+with SNI}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{94.187745571136503, 338.66666666666669}, {84, 24}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4060
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 2: 200 Connection \
+Established}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{94.187741915384976, 283.66659164428717}, {64, 24}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4058
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 1: CONNECT \
+request}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Class
+			LineGraphic
+			ID
+			4041
+			Points
+			
+				{84.896692911783944, 366.91666793823208}
+				{198, 366.66666666666669}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					0
+					Legacy
+					
+					TailArrow
+					FilledArrow
+				
+			
+		
+		
+			Class
+			LineGraphic
+			ID
+			31
+			Points
+			
+				{84.896687825520857, 314.66666126251221}
+				{129.33330790201822, 314.66666126251238}
+				{146.66664123535153, 313.99999459584569}
+				{198, 313.66666134198505}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Bounds
+			{{430.83098347981803, 515.99999999999989}, {36, 14}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			ID
+			4026
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 Server}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{40.499999999999993, 486.66666666666663}, {31, 14}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			ID
+			4025
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 Client}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{417.16432189941418, 323.90565299479198}, {63.333332061767578, 185.52200317382812}}
+			Class
+			ShapedGraphic
+			ID
+			4004
+			ImageID
+			6
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+		
+		
+			Bounds
+			{{205.34386889139773, 289.33333333333331}, {84, 248.66667175292969}}
+			Class
+			ShapedGraphic
+			ID
+			4023
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Color
+					
+						b
+						0
+						g
+						0.463735
+						r
+						1
+					
+				
+			
+			Text
+			
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red37\green17\blue0;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf2 mitmproxy}
+			
+		
+		
+			Bounds
+			{{4.6666666467984399, 351.33332316080771}, {102.66666412353516, 130.66667175292969}}
+			Class
+			ShapedGraphic
+			ID
+			134
+			ImageID
+			3
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+		
+	
+	GridInfo
+	
+	GuidesLocked
+	NO
+	GuidesVisible
+	YES
+	HPages
+	1
+	ImageCounter
+	7
+	ImageLinkBack
+	
+		
+		
+	
+	ImageList
+	
+		image6.tiff
+		image3.icns
+	
+	KeepToScale
+	
+	Layers
+	
+		
+			Lock
+			NO
+			Name
+			Layer 1
+			Print
+			YES
+			View
+			YES
+		
+	
+	LayoutInfo
+	
+		Animate
+		NO
+		circoMinDist
+		18
+		circoSeparation
+		0.0
+		layoutEngine
+		dot
+		neatoSeparation
+		0.0
+		twopiSeparation
+		0.0
+	
+	LinksVisible
+	NO
+	MagnetsVisible
+	NO
+	MasterSheets
+	
+	ModificationDate
+	2013-01-03 02:14:45 +0000
+	Modifier
+	Aldo Cortesi
+	NotesVisible
+	NO
+	Orientation
+	2
+	OriginVisible
+	NO
+	PageBreaks
+	YES
+	PrintInfo
+	
+		NSBottomMargin
+		
+			float
+			41
+		
+		NSHorizonalPagination
+		
+			coded
+			BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG
+		
+		NSLeftMargin
+		
+			float
+			18
+		
+		NSPaperSize
+		
+			size
+			{595.19998741149902, 841.79998779296875}
+		
+		NSPrintReverseOrientation
+		
+			int
+			0
+		
+		NSRightMargin
+		
+			float
+			18
+		
+		NSTopMargin
+		
+			float
+			18
+		
+	
+	PrintOnePage
+	
+	ReadOnly
+	NO
+	RowAlign
+	1
+	RowSpacing
+	36
+	SheetTitle
+	Canvas 1
+	SmartAlignmentGuidesActive
+	YES
+	SmartDistanceGuidesActive
+	YES
+	UniqueID
+	1
+	UseEntirePage
+	
+	VPages
+	1
+	WindowInfo
+	
+		CurrentSheet
+		0
+		ExpandedCanvases
+		
+			
+				name
+				Canvas 1
+			
+		
+		Frame
+		{{271, 336}, {974, 874}}
+		ListView
+		
+		OutlineWidth
+		142
+		RightSidebar
+		
+		ShowRuler
+		
+		Sidebar
+		
+		SidebarWidth
+		120
+		VisibleRegion
+		{{0, 202}, {550, 469.33333333333337}}
+		Zoom
+		1.5
+		ZoomValues
+		
+			
+				Canvas 1
+				1.5
+				1
+			
+		
+	
+
+
diff --git a/doc-src/_explicit_https.graffle/image3.icns b/doc-src/_explicit_https.graffle/image3.icns
new file mode 100644
index 00000000..964df4b8
Binary files /dev/null and b/doc-src/_explicit_https.graffle/image3.icns differ
diff --git a/doc-src/_explicit_https.graffle/image6.tiff b/doc-src/_explicit_https.graffle/image6.tiff
new file mode 100644
index 00000000..bd6ed534
Binary files /dev/null and b/doc-src/_explicit_https.graffle/image6.tiff differ
diff --git a/doc-src/_layout.html b/doc-src/_layout.html
index a4e84bcc..d9ff6be1 100644
--- a/doc-src/_layout.html
+++ b/doc-src/_layout.html
@@ -19,42 +19,45 @@
         
      
             $!nav("index.html", this, state)!$
             $!nav("install.html", this, state)!$
-            $!nav("mitmproxy.html", this, state)!$
-            $!nav("mitmdump.html", this, state)!$
+            $!nav("howmitmproxy.html", this, state)!$
             $!nav("faq.html", this, state)!$
 
+            
    • Tools
      • 
+                $!nav("mitmproxy.html", this, state)!$
+                $!nav("mitmdump.html", this, state)!$
+
             
    • Features
      • 
-                    $!nav("anticache.html", this, state)!$
-                    $!nav("clientreplay.html", this, state)!$
-                    $!nav("filters.html", this, state)!$
-                    $!nav("proxyauth.html", this, state)!$
-                    $!nav("replacements.html", this, state)!$
-                    $!nav("serverreplay.html", this, state)!$
-                    $!nav("setheaders.html", this, state)!$
-                    $!nav("sticky.html", this, state)!$
-                    $!nav("reverseproxy.html", this, state)!$
-                    $!nav("upstreamcerts.html", this, state)!$
+                $!nav("anticache.html", this, state)!$
+                $!nav("clientreplay.html", this, state)!$
+                $!nav("filters.html", this, state)!$
+                $!nav("proxyauth.html", this, state)!$
+                $!nav("replacements.html", this, state)!$
+                $!nav("serverreplay.html", this, state)!$
+                $!nav("setheaders.html", this, state)!$
+                $!nav("sticky.html", this, state)!$
+                $!nav("reverseproxy.html", this, state)!$
+                $!nav("upstreamcerts.html", this, state)!$
 
             
    • SSL interception
      • 
-                    $!nav("ssl.html", this, state)!$
-                    $!nav("certinstall/firefox.html", this, state)!$
-                    $!nav("certinstall/osx.html", this, state)!$
-                    $!nav("certinstall/windows7.html", this, state)!$
-                    $!nav("certinstall/ios.html", this, state)!$
-                    $!nav("certinstall/android.html", this, state)!$
+                $!nav("ssl.html", this, state)!$
+                $!nav("certinstall/firefox.html", this, state)!$
+                $!nav("certinstall/osx.html", this, state)!$
+                $!nav("certinstall/windows7.html", this, state)!$
+                $!nav("certinstall/ios.html", this, state)!$
+                $!nav("certinstall/android.html", this, state)!$
 
             
    • Transparent Proxying
      • 
-                    $!nav("transparent.html", this, state)!$
-                    $!nav("transparent/linux.html", this, state)!$
-                    $!nav("transparent/osx.html", this, state)!$
+                $!nav("transparent.html", this, state)!$
+                $!nav("transparent/linux.html", this, state)!$
+                $!nav("transparent/osx.html", this, state)!$
 
              
    • Tutorials
      • 
-                    $!nav("tutorials/30second.html", this, state)!$
-                    $!nav("tutorials/gamecenter.html", this, state)!$
+                $!nav("tutorials/30second.html", this, state)!$
+                $!nav("tutorials/gamecenter.html", this, state)!$
 
             
    • Scripting mitmproxy
      • 
-                    $!nav("scripting/inlinescripts.html", this, state)!$
-                    $!nav("scripting/libmproxy.html", this, state)!$
+                $!nav("scripting/inlinescripts.html", this, state)!$
+                $!nav("scripting/libmproxy.html", this, state)!$
         
    
       
     
diff --git a/doc-src/_transparent.graffle/data.plist b/doc-src/_transparent.graffle/data.plist
new file mode 100644
index 00000000..722b4a44
--- /dev/null
+++ b/doc-src/_transparent.graffle/data.plist
@@ -0,0 +1,771 @@
+
+
+
+
+	ActiveLayerIndex
+	0
+	ApplicationVersion
+	
+		com.omnigroup.OmniGraffle.MacAppStore
+		139.16
+	
+	AutoAdjust
+	
+	BackgroundGraphic
+	
+		Bounds
+		{{0, 0}, {559.19998741149902, 782.79998779296875}}
+		Class
+		SolidGraphic
+		ID
+		2
+		Style
+		
+			shadow
+			
+				Draws
+				NO
+			
+			stroke
+			
+				Draws
+				NO
+			
+		
+	
+	BaseZoom
+	0
+	CanvasOrigin
+	{0, 0}
+	ColumnAlign
+	1
+	ColumnSpacing
+	36
+	CreationDate
+	2013-01-02 19:31:53 +0000
+	Creator
+	Aldo Cortesi
+	DisplayScale
+	1.000 cm = 1.000 cm
+	GraphDocumentVersion
+	8
+	GraphicsList
+	
+		
+			Bounds
+			{{101.18773396809897, 358.41662979125977}, {62, 12}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4079
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 2: Redirection}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{102.18775939941409, 405.16666666666663}, {78, 12}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4078
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 3: HTTP Request}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Class
+			LineGraphic
+			ControlPoints
+			
+				{-29.333333333333343, 15.666671991348267}
+				{-14, -7.3333333333333712}
+			
+			ID
+			37
+			Points
+			
+				{196.99999491373691, 331.83332316080725}
+				{198.00000508626303, 402.49998982747394}
+			
+			Style
+			
+				stroke
+				
+					Bezier
+					
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					LineType
+					1
+					TailArrow
+					0
+				
+			
+		
+		
+			Bounds
+			{{205.34387397766082, 289.3333333333328}, {84, 52.666667938232422}}
+			Class
+			ShapedGraphic
+			ID
+			4076
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Color
+					
+						b
+						0.547829
+						g
+						1
+						r
+						0.790866
+					
+				
+			
+			Text
+			
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red37\green17\blue0;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf2 router}
+			
+		
+		
+			Class
+			LineGraphic
+			ID
+			4075
+			Points
+			
+				{304.061024983724, 422.16667167345679}
+				{348.49764506022132, 422.16667167345696}
+				{365.83097839355469, 421.50000500679027}
+				{417.16433715820312, 421.16667175292963}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Bounds
+			{{321.11267089843761, 405.16706339518225}, {49, 12}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4067
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 4: Request}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{101.18773682912195, 295.66660690307623}, {62, 12}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4058
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 1: Connection}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Class
+			LineGraphic
+			ID
+			4041
+			Points
+			
+				{85.896713256836037, 421.41666793823208}
+				{199.00002034505209, 421.16666666666669}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Class
+			LineGraphic
+			ID
+			31
+			Points
+			
+				{84.896687825520857, 314.66666126251221}
+				{129.33330790201822, 314.66666126251238}
+				{146.66664123535153, 313.99999459584569}
+				{198, 313.66666134198505}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Bounds
+			{{430.83098347981803, 515.99999999999989}, {36, 14}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			ID
+			4026
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 Server}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{40.499999999999993, 486.66666666666663}, {31, 14}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			ID
+			4025
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 Client}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{417.16432189941418, 323.90565299479198}, {63.333332061767578, 185.52200317382812}}
+			Class
+			ShapedGraphic
+			ID
+			4004
+			ImageID
+			6
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+		
+		
+			Bounds
+			{{205.34386889139773, 289.33333333333331}, {84, 248.66667175292969}}
+			Class
+			ShapedGraphic
+			ID
+			4023
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Color
+					
+						b
+						0
+						g
+						0.463735
+						r
+						1
+					
+				
+			
+			Text
+			
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red37\green17\blue0;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf2 mitmproxy}
+			
+		
+		
+			Bounds
+			{{4.6666666467984399, 351.33332316080771}, {102.66666412353516, 130.66667175292969}}
+			Class
+			ShapedGraphic
+			ID
+			134
+			ImageID
+			3
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+		
+	
+	GridInfo
+	
+	GuidesLocked
+	NO
+	GuidesVisible
+	YES
+	HPages
+	1
+	ImageCounter
+	7
+	ImageLinkBack
+	
+		
+		
+	
+	ImageList
+	
+		image6.tiff
+		image3.icns
+	
+	KeepToScale
+	
+	Layers
+	
+		
+			Lock
+			NO
+			Name
+			Layer 1
+			Print
+			YES
+			View
+			YES
+		
+	
+	LayoutInfo
+	
+		Animate
+		NO
+		circoMinDist
+		18
+		circoSeparation
+		0.0
+		layoutEngine
+		dot
+		neatoSeparation
+		0.0
+		twopiSeparation
+		0.0
+	
+	LinksVisible
+	NO
+	MagnetsVisible
+	NO
+	MasterSheets
+	
+	ModificationDate
+	2013-01-03 04:13:10 +0000
+	Modifier
+	Aldo Cortesi
+	NotesVisible
+	NO
+	Orientation
+	2
+	OriginVisible
+	NO
+	PageBreaks
+	YES
+	PrintInfo
+	
+		NSBottomMargin
+		
+			float
+			41
+		
+		NSHorizonalPagination
+		
+			coded
+			BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG
+		
+		NSLeftMargin
+		
+			float
+			18
+		
+		NSPaperSize
+		
+			size
+			{595.19998741149902, 841.79998779296875}
+		
+		NSPrintReverseOrientation
+		
+			int
+			0
+		
+		NSRightMargin
+		
+			float
+			18
+		
+		NSTopMargin
+		
+			float
+			18
+		
+	
+	PrintOnePage
+	
+	ReadOnly
+	NO
+	RowAlign
+	1
+	RowSpacing
+	36
+	SheetTitle
+	Canvas 1
+	SmartAlignmentGuidesActive
+	YES
+	SmartDistanceGuidesActive
+	YES
+	UniqueID
+	1
+	UseEntirePage
+	
+	VPages
+	1
+	WindowInfo
+	
+		CurrentSheet
+		0
+		ExpandedCanvases
+		
+			
+				name
+				Canvas 1
+			
+		
+		Frame
+		{{295, 141}, {974, 874}}
+		ListView
+		
+		OutlineWidth
+		142
+		RightSidebar
+		
+		ShowRuler
+		
+		Sidebar
+		
+		SidebarWidth
+		120
+		VisibleRegion
+		{{0, 208}, {550, 469.33333333333337}}
+		Zoom
+		1.5
+		ZoomValues
+		
+			
+				Canvas 1
+				1.5
+				1
+			
+		
+	
+
+
diff --git a/doc-src/_transparent.graffle/image3.icns b/doc-src/_transparent.graffle/image3.icns
new file mode 100644
index 00000000..964df4b8
Binary files /dev/null and b/doc-src/_transparent.graffle/image3.icns differ
diff --git a/doc-src/_transparent.graffle/image6.tiff b/doc-src/_transparent.graffle/image6.tiff
new file mode 100644
index 00000000..bd6ed534
Binary files /dev/null and b/doc-src/_transparent.graffle/image6.tiff differ
diff --git a/doc-src/_transparent_https.graffle/data.plist b/doc-src/_transparent_https.graffle/data.plist
new file mode 100644
index 00000000..9c1395d7
--- /dev/null
+++ b/doc-src/_transparent_https.graffle/data.plist
@@ -0,0 +1,1096 @@
+
+
+
+
+	ActiveLayerIndex
+	0
+	ApplicationVersion
+	
+		com.omnigroup.OmniGraffle.MacAppStore
+		139.16
+	
+	AutoAdjust
+	
+	BackgroundGraphic
+	
+		Bounds
+		{{0, 0}, {559.19998741149902, 782.79998779296875}}
+		Class
+		SolidGraphic
+		ID
+		2
+		Style
+		
+			shadow
+			
+				Draws
+				NO
+			
+			stroke
+			
+				Draws
+				NO
+			
+		
+	
+	BaseZoom
+	0
+	CanvasOrigin
+	{0, 0}
+	ColumnAlign
+	1
+	ColumnSpacing
+	36
+	CreationDate
+	2013-01-02 19:31:53 +0000
+	Creator
+	Aldo Cortesi
+	DisplayScale
+	1.000 cm = 1.000 cm
+	GraphDocumentVersion
+	8
+	GraphicsList
+	
+		
+			Class
+			LineGraphic
+			ID
+			4075
+			Points
+			
+				{299.99999999999994, 470.90565482775372}
+				{344.43662007649726, 470.90565482775389}
+				{361.76995340983063, 470.23898816108721}
+				{413.10331217447907, 469.90565490722656}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Class
+			LineGraphic
+			ID
+			4074
+			Points
+			
+				{300.5, 417.94731195767724}
+				{344.93662007649738, 417.94731195767741}
+				{362.26995340983063, 417.28064529101073}
+				{413.60331217447907, 416.94731203715008}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					0
+					Legacy
+					
+					TailArrow
+					FilledArrow
+				
+			
+		
+		
+			Class
+			LineGraphic
+			ID
+			4073
+			Points
+			
+				{300.50000000000006, 364.90563909212648}
+				{344.93662007649743, 364.90563909212665}
+				{362.26995340983069, 364.23897242545996}
+				{413.60331217447919, 363.90563917159932}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Bounds
+			{{316.55163383483881, 323.90562693277991}, {65, 36}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4069
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 4: Initiate SSL \
+handshake \
+with SNI}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{317.05164591471356, 453.90604654947919}, {49, 12}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4067
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 8: Request}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{317.05163574218761, 400.90584119160991}, {64, 12}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4063
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 5: CN & SANs}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Class
+			LineGraphic
+			ID
+			4072
+			Points
+			
+				{85.333343505859332, 525.3331921100596}
+				{129.7699635823565, 525.3331921100596}
+				{147.10329691568987, 524.66652544339308}
+				{198.4366556803383, 524.33319218953238}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Class
+			LineGraphic
+			ID
+			4071
+			Points
+			
+				{85.3333333333334, 471.58316930134964}
+				{198.43664042154924, 471.33316802978419}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					0
+					Legacy
+					
+					TailArrow
+					FilledArrow
+				
+			
+		
+		
+			Class
+			LineGraphic
+			ID
+			4070
+			Points
+			
+				{85.33333841959633, 419.33315936724267}
+				{129.76995849609349, 419.33315936724279}
+				{147.10329182942687, 418.66649270057616}
+				{198.4366505940753, 418.33315944671557}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Bounds
+			{{97.957725524902315, 508.66666666666663}, {49, 12}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4066
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 7: Request}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{94.624392191569157, 440.16654586791918}, {76, 24}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4065
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 6: Complete SSL\
+handshake}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{94.624387105305999, 377.33333333333331}, {65, 36}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4061
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 3: Initiate SSL \
+handshake \
+with SNI}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{94.624387105305971, 344.58320871988946}, {62, 12}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4079
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 2: Redirection}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Class
+			LineGraphic
+			ControlPoints
+			
+				{-29.333333333333343, 15.666671991348267}
+				{-14, -7.3333333333333712}
+			
+			ID
+			37
+			Points
+			
+				{197.43664042154938, 317.99990208943694}
+				{198.4366505940755, 388.66656875610363}
+			
+			Style
+			
+				stroke
+				
+					Bezier
+					
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					LineType
+					1
+					TailArrow
+					0
+				
+			
+		
+		
+			Bounds
+			{{205.34387397766082, 289.3333333333328}, {84, 52.666667938232422}}
+			Class
+			ShapedGraphic
+			ID
+			4076
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Color
+					
+						b
+						0.547829
+						g
+						1
+						r
+						0.790866
+					
+				
+			
+			Text
+			
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red37\green17\blue0;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf2 router}
+			
+		
+		
+			Bounds
+			{{97.957725842793792, 284.99970499674527}, {62, 12}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			FontInfo
+			
+				Font
+				Helvetica
+				Size
+				12
+			
+			ID
+			4058
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs20 \cf0 1: Connection}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Class
+			LineGraphic
+			ID
+			31
+			Points
+			
+				{85.333333333333329, 300.8332401911419}
+				{129.76995340983069, 300.83324019114207}
+				{147.10328674316401, 300.16657352447538}
+				{198.43664550781247, 299.83324027061474}
+			
+			Style
+			
+				stroke
+				
+					HeadArrow
+					FilledArrow
+					Legacy
+					
+					TailArrow
+					0
+				
+			
+		
+		
+			Bounds
+			{{430.83098347981803, 515.99999999999989}, {36, 14}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			ID
+			4026
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 Server}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{40.499999999999993, 486.66666666666663}, {31, 14}}
+			Class
+			ShapedGraphic
+			FitText
+			YES
+			Flow
+			Resize
+			ID
+			4025
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+			Text
+			
+				Pad
+				0
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 Client}
+				VerticalPad
+				0
+			
+			Wrap
+			NO
+		
+		
+			Bounds
+			{{417.16432189941418, 323.90565299479198}, {63.333332061767578, 185.52200317382812}}
+			Class
+			ShapedGraphic
+			ID
+			4004
+			ImageID
+			6
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+		
+		
+			Bounds
+			{{205.34386889139773, 289.33333333333331}, {84, 248.66667175292969}}
+			Class
+			ShapedGraphic
+			ID
+			4023
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Color
+					
+						b
+						0
+						g
+						0.463735
+						r
+						1
+					
+				
+			
+			Text
+			
+				Text
+				{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red37\green17\blue0;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf2 mitmproxy}
+			
+		
+		
+			Bounds
+			{{4.6666666467984399, 351.33332316080771}, {102.66666412353516, 130.66667175292969}}
+			Class
+			ShapedGraphic
+			ID
+			134
+			ImageID
+			3
+			Shape
+			Rectangle
+			Style
+			
+				fill
+				
+					Draws
+					NO
+				
+				shadow
+				
+					Draws
+					NO
+				
+				stroke
+				
+					Draws
+					NO
+				
+			
+		
+	
+	GridInfo
+	
+	GuidesLocked
+	NO
+	GuidesVisible
+	YES
+	HPages
+	1
+	ImageCounter
+	7
+	ImageLinkBack
+	
+		
+		
+	
+	ImageList
+	
+		image6.tiff
+		image3.icns
+	
+	KeepToScale
+	
+	Layers
+	
+		
+			Lock
+			NO
+			Name
+			Layer 1
+			Print
+			YES
+			View
+			YES
+		
+	
+	LayoutInfo
+	
+		Animate
+		NO
+		circoMinDist
+		18
+		circoSeparation
+		0.0
+		layoutEngine
+		dot
+		neatoSeparation
+		0.0
+		twopiSeparation
+		0.0
+	
+	LinksVisible
+	NO
+	MagnetsVisible
+	NO
+	MasterSheets
+	
+	ModificationDate
+	2013-01-03 04:16:32 +0000
+	Modifier
+	Aldo Cortesi
+	NotesVisible
+	NO
+	Orientation
+	2
+	OriginVisible
+	NO
+	PageBreaks
+	YES
+	PrintInfo
+	
+		NSBottomMargin
+		
+			float
+			41
+		
+		NSHorizonalPagination
+		
+			coded
+			BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG
+		
+		NSLeftMargin
+		
+			float
+			18
+		
+		NSPaperSize
+		
+			size
+			{595.19998741149902, 841.79998779296875}
+		
+		NSPrintReverseOrientation
+		
+			int
+			0
+		
+		NSRightMargin
+		
+			float
+			18
+		
+		NSTopMargin
+		
+			float
+			18
+		
+	
+	PrintOnePage
+	
+	ReadOnly
+	NO
+	RowAlign
+	1
+	RowSpacing
+	36
+	SheetTitle
+	Canvas 1
+	SmartAlignmentGuidesActive
+	YES
+	SmartDistanceGuidesActive
+	YES
+	UniqueID
+	1
+	UseEntirePage
+	
+	VPages
+	1
+	WindowInfo
+	
+		CurrentSheet
+		0
+		ExpandedCanvases
+		
+			
+				name
+				Canvas 1
+			
+		
+		Frame
+		{{869, 248}, {974, 874}}
+		ListView
+		
+		OutlineWidth
+		142
+		RightSidebar
+		
+		ShowRuler
+		
+		Sidebar
+		
+		SidebarWidth
+		120
+		VisibleRegion
+		{{0, 208}, {550, 469.33333333333337}}
+		Zoom
+		1.5
+		ZoomValues
+		
+			
+				Canvas 1
+				1.5
+				1
+			
+		
+	
+
+
diff --git a/doc-src/_transparent_https.graffle/image3.icns b/doc-src/_transparent_https.graffle/image3.icns
new file mode 100644
index 00000000..964df4b8
Binary files /dev/null and b/doc-src/_transparent_https.graffle/image3.icns differ
diff --git a/doc-src/_transparent_https.graffle/image6.tiff b/doc-src/_transparent_https.graffle/image6.tiff
new file mode 100644
index 00000000..bd6ed534
Binary files /dev/null and b/doc-src/_transparent_https.graffle/image6.tiff differ
diff --git a/doc-src/explicit.png b/doc-src/explicit.png
new file mode 100644
index 00000000..c9ba26a7
Binary files /dev/null and b/doc-src/explicit.png differ
diff --git a/doc-src/explicit_https.png b/doc-src/explicit_https.png
new file mode 100644
index 00000000..1f1ca023
Binary files /dev/null and b/doc-src/explicit_https.png differ
diff --git a/doc-src/howmitmproxy.html b/doc-src/howmitmproxy.html
new file mode 100644
index 00000000..6ea723cd
--- /dev/null
+++ b/doc-src/howmitmproxy.html
@@ -0,0 +1,341 @@
+
+TODO:
+
+- Clarify terminology: SSL vs TLS
+
+
+Mitmproxy is an enormously flexible tool. Knowing exactly how the proxying
+process works will help you deploy it more creatively, and let you understand
+its fundamental assumptions and how to work around them. This document explains
+mitmproxy's proxy mechanism by example, starting with the simplest explicit
+proxy configuration, and working up to the most complicated interaction -
+transparent proxying of SSL-protected traffic in the presence of SNI.
+
+
+
    
+    
    Explicit HTTP
    
+
    
+
+Configuring the client to use mitmproxy as an explicit proxy is the simplest
+and most reliable way to intercept traffic. The proxy protocol is codified in
+the [HTTP RFC](http://www.ietf.org/rfc/rfc2068.txt), so the behaviour of both
+the client and the server is well defined, and usually reliable. In the
+simplest possible interaction with mitmproxy, a client connects directly to the
+proxy, and makes a request that looks like this: 
+
+
    GET http://example.com/index.html HTTP/1.1
     
+                
+This is a proxy GET request - an extended form of the vanilla HTTP GET request
+that includes a schema and host specification, and it includes all the
+information mitmproxy needs to proceed. 
+
+
+
+
+    
+        
+
+            
+
+            
+
+        
+
+        
+
+             
+
+            
+
+        
+    
+
    1The client connects to the proxy and makes a request.
    2Mitmproxy connects to the upstream server and simply forwards
+            the request on.
    
+
+
+
    
+    
    Explicit HTTPS
    
+
    
+
+The process for an explicitly proxied HTTPS connection is quite different. The
+client connects to the proxy and makes a request that looks like this:
+
+
    CONNECT example.com:443 HTTP/1.1
    
+
+A conventional proxy can neither view nor manipulate an SSL-encrypted data
+stream, so a CONNECT request simply asks the proxy to open a pipe between the
+client and server. The proxy here is just a facilitator - it blindly forwards
+data in both directions without knowing anything about the contents. The
+negotiation of the SSL connection happens over this pipe, and the subsequent
+flow of requests and responses are completely opaque to the proxy.
+
+## The MITM in mitmproxy
+
+This is where mitmproxy's fundamental trick comes in to play. The MITM in its
+name stands for Man-In-The-Middle - a reference to the process we use to
+intercept and interfere with these theoretially opaque data streams. The basic
+idea is to pretend to be the server to the client, and pretend to be the client
+to the server. The tricky part is that the Certificate Authority system is
+designed to prevent exactly this attack, by allowing a trusted third-party to
+cryptographically sign a server's SSL certificates to verify that the certs are
+legit. If this signature is from a non-trusted party, a secure client will
+simply drop the connection and refuse to proceed. Despite the many shortcomings
+of the CA system as it exists today, this is usually fatal to attempts to MITM
+an SSL connection for analysis.
+
+Our answer to this conundrum is to become a trusted Certificate Authority
+ourselves. Mitmproxy includes a full CA implementation that generates
+interception certificates on the fly. To get the client to trust these
+certificates, we register mitmproxy as a CA with the device manually.
+
+## Complication 1: What's the remote hostname? 
+
+To proceed with this plan, we need to know the domain name to use in the
+interception certificate - the client will verify that the certificate is for
+the domain it's connecting to, and abort if this is not the case. At first
+blush, it seems that the CONNECT request above gives us all we need - in this
+example, both of these values are "example.com".  But what if the client had
+initiated the connection as follows: 
+
+
    CONNECT 10.1.1.1:443 HTTP/1.1
    
+
+Using the IP address is perfectly legitimate because it gives us enough
+information to initiate the pipe, even though it doesn't reveal the remote
+hostname. 
+
+Mitmproxy has a cunning mechanism that smooths this over - upstream certificate
+sniffing. As soon as we see the CONNECT request, we pause the client part of
+the conversation, and initiate a simultaneous connection to the server. We
+complete the SSL handshake with the server, and inspect the certificates it
+used. Now, we use the Common Name in the upstream SSL certificates to generate
+the dummy certificate for the client. Voila, we have the correct hostname to
+present to the client, even if it was never specified.
+
+
+## Complication 2: Subject Alternate Name
+
+Enter the next complication. Sometimes, the certificate Common Name is not, in
+fact, the hostname that the client is connecting to. This is because of the
+optional Subject Alternate Name field in the SSL certificate that allows an
+arbitrary number of alternate domains to be specified. If the expected domain
+matches any of these, the client wil proceed, even though the domain doesn't
+match the certificate Common Name. The answer here is simple: when extract the
+CN from the upstream cert, we also extract the SANs, and add them to the
+generated dummy certificate.
+
+
+## Complication 3: Server Name Indication
+
+One of the big limitations of conventional SSL is that each certificate
+requires its own IP address. This means that you couldn't do virtual hosting
+where multiple domains with independent certificates share the same IP address.
+In a world with a rapidly shrinking IPv4 address pool this is a problem, and we
+have a solution in the form of the Server Name Indication extension to the SSL
+and TLS protocols. This lets the client specify the remote server name at the
+start of the SSL handshake, which then lets the server select the right
+certificate to complete the process.
+
+SNI breaks our upstream certificate sniffing process, because when we connect
+without using SNI, we get served a default certificate that may have nothing to
+do with the certificate expected by the client. The solution is another tricky
+complication to the client connection process. After the client connects, we
+allow the SSL handshake to continue until just _after_ the SNI value has been
+passed to us. Now we can pause the conversation, and initiate an upstream
+connection using the correct SNI value, which then serves us the correct
+upstream certificate, from which we can extract the expected CN and SANs.
+
+
+## Putting it all together
+
+Lets put all of this together into the complete explicitly proxied HTTPS flow. 
+
+
+
+
+    
+        
+             
+            
+        
+        
+             
+
+            
+        
+        
+             
+
+            
+        
+
+        
+             
+
+            
+            
+        
+        
+             
+
+            
+        
+        
+             
+
+            
+        
+        
+             
+
+            
+        
+        
+             
+
+            
+        
+    
+
    1The client makes a connection to mitmproxy, and issues an HTTP
+            CONNECT request.
    2Mitmproxy responds with a 200 Connection Established, as if it
+            has set up the CONNECT pipe.
    3The client believes it's talking to the remote server, and
+            initiates the SSL connection. It uses SNI to indicate the hostname
+            it is connecting to.
    4Mitmproxy connects to the server, and establishes an SSL
+            connection using the SNI hostname indicated by the client.
    5The server responds with the matching SSL certificate, which
+            contains the CN and SAN values needed to generate the interception
+            certificate.
    6Mitmproxy generates the interception cert, and continues the
+            client SSL handshake paused in step 3.
    7The client sends the request over the established SSL
+            connection.
    7Mitmproxy passes the request on to the server over the SSL
+            connection initiated in step 4.
    
+
+
+
    
+    
    Transparent HTTP
    
+
    
+
+When a transparent proxy is used, the HTTP/S connection is redirected into a
+proxy at the network layer, without any client configuration being required.
+This makes transparent proxying ideal for those situations where you can't
+change client behaviour - proxy-oblivious Android applications being a common
+example.
+
+To achieve this, we need to introduce two extra components. The first new
+component is a router that transparently redirects the TCP connection to the
+proxy. Once the client has initiated the connection, it makes a vanilla HTTP
+request, which might look something like this:
+
+
    GET /index.html HTTP/1.1
     
+
+Note that this request differs from the explicit proxy variation, in that it
+omits the scheme and hostname. How, then, do we know which upstream host to
+forward the request to? The routing mechanism that has performed the
+redirection keeps track of the original destination. Each different routing
+mechanism has its own ideosyncratic way of exposing this data, so this
+introduces the second component required for working transparent proxying: a
+host module that knows how to retrieve the original destination address from
+the router. Once we have this information, the process is fairly
+straight-forward.
+
+
+
+
+
+    
+        
+             
+            
+        
+        
+             
+
+            
+        
+        
+             
+
+            
+        
+
+        
+             
+
+            
+            
+        
+    
+
    1The client makes a connection to the server.
    2The router redirects the connection to mitmproxy, which is
+            typically listening on a local port of the same host. Mitmproxy
+            then consults the routing mechanism to establish what the original
+            destination was.
    3Now, we simply read the client's request...
    4... and forward it upstream.
    
+
+
    
+    
    Transparent HTTPS
    
+
    
+
+The process for transparently proxying an HTTPS request is a merger of the
+methods we've outlined for transparently proxying HTTP, and explicitly proxying
+HTTPS. We use the routing mechanism to establish the upstream server address,
+and then proceed as for explit HTTPS connections to establish the CN and SANs,
+and cope with SNI.
+
+
+
+
+
+    
+        
+             
+            
+        
+        
+             
+
+            
+        
+        
+             
+
+            
+        
+
+        
+             
+
+            
+            
+        
+        
+             
+
+            
+        
+        
+             
+
+            
+        
+        
+             
+
+            
+        
+        
+             
+
+            
+        
+    
+
    1The client makes a connection to the server.
    2The router redirects the connection to mitmproxy, which is
+            typically listening on a local port of the same host. Mitmproxy
+            then consults the routing mechanism to establish what the original
+            destination was.
    3The client believes it's talking to the remote server, and
+            initiates the SSL connection. It uses SNI to indicate the hostname
+            it is connecting to.
    4Mitmproxy connects to the server, and establishes an SSL
+            connection using the SNI hostname indicated by the client.
    5The server responds with the matching SSL certificate, which
+            contains the CN and SAN values needed to generate the interception
+            certificate.
    6Mitmproxy generates the interception cert, and continues the
+            client SSL handshake paused in step 3.
    7The client sends the request over the established SSL
+            connection.
    7Mitmproxy passes the request on to the server over the SSL
+            connection initiated in step 4.
    
+
+
+
diff --git a/doc-src/index.py b/doc-src/index.py
index 01b9363d..930037ec 100644
--- a/doc-src/index.py
+++ b/doc-src/index.py
@@ -65,12 +65,13 @@ pages = [
     Page("install.html", "Installation"),
     Page("mitmproxy.html", "mitmproxy"),
     Page("mitmdump.html", "mitmdump"),
+    Page("howmitmproxy.html", "How mitmproxy works"),
 
     Page("ssl.html", "Overview"),
-    Page("transparent.html", "Overview"),
     Directory("certinstall"),
     Directory("scripting"),
     Directory("tutorials"),
+    Page("transparent.html", "Overview"),
     Directory("transparent"),
     Page("faq.html", "FAQ"),
 ]
diff --git a/doc-src/transparent.html b/doc-src/transparent.html
index 9e77d70d..e69de29b 100644
--- a/doc-src/transparent.html
+++ b/doc-src/transparent.html
@@ -1,2 +0,0 @@
-
-Foo
diff --git a/doc-src/transparent.png b/doc-src/transparent.png
new file mode 100644
index 00000000..3994d681
Binary files /dev/null and b/doc-src/transparent.png differ
diff --git a/doc-src/transparent_https.png b/doc-src/transparent_https.png
new file mode 100644
index 00000000..559cddd2
Binary files /dev/null and b/doc-src/transparent_https.png differ
-- 
cgit v1.2.3


From fb7526fc4f133e9c8c0957ed4d6ab35972110e6d Mon Sep 17 00:00:00 2001
From: Andy Smith 
Date: Fri, 11 Jan 2013 15:05:40 -0600
Subject: fix some syntax / formatting in the docs

---
 doc-src/scripting/inlinescripts.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'doc-src')

diff --git a/doc-src/scripting/inlinescripts.html b/doc-src/scripting/inlinescripts.html
index 860ad9b6..7abf743c 100644
--- a/doc-src/scripting/inlinescripts.html
+++ b/doc-src/scripting/inlinescripts.html
@@ -1,4 +1,3 @@
-
 __mitmproxy__ has a powerful scripting API that allows you to modify flows
 on-the-fly or rewrite previously saved flows locally. 
 
@@ -22,13 +21,13 @@ response itself.
 Called once on startup, before any other events.
 
 
-###clientconnect(ScriptContext, ClientConnect)
+### clientconnect(ScriptContext, ClientConnect)
 
 Called when a client initiates a connection to the proxy. Note that
 a connection can correspond to multiple HTTP requests.
 
 
-###request(ScriptContext, Flow)
+### request(ScriptContext, Flow)
 
 Called when a client request has been received. The __Flow__ object is
 guaranteed to have a non-None __request__ attribute.
-- 
cgit v1.2.3