From dffe075bb3e375888e748460187d91f0416590da Mon Sep 17 00:00:00 2001 From: Dominic Dagradi Date: Sun, 27 Mar 2011 17:50:55 -0400 Subject: [PATCH 1/4] don't break the type hierarchy to add contrast, use color --- public/s/screen.css | 2 +- views/screen.scss | 2 +- views/stylesheets/content.scss | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/public/s/screen.css b/public/s/screen.css index 42597460..b941b499 100644 --- a/public/s/screen.css +++ b/public/s/screen.css @@ -1 +1 @@ -html,body{margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline}html{font-size:100.01%}div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,pre,a,abbr,acronym,address,code,del,dfn,em,img,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,caption,tbody,tfoot,thead,tr{margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline}blockquote,q{margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;quotes:"" ""}blockquote:before,blockquote:after,q:before,q:after{content:""}th,td,caption{margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;text-align:left;font-weight:normal;vertical-align:middle}table{margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;border-collapse:separate;border-spacing:0;vertical-align:middle}a img{border:none}.box{padding:1.5em;margin-bottom:1.5em;background:#e5ecf9}div.border{padding-right:4px;margin-right:5px;border-right:1px solid #eeeeee}div.colborder{padding-right:24px;margin-right:25px;border-right:1px solid #eeeeee}hr{background:#dddddd;color:#dddddd;clear:both;float:none;width:100%;height:0.1em;margin:0 0 1.45em;border:none}hr.space{background:#dddddd;color:#dddddd;clear:both;float:none;width:100%;height:0.1em;margin:0 0 1.45em;border:none;background:white;color:white;visibility:hidden}form.inline{line-height:3}form.inline p{margin-bottom:0}body .clear{clear:both}body .nowrap{white-space:nowrap}body .clearfix{overflow:hidden;*zoom:1}body .small{font-size:0.8em;margin-bottom:1.875em;line-height:1.875em}body .large{font-size:1.2em;line-height:2.5em;margin-bottom:1.25em}body .first{margin-left:0;padding-left:0}body .last{margin-right:0;padding-right:0}body .top{margin-top:0;padding-top:0}body .bottom{margin-bottom:0;padding-bottom:0}body .error{padding:0.8em;margin-bottom:1em;border:2px solid #dddddd;background:#fbe3e4;color:#8a1f11;border-color:#fbc2c4}body .error a{color:#8a1f11}body .notice{padding:0.8em;margin-bottom:1em;border:2px solid #dddddd;background:#fff6bf;color:#514721;border-color:#ffd324}body .notice a{color:#514721}body .success{padding:0.8em;margin-bottom:1em;border:2px solid #dddddd;background:#e6efc2;color:#264409;border-color:#c6d880}body .success a{color:#264409}body .hide{display:none}body .highlight{background:yellow}body .added{background:#006600;color:white}body .removed{background:#990000;color:white}.button{display:inline-block;padding:7px 9px;font-size:12px;line-height:1;color:#3C3C3D;text-shadow:1px 1px 0 #FFFFFF;background:#ececec url("/images/css3buttons_backgrounds.png") 0 0 no-repeat;white-space:nowrap;overflow:visible;cursor:pointer;text-decoration:none;border:1px solid #CACACA;-webkit-border-radius:2px;-moz-border-radius:2px;-webkit-background-clip:padding-box;border-radius:2px;outline:none;position:relative;zoom:1;*display:inline}.button.primary{font-weight:bold}.button:hover{color:#FFFFFF;border-color:#4c9092;text-decoration:none;text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);background-position:0 -40px;background-color:#378284}.button:active,.button.active{background-position:0 -81px;border-color:#4c9092;background-color:#378284;color:#FFFFFF;text-shadow:none}.button:active{top:1px}.button.negative:hover{color:#FFFFFF;background-position:0 -121px;background-color:#D84743;border-color:#911D1B}.button.negative:active,.button.negative.active{background-position:0 -161px;background-color:#A5211E;border-color:#911D1B}.button.pill{-webkit-border-radius:19px;-moz-border-radius:19px;border-radius:19px;padding:6px 12px}.button.left{-webkit-border-bottom-right-radius:0px;-webkit-border-top-right-radius:0px;-moz-border-radius-bottomright:0px;-moz-border-radius-topright:0px;border-bottom-right-radius:0px;border-top-right-radius:0px;margin-right:0px}.button.middle{margin-right:0px;margin-left:0px;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;border-left:none}.button.right{-webkit-border-bottom-left-radius:0px;-webkit-border-top-left-radius:0px;-moz-border-radius-bottomleft:0px;-moz-border-radius-topleft:0px;border-top-left-radius:0px;border-bottom-left-radius:0px;margin-left:0px;border-left:none}.button.left:active,.button.middle:active,.button.right:active{top:0px}.button.big{font-size:16px;padding:7px 16px}.button span.icon{display:inline-block;width:12px;height:12px;margin:auto 4px auto auto;position:relative;top:1px;background-image:url("/images/css3buttons_icons.png");background-repeat:no-repeat}a.big.button span.icon{top:0px}.button span.icon.book{background-position:0 0}.button:hover span.icon.book{background-position:0 -15px}.button span.icon.calendar{background-position:0 -30px}.button:hover span.icon.calendar{background-position:0 -45px}.button span.icon.chat{background-position:0 -60px}.button:hover span.icon.chat{background-position:0 -75px}.button span.icon.check{background-position:0 -90px}.button:hover span.icon.check{background-position:0 -103px}.button span.icon.clock{background-position:0 -116px}.button:hover span.icon.clock{background-position:0 -131px}.button span.icon.cog{background-position:0 -146px}.button:hover span.icon.cog{background-position:0 -161px}.button span.icon.comment{background-position:0 -176px}.button:hover span.icon.comment{background-position:0 -190px}.button span.icon.cross{background-position:0 -204px}.button:hover span.icon.cross{background-position:0 -219px}.button span.icon.downarrow{background-position:0 -234px}.button:hover span.icon.downarrow{background-position:0 -249px}.button span.icon.fork{background-position:0 -264px}.button:hover span.icon.fork{background-position:0 -279px}.button span.icon.heart{background-position:0 -294px}.button:hover span.icon.heart{background-position:0 -308px}.button span.icon.home{background-position:0 -322px}.button:hover span.icon.home{background-position:0 -337px}.button span.icon.key{background-position:0 -352px}.button:hover span.icon.key{background-position:0 -367px}.button span.icon.leftarrow{background-position:0 -382px}.button:hover span.icon.leftarrow{background-position:0 -397px}.button span.icon.lock{background-position:0 -412px}.button:hover span.icon.lock{background-position:0 -427px}.button span.icon.loop{background-position:0 -442px}.button:hover span.icon.loop{background-position:0 -457px}.button span.icon.magnifier{background-position:0 -472px}.button:hover span.icon.magnifier{background-position:0 -487px}.button span.icon.mail{background-position:0 -500px}.button:hover span.icon.mail{background-position:0 -512px}.button span.icon.move{background-position:0 -526px}.button:hover span.icon.move{background-position:0 -541px}.button span.icon.pen{background-position:0 -556px}.button:hover span.icon.pen{background-position:0 -571px}.button span.icon.pin{background-position:0 -586px}.button:hover span.icon.pin{background-position:0 -601px}.button span.icon.plus{background-position:0 -616px}.button:hover span.icon.plus{background-position:0 -631px}.button span.icon.reload{background-position:0 -646px}.button:hover span.icon.reload{background-position:0 -660px}.button span.icon.rightarrow{background-position:0 -674px}.button:hover span.icon.rightarrow{background-position:0 -689px}.button span.icon.rss{background-position:0 -704px}.button:hover span.icon.rss{background-position:0 -719px}.button span.icon.tag{background-position:0 -734px}.button:hover span.icon.tag{background-position:0 -749px}.button span.icon.trash{background-position:0 -764px}.button:hover span.icon.trash{background-position:0 -779px}.button span.icon.unlock{background-position:0 -794px}.button:hover span.icon.unlock{background-position:0 -809px}.button span.icon.twitter{background-position:0 -824px}.button:hover span.icon.twitter{background-position:0 -839px}.button span.icon.facebook{width:8px;background-position:0 -854px}.button:hover span.icon.facebook{width:8px;background-position:0 -869px}body{line-height:1.5}p{margin-bottom:1.5em}a{color:#65bfc2;text-decoration:none}a:hover{text-decoration:underline}h1,h2,h3,h4,h5{font-family:"Arial Black", Arial, sans-serif}h1{font-size:3em;line-height:1;margin-bottom:0.50em}h2{font-size:2em;margin-bottom:0.75em}h3{font-size:1.5em;line-height:1;margin-bottom:1.00em}h4{font-size:1.2em;line-height:1.25;margin-bottom:1.25em}h5{font-size:1em;font-weight:bold;margin-bottom:1.50em}h6{font-size:1em;font-weight:bold}label{font-weight:bold}body{background-color:white;font-family:Arial, sans-serif;font-size:12px;padding:0}#main{background:#f3f3f3;width:950px;margin:0 auto;overflow:hidden;*zoom:1;padding-top:3em;margin-top:0;padding-bottom:2em}#flash,#error{padding:0.75em;font-size:1.2em;color:white;background:#aaa;margin-bottom:1em}#error{background:#990000}#error p{margin:0.5em 0}#error a{color:#66ffff}body#home #header{overflow:hidden;*zoom:1}body#home #header h2#logo{display:inline;float:left;margin-right:10px;width:670px}* html body#home #header h2#logo{overflow-x:hidden}body#home #header #login{display:inline;float:left;margin-right:10px;width:270px;margin-right:0}* html body#home #header #login{overflow-x:hidden}body#home #pitch{overflow:hidden;*zoom:1}body#home #pitch .col{display:inline;float:left;margin-right:10px;width:310px}* html body#home #pitch .col{overflow-x:hidden}body#home #pitch .last-col{margin-right:0}body#home #home-bottom #manifesto{display:inline;float:left;margin-right:10px;width:350px}* html body#home #home-bottom #manifesto{overflow-x:hidden}body#home #home-bottom #recent{display:inline;float:left;margin-right:10px;width:550px;margin-right:0}* html body#home #home-bottom #recent{overflow-x:hidden}#main #left{padding-left:40px;display:inline;float:left;margin-right:10px;width:230px}* html #main #left{overflow-x:hidden}#main #right{display:inline;float:left;margin-right:10px;width:550px;margin-right:0}* html #main #right{overflow-x:hidden}.internal #main,.internal #footer{width:880px}#footer{width:950px;margin:0 auto;overflow:hidden;*zoom:1;border-top:1px solid #ccc}#footer #footer-wrap{padding:1em;overflow:hidden;*zoom:1}#footer #logo{float:left}#footer #logo a{display:block;background:url("../images/logo-xs.png") no-repeat;text-indent:-9999px;width:71px;height:20px}#footer ul{float:left;overflow:hidden;*zoom:1;padding-left:1em;padding-top:0.25em}#footer ul li{list-style-type:none;float:left;padding-left:1em;border-left:1px solid #ddd;padding-right:1em}body#home #header h2#logo a{margin-left:1em;display:block;display:block;background:url("../images/logo.png") no-repeat;text-indent:-9999px;width:348px;height:100px}body#home #header #login{padding-top:2.25em}body#home #header #login .options{padding-top:0.25em;overflow:hidden;*zoom:1}body#home #header #login .options div{float:left;padding-right:0.25em}body#home #pitch{background:white}body#home #pitch .col{margin:1em 0;border-right:1px solid #ddd;text-align:center;padding-bottom:178px}body#home #pitch .col .title{font-size:2.4em;color:#65bfc2;margin-bottom:0.15em}body#home #pitch .col .content{width:250px;margin:auto;font-family:"Arial Black", Arial, sans-serif;font-size:1.3em;color:#c9c9c9}body#home #pitch #col-1{background:url("../images/slide1.png") center bottom no-repeat}body#home #pitch #col-1:hover{text-decoration:none}body#home #pitch #col-2{background:url("../images/slide2.png") center bottom no-repeat}body#home #pitch #col-3{background:url("../images/slide3.png") center bottom no-repeat}body#home #pitch .last-col{border:none}body#home #home-bottom{overflow:hidden;*zoom:1}body#home #home-bottom #manifesto .wrap{padding:1em 2em 0}body#home #home-bottom #recent .updates{padding-top:2em;padding-left:1em}body#home #home-bottom #recent .updates h4{padding-top:1em}body#home #home-bottom #recent .updates .world-link{text-align:right}#main #left #logo h2{display:block;background:url("../images/logo-sm.png") no-repeat;text-indent:-9999px;width:159px;height:45px}#main #left #profile{overflow:hidden;*zoom:1;padding-top:2em;width:200px}#main #left #profile h3{color:#888;padding-bottom:0.5em;border-bottom:1px solid #ddd}#main #left #profile .profile-wrap{overflow:hidden;*zoom:1;padding-top:0.25em}#main #left #profile .avatar,#main #left #profile .userinfo{float:left}#main #left #profile .avatar{width:48px}#main #left #profile .avatar img{width:48px}#main #left #profile .userinfo .name{font-weight:bold;font-size:1.25em}#main #left #profile .userinfo .logout{margin-top:1em;border-top:1px solid #ddd;padding-top:1em}#main #left .links,#main #left .logout{width:200px;padding-top:1em;border-top:1px solid #ddd;margin-top:1em}#content{position:relative;padding-top:1.5em}#content h1{margin-top:-0.35em}#users-search{position:absolute;top:1.2em;right:0}#users-search input[type="text"]{padding:0.45em}#users-nav{padding:1em 0.5em;font-size:1.1em}#users-nav .all{padding-right:0.75em;border-right:1px solid #ccc;margin-right:0.5em}.user-list{padding:0;margin:0 0 1.5em 0}.user-list .user{position:relative;padding:0.5em;list-style-type:none;overflow:hidden;*zoom:1}.user-list .user .follow{position:absolute;top:0.75em;right:0.5em}.user-list .even{background:#e9e9e9}#sites{display:inline;float:left;margin-right:10px;width:350px}* html #sites{overflow-x:hidden}#follow-form{display:inline;float:left;margin-right:10px;width:190px;margin-right:0}* html #follow-form{overflow-x:hidden}form#update-form{overflow:hidden;*zoom:1;padding:0 0 1em 0;border-bottom:1px solid #ddd;margin-bottom:1em}form#update-form #update-content textarea{font-family:Arial, sans-serif;width:538px;padding:5px;height:2.5em;margin:0;border:solid 1px #CCCCCC}form#update-form #update-info{overflow:hidden;*zoom:1}form#update-form #update-info #update-button,form#update-form #update-info #update-count{float:left}form#update-form #update-info #update-count{color:#999;padding-left:0.75em}form#update-form #update-info #update-count .update-count{font-size:180%}form#update-form #update-info.negative #update-count .update-count{color:red}.no-js #update-count{display:none}#update-form:focus{-moz-box-shadow:5px 3px 5px #efefef;-wekbit-box-shadow:5px 3px 5px #efefef;box-shadow:5px 3px 5px #efefef}#navigation ul{margin:0;padding:0;overflow:hidden;*zoom:1}#navigation ul li{background:#dadada;padding:0.5em 1em;margin:0 2px 2px 0;list-style-type:none;float:left;font-family:"Arial Black", Arial, sans-serif;font-size:1.25em}#navigation ul li a{color:#8f8f8f}#navigation ul li.active{background:#65bfc2}#navigation ul li.active a{color:white}.pagination{margin-top:0.5em}.pagination .button{margin:0}.pagination #next_button{float:right;margin-right:0.5em}.pagination #prev_button{float:left;margin-left:0.5em}#profile{position:relative}#profile h3{margin-bottom:0.25em}#profile .username{padding-bottom:1em}#profile #follow{position:absolute;top:0;right:0;text-align:right}#profile #follow .follow-status{font-size:0.8em;color:#999}#profile .bio{margin:0.5em 0em}#profile input{border:solid 1px #CCCCCC;margin:0.2em}#profile textarea{font-family:Arial, sans-serif;border:solid 1px #CCCCCC;width:30em;height:10em}#profile label{display:inline-block;width:5em}#profile .gravatar{padding-top:1em}#login-forms{overflow:hidden;*zoom:1}#login-forms #login,#login-forms #signup{float:left;width:220px;overflow:hidden;*zoom:1}#login-forms #login label,#login-forms #login input,#login-forms #signup label,#login-forms #signup input{display:block}#login-forms #login label,#login-forms #signup label{width:100px}#login-forms #login input,#login-forms #signup input{margin-bottom:0.75em}#login-forms #login{padding-right:30px;border-right:1px solid #ddd;margin-right:40px}#login-forms #login #username,#login-forms #login #password{width:200px}#login-forms input[type="text"],#login-forms input[type="password"]{width:170px;font-size:1.15em;padding:0.25em;border:1px solid #ccc;margin-bottom:0.5em}#login-other{margin-top:2em;border-top:1px solid #ddd;padding-top:2em}#login-other .options div{float:left;padding-right:0.25em}.negative{color:red}.negative .button:hover,.negative a.button:hover{color:#FFFFFF;background-position:0 -121px;background-color:#D84743;border-color:#911D1B}.updates .update{overflow:hidden;*zoom:1;background:white;padding:1em;border-bottom:solid 1px #efefef;clear:both;overflow:auto}.updates .update .content{float:left;width:450px}.updates .update .content .name{font-weight:bold}.updates .update .content .text{word-wrap:break-word;font-size:1.1em}.updates .update .content .date,.updates .update .content .in-reply{float:left}.updates .update .content .in-reply .avatar,.updates .update .content .in-reply .name,.updates .update .content .in-reply .links{display:inline}.updates .update .content .in-reply .avatar{float:none;width:18px;padding:0 2px}.updates .update .content .in-reply .avatar img{width:18px;margin-bottom:-4px}.updates .update .content .in-reply{margin-left:0.5em}.updates .mention{background:#e4feff}.updates .mine{background:#fffeef}.updates .empty{background:white;font-size:1.2em;padding:1em;color:#bbb}.avatar{float:left;width:35px;height:35px;padding-right:1em}.avatar img{width:35px}#fourohfour,#update{background:#f3f3f3;padding-top:3em;width:520px;margin:auto}#fourohfour #footer,#update #footer{padding:1em;border-top:1px solid #ccc;width:498px}#fourohfour .image404{text-align:center}#fourohfour .image404 .credits{font-size:0.85em;color:#aaa}.single-update .update-text-wrap{border-radius:5px;background:white;padding:1em}.single-update .update-text-wrap .update-text{word-wrap:break-word;font-size:2.5em}.single-update .byline{overflow:hidden;*zoom:1;padding:1em}.single-update .byline a{padding-right:0.2em}.single-update .byline .update-date,.single-update .byline .avatar,.single-update .byline .name{display:inline}.single-update .byline .avatar{float:none;width:18px;padding:0 2px}.single-update .byline .avatar img{width:18px;margin-bottom:-4px}.single-update .byline .links{float:right}.single-update .in-reply .avatar,.single-update .in-reply .name,.single-update .in-reply .links{display:inline}.single-update .in-reply .avatar{float:none;width:18px;padding:0 2px}.single-update .in-reply .avatar img{width:18px;margin-bottom:-4px}.single-update .links{float:right}.update .remove-update{cursor:pointer;float:right;border:none;display:block;background:url("../images/trash.png") no-repeat;text-indent:-9999px;width:13px;height:16px}.update .end-links{float:right}.update .end-links,.update .date,.update .in-reply{font-size:0.9em;color:#aaa;line-height:2em} +html,body{margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline}html{font-size:100.01%}div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,pre,a,abbr,acronym,address,code,del,dfn,em,img,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,caption,tbody,tfoot,thead,tr{margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline}blockquote,q{margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;quotes:"" ""}blockquote:before,blockquote:after,q:before,q:after{content:""}th,td,caption{margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;text-align:left;font-weight:normal;vertical-align:middle}table{margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;border-collapse:separate;border-spacing:0;vertical-align:middle}a img{border:none}.box{padding:1.5em;margin-bottom:1.5em;background:#e5ecf9}div.border{padding-right:4px;margin-right:5px;border-right:1px solid #eeeeee}div.colborder{padding-right:24px;margin-right:25px;border-right:1px solid #eeeeee}hr{background:#dddddd;color:#dddddd;clear:both;float:none;width:100%;height:0.1em;margin:0 0 1.45em;border:none}hr.space{background:#dddddd;color:#dddddd;clear:both;float:none;width:100%;height:0.1em;margin:0 0 1.45em;border:none;background:white;color:white;visibility:hidden}form.inline{line-height:3}form.inline p{margin-bottom:0}body .clear{clear:both}body .nowrap{white-space:nowrap}body .clearfix{overflow:hidden;*zoom:1}body .small{font-size:0.8em;margin-bottom:1.875em;line-height:1.875em}body .large{font-size:1.2em;line-height:2.5em;margin-bottom:1.25em}body .first{margin-left:0;padding-left:0}body .last{margin-right:0;padding-right:0}body .top{margin-top:0;padding-top:0}body .bottom{margin-bottom:0;padding-bottom:0}body .error{padding:0.8em;margin-bottom:1em;border:2px solid #dddddd;background:#fbe3e4;color:#8a1f11;border-color:#fbc2c4}body .error a{color:#8a1f11}body .notice{padding:0.8em;margin-bottom:1em;border:2px solid #dddddd;background:#fff6bf;color:#514721;border-color:#ffd324}body .notice a{color:#514721}body .success{padding:0.8em;margin-bottom:1em;border:2px solid #dddddd;background:#e6efc2;color:#264409;border-color:#c6d880}body .success a{color:#264409}body .hide{display:none}body .highlight{background:yellow}body .added{background:#006600;color:white}body .removed{background:#990000;color:white}.button{display:inline-block;padding:7px 9px;font-size:12px;line-height:1;color:#3C3C3D;text-shadow:1px 1px 0 #FFFFFF;background:#ececec url("/images/css3buttons_backgrounds.png") 0 0 no-repeat;white-space:nowrap;overflow:visible;cursor:pointer;text-decoration:none;border:1px solid #CACACA;-webkit-border-radius:2px;-moz-border-radius:2px;-webkit-background-clip:padding-box;border-radius:2px;outline:none;position:relative;zoom:1;*display:inline}.button.primary{font-weight:bold}.button:hover{color:#FFFFFF;border-color:#4c9092;text-decoration:none;text-shadow:-1px -1px 0 rgba(0, 0, 0, 0.3);background-position:0 -40px;background-color:#378284}.button:active,.button.active{background-position:0 -81px;border-color:#4c9092;background-color:#378284;color:#FFFFFF;text-shadow:none}.button:active{top:1px}.button.negative:hover{color:#FFFFFF;background-position:0 -121px;background-color:#D84743;border-color:#911D1B}.button.negative:active,.button.negative.active{background-position:0 -161px;background-color:#A5211E;border-color:#911D1B}.button.pill{-webkit-border-radius:19px;-moz-border-radius:19px;border-radius:19px;padding:6px 12px}.button.left{-webkit-border-bottom-right-radius:0px;-webkit-border-top-right-radius:0px;-moz-border-radius-bottomright:0px;-moz-border-radius-topright:0px;border-bottom-right-radius:0px;border-top-right-radius:0px;margin-right:0px}.button.middle{margin-right:0px;margin-left:0px;-webkit-border-radius:0px;-moz-border-radius:0px;border-radius:0px;border-left:none}.button.right{-webkit-border-bottom-left-radius:0px;-webkit-border-top-left-radius:0px;-moz-border-radius-bottomleft:0px;-moz-border-radius-topleft:0px;border-top-left-radius:0px;border-bottom-left-radius:0px;margin-left:0px;border-left:none}.button.left:active,.button.middle:active,.button.right:active{top:0px}.button.big{font-size:16px;padding:7px 16px}.button span.icon{display:inline-block;width:12px;height:12px;margin:auto 4px auto auto;position:relative;top:1px;background-image:url("/images/css3buttons_icons.png");background-repeat:no-repeat}a.big.button span.icon{top:0px}.button span.icon.book{background-position:0 0}.button:hover span.icon.book{background-position:0 -15px}.button span.icon.calendar{background-position:0 -30px}.button:hover span.icon.calendar{background-position:0 -45px}.button span.icon.chat{background-position:0 -60px}.button:hover span.icon.chat{background-position:0 -75px}.button span.icon.check{background-position:0 -90px}.button:hover span.icon.check{background-position:0 -103px}.button span.icon.clock{background-position:0 -116px}.button:hover span.icon.clock{background-position:0 -131px}.button span.icon.cog{background-position:0 -146px}.button:hover span.icon.cog{background-position:0 -161px}.button span.icon.comment{background-position:0 -176px}.button:hover span.icon.comment{background-position:0 -190px}.button span.icon.cross{background-position:0 -204px}.button:hover span.icon.cross{background-position:0 -219px}.button span.icon.downarrow{background-position:0 -234px}.button:hover span.icon.downarrow{background-position:0 -249px}.button span.icon.fork{background-position:0 -264px}.button:hover span.icon.fork{background-position:0 -279px}.button span.icon.heart{background-position:0 -294px}.button:hover span.icon.heart{background-position:0 -308px}.button span.icon.home{background-position:0 -322px}.button:hover span.icon.home{background-position:0 -337px}.button span.icon.key{background-position:0 -352px}.button:hover span.icon.key{background-position:0 -367px}.button span.icon.leftarrow{background-position:0 -382px}.button:hover span.icon.leftarrow{background-position:0 -397px}.button span.icon.lock{background-position:0 -412px}.button:hover span.icon.lock{background-position:0 -427px}.button span.icon.loop{background-position:0 -442px}.button:hover span.icon.loop{background-position:0 -457px}.button span.icon.magnifier{background-position:0 -472px}.button:hover span.icon.magnifier{background-position:0 -487px}.button span.icon.mail{background-position:0 -500px}.button:hover span.icon.mail{background-position:0 -512px}.button span.icon.move{background-position:0 -526px}.button:hover span.icon.move{background-position:0 -541px}.button span.icon.pen{background-position:0 -556px}.button:hover span.icon.pen{background-position:0 -571px}.button span.icon.pin{background-position:0 -586px}.button:hover span.icon.pin{background-position:0 -601px}.button span.icon.plus{background-position:0 -616px}.button:hover span.icon.plus{background-position:0 -631px}.button span.icon.reload{background-position:0 -646px}.button:hover span.icon.reload{background-position:0 -660px}.button span.icon.rightarrow{background-position:0 -674px}.button:hover span.icon.rightarrow{background-position:0 -689px}.button span.icon.rss{background-position:0 -704px}.button:hover span.icon.rss{background-position:0 -719px}.button span.icon.tag{background-position:0 -734px}.button:hover span.icon.tag{background-position:0 -749px}.button span.icon.trash{background-position:0 -764px}.button:hover span.icon.trash{background-position:0 -779px}.button span.icon.unlock{background-position:0 -794px}.button:hover span.icon.unlock{background-position:0 -809px}.button span.icon.twitter{background-position:0 -824px}.button:hover span.icon.twitter{background-position:0 -839px}.button span.icon.facebook{width:8px;background-position:0 -854px}.button:hover span.icon.facebook{width:8px;background-position:0 -869px}body{line-height:1.5}p{margin-bottom:1.5em}a{color:#65bfc2;text-decoration:none}a:hover{text-decoration:underline}h1,h2,h3,h4,h5{font-family:"Arial Black", Arial, sans-serif}h1{font-size:3em;line-height:1;margin-bottom:0.50em}h2{font-size:2em;margin-bottom:0.75em}h3{font-size:1.5em;line-height:1;margin-bottom:1.00em}h4{font-size:1.2em;line-height:1.25;margin-bottom:1.25em}h5{font-size:1em;font-weight:bold;margin-bottom:1.50em}h6{font-size:1em;font-weight:bold}label{font-weight:bold}body{background-color:white;font-family:Arial, sans-serif;font-size:12px;padding:0}#main{background:#f3f3f3;width:950px;margin:0 auto;overflow:hidden;*zoom:1;padding-top:3em;margin-top:0;padding-bottom:2em}#flash,#error{padding:0.75em;font-size:1.2em;color:white;background:#aaa;margin-bottom:1em}#error{background:#990000}#error p{margin:0.5em 0}#error a{color:#66ffff}body#home #header{overflow:hidden;*zoom:1}body#home #header h2#logo{display:inline;float:left;margin-right:10px;width:670px}* html body#home #header h2#logo{overflow-x:hidden}body#home #header #login{display:inline;float:left;margin-right:10px;width:270px;margin-right:0}* html body#home #header #login{overflow-x:hidden}body#home #pitch{overflow:hidden;*zoom:1}body#home #pitch .col{display:inline;float:left;margin-right:10px;width:310px}* html body#home #pitch .col{overflow-x:hidden}body#home #pitch .last-col{margin-right:0}body#home #home-bottom #manifesto{display:inline;float:left;margin-right:10px;width:350px}* html body#home #home-bottom #manifesto{overflow-x:hidden}body#home #home-bottom #recent{display:inline;float:left;margin-right:10px;width:550px;margin-right:0}* html body#home #home-bottom #recent{overflow-x:hidden}#main #left{padding-left:40px;display:inline;float:left;margin-right:10px;width:230px}* html #main #left{overflow-x:hidden}#main #right{display:inline;float:left;margin-right:10px;width:550px;margin-right:0}* html #main #right{overflow-x:hidden}.internal #main,.internal #footer{width:880px}#footer{width:950px;margin:0 auto;overflow:hidden;*zoom:1;border-top:1px solid #ccc}#footer #footer-wrap{padding:1em;overflow:hidden;*zoom:1}#footer #logo{float:left}#footer #logo a{display:block;background:url("../images/logo-xs.png") no-repeat;text-indent:-9999px;width:71px;height:20px}#footer ul{float:left;overflow:hidden;*zoom:1;padding-left:1em;padding-top:0.25em}#footer ul li{list-style-type:none;float:left;padding-left:1em;border-left:1px solid #ddd;padding-right:1em}body#home #header h2#logo a{margin-left:1em;display:block;display:block;background:url("../images/logo.png") no-repeat;text-indent:-9999px;width:348px;height:100px}body#home #header #login{padding-top:2.25em}body#home #header #login .options{padding-top:0.25em;overflow:hidden;*zoom:1}body#home #header #login .options div{float:left;padding-right:0.25em}body#home #pitch{background:white}body#home #pitch .col{margin:1em 0;border-right:1px solid #ddd;text-align:center;padding-bottom:178px}body#home #pitch .col .title{font-size:2.4em;color:#65bfc2;margin-bottom:0.15em}body#home #pitch .col .content{width:250px;margin:auto;font-family:"Arial Black", Arial, sans-serif;font-size:1.3em;color:#c9c9c9}body#home #pitch #col-1{background:url("../images/slide1.png") center bottom no-repeat}body#home #pitch #col-1:hover{text-decoration:none}body#home #pitch #col-2{background:url("../images/slide2.png") center bottom no-repeat}body#home #pitch #col-3{background:url("../images/slide3.png") center bottom no-repeat}body#home #pitch .last-col{border:none}body#home #home-bottom{overflow:hidden;*zoom:1}body#home #home-bottom #manifesto .wrap{padding:1em 2em 0}body#home #home-bottom #recent .updates{padding-top:2em;padding-left:1em}body#home #home-bottom #recent .updates h4{padding-top:1em}body#home #home-bottom #recent .updates .world-link{text-align:right}#main #left #logo h2{display:block;background:url("../images/logo-sm.png") no-repeat;text-indent:-9999px;width:159px;height:45px}#main #left #profile{overflow:hidden;*zoom:1;padding-top:2em;width:200px}#main #left #profile h3{color:#888;padding-bottom:0.5em;border-bottom:1px solid #ddd}#main #left #profile .profile-wrap{overflow:hidden;*zoom:1;padding-top:0.25em}#main #left #profile .avatar,#main #left #profile .userinfo{float:left}#main #left #profile .avatar{width:48px}#main #left #profile .avatar img{width:48px}#main #left #profile .userinfo .name{font-weight:bold;font-size:1.25em}#main #left #profile .userinfo .logout{margin-top:1em;border-top:1px solid #ddd;padding-top:1em}#main #left .links,#main #left .logout{width:200px;padding-top:1em;border-top:1px solid #ddd;margin-top:1em}#content{position:relative;padding-top:1.5em}#content h1{margin-top:-0.35em}#users-search{position:absolute;top:1.2em;right:0}#users-search input[type="text"]{padding:0.45em}#users-nav{padding:1em 0.5em;font-size:1.1em}#users-nav .all{padding-right:0.75em;border-right:1px solid #ccc;margin-right:0.5em}.user-list{padding:0;margin:0 0 1.5em 0}.user-list .user{position:relative;padding:0.5em;list-style-type:none;overflow:hidden;*zoom:1}.user-list .user .follow{position:absolute;top:0.75em;right:0.5em}.user-list .even{background:#e9e9e9}#sites{display:inline;float:left;margin-right:10px;width:350px}* html #sites{overflow-x:hidden}#follow-form{display:inline;float:left;margin-right:10px;width:190px;margin-right:0}* html #follow-form{overflow-x:hidden}form#update-form{overflow:hidden;*zoom:1;padding:0 0 1em 0;border-bottom:1px solid #ddd;margin-bottom:1em}form#update-form #update-content textarea{font-family:Arial, sans-serif;width:538px;padding:5px;height:2.5em;margin:0;border:solid 1px #CCCCCC}form#update-form #update-info{overflow:hidden;*zoom:1}form#update-form #update-info #update-button,form#update-form #update-info #update-count{float:left}form#update-form #update-info #update-count{font-size:1.1em;color:#aaa;padding-left:0.75em;padding-top:0.6em}form#update-form #update-info #update-count .update-count{color:#666;padding-right:0.2em}form#update-form #update-info.negative #update-count .update-count{color:red}.no-js #update-count{display:none}#update-form:focus{-moz-box-shadow:5px 3px 5px #efefef;-wekbit-box-shadow:5px 3px 5px #efefef;box-shadow:5px 3px 5px #efefef}#navigation ul{margin:0;padding:0;overflow:hidden;*zoom:1}#navigation ul li{background:#dadada;padding:0.5em 1em;margin:0 2px 2px 0;list-style-type:none;float:left;font-family:"Arial Black", Arial, sans-serif;font-size:1.25em}#navigation ul li a{color:#8f8f8f}#navigation ul li.active{background:#65bfc2}#navigation ul li.active a{color:white}.pagination{margin-top:0.5em}.pagination .button{margin:0}.pagination #next_button{float:right;margin-right:0.5em}.pagination #prev_button{float:left;margin-left:0.5em}#profile{position:relative}#profile h3{margin-bottom:0.25em}#profile .username{padding-bottom:1em}#profile #follow{position:absolute;top:0;right:0;text-align:right}#profile #follow .follow-status{font-size:0.8em;color:#999}#profile .bio{margin:0.5em 0em}#profile input{border:solid 1px #CCCCCC;margin:0.2em}#profile textarea{font-family:Arial, sans-serif;border:solid 1px #CCCCCC;width:30em;height:10em}#profile label{display:inline-block;width:5em}#profile .gravatar{padding-top:1em}#login-forms{overflow:hidden;*zoom:1}#login-forms #login,#login-forms #signup{float:left;width:220px;overflow:hidden;*zoom:1}#login-forms #login label,#login-forms #login input,#login-forms #signup label,#login-forms #signup input{display:block}#login-forms #login label,#login-forms #signup label{width:100px}#login-forms #login input,#login-forms #signup input{margin-bottom:0.75em}#login-forms #login{padding-right:30px;border-right:1px solid #ddd;margin-right:40px}#login-forms #login #username,#login-forms #login #password{width:200px}#login-forms input[type="text"],#login-forms input[type="password"]{width:170px;font-size:1.15em;padding:0.25em;border:1px solid #ccc;margin-bottom:0.5em}#login-other{margin-top:2em;border-top:1px solid #ddd;padding-top:2em}#login-other .options div{float:left;padding-right:0.25em}.negative{color:red}.negative .button:hover,.negative a.button:hover{color:#FFFFFF;background-position:0 -121px;background-color:#D84743;border-color:#911D1B}.updates .update{overflow:hidden;*zoom:1;background:white;padding:1em;border-bottom:solid 1px #efefef;clear:both;overflow:auto}.updates .update .content{float:left;width:450px}.updates .update .content .name{font-weight:bold}.updates .update .content .text{word-wrap:break-word;font-size:1.1em}.updates .update .content .date,.updates .update .content .in-reply{float:left}.updates .update .content .in-reply .avatar,.updates .update .content .in-reply .name,.updates .update .content .in-reply .links{display:inline}.updates .update .content .in-reply .avatar{float:none;width:18px;padding:0 2px}.updates .update .content .in-reply .avatar img{width:18px;margin-bottom:-4px}.updates .update .content .in-reply{margin-left:0.5em}.updates .mention{background:#e4feff}.updates .mine{background:#fffeef}.updates .empty{background:white;font-size:1.2em;padding:1em;color:#bbb}.avatar{float:left;width:35px;height:35px;padding-right:1em}.avatar img{width:35px}#fourohfour,#update{background:#f3f3f3;padding-top:3em;width:520px;margin:auto}#fourohfour #footer,#update #footer{padding:1em;border-top:1px solid #ccc;width:498px}#fourohfour .image404{text-align:center}#fourohfour .image404 .credits{font-size:0.85em;color:#aaa}.single-update .update-text-wrap{border-radius:5px;background:white;padding:1em}.single-update .update-text-wrap .update-text{word-wrap:break-word;font-size:2.5em}.single-update .byline{overflow:hidden;*zoom:1;padding:1em}.single-update .byline a{padding-right:0.2em}.single-update .byline .update-date,.single-update .byline .avatar,.single-update .byline .name{display:inline}.single-update .byline .avatar{float:none;width:18px;padding:0 2px}.single-update .byline .avatar img{width:18px;margin-bottom:-4px}.single-update .byline .links{float:right}.single-update .in-reply .avatar,.single-update .in-reply .name,.single-update .in-reply .links{display:inline}.single-update .in-reply .avatar{float:none;width:18px;padding:0 2px}.single-update .in-reply .avatar img{width:18px;margin-bottom:-4px}.single-update .links{float:right}.update .remove-update{cursor:pointer;float:right;border:none;display:block;background:url("../images/trash.png") no-repeat;text-indent:-9999px;width:13px;height:16px}.update .end-links{float:right}.update .end-links,.update .date,.update .in-reply{font-size:0.9em;color:#aaa;line-height:2em} diff --git a/views/screen.scss b/views/screen.scss index 913febee..2f7fa6de 100644 --- a/views/screen.scss +++ b/views/screen.scss @@ -2,7 +2,7 @@ Use the following command: -rake css:compile +rake scss Do not edit screen.css manually! diff --git a/views/stylesheets/content.scss b/views/stylesheets/content.scss index 4ab18d5f..7f6e3c98 100644 --- a/views/stylesheets/content.scss +++ b/views/stylesheets/content.scss @@ -140,11 +140,14 @@ form#update-form { float: left; } #update-count { + font-size: 1.1em; .update-count { - font-size: 180%; + color: #666; + padding-right: 0.2em; } - color: #999; + color: #aaa; padding-left: 0.75em; + padding-top: 0.6em; } } #update-info.negative #update-count .update-count { From dfdf4b5101ed52b4fbd0b91fdfaaa72f129936b4 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Sun, 27 Mar 2011 18:02:42 -0400 Subject: [PATCH 2/4] Giving the #dickbar to facebook people Closes #52 --- rstatus.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rstatus.rb b/rstatus.rb index d84ff522..922fde23 100644 --- a/rstatus.rb +++ b/rstatus.rb @@ -143,7 +143,7 @@ class Rstatus < Sinatra::Base ############################ before do @error_bar = "" - if current_user && (current_user.username.nil? or current_user.username.empty?) + if current_user && (current_user.username.nil? or current_user.username.empty? or current_user.username.match(/profile.php/).nil?) @error_bar = haml :_username_error, :layout => false end end From f41e131976030d183228c838acc3302e2fcaae4c Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Sun, 27 Mar 2011 18:03:47 -0400 Subject: [PATCH 3/4] Revert "Giving the #dickbar to facebook people" This reverts commit dfdf4b5101ed52b4fbd0b91fdfaaa72f129936b4. --- rstatus.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rstatus.rb b/rstatus.rb index 922fde23..d84ff522 100644 --- a/rstatus.rb +++ b/rstatus.rb @@ -143,7 +143,7 @@ class Rstatus < Sinatra::Base ############################ before do @error_bar = "" - if current_user && (current_user.username.nil? or current_user.username.empty? or current_user.username.match(/profile.php/).nil?) + if current_user && (current_user.username.nil? or current_user.username.empty?) @error_bar = haml :_username_error, :layout => false end end From 9aa2dd7b796c5938da7296469eba73334583d9a6 Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Sun, 27 Mar 2011 18:21:23 -0400 Subject: [PATCH 4/4] okay, #dickbar for real this time --- rstatus.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rstatus.rb b/rstatus.rb index d84ff522..63ce43b1 100644 --- a/rstatus.rb +++ b/rstatus.rb @@ -143,7 +143,7 @@ class Rstatus < Sinatra::Base ############################ before do @error_bar = "" - if current_user && (current_user.username.nil? or current_user.username.empty?) + if current_user && (current_user.username.nil? or current_user.username.empty? or !current_user.username.match(/profile.php/).nil?) @error_bar = haml :_username_error, :layout => false end end