Merge branch '1.0.x' into profile-fixups

This commit is contained in:
Zach Copley 2011-03-10 15:07:09 -08:00
commit 6aa7935397
6 changed files with 427 additions and 175 deletions

View File

@ -13,11 +13,19 @@
body { body {
background-color: #C6C8CC; background-color: #C6C8CC;
background-image: url(../images/bg.png); background-image: url(../images/bg.png);
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 82%; font-size: 14px;
line-height: 1.6;
color: #222;
}
input, textarea, select, option {
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 1em;
} }
a {color: #3e3e8c;} a {color: #3e3e8c;}
a:hover {color: blue;}
h1 {font-size: 1.6em;} h1 {font-size: 1.6em;}
h2 {font-size: 1.6em;} h2 {font-size: 1.6em;}
@ -27,59 +35,48 @@ h5 {font-size: 1.2em;}
h6 {font-size: 1em;} h6 {font-size: 1em;}
#wrap { #wrap {
width: 930px; width: 960px;
margin: 0px auto; margin: 0px auto;
padding: 0px 15px 10px 15px; background: #fff url('../images/brdr_black_dot.png') repeat-x 0px 10px;
background-color: #fff; border-left: 10px solid #fff;
border-left: 10px solid #E0E0E0; border-right: 10px solid #fff;
border-right: 10px solid #E0E0E0; padding-top: 10px;
} }
#header { #header {
width: 940px; width: 960px;
padding: 0px; padding: 0px;
padding-top: 50px; padding-top: 12px;
} }
address { address {
float: left; float: left;
margin-right: 20px; position: relative;
margin-top: 0px; top: 1px;
} left: 2px;
margin: 0px;
.poweredby { padding: 0px;
background: url(../images/sn-tiny.png) no-repeat top left; height: 24px;
height: 40px; width: 148px;
font-size: 0.8em;
color: #fff;
line-height: 42px;
padding-left: 50px;
position: absolute;
top: 6px;
left: 0;
z-index: 99; z-index: 99;
font-style: normal;
}
.poweredby a {
color: #fff !important;
font-weight: bold;
} }
#site_nav_global_primary { #site_nav_global_primary {
display: block; display: block;
position: absolute; position: absolute;
top: 0; top: 10px;
left: 0; right: 0;
z-index: 98; width: 800px;
background-color: #364A84; margin: 0px;
width: 960px;
margin-left: -15px;
margin-top: 0px;
height: 24px; height: 24px;
line-height: 20px; line-height: 20px;
border-top: 10px solid #fff; -webkit-border-top-right-radius: 6px;
border-bottom: 1px solid #fff; -moz-border-radius-topright: 6px;
border-top-right-radius: 6px;
background: #364A84;
background: -moz-linear-gradient(top, #516499 , #364a84);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 ); /* XXX move all to ie.css */
} }
#site_nav_global_primary ul { #site_nav_global_primary ul {
@ -91,13 +88,13 @@ address {
} }
#site_nav_global_primary li:last-child { #site_nav_global_primary li:last-child {
margin-right: 16px; margin-right: 10px;
} }
#site_nav_global_primary a { #site_nav_global_primary a {
color: #fff !important; color: #fff !important;
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
padding: 2px 12px 2px 12px; padding: 2px 10px 2px 10px;
height: 20px; height: 20px;
display: block; display: block;
float: left; float: left;
@ -137,92 +134,40 @@ address {
color: #3e3e8c; color: #3e3e8c;
} }
.form_notice {
float: left;
margin-top: 0px;
width: 510px;
padding: 10px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
background: #cdd1dd;
}
.form_notice fieldset {
width: 100%;
}
.form_notice textarea {
width: 378px;
height: 54px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
}
.form_notice label.notice_data-attach {
top: 27px;
right: 86px;
}
.form_notice #notice_data-geo_wrap label,
.form_notice #notice_data-geo_wrap input {
top: 52px;
right: 86px;
}
.form_notice #notice_action-submit {
font-size: 0.9em;
top: 80px;
right: -2px;
height: 2.4em;
width: 106px;
}
.form_notice .error,
.form_notice .success,
.form_notice .notice-status {
width: 341px;
}
.form_notice .error {
margin-left: 0px;
}
#core { #core {
clear: both; clear: both;
margin: 0px; margin: 0px;
width: 930px; width: 960px;
margin-left: 0px; border-top: 5px solid #FB6104;
margin-top: 8px;
}
#content {
width: 530px;
margin-right: 0px;
padding-left: 30px;
padding-right: 30px;
} }
#site_nav_local_views { #site_nav_local_views {
display: block; display: block;
float: left; float: left;
width: 130px; width: 138px;
margin-top: 5px; margin-top: 0px;
padding: 10px;
padding-top: 22px;
background-color: #ececf2;
border-left: 1px solid #d8dae6;
border-right: 1px solid #d8dae6;
min-height: 800px; /* XXX set up equal column heights! */
} }
#site_nav_local_views H3 { #site_nav_local_views H3 {
border-bottom: 3px solid #A6ADBF; margin-bottom: 10px;
color: #A6ADBF; padding-bottom: 6px;
background: url('../images/brdr_black_dot.png') repeat-x bottom left;
color: #7a7c87;
font-size: 1.1em; font-size: 1.1em;
letter-spacing: 2px; letter-spacing: 2px;
margin-bottom: 10px; text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
text-transform: uppercase; text-transform: uppercase;
} }
#site_nav_local_views li { #site_nav_local_views li {
display: block; display: block;
margin: 0px 0px 6px 0px; margin: 0px 0px 8px 0px;
} }
#site_nav_local_views li ul { #site_nav_local_views li ul {
@ -230,52 +175,214 @@ address {
} }
#site_nav_local_views a { #site_nav_local_views a {
padding: 2px 0px 2px 10px;
display: block; display: block;
-webkit-border-radius: 6px; padding: 0px 0px 1px 10px;
-moz-border-radius: 6px; -webkit-border-radius: 4px;
border-radius: 6px; -moz-border-radius: 4px;
border-radius: 4px;
text-transform: uppercase;
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
} }
#site_nav_local_views a:hover { #site_nav_local_views a:hover, #site_nav_local_views .current a {
background: #8e98b4 !important; color: #fff;
color: #fff !important;
text-decoration: none; text-decoration: none;
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
background: #364a84;
background: -moz-linear-gradient(top, #7b8dbb , #364a84);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
} }
#site_nav_local_views .current a { #content {
text-decoration: none; width: 520px;
background: #8e98b4 !important; margin-right: 0px;
color: #fff !important; padding: 20px;
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); }
/* Input forms */
.input_forms {
float: left;
position: relative;
top: -20px;
left: -20px;
padding: 18px 20px 0px 20px;
background: #fafafa url('../images/brdr_black_dot.png') repeat-x bottom left;
}
#input_form_nav {
float: left;
margin-bottom: 10px;
}
#input_form_nav li a {
display: block;
float: left;
padding: 0px 10px 1px 10px;
margin-right: 10px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
border: 1px solid #ECECF2;
font-weight: bold;
line-height: 1.4em;
text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.9);
background: #ececf2;
background: -moz-linear-gradient(top, #fff , #ececf2);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fff), color-stop(100%,#ececf2));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fff', endColorstr='#ececf2',GradientType=0 );
}
#input_form_nav li:hover a, #input_form_nav li.current a {
color: #fff;
text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
border: 1px solid #ececf2;
background: #364a84;
background: -moz-linear-gradient(top, #7b8dbb , #364a84);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#364a84));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#364a84',GradientType=0 );
}
.input_form_nav_tab a, .input_form_nav_tab.current {
text-decoration: none !important; /* XXX cf rebase */
}
.input_form {
position: relative;
float: left;
width: 520px;
padding-bottom: 15px;
}
#input_form_status {
padding-bottom: 45px;
}
.form_notice {
padding: 0px;
background: none;
}
.form_notice fieldset {
width: auto;
position: static;
}
.form_notice #notice_data-text-label {
display: none; /* XXX move into input with js */
}
.form_notice textarea {
width: 473px;
height: 42px;
padding: 6px 10px 18px 10px;
border: 1px solid #a6a6a6;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
z-index: 97;
font-size: 1.2em;
}
.form_notice label.notice_data-attach {
top: 0px;
right: 0px;
z-index: 96;
}
.form_notice .notice_data-geo_wrap label,
.form_notice .notice_data-geo_wrap input {
top: 26px;
right: 0px;
z-index: 99;
}
.form_notice .count {
position: absolute;
top: 50px;
right: 35px;
font-size: 0.8em;
height: 1em;
z-index: 99;
}
.form_notice #notice_action-submit {
position: absolute;
top: 100%;
left: 0px;
margin-top: -44px;
float: left;
width: 90px;
padding: 0px;
z-index: 99;
}
.form_notice .error,
.form_notice .success.
.form_notice .notice-status {
width: 478px;
position: relative;
top: 0px;
float: none;
clear: none;
margin-left: 0px;
margin-top: 5px;
padding: 5px 5px 5px 10px;
border: 1px solid #ccc;
}
.form_notice .error {
border: 1px solid #d05858;
}
.form_notice .attach-status code {
font-size: 1em;
}
.input_form fieldset {
margin: 0px;
padding: 0px;
}
.input_form fieldset fieldset {
margin-bottom: 10px !important;
} }
#aside_primary { #aside_primary {
background: none; width: 218px;
width: 210px; padding: 10px;
padding-top: 0px; padding-top: 22px;
margin-top: 5px; margin-top: 0px;
background-color: #ececf2;
border-left: 1px solid #d8dae6;
border-right: 1px solid #d8dae6;
min-height: 800px; /* XXX set up equal column heights! */
} }
#aside_primary .section { #aside_primary .section {
width: 100%; width: 100%;
margin-left: 0px; margin-left: 0px;
margin-right: 0px; margin-right: 0px;
font-size: 0.88em;
} }
#aside_primary h2 { #aside_primary h2 {
border-bottom: 3px solid #A6ADBF;
color: #A6ADBF;
font-size: 1.1em;
letter-spacing: 2px;
margin-bottom: 10px; margin-bottom: 10px;
padding-bottom: 6px;
background: url('../images/brdr_black_dot.png') repeat-x bottom left;
color: #7a7c87;
font-size: 1.25em;
letter-spacing: 2px;
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
text-transform: uppercase; text-transform: uppercase;
text-align: right;
} }
.section ul.entities { .section ul.entities {
width: 290px; width: 220px;
} }
.section .entities li { .section .entities li {
@ -286,8 +393,8 @@ address {
#popular_notices .avatar { #popular_notices .avatar {
position: relative; position: relative;
top: 2px; top: 4px;
margin-bottom: 4px; margin-bottom: 6px;
} }
#aside_primary td { #aside_primary td {
@ -310,7 +417,7 @@ address {
color: #A6ADBF; color: #A6ADBF;
font-size: 1.4em; font-size: 1.4em;
letter-spacing: 4px; letter-spacing: 4px;
text-transform: uppercase; text-transform: none;
} }
#notices_primary { #notices_primary {
@ -323,17 +430,17 @@ address {
} }
.notice { .notice {
line-height: 1.35em; line-height: 1.36em;
margin-bottom: 10px; margin-bottom: 10px;
} }
#content .notice .author .photo { #content .notice .author .photo {
left: 0px; left: 0px;
top: 6px; top: 9px;
} }
#content .notice .entry-title { #content .notice .entry-title {
min-height: 34px; min-height: 35px;
} }
#showstream .notice .entry-title { #showstream .notice .entry-title {
@ -345,7 +452,7 @@ address {
} }
.notice div.entry-content { .notice div.entry-content {
font-size: 0.9em; font-size: 0.88em;
line-height: 1.2em; line-height: 1.2em;
margin-top: 6px; margin-top: 6px;
opacity: 0.6; opacity: 0.6;
@ -371,6 +478,96 @@ div.entry-content a.response:after {
margin-top: 4px; margin-top: 4px;
} }
.threaded-replies {
clear: both;
float: left;
width: 458px;
margin-left: 59px;
margin-top: 10px;
padding-right: 2px;
border-left: 3px solid #ECECF2;
background: #fafafa;
font-size: 1em;
}
#content .notice .threaded-replies .notice {
padding-bottom: 14px;
padding-top: 5px;
border-bottom: 2px dotted #eee;
line-height: 1.36em;
margin-top: 0px;
margin-bottom: 0px;
margin-left: 10px;
background: none;
}
#content .threaded-replies .notice .author .photo {
height: 24px;
width: 24px;
top: 14px;
}
#content .notice .threaded-replies .notice .entry-title {
margin: 2px 7px 0px 35px;
}
#content .notice .threaded-replies .notice div.entry-content {
clear:left;
float:left;
margin-left: 35px;
margin-top: 10px;
}
.threaded-replies li {
list-style-type: none;
}
.threaded-replies .notice-reply-comments {
margin: 2px 0px 4px 10px;
}
.threaded-replies .placeholder {
margin: 10px;
width: 426px;
}
.threaded-replies .notice-reply {
clear: left;
position: relative;
padding: 10px;
padding-bottom: 44px;
}
.threaded-replies .form_notice textarea {
width: 385px;
}
.threaded-replies .form_notice label.notice_data-attach {
top: 10px;
right: 10px;
}
.threaded-replies .form_notice .notice_data-geo_wrap label,
.threaded-replies .form_notice .notice_data-geo_wrap input {
top: 36px;
right: 10px;
}
.threaded-replies .form_notice .count {
top: 60px;
right: 50px;
}
.threaded-replies .form_notice #notice_action-submit {
left: 10px;
}
.threaded-replies .form_notice .error,
.threaded-replies .form_notice .success,
.threaded-replies .form_notice .notice-status {
width: 390px;
}
.pagination { .pagination {
height: 1.2em; height: 1.2em;
} }
@ -382,14 +579,10 @@ div.entry-content a.response:after {
.entity_profile { .entity_profile {
float: left; float: left;
width: 435px; width: 360px;
margin-top: 4px; margin-top: 4px;
} }
td.entity_profile { /* cf directory table */
width: auto;
}
.entity_profile .entity_depiction { .entity_profile .entity_depiction {
margin-top: 4px; margin-top: 4px;
} }
@ -453,7 +646,7 @@ td.entity_profile { /* cf directory table */
top: -3px; top: -3px;
} }
.pagination { #pagination {
height: 1.2em; height: 1.2em;
padding-bottom: 12px; padding-bottom: 12px;
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
@ -493,29 +686,29 @@ td.entity_profile { /* cf directory table */
} }
.form_notice input.submit, .form_settings input.submit, .form_settings input.cancel { .form_notice input.submit, .form_settings input.submit, .form_settings input.cancel {
border-radius: 3px; height: 1.9em;
-moz-border-radius: 3px; padding: 0px 10px;
-webkit-border-radius: 3px;
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
color:#fff; color:#fff;
font-weight: normal; font-weight: bold;
font-size: 1em; text-transform: uppercase;
height: 2.2em; font-size: 1.2em;
padding-left: 1em; text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);
padding-right: 1em; border: 1px solid #d7621c;
background: #7080aa; border-radius: 4px;
background: -moz-linear-gradient(top, #7b8dbb , #7080aa); -moz-border-radius: 4px;
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7b8dbb), color-stop(100%,#7080aa)); -webkit-border-radius: 4px;
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7b8dbb', endColorstr='#7080aa',GradientType=0 ); background: #FB6104;
border-width: 1px; background: -moz-linear-gradient(top, #ff9d63 , #FB6104);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#FB6104));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#FB6104',GradientType=0 );
} }
.form_notice input.submit:hover, .form_settings input.submit:hover, .form_settings input.cancel:hover { .form_notice input.submit:hover, .form_settings input.submit:hover, .form_settings input.cancel:hover {
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.8); text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
background: #7b8dbb; background: #ff9d63;
background: -moz-linear-gradient(top, #7080aa , #7b8dbb); background: -moz-linear-gradient(top, #FB6104 , #fc8035);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#7080aa), color-stop(100%,#7b8dbb)); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FB6104), color-stop(100%,#fc8035));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7080aa', endColorstr='#7b8dbb',GradientType=0 ); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
} }
.form_settings input#settings_design_reset, .form_settings input.cancel { .form_settings input#settings_design_reset, .form_settings input.cancel {
@ -825,4 +1018,63 @@ ul.bookmark-tags a:hover {
margin-right: 0px; margin-right: 0px;
} }
/* Directory specific styles */
td.entity_profile {
width: auto;
}
#user_directory {
position: relative;
top: -20px;
}
div#user_directory div.alpha_nav > a {
border-left: 1px solid #ccc !important;
padding-left: 3.5px !important;
padding-right: 4px !important;
margin-right: 0px;
float: left;
line-height: 1.4em;
}
div#user_directory div.alpha_nav > a.first {
border-left: none !important;
}
div#user_directory div.alpha_nav a.current {
background-color: #ECECF2 !important;
}
table.profile_list {
margin-top: 10px;
}
.profile_list th#created {
width: 100px;
}
.profile_list th#subscriptions {
width: 120px;
}
table.profile_list tr.alt {
background-color: #fafafa !important;
}
.profile_list .entity_actions {
width: 30px;
height: 26px;
margin-right: 5px;
}
.profile_list .entity_actions input {
width: 26px;
height: 26px;
display: block;
overflow: hidden;
font-size: 0em;
}
}/*end of @media screen, projection, tv*/ }/*end of @media screen, projection, tv*/

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -1 +1,5 @@
external[]="http://fonts.googleapis.com/css?family=Lato:100,100italic,300,300italic,400,400italic,700,700italic,900,900italic"
external[]="http://fonts.googleapis.com/css?family=Cabin:400,500,600,bold"
external[]="http://fonts.googleapis.com/css?family=Puritan:regular,italic,bold,bolditalic"
external[]="http://fonts.googleapis.com/css?family=Cantarell:regular,italic,bold,bolditalic"
include=rebase include=rebase

View File

@ -928,7 +928,7 @@ outline:none;
text-indent:-9999px; text-indent:-9999px;
} }
.pagination { #pagination {
background-color: #f2f2f2; background-color: #f2f2f2;
clear: left; clear: left;
margin-top: 20px; margin-top: 20px;
@ -936,19 +936,15 @@ text-indent:-9999px;
height: 1em; height: 1em;
} }
.pagination dt { #pagination li {
display: none;
}
.pagination li {
display: inline; display: inline;
} }
.pagination .nav_prev { #pagination .nav_prev {
float: left; float: left;
} }
.pagination .nav_next { #pagination .nav_next {
float: right; float: right;
} }
@ -1737,7 +1733,7 @@ body.realtime-popup {
right: 70px; right: 70px;
} }
.realtime-popup .form_notice .notice_data-geo_wrap label, .form_notice .notice_data-geo_wrap input { .realtime-popup .form_notice .notice_data-geo_wrap label, .realtime-popup .form_notice .notice_data-geo_wrap input {
right: 2px; right: 2px;
} }
@ -1763,8 +1759,8 @@ body.realtime-popup {
.notice-options .notice_delete, .notice-options .notice_delete,
.notice-options form.form_repeat input.submit, .notice-options form.form_repeat input.submit,
#new_group a, #new_group a,
.pagination .nav_prev a, #pagination .nav_prev a,
.pagination .nav_next a, #pagination .nav_next a,
button.close, button.close,
.form_group_leave input.submit, .form_group_leave input.submit,
.form_user_unsubscribe input.submit, .form_user_unsubscribe input.submit,
@ -1940,12 +1936,12 @@ background-position:0 -1054px;
background-position: 0 -1846px; background-position: 0 -1846px;
} }
.pagination .nav_prev a { #pagination .nav_prev a {
padding-top: 8px; padding-top: 8px;
padding-left: 25px; padding-left: 25px;
background-position:0 -187px; background-position:0 -187px;
} }
.pagination .nav_next a { #pagination .nav_next a {
padding-top: 9px; padding-top: 9px;
padding-right: 25px; padding-right: 25px;
background-position: 115% -252px; background-position: 115% -252px;