Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

This commit is contained in:
Evan Prodromou 2011-08-25 12:34:32 -04:00
commit 1593c97bc1
9 changed files with 469 additions and 1419 deletions

View File

@ -251,16 +251,14 @@ class MobileProfilePlugin extends WAP20Plugin
$action->primaryCssLink(); $action->primaryCssLink();
$action->cssLink($this->path('mp-screen.css'),null,'screen');
if (file_exists(Theme::file('css/mp-screen.css'))) { if (file_exists(Theme::file('css/mp-screen.css'))) {
$action->cssLink('css/mp-screen.css', null, 'screen'); $action->cssLink('css/mp-screen.css', null, 'screen');
} else {
$action->cssLink($this->path('mp-screen.css'),null,'screen');
} }
$action->cssLink($this->path('mp-handheld.css'),null,'handheld');
if (file_exists(Theme::file('css/mp-handheld.css'))) { if (file_exists(Theme::file('css/mp-handheld.css'))) {
$action->cssLink('css/mp-handheld.css', null, 'handheld'); $action->cssLink('css/mp-handheld.css', null, 'handheld');
} else {
$action->cssLink($this->path('mp-handheld.css'),null,'handheld');
} }
// Allow other plugins to load their styles. // Allow other plugins to load their styles.

View File

@ -1,288 +1,357 @@
/** theme: mobile profile screen
*
* @package StatusNet
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2009-2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
#wrap { #wrap {
min-width:0; margin: 0;
max-width:100%; padding: 0;
min-width:0;
max-width:100%;
width: auto;
border: none;
} }
#header { #header {
margin:0; width: 100%;
padding:0.7em 2%;
width:96%;
} }
address { address {
margin:1em 0 0 0; width: auto;
float:left; left: 0px;
width:100%;
} }
address .vcard .photo {
margin-right:0; address img {
float: left;
background: #fff;
padding: 2px 2px 2px 6px;
} }
address img + .fn { address img + .fn {
display:block; display:block;
margin-top:1em; margin-top: 8px;
float:left; clear: left;
float: left;
color: #000;
margin-left: 6px;
} }
.vcard .photo { #site_nav_global_primary {
margin-right:7px; width: 100%;
padding: 2px 0;
height: auto;
left:0;
} }
#site_nav_global_primary li {
margin-right: 4px;
}
#site_nav_global_primary li:last-child {
margin-right: 0px;
}
#site_nav_global_primary a {
padding: 2px 4px;
}
#core {
width: 100%;
border-left: none;
border-right: none;
}
#aside_primary_wrapper {
background: none;
}
#content_wrapper {
right: 0px;
border: none;
}
#site_nav_local_views_wrapper {
right: 0px;
border: none;
}
#navtoggle {
float: right;
padding: 2px 6px;
text-decoration: none;
}
#site_nav_local_views {
margin-bottom: 0px;
padding: 10px 0px 10px 6px;
left: 0px;
width: 100%;
display: none;
}
#site_nav_local_views h3 {
font-size: 1em;
margin-bottom: 0px;
}
#site_nav_local_views li {
margin: 0 6px 0 0;
clear: left;
}
#site_nav_local_views li li {
float: left;
clear: none;
margin: 0 10px 6px 0;
}
#login #site_nav_local_views, #register #site_nav_local_views, #openidlogin #site_nav_local_views {
display: block;
margin-top: 25px;
}
#login #navtoggle, #register #navtoggle, #openidlogin #navtoggle {
display: none;
}
#login #site_nav_local_views li, #register #site_nav_local_views li, #openidlogin #site_nav_local_views li {
float: left;
clear: none;
margin: 0 10px 6px 0;
}
#content {
width: 96%;
padding: 10px 2%;
min-height: auto;
left: 0px;
}
#content h1 {
clear: left;
}
#footer {
width: auto;
padding: 10px 4px 4px 4px;
}
.input_forms {
width: 102%;
left: -2%;
padding-left: 2%;
}
#input_form_nav li a {
margin-right: 6px;
}
.input_form {
clear: left;
width: 100%;
padding-bottom: 0px;
}
#input_form_status, #input_form_direct {
padding-bottom: 40px;
}
.form_notice_placeholder .placeholder {
width: 290px;
margin-bottom: 20px;
}
.form_notice {
float: left;
width: 300px;
padding: 4px 0px;
}
#form_notice-direct.form_notice {
padding-top: 0px;
}
.form_notice textarea, #form_notice-direct.form_notice textarea {
width: 292px;
height: 36px;
padding: 4px 4px 16px 4px;
font-size: 1em;
}
.form_notice .count {
position: absolute;
top: 46px;
left: 278px;
}
#form_notice-direct.form_notice .count {
top: 76px;
left: 278px;
}
.form_notice .error,
.form_notice .success,
.form_notice .notice-status {
width: 285px;
}
/*input type=file no good in
iPhone/iPod Touch, Android, Opera Mini Simulator
*/
.form_notice .notice_data-attach, .form_notice .notice_data-geo_wrap label, .form_notice .notice_data-geo_wrap input {
display:none;
}
.checkbox-wrapper {
margin-left: 0px;
clear: left;
float: left;
width: 200px;
z-index: 2;
}
.form_notice .checkbox-wrapper {
margin-left: 0px;
}
.checkbox-wrapper label.checkbox {
display: none !important;
}
.checkbox-wrapper #notice_private {
display: inline;
margin-top: 10px;
margin-left: 20px;
}
.form_notice .checkbox-wrapper #notice_private {
margin-left: 0px;
}
.checkbox-wrapper:before {
content: "Send privately?";
}
.input_form .form_settings fieldset fieldset {
width: 300px;
}
.input_form .form_settings label {
display: inline;
}
label[for=blog-entry-content] {
display: none !important;
}
.input_form .form_settings li input {
width: 292px;
}
.input_form .form_settings li textarea {
width: 292px;
}
.bookmarkform-thumbnail {
display: none;
}
.input_form .form_settings .submit {
margin: 10px 0;
clear: left;
float: left;
}
.form_notice input.submit {
margin-top: -45px;
width: 80px;
}
#form_notice-direct.form_notice #notice_action-submit {
top: 148px;
}
.threaded-replies {
width: 80%;
}
#content .notice .threaded-replies .notice {
width: 95%;
}
.threaded-replies .placeholder {
margin: 10px;
width: 92%;
}
.threaded-replies .form_notice {
margin-bottom: 10px;
}
.threaded-replies .form_notice textarea {
width: 220px;
}
.threaded-replies .form_notice .count {
left: 215px;
top: 55px;
}
.threaded-replies .form_notice #notice_action-submit {
position: relative;
top: 0;
bottom: 0px;
left: 0;
margin-top: 10px;
}
.threaded-replies .form_notice .error,
.threaded-replies .form_notice .success,
.threaded-replies .form_notice .notice-status {
width: 210px;
}
.form_settings fieldset { .form_settings fieldset {
margin-bottom:7px; margin-bottom: 7px;
} }
.form_settings label { .form_settings label {
width:auto; width: auto;
display:block; display: block;
float:none; text-align: left;
} }
.form_settings .form_data li { .form_settings .form_data li {
margin-bottom:7px; margin-bottom: 10px;
} }
.form_settings .form_data textarea, .form_settings .form_data textarea,
.form_settings .form_data select, .form_settings .form_data select,
.form_settings .form_data input { .form_settings .form_data input {
margin-left:0; margin-left: 0;
display:block;
} }
.form_settings .form_data textarea { .form_settings .form_data textarea {
width:96.41%; width: 98%;
} }
.form_settings .form_data label { .form_settings .form_data label {
float:none; float: none;
} }
.form_settings .form_data p.form_guide { .form_settings .form_data p.form_guide {
width:auto; margin-left: 0;
margin-left:0;
} }
#site_nav_global_primary { .form_settings input.checkbox, .form_settings input.radio {
margin:0; left: 0px;
width:100%;
list-style-type:none;
position:absolute;
top:0;
left:0;
}
#site_nav_global_primary li {
margin-left:0;
margin-right:4%;
float:left;
font-size:0.9em;
} }
#form_notice { .form_settings label.checkbox, .form_settings label.radio {
width:100%; left: -10px;
} }
#form_notice textarea { .notice .addressees:before {
width:60%; content: '\003E';
height:20px;
} }
.form_notice .count { .user_in .notice div.entry-content {
position:absolute; max-width: 150px;
bottom:2px;
right:40%;
z-index:9;
} }
/*input type=file no good in
iPhone/iPod Touch, Android, Opera Mini Simulator
*/
.form_notice .count + label,
#form_notice label[for="notice_data-attach"] {
display:none;
}
#form_notice input.notice_data-attach {
position:static;
clear:both;
width:65%;
height:auto;
display:block;
z-index:9;
padding:0;
margin:0;
background:none;
opacity:1;
}
#form_notice .submit {
width:20%;
right:2%;
text-align:center;
}
#site_nav_local_views li {
margin-left:0;
margin-right:0;
}
#site_nav_local_views li:first-child {
margin-left:0;
}
#site_nav_local_views a {
padding:1px 3px;
display:block;
font-size:0.9em;
}
#site_nav_local_views .current a {
text-shadow:none;
}
#site_nav_local_views li {
-moz-box-shadow:none;
-webkit-box-shadow:none;
box-shadow:none;
}
#content {
width:96.41%;
min-height:auto;
}
#content,
#site_nav_local_views a,
#aside_primary {
border:0;
}
.instructions p,
.instructions ul {
margin-bottom:4px;
}
h1 {
margin-bottom:0;
}
.notice,
.profile {
padding-top:4px;
padding-bottom:4px;
min-height:65px;
}
#content .notice .entry-title {
float:left;
width:100%;
margin-left:0;
}
#content .notice .author .photo {
position:static;
float:left;
}
#content .notice div.entry-content {
margin-left:0;
width:75%;
max-width:100%;
min-width:0;
}
.notice-options {
width:43px;
margin-right:1%;
}
.notice-options form.processing {
background-image:none;
}
#wrap .notice-options form.processing input.submit {
background-position:0 47%;
}
.notice .notice-options a,
.notice .notice-options input {
box-shadow:none;
-moz-box-shadow:none;
-webkit-box-shadow:none;
}
.notice .notice-options a,
.notice .notice-options form {
margin:-4px 0 0 0;
}
.notice .notice-options .form_repeat,
.notice .notice-options .notice_delete {
margin-top:11px;
}
.notice .notice-options .form_favor,
.notice .notice-options .form_disfavor,
.notice .notice-options .form_repeat {
margin-right:11px;
}
.notice .notice-options .notice_delete {
float:left;
}
.entity_profile {
width:auto;
}
.entity_actions {
margin-right:0;
margin-left:0;
clear:both;
float:none;
width:100%;
max-width:9999px;
}
.entity_profile {
margin-bottom:7px;
min-height:0;
}
.entity_profile .entity_fn,
.entity_profile .entity_nickname,
.entity_profile .entity_location,
.entity_profile .entity_url,
.entity_profile .entity_note,
.entity_profile .entity_tags,
.entity_profile .entity_aliases {
line-height:1.4;
margin-left:0;
}
.entity_profile .entity_depiction {
margin-bottom:1%;
margin-right:7px;
}
.entity_actions {
margin-bottom:1%;
float:left;
width:100%;
}
.entity_actions li {
float:left;
margin-right:1.5%;
margin-bottom:0;
height:29px;
width:40%;
}
.user_in .entity_actions .entity_subscribe {
margin-bottom:47px;
width:auto;
height:auto;
margin-right:5%;
}
#footer {
width:96%;
padding:2%;
}

View File

@ -1,5 +1,78 @@
/* Why doesn't this work? */ .question .answer-count, .qna-full-question .answer-count {
input.answer-placeholder { display: block;
margin-left: 0; clear: left;
width: 95%; }
.question .answer-count:before, .qna-full-question .answer-count:before {
content: '(';
}
.question .answer-count:after, .qna-full-question .answer-count:after {
content: ')';
}
.question .notice-answer {
margin-left: 10px;
padding-bottom: 10px;
}
ul.qna-dummy {
clear: left;
float: left;
list-style-type: none;
width: 458px;
margin-left: 59px;
padding-right: 2px;
border-left: 3px solid #ECECF2;
background: #fafafa;
font-size: 1em;
}
ul.qna-dummy + ul.threaded-replies li.notice:first-child, li.notice-answer + li.notice {
border-top: 2px dotted #eee;
margin-top: -10px;
padding-top: 10px;
}
.qna-dummy-placeholder input {
margin: 10px 0px 10px 2px;
width: 426px;
color: #888;
border: 1px solid #A6A6A6;
padding: 4px 4px 4px 6px;
}
.question fieldset, .qna-full-question fieldset {
margin: 0px;
}
.question fieldset legend, .qna-full-question fieldset legend, .answer fieldset legend {
display: none;
}
.question label[for=qna-answer], .qna-full-question label[for=qna-answer] {
display: none;
}
.question #qna-answer, .qna-full-question #qna-answer {
width: 426px;
height: 54px;
padding: 6px 5px;
font-size: 1.2em;
margin-top: 10px;
margin-bottom: 10px;
border: 1px solid #A6A6A6;
}
.qna-full-question textarea {
width: 508px;
}
.question p.best:before, .answer p.best:before {
content: '[Best] ';
}
.question .question-closed {
display: block;
font-style: italic;
} }

View File

@ -735,6 +735,7 @@ left:0;
float: right; float: right;
margin-top: 12px; margin-top: 12px;
margin-right: -6px; margin-right: -6px;
margin-bottom: 10px;
} }
.notice-options fieldset { .notice-options fieldset {
@ -1145,12 +1146,6 @@ display:none;
/* secondary elements */ /* secondary elements */
.processing { /* XXX ? */
background-image:url(../images/icons/icon_processing.gif);
background-repeat:no-repeat;
background-position:47% 47%;
}
.error, .success, .notice-status { .error, .success, .notice-status {
background-color: #F7E8E8; background-color: #F7E8E8;
padding: 4px 10px; padding: 4px 10px;
@ -1247,14 +1242,6 @@ padding-left:4px;
margin-bottom:0; margin-bottom:0;
} }
#wrap form.processing input.submit,
.entity_actions a.processing,
.dialogbox.processing .submit_dialogbox {
cursor:wait;
outline:none;
text-indent:-9999px;
}
#pagination { #pagination {
background-color: #f2f2f2; background-color: #f2f2f2;
clear: left; clear: left;
@ -1275,6 +1262,15 @@ text-indent:-9999px;
float: right; float: right;
} }
#wrap form.processing input.submit,
#wrap a.processing,
.dialogbox.processing .submit_dialogbox {
background: url(../images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor: wait;
outline: none;
text-indent: -9999px;
}
/* footer elements */ /* footer elements */
#site_nav_global_secondary dt { #site_nav_global_secondary dt {

View File

@ -1,7 +0,0 @@
/* just a placeholder for now */
address img + .fn {
display:block;
margin-top:1em;
float:left;
}

View File

@ -1,140 +1,49 @@
/* mobile style */ address img {
background: none !important;
}
/* copy of mp-screen.css from neo theme */
body { body {
background-image: none; background-image: none;
min-width: 0; min-width: 0;
} }
#wrap {
margin: 0;
padding: 0;
min-width:0;
max-width:100%;
width: auto;
border: none;
}
#header { #header {
width: 100%;
padding: 0; padding: 0;
} }
address {
float:left;
margin: 0px;
width: auto;
left: 0px;
}
address img {
float: left;
padding: 2px 2px 2px 6px;
}
address img + .fn {
display:block;
margin-top: 8px;
clear: left;
float: left;
color: #000;
margin-left: 6px;
}
#site_nav_global_primary { #site_nav_global_primary {
margin:0; top: 0;
width: 100%;
padding: 2px 0;
height: auto;
position:absolute;
top:0;
left:0;
font-size: 1em;
letter-spacing: 0em;
border-top: none;
-webkit-border-top-right-radius: 0px; -webkit-border-top-right-radius: 0px;
-moz-border-radius-topright: 0px; -moz-border-radius-topright: 0px;
border-top-right-radius: 0px; border-top-right-radius: 0px;
height: 24px;
line-height: 16px; line-height: 16px;
} }
#site_nav_global_primary li { #site_nav_global_primary li {
margin-left:0; float: left;
margin-right: 2px; margin-right: 8px;
float:left;
font-size:0.9em;
padding: 2px 4px;
line-height: 1em;
height: auto;
}
#site_nav_global_primary li:last-child {
margin-right: 0px;
}
#site_nav_global_primary a {
padding: 2px 4px;
height: 20px;
}
#core {
width: 100%;
border-left: none;
border-right: none;
}
#aside_primary_wrapper {
background: none;
}
#content_wrapper {
right: 0px;
border: none;
}
#site_nav_local_views_wrapper {
right: 0px;
border: none;
}
#navtoggle {
float: right;
padding: 2px 6px;
text-decoration: none;
} }
#site_nav_local_views { #site_nav_local_views {
height: auto;
font-size: 1em;
line-height: 2em; line-height: 2em;
margin-bottom: 0px;
padding: 10px 0px 10px 6px;
background: none;
left: 0px;
width: 100%;
display: none;
} }
#site_nav_local_views h3 { #site_nav_local_views h3 {
color: #333; color: #333;
font-size: 1em;
margin-bottom: 0px;
background: none; background: none;
text-transform: none; text-transform: none;
letter-spacing: 0; letter-spacing: 0;
padding-bottom: 0; padding-bottom: 0;
} }
#site_nav_local_views li { #site_nav_local_views li li {
margin-right: 6px; margin: 0 6px 6px 0;
margin-bottom: 0px;
clear: left;
} }
#site_nav_local_views li li { #login #site_nav_local_views li, #register #site_nav_local_views li, #openidlogin #site_nav_local_views li {
float: left; margin: 0 6px 6px 0;
clear: none;
margin-bottom: 6px;
} }
#site_nav_local_views a { #site_nav_local_views a {
@ -153,161 +62,23 @@ address img + .fn {
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#364a84), color-stop(100%,#7b8dbb)); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#364a84), color-stop(100%,#7b8dbb));
} }
#login #site_nav_local_views, #register #site_nav_local_views, #openidlogin #site_nav_local_views {
display: block;
margin-top: 25px;
}
#login #navtoggle, #register #navtoggle, #openidlogin #navtoggle {
display: none;
}
#login #site_nav_local_views li, #register #site_nav_local_views li, #openidlogin #site_nav_local_views li {
float: left;
clear: none;
margin-bottom: 6px;
}
#content {
width: 96%;
padding: 10px 2%;
margin: 0;
min-height: auto;
left: 0px;
}
#content h1 {
clear: left;
}
#footer {
width: auto;
margin: 0;
padding: 10px 4px 4px 4px;
}
.input_forms { .input_forms {
display: block;
width: 102%;
top: -10px; top: -10px;
left: -2%;
padding-left: 2%;
padding-right: 0; padding-right: 0;
} }
#input_form_nav li a { #input_form_nav li a {
padding: 0px 4px 1px 4px; padding: 0px 4px 1px 4px;
margin-right: 6px;
}
.input_form {
clear: left;
width: 100%;
padding-bottom: 0px;
}
#input_form_status, #input_form_direct {
padding-bottom: 40px;
}
.form_notice_placeholder .placeholder {
width: 290px;
margin-bottom: 20px;
}
.form_notice {
float: left;
margin-left: 0px;
width: 300px;
padding: 4px 0px;
}
#form_notice-direct.form_notice {
padding-top: 0px;
}
.form_notice textarea, #form_notice-direct.form_notice textarea {
width: 292px;
height: 36px;
padding: 4px 4px 16px 4px;
font-size: 1em;
} }
.form_notice .count { .form_notice .count {
position: absolute;
top: 44px; top: 44px;
left: 270px; left: 276px;
} }
#form_notice-direct.form_notice .count { #form_notice-direct.form_notice .count {
top: 70px; top: 74px;
left: 270px; left: 276px;
}
.form_notice .error,
.form_notice .success,
.form_notice .notice-status {
width: 285px;
}
/*input type=file no good in
iPhone/iPod Touch, Android, Opera Mini Simulator
*/
.form_notice .notice_data-attach, .form_notice .notice_data-geo_wrap label, .form_notice .notice_data-geo_wrap input {
display:none;
}
.checkbox-wrapper {
margin-left: 0px;
clear: left;
float: left;
width: 200px;
z-index: 2;
}
.form_notice .checkbox-wrapper {
display: inline;
margin-left: 0px;
}
.checkbox-wrapper label.checkbox {
display: none !important;
}
.checkbox-wrapper #notice_private {
display: inline;
margin-top: 10px;
margin-left: 20px;
}
.form_notice .checkbox-wrapper #notice_private {
margin-left: 0px;
}
.checkbox-wrapper:before {
content: "Send privately?";
}
.input_form fieldset fieldset {
width: 300px;
}
.input_form .form_settings label {
display: inline;
}
.input_form .form_settings li input {
width: 292px;
}
.input_form .form_settings li textarea {
width: 292px;
}
.bookmarkform-thumbnail {
display: none;
} }
#event-startdate, #event-starttime, #event-enddate, #event-endtime { #event-startdate, #event-starttime, #event-enddate, #event-endtime {
@ -317,118 +88,14 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
.input_form .form_settings .submit { .input_form .form_settings .submit {
font-size: 1em; font-size: 1em;
margin: 10px 0;
clear: left;
float: left;
} }
.form_notice #notice_action-submit { .form_notice input.submit {
text-align: center;
left: 0px;
top: 100%;
margin-top: -45px;
width: 80px;
font-size: 1em; font-size: 1em;
} }
#form_notice-direct.form_notice #notice_action-submit { .question div.question-description {
top: 148px; max-width: 100% !important;
}
.threaded-replies {
width: 80%;
margin-left: 59px;
}
#content .notice .threaded-replies .notice {
width: 95%;
}
.threaded-replies .placeholder {
margin: 10px;
width: 92%;
}
.threaded-replies .form_notice {
margin-bottom: 10px;
}
.threaded-replies .form_notice textarea {
width: 220px;
}
.threaded-replies .form_notice .count {
left: 205px;
top: 53px;
}
.threaded-replies .form_notice #notice_action-submit {
position: relative;
top: 0;
bottom: 0px;
left: 0;
margin-top: 10px;
}
.threaded-replies .form_notice .error,
.threaded-replies .form_notice .success,
.threaded-replies .form_notice .notice-status {
width: 210px;
}
.form_settings fieldset {
margin-bottom:7px;
}
.form_settings label {
width:auto;
display:block;
float:none;
text-align: left;
}
.form_settings .form_data li {
margin-bottom:7px;
}
.form_settings .form_data textarea,
.form_settings .form_data select,
.form_settings .form_data input {
margin-left:0;
display:block;
}
.form_settings .form_data textarea {
width:96.41%;
}
.form_settings .form_data label {
float:none;
}
.form_settings .form_data p.form_guide {
width:auto;
margin-left:0 !important;
}
#settings_design_color .form_data {
width: auto;
margin-right: 0;
}
.form_settings input.checkbox, .form_settings input.radio {
left: 0px;
}
.form_settings label.checkbox, .form_settings label.radio {
left: -10px;
}
.notice .addressees:before {
content: '\003E';
}
.user_in .notice div.entry-content {
max-width: 150px;
} }
ul.qna-dummy { ul.qna-dummy {

View File

@ -1,141 +1,45 @@
/* mobile style */ /* copy of mp-screen.css from neo theme */
body { body {
background-image: none; background-image: none;
min-width: 0; min-width: 0;
} }
#wrap {
margin: 0;
padding: 0;
min-width:0;
max-width:100%;
width: auto;
border: none;
}
#header { #header {
width: 100%;
padding: 0; padding: 0;
} }
address {
float:left;
margin: 0px;
width: auto;
left: 0px;
}
address img {
float: left;
background: #fff;
padding: 2px 2px 2px 6px;
}
address img + .fn {
display:block;
margin-top: 8px;
clear: left;
float: left;
color: #000;
margin-left: 6px;
}
#site_nav_global_primary { #site_nav_global_primary {
margin:0; top: 0;
width: 100%;
padding: 2px 0;
height: auto;
position:absolute;
top:0;
left:0;
font-size: 1em;
letter-spacing: 0em;
border-top: none;
-webkit-border-top-right-radius: 0px; -webkit-border-top-right-radius: 0px;
-moz-border-radius-topright: 0px; -moz-border-radius-topright: 0px;
border-top-right-radius: 0px; border-top-right-radius: 0px;
height: 24px;
line-height: 16px; line-height: 16px;
} }
#site_nav_global_primary li { #site_nav_global_primary li {
margin-left:0; float: left;
margin-right: 2px; margin-right: 8px;
float:left;
font-size:0.9em;
padding: 2px 4px;
line-height: 1em;
height: auto;
}
#site_nav_global_primary li:last-child {
margin-right: 0px;
}
#site_nav_global_primary a {
padding: 2px 4px;
height: 20px;
}
#core {
width: 100%;
border-left: none;
border-right: none;
}
#aside_primary_wrapper {
background: none;
}
#content_wrapper {
right: 0px;
border: none;
}
#site_nav_local_views_wrapper {
right: 0px;
border: none;
}
#navtoggle {
float: right;
padding: 2px 6px;
text-decoration: none;
} }
#site_nav_local_views { #site_nav_local_views {
height: auto;
font-size: 1em;
line-height: 2em; line-height: 2em;
margin-bottom: 0px;
padding: 10px 0px 10px 6px;
background: none;
left: 0px;
width: 100%;
display: none;
} }
#site_nav_local_views h3 { #site_nav_local_views h3 {
color: #333; color: #333;
font-size: 1em;
margin-bottom: 0px;
background: none; background: none;
text-transform: none; text-transform: none;
letter-spacing: 0; letter-spacing: 0;
padding-bottom: 0; padding-bottom: 0;
} }
#site_nav_local_views li { #site_nav_local_views li li {
margin-right: 6px; margin: 0 6px 6px 0;
margin-bottom: 0px;
clear: left;
} }
#site_nav_local_views li li { #login #site_nav_local_views li, #register #site_nav_local_views li, #openidlogin #site_nav_local_views li {
float: left; margin: 0 6px 6px 0;
clear: none;
margin-bottom: 6px;
} }
#site_nav_local_views a { #site_nav_local_views a {
@ -154,161 +58,23 @@ address img + .fn {
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#364a84), color-stop(100%,#7b8dbb)); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#364a84), color-stop(100%,#7b8dbb));
} }
#login #site_nav_local_views, #register #site_nav_local_views, #openidlogin #site_nav_local_views {
display: block;
margin-top: 25px;
}
#login #navtoggle, #register #navtoggle, #openidlogin #navtoggle {
display: none;
}
#login #site_nav_local_views li, #register #site_nav_local_views li, #openidlogin #site_nav_local_views li {
float: left;
clear: none;
margin-bottom: 6px;
}
#content {
width: 96%;
padding: 10px 2%;
margin: 0;
min-height: auto;
left: 0px;
}
#content h1 {
clear: left;
}
#footer {
width: auto;
margin: 0;
padding: 10px 4px 4px 4px;
}
.input_forms { .input_forms {
display: block;
width: 102%;
top: -10px; top: -10px;
left: -2%;
padding-left: 2%;
padding-right: 0; padding-right: 0;
} }
#input_form_nav li a { #input_form_nav li a {
padding: 0px 4px 1px 4px; padding: 0px 4px 1px 4px;
margin-right: 6px;
}
.input_form {
clear: left;
width: 100%;
padding-bottom: 0px;
}
#input_form_status, #input_form_direct {
padding-bottom: 40px;
}
.form_notice_placeholder .placeholder {
width: 290px;
margin-bottom: 20px;
}
.form_notice {
float: left;
margin-left: 0px;
width: 300px;
padding: 4px 0px;
}
#form_notice-direct.form_notice {
padding-top: 0px;
}
.form_notice textarea, #form_notice-direct.form_notice textarea {
width: 292px;
height: 36px;
padding: 4px 4px 16px 4px;
font-size: 1em;
} }
.form_notice .count { .form_notice .count {
position: absolute;
top: 44px; top: 44px;
left: 270px; left: 276px;
} }
#form_notice-direct.form_notice .count { #form_notice-direct.form_notice .count {
top: 70px; top: 74px;
left: 270px; left: 276px;
}
.form_notice .error,
.form_notice .success,
.form_notice .notice-status {
width: 285px;
}
/*input type=file no good in
iPhone/iPod Touch, Android, Opera Mini Simulator
*/
.form_notice .notice_data-attach, .form_notice .notice_data-geo_wrap label, .form_notice .notice_data-geo_wrap input {
display:none;
}
.checkbox-wrapper {
margin-left: 0px;
clear: left;
float: left;
width: 200px;
z-index: 2;
}
.form_notice .checkbox-wrapper {
display: inline;
margin-left: 0px;
}
.checkbox-wrapper label.checkbox {
display: none !important;
}
.checkbox-wrapper #notice_private {
display: inline;
margin-top: 10px;
margin-left: 20px;
}
.form_notice .checkbox-wrapper #notice_private {
margin-left: 0px;
}
.checkbox-wrapper:before {
content: "Send privately?";
}
.input_form fieldset fieldset {
width: 300px;
}
.input_form .form_settings label {
display: inline;
}
.input_form .form_settings li input {
width: 292px;
}
.input_form .form_settings li textarea {
width: 292px;
}
.bookmarkform-thumbnail {
display: none;
} }
#event-startdate, #event-starttime, #event-enddate, #event-endtime { #event-startdate, #event-starttime, #event-enddate, #event-endtime {
@ -318,118 +84,14 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
.input_form .form_settings .submit { .input_form .form_settings .submit {
font-size: 1em; font-size: 1em;
margin: 10px 0;
clear: left;
float: left;
} }
.form_notice #notice_action-submit { .form_notice input.submit {
text-align: center;
left: 0px;
top: 100%;
margin-top: -45px;
width: 80px;
font-size: 1em; font-size: 1em;
} }
#form_notice-direct.form_notice #notice_action-submit { .question div.question-description {
top: 148px; max-width: 100% !important;
}
.threaded-replies {
width: 80%;
margin-left: 59px;
}
#content .notice .threaded-replies .notice {
width: 95%;
}
.threaded-replies .placeholder {
margin: 10px;
width: 92%;
}
.threaded-replies .form_notice {
margin-bottom: 10px;
}
.threaded-replies .form_notice textarea {
width: 220px;
}
.threaded-replies .form_notice .count {
left: 205px;
top: 53px;
}
.threaded-replies .form_notice #notice_action-submit {
position: relative;
top: 0;
bottom: 0px;
left: 0;
margin-top: 10px;
}
.threaded-replies .form_notice .error,
.threaded-replies .form_notice .success,
.threaded-replies .form_notice .notice-status {
width: 210px;
}
.form_settings fieldset {
margin-bottom:7px;
}
.form_settings label {
width:auto;
display:block;
float:none;
text-align: left;
}
.form_settings .form_data li {
margin-bottom:7px;
}
.form_settings .form_data textarea,
.form_settings .form_data select,
.form_settings .form_data input {
margin-left:0;
display:block;
}
.form_settings .form_data textarea {
width:96.41%;
}
.form_settings .form_data label {
float:none;
}
.form_settings .form_data p.form_guide {
width:auto;
margin-left:0 !important;
}
#settings_design_color .form_data {
width: auto;
margin-right: 0;
}
.form_settings input.checkbox, .form_settings input.radio {
left: 0px;
}
.form_settings label.checkbox, .form_settings label.radio {
left: -10px;
}
.notice .addressees:before {
content: '\003E';
}
.user_in .notice div.entry-content {
max-width: 150px;
} }
ul.qna-dummy { ul.qna-dummy {

View File

@ -413,7 +413,6 @@ div.entry-content a.response:after {
.notice-options { .notice-options {
margin-top: 4px; margin-top: 4px;
margin-bottom: 10px;
} }
#content .threaded-replies .notice .author .photo { #content .threaded-replies .notice .author .photo {
@ -580,7 +579,6 @@ div.entry-content a.response:after {
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5); text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
} }
#form_login p.form_guide, #form_register #settings_rememberme p.form_guide, #form_openid_login #settings_rememberme p.form_guide, #settings_twitter_remove p.form_guide, #design_background-image_onoff p.form_guide { #form_login p.form_guide, #form_register #settings_rememberme p.form_guide, #form_openid_login #settings_rememberme p.form_guide, #settings_twitter_remove p.form_guide, #design_background-image_onoff p.form_guide {
margin-left: 26%; margin-left: 26%;
} }
@ -839,9 +837,8 @@ ul.bookmark-tags a:hover {
color: #777; color: #777;
} }
#bookmarkpopup #submit { #bookmarkpopup #bookmark-submit {
float: right; min-width: 100px;
margin-right: 0px;
} }
#bookmarkpopup fieldset fieldset { #bookmarkpopup fieldset fieldset {
@ -1158,6 +1155,11 @@ td.entity_profile {
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 ); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
} }
#wrap .vevent form.processing input.submit {
text-indent: 0;
background: #ff9d63;
}
#input_form_event .form_settings .form_data { #input_form_event .form_settings .form_data {
float: left; float: left;
} }
@ -1172,7 +1174,7 @@ td.entity_profile {
} }
label[for=event-starttime], label[for=event-endtime] { label[for=event-starttime], label[for=event-endtime] {
display: none; display: none !important;
} }
#event-starttime, #event-endtime { #event-starttime, #event-endtime {
@ -1221,10 +1223,6 @@ label[for=event-starttime], label[for=event-endtime] {
/* QnA specific styles */ /* QnA specific styles */
#content .question .entry-title, #content .qna-full-question .entry-title {
min-height: 1px;
}
.question div.question-description { .question div.question-description {
font-size: 1em; font-size: 1em;
line-height: 1.36em; line-height: 1.36em;
@ -1233,95 +1231,17 @@ label[for=event-starttime], label[for=event-endtime] {
} }
.question div.answer-content, .qna-full-question div.answer-content { .question div.answer-content, .qna-full-question div.answer-content {
font-size: 1em;
opacity: 1; opacity: 1;
} }
.question .answer-count, .qna-full-question .answer-count { .qna-dummy-placeholder input, .question #qna-answer, .qna-full-question #qna-answer {
display: block;
clear: left;
}
.question .answer-count:before, .qna-full-question .answer-count:before {
content: '(';
}
.question .answer-count:after, .qna-full-question .answer-count:after {
content: ')';
}
.question .notice-answer {
margin-left: 10px;
padding-bottom: 10px;
}
ul.qna-dummy {
clear: left;
float: left;
list-style-type: none;
width: 458px;
margin-left: 59px;
padding-right: 2px;
border-left: 3px solid #ECECF2;
background: #fafafa;
font-size: 1em;
}
ul.qna-dummy + ul.threaded-replies li.notice:first-child {
border-top: 2px dotted #eee;
margin-top: -10px;
padding-top: 10px;
}
.qna-dummy-placeholder input {
margin: 10px;
width: 426px;
padding: 4px 4px 4px 6px;
border: 1px solid #a6a6a6;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2); box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-moz-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); -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
color: #888;
}
li.notice-answer + li.notice {
border-top: 2px dotted #eee;
margin-top: -10px;
padding-top: 10px;
}
.question fieldset, .qna-full-question fieldset {
margin: 0px;
}
.question fieldset legend, .qna-full-question fieldset legend, .answer fieldset legend {
display: none;
}
.question label[for=qna-answer], .qna-full-question label[for=qna-answer] {
display: none;
}
.question #qna-answer, .qna-full-question #qna-answer {
width: 426px;
height: 54px;
padding: 6px 5px;
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);
font-size: 1.2em;
margin-top: 10px;
margin-bottom: 10px;
}
.qna-full-question textarea {
width: 508px;
} }
.question-description input.submit, .answer-content input.submit { .question-description input.submit, .answer-content input.submit {
@ -1343,6 +1263,10 @@ li.notice-answer + li.notice {
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#FB6104',GradientType=0 ); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#FB6104',GradientType=0 );
} }
#qna-answer-submit {
min-width: 100px;
}
.question .question-description input.submit:hover, .question .answer-content input.submit:hover { .question .question-description input.submit:hover, .question .answer-content input.submit:hover {
text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6); text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
background: #ff9d63; background: #ff9d63;
@ -1360,6 +1284,10 @@ li.notice-answer + li.notice {
padding-left: 20px; padding-left: 20px;
} }
.question p.best:before, .answer p.best:before {
content: none !important;
}
/* Blog specific styles */ /* Blog specific styles */
label[for=blog-entry-content] { label[for=blog-entry-content] {
@ -1381,6 +1309,10 @@ label[for=blog-entry-content] {
opacity: 1; opacity: 1;
} }
#poll-response-submit {
min-width: 100px;
}
/* SNOD CompanyLogo styling */ /* SNOD CompanyLogo styling */
#site_nav_local_views a.company_logo { #site_nav_local_views a.company_logo {

View File

@ -1,141 +1,43 @@
/* mobile style */
body { body {
background-image: none; background-image: none;
min-width: 0; min-width: 0;
} }
#wrap {
margin: 0;
padding: 0;
min-width:0;
max-width:100%;
width: auto;
border: none;
}
#header { #header {
width: 100%;
padding: 0; padding: 0;
} }
address {
float:left;
margin: 0px;
width: auto;
left: 0px;
}
address img {
float: left;
background: #fff;
padding: 2px 2px 2px 6px;
}
address img + .fn {
display:block;
margin-top: 8px;
clear: left;
float: left;
color: #000;
margin-left: 6px;
}
#site_nav_global_primary { #site_nav_global_primary {
margin:0; top: 0;
width: 100%;
padding: 2px 0;
height: auto;
position:absolute;
top:0;
left:0;
font-size: 1em;
letter-spacing: 0em;
border-top: none;
-webkit-border-top-right-radius: 0px; -webkit-border-top-right-radius: 0px;
-moz-border-radius-topright: 0px; -moz-border-radius-topright: 0px;
border-top-right-radius: 0px; border-top-right-radius: 0px;
height: 24px;
line-height: 16px; line-height: 16px;
} }
#site_nav_global_primary li { #site_nav_global_primary li {
margin-left:0; float: left;
margin-right: 2px; margin-right: 8px;
float:left;
font-size:0.9em;
padding: 2px 4px;
line-height: 1em;
height: auto;
}
#site_nav_global_primary li:last-child {
margin-right: 0px;
}
#site_nav_global_primary a {
padding: 2px 4px;
height: 20px;
}
#core {
width: 100%;
border-left: none;
border-right: none;
}
#aside_primary_wrapper {
background: none;
}
#content_wrapper {
right: 0px;
border: none;
}
#site_nav_local_views_wrapper {
right: 0px;
border: none;
}
#navtoggle {
float: right;
padding: 2px 6px;
text-decoration: none;
} }
#site_nav_local_views { #site_nav_local_views {
height: auto;
font-size: 1em;
line-height: 2em; line-height: 2em;
margin-bottom: 0px;
padding: 10px 0px 10px 6px;
background: none;
left: 0px;
width: 100%;
display: none;
} }
#site_nav_local_views h3 { #site_nav_local_views h3 {
color: #333; color: #333;
font-size: 1em;
margin-bottom: 0px;
background: none; background: none;
text-transform: none; text-transform: none;
letter-spacing: 0; letter-spacing: 0;
padding-bottom: 0; padding-bottom: 0;
} }
#site_nav_local_views li { #site_nav_local_views li li {
margin-right: 6px; margin: 0 6px 6px 0;
margin-bottom: 0px;
clear: left;
} }
#site_nav_local_views li li { #login #site_nav_local_views li, #register #site_nav_local_views li, #openidlogin #site_nav_local_views li {
float: left; margin: 0 6px 6px 0;
clear: none;
margin-bottom: 6px;
} }
#site_nav_local_views a { #site_nav_local_views a {
@ -154,161 +56,23 @@ address img + .fn {
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#364a84), color-stop(100%,#7b8dbb)); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#364a84), color-stop(100%,#7b8dbb));
} }
#login #site_nav_local_views, #register #site_nav_local_views, #openidlogin #site_nav_local_views {
display: block;
margin-top: 25px;
}
#login #navtoggle, #register #navtoggle, #openidlogin #navtoggle {
display: none;
}
#login #site_nav_local_views li, #register #site_nav_local_views li, #openidlogin #site_nav_local_views li {
float: left;
clear: none;
margin-bottom: 6px;
}
#content {
width: 96%;
padding: 10px 2%;
margin: 0;
min-height: auto;
left: 0px;
}
#content h1 {
clear: left;
}
#footer {
width: auto;
margin: 0;
padding: 10px 4px 4px 4px;
}
.input_forms { .input_forms {
display: block;
width: 102%;
top: -10px; top: -10px;
left: -2%;
padding-left: 2%;
padding-right: 0; padding-right: 0;
} }
#input_form_nav li a { #input_form_nav li a {
padding: 0px 4px 1px 4px; padding: 0px 4px 1px 4px;
margin-right: 6px;
}
.input_form {
clear: left;
width: 100%;
padding-bottom: 0px;
}
#input_form_status, #input_form_direct {
padding-bottom: 40px;
}
.form_notice_placeholder .placeholder {
width: 290px;
margin-bottom: 20px;
}
.form_notice {
float: left;
margin-left: 0px;
width: 300px;
padding: 4px 0px;
}
#form_notice-direct.form_notice {
padding-top: 0px;
}
.form_notice textarea, #form_notice-direct.form_notice textarea {
width: 292px;
height: 36px;
padding: 4px 4px 16px 4px;
font-size: 1em;
} }
.form_notice .count { .form_notice .count {
position: absolute;
top: 44px; top: 44px;
left: 270px; left: 276px;
} }
#form_notice-direct.form_notice .count { #form_notice-direct.form_notice .count {
top: 70px; top: 74px;
left: 270px; left: 276px;
}
.form_notice .error,
.form_notice .success,
.form_notice .notice-status {
width: 285px;
}
/*input type=file no good in
iPhone/iPod Touch, Android, Opera Mini Simulator
*/
.form_notice .notice_data-attach, .form_notice .notice_data-geo_wrap label, .form_notice .notice_data-geo_wrap input {
display:none;
}
.checkbox-wrapper {
margin-left: 0px;
clear: left;
float: left;
width: 200px;
z-index: 2;
}
.form_notice .checkbox-wrapper {
display: inline;
margin-left: 0px;
}
.checkbox-wrapper label.checkbox {
display: none !important;
}
.checkbox-wrapper #notice_private {
display: inline;
margin-top: 10px;
margin-left: 20px;
}
.form_notice .checkbox-wrapper #notice_private {
margin-left: 0px;
}
.checkbox-wrapper:before {
content: "Send privately?";
}
.input_form fieldset fieldset {
width: 300px;
}
.input_form .form_settings label {
display: inline;
}
.input_form .form_settings li input {
width: 292px;
}
.input_form .form_settings li textarea {
width: 292px;
}
.bookmarkform-thumbnail {
display: none;
} }
#event-startdate, #event-starttime, #event-enddate, #event-endtime { #event-startdate, #event-starttime, #event-enddate, #event-endtime {
@ -318,118 +82,14 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
.input_form .form_settings .submit { .input_form .form_settings .submit {
font-size: 1em; font-size: 1em;
margin: 10px 0;
clear: left;
float: left;
} }
.form_notice #notice_action-submit { .form_notice input.submit {
text-align: center;
left: 0px;
top: 100%;
margin-top: -45px;
width: 80px;
font-size: 1em; font-size: 1em;
} }
#form_notice-direct.form_notice #notice_action-submit { .question div.question-description {
top: 148px; max-width: 100% !important;
}
.threaded-replies {
width: 80%;
margin-left: 59px;
}
#content .notice .threaded-replies .notice {
width: 95%;
}
.threaded-replies .placeholder {
margin: 10px;
width: 92%;
}
.threaded-replies .form_notice {
margin-bottom: 10px;
}
.threaded-replies .form_notice textarea {
width: 220px;
}
.threaded-replies .form_notice .count {
left: 205px;
top: 53px;
}
.threaded-replies .form_notice #notice_action-submit {
position: relative;
top: 0;
bottom: 0px;
left: 0;
margin-top: 10px;
}
.threaded-replies .form_notice .error,
.threaded-replies .form_notice .success,
.threaded-replies .form_notice .notice-status {
width: 210px;
}
.form_settings fieldset {
margin-bottom:7px;
}
.form_settings label {
width:auto;
display:block;
float:none;
text-align: left;
}
.form_settings .form_data li {
margin-bottom:7px;
}
.form_settings .form_data textarea,
.form_settings .form_data select,
.form_settings .form_data input {
margin-left:0;
display:block;
}
.form_settings .form_data textarea {
width:96.41%;
}
.form_settings .form_data label {
float:none;
}
.form_settings .form_data p.form_guide {
width:auto;
margin-left:0 !important;
}
#settings_design_color .form_data {
width: auto;
margin-right: 0;
}
.form_settings input.checkbox, .form_settings input.radio {
left: 0px;
}
.form_settings label.checkbox, .form_settings label.radio {
left: -10px;
}
.notice .addressees:before {
content: '\003E';
}
.user_in .notice div.entry-content {
max-width: 150px;
} }
ul.qna-dummy { ul.qna-dummy {