Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts: js/util.min.js
This commit is contained in:
Evan Prodromou
commit
feb53619cf
|
|
@ -195,8 +195,21 @@ class AllAction extends ProfileAction
|
|||
|
||||
function showSections()
|
||||
{
|
||||
$ibs = new InviteButtonSection($this);
|
||||
$ibs->show();
|
||||
// Show invite button, as long as site isn't closed, and
|
||||
// we have a logged in user.
|
||||
if (!common_config('site', 'closed') && common_logged_in()) {
|
||||
if (!common_config('site', 'private')) {
|
||||
$ibs = new InviteButtonSection(
|
||||
$this,
|
||||
// TRANS: Button text for inviting more users to the StatusNet instance.
|
||||
// TRANS: Less business/enterprise-oriented language for public sites.
|
||||
_m('BUTTON', 'Send invite')
|
||||
);
|
||||
} else {
|
||||
$ibs = new InviteButtonSection($this);
|
||||
}
|
||||
$ibs->show();
|
||||
}
|
||||
$pop = new PopularNoticeSection($this);
|
||||
$pop->show();
|
||||
// $pop = new InboxTagCloudSection($this, $this->user);
|
||||
|
|
|
|||
|
|
@ -227,8 +227,22 @@ class PublicAction extends Action
|
|||
|
||||
function showSections()
|
||||
{
|
||||
$ibs = new InviteButtonSection($this);
|
||||
$ibs->show();
|
||||
// Show invite button, as long as site isn't closed, and
|
||||
// we have a logged in user.
|
||||
if (!common_config('site', 'closed') && common_logged_in()) {
|
||||
if (!common_config('site', 'private')) {
|
||||
$ibs = new InviteButtonSection(
|
||||
$this,
|
||||
// TRANS: Button text for inviting more users to the StatusNet instance.
|
||||
// TRANS: Less business/enterprise-oriented language for public sites.
|
||||
_m('BUTTON', 'Send invite')
|
||||
);
|
||||
} else {
|
||||
$ibs = new InviteButtonSection($this);
|
||||
}
|
||||
$ibs->show();
|
||||
}
|
||||
|
||||
$pop = new PopularNoticeSection($this);
|
||||
$pop->show();
|
||||
$cloud = new PublicTagCloudSection($this);
|
||||
|
|
|
|||
|
|
@ -46,6 +46,19 @@ if (!defined('STATUSNET')) {
|
|||
*/
|
||||
class InviteButtonSection extends Section
|
||||
{
|
||||
protected $buttonText;
|
||||
|
||||
function __construct($out = null, $buttonText = null)
|
||||
{
|
||||
$this->out = $out;
|
||||
if (empty($buttonText)) {
|
||||
// TRANS: Default button text for inviting more users to the StatusNet instance.
|
||||
$this->buttonText = _m('BUTTON', 'Invite more colleagues');
|
||||
} else {
|
||||
$this->buttonText = $buttonText;
|
||||
}
|
||||
}
|
||||
|
||||
function showTitle()
|
||||
{
|
||||
return false;
|
||||
|
|
@ -53,11 +66,14 @@ class InviteButtonSection extends Section
|
|||
|
||||
function showContent()
|
||||
{
|
||||
$this->out->element('a',
|
||||
array('href' => common_local_url('invite'),
|
||||
'class' => 'invite_button'),
|
||||
// TRANS: Button text for inviting more users to the StatusNet instance.
|
||||
_m('BUTTON','Invite more colleagues'));
|
||||
$this->out->element(
|
||||
'a',
|
||||
array(
|
||||
'href' => common_local_url('invite'),
|
||||
'class' => 'invite_button'
|
||||
),
|
||||
$this->buttonText
|
||||
);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1000 B |
Binary file not shown.
|
Before Width: | Height: | Size: 8.8 KiB After Width: | Height: | Size: 6.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 2.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 749 B |
Binary file not shown.
|
After Width: | Height: | Size: 727 B |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 990 B |
|
|
@ -30,18 +30,17 @@
|
|||
|
||||
@media screen, projection, tv {
|
||||
|
||||
/* general styles and layout */
|
||||
|
||||
body {
|
||||
background-color: #C6C8CC;
|
||||
background-image: url(../images/bg.png);
|
||||
font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
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;}
|
||||
|
|
@ -57,41 +56,46 @@ h5 {font-size: 1.2em;}
|
|||
h6 {font-size: 1em;}
|
||||
|
||||
#wrap {
|
||||
width: 960px;
|
||||
margin: 0px auto;
|
||||
background: #fff url('../images/brdr_black_dot.png') repeat-x 0px 10px;
|
||||
border-left: 10px solid #fff;
|
||||
border-right: 10px solid #fff;
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
#header {
|
||||
width: 960px;
|
||||
padding: 0px;
|
||||
padding-top: 12px;
|
||||
}
|
||||
|
||||
address {
|
||||
float: left;
|
||||
position: relative;
|
||||
top: 1px;
|
||||
left: 2px;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
height: 24px;
|
||||
width: 148px;
|
||||
z-index: 99;
|
||||
#core {
|
||||
border-top: 5px solid #FB6104;
|
||||
border-left: 1px solid #d8dae6;
|
||||
border-right: 1px solid #d8dae6;
|
||||
}
|
||||
|
||||
#aside_primary_wrapper {
|
||||
background-color: #ececf2;
|
||||
}
|
||||
|
||||
#content_wrapper {
|
||||
border-right: 1px solid #d8dae6;
|
||||
}
|
||||
|
||||
#site_nav_local_views_wrapper {
|
||||
background-color: #ececf2;
|
||||
border-right: 1px solid #d8dae6;
|
||||
}
|
||||
|
||||
#footer {
|
||||
top: -6px;
|
||||
-webkit-border-top-left-radius: 6px;
|
||||
-webkit-border-top-right-radius: 6px;
|
||||
-moz-border-radius-topleft: 6px;
|
||||
-moz-border-radius-topright: 6px;
|
||||
border-top-left-radius: 6px;
|
||||
border-top-right-radius: 6px;
|
||||
}
|
||||
|
||||
/* header elements */
|
||||
|
||||
#site_nav_global_primary {
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
right: 0;
|
||||
width: 800px;
|
||||
margin: 0px;
|
||||
height: 24px;
|
||||
line-height: 20px;
|
||||
-webkit-border-top-right-radius: 6px;
|
||||
-moz-border-radius-topright: 6px;
|
||||
border-top-right-radius: 6px;
|
||||
|
|
@ -101,10 +105,6 @@ address {
|
|||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 ); /* XXX move all to ie.css */
|
||||
}
|
||||
|
||||
#site_nav_global_primary ul {
|
||||
float: right;
|
||||
}
|
||||
|
||||
#site_nav_global_primary li {
|
||||
margin-right: 0px;
|
||||
}
|
||||
|
|
@ -114,12 +114,12 @@ address {
|
|||
}
|
||||
|
||||
#site_nav_global_primary a {
|
||||
color: #fff !important;
|
||||
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
padding: 2px 10px 2px 10px;
|
||||
height: 20px;
|
||||
display: block;
|
||||
float: left;
|
||||
color: #fff;
|
||||
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
|
||||
#site_nav_global_primary a:hover {
|
||||
|
|
@ -130,150 +130,27 @@ address {
|
|||
}
|
||||
|
||||
#site_notice {
|
||||
color: #000;
|
||||
float: right;
|
||||
width: 280px;
|
||||
padding: 10px;
|
||||
margin-left: 40px;
|
||||
-webkit-border-radius: 6px;
|
||||
-moz-border-radius: 6px;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
#site_notice a {
|
||||
color: #3e3e8c;
|
||||
}
|
||||
|
||||
#anon_notice {
|
||||
color: #000;
|
||||
clear: both;
|
||||
background: none;
|
||||
padding: 0px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
#anon_notice a {
|
||||
color: #3e3e8c;
|
||||
}
|
||||
|
||||
#core {
|
||||
clear: both;
|
||||
margin: 0px;
|
||||
width: 958px;
|
||||
border-top: 5px solid #FB6104;
|
||||
border-left: 1px solid #d8dae6;
|
||||
border-right: 1px solid #d8dae6;
|
||||
}
|
||||
|
||||
#aside_primary_wrapper {
|
||||
width: 100%;
|
||||
float: left;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
background-color: #ececf2;
|
||||
}
|
||||
|
||||
#content_wrapper {
|
||||
width: 100%;
|
||||
float: left;
|
||||
position: relative;
|
||||
right: 239px;
|
||||
background-color: #fff;
|
||||
border-right: 1px solid #d8dae6;
|
||||
}
|
||||
|
||||
#site_nav_local_views_wrapper {
|
||||
width: 100%;
|
||||
float: left;
|
||||
position: relative;
|
||||
right: 561px;
|
||||
background-color: #ececf2;
|
||||
border-right: 1px solid #d8dae6;
|
||||
}
|
||||
|
||||
#site_nav_local_views {
|
||||
width: 138px;
|
||||
float: left;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
left: 800px;
|
||||
margin-top: 0px;
|
||||
padding: 22px 10px 40px 10px;
|
||||
}
|
||||
|
||||
#site_nav_local_views H3 {
|
||||
margin-bottom: 10px;
|
||||
padding-bottom: 6px;
|
||||
background: url('../images/brdr_black_dot.png') repeat-x bottom left;
|
||||
color: #7a7c87;
|
||||
font-size: 1.1em;
|
||||
letter-spacing: 2px;
|
||||
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
#site_nav_local_views li {
|
||||
display: block;
|
||||
margin: 0px 0px 8px 0px;
|
||||
}
|
||||
|
||||
#site_nav_local_views li ul {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
#site_nav_local_views a {
|
||||
display: block;
|
||||
width: 118px;
|
||||
padding: 0px 10px 1px 10px;
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
text-transform: uppercase;
|
||||
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
#site_nav_local_views a:hover, #site_nav_local_views .current a {
|
||||
color: #fff;
|
||||
text-decoration: none;
|
||||
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 );
|
||||
}
|
||||
|
||||
#content {
|
||||
width: 520px;
|
||||
float: left;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
left: 801px;
|
||||
margin: 0px;
|
||||
padding: 20px 20px 40px 20px;
|
||||
}
|
||||
|
||||
/* Input forms */
|
||||
/* input forms */
|
||||
|
||||
.input_forms {
|
||||
float: left;
|
||||
position: relative;
|
||||
top: -20px;
|
||||
left: -20px;
|
||||
padding: 18px 20px 0px 20px;
|
||||
border-bottom: none;
|
||||
margin-bottom: 0px;
|
||||
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;
|
||||
|
|
@ -298,285 +175,73 @@ address {
|
|||
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: 20px;
|
||||
}
|
||||
|
||||
#input_form_status, #input_form_direct {
|
||||
padding-bottom: 50px;
|
||||
}
|
||||
|
||||
.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_placeholder .placeholder {
|
||||
width: 508px;
|
||||
padding: 4px 4px 4px 6px;
|
||||
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: 1em;
|
||||
color: #888;
|
||||
}
|
||||
|
||||
.form_notice textarea {
|
||||
width: 483px;
|
||||
height: 42px;
|
||||
padding: 6px 5px 18px 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);
|
||||
z-index: 97;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
#form_notice-direct.form_notice textarea {
|
||||
width: 508px;
|
||||
}
|
||||
|
||||
.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: 32px;
|
||||
font-size: 0.8em;
|
||||
height: 1em;
|
||||
z-index: 99;
|
||||
}
|
||||
|
||||
#form_notice-direct.form_notice .count {
|
||||
top: 78px;
|
||||
right: 7px;
|
||||
}
|
||||
|
||||
.form_notice #notice_action-submit {
|
||||
position: absolute;
|
||||
top: 100%;
|
||||
left: 0px;
|
||||
margin-top: -49px;
|
||||
float: left;
|
||||
width: 100px;
|
||||
padding: 0px;
|
||||
z-index: 99;
|
||||
.input_form_nav_tab a, .input_form_nav_tab.current a {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.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: 10px;
|
||||
padding: 5px 5px 5px 10px;
|
||||
border: 1px solid #ccc;
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.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 {
|
||||
width: 400px;
|
||||
float: left;
|
||||
background: none;
|
||||
border: none;
|
||||
margin-bottom: 0px !important;
|
||||
padding: 0px !important;
|
||||
}
|
||||
|
||||
.input_form .form_settings .form_data li {
|
||||
position: relative;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.input_form fieldset fieldset label {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 6px;
|
||||
float: none;
|
||||
text-align: left;
|
||||
color: #888;
|
||||
cursor: text;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.input_form .form_settings li input {
|
||||
width: 388px;
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
padding: 4px 5px 4px 5px;
|
||||
border: 1px solid #a6a6a6;
|
||||
.form_notice_placeholder .placeholder,
|
||||
.form_notice textarea ,
|
||||
.input_form .form_settings li input,
|
||||
.input_form .form_settings li textarea,
|
||||
.threaded-replies .placeholder {
|
||||
-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: 1em;
|
||||
}
|
||||
|
||||
.input_form .form_settings li textarea {
|
||||
width: 388px;
|
||||
margin-left: 0;
|
||||
padding: 4px 5px 4px 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);
|
||||
z-index: 97;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
.input_form .form_settings p.form_guide {
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.input_form .form_settings .submit {
|
||||
position: relative;
|
||||
top: 0;
|
||||
right: 0;
|
||||
float: right;
|
||||
width: 100px;
|
||||
height: 26px;
|
||||
line-height: 26px;
|
||||
padding: 0px 10px;
|
||||
margin: 0px;
|
||||
color:#fff;
|
||||
font-weight: bold;
|
||||
text-transform: uppercase;
|
||||
font-size: 1.1em;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.to-selector {
|
||||
padding-top: 15px;
|
||||
z-index: 99;
|
||||
/* site nav local views */
|
||||
|
||||
#site_nav_local_views H3 {
|
||||
margin-bottom: 10px;
|
||||
padding-bottom: 6px;
|
||||
background: url('../images/brdr_black_dot.png') repeat-x bottom left;
|
||||
color: #7a7c87;
|
||||
font-size: 1.1em;
|
||||
letter-spacing: 2px;
|
||||
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.form_settings label[for=notice_to] {
|
||||
left: 5px;
|
||||
margin-left: 0px;
|
||||
margin-right: 10px;
|
||||
position: relative;
|
||||
clear: left;
|
||||
#site_nav_local_views a {
|
||||
display: block;
|
||||
width: 118px;
|
||||
padding: 0px 10px 1px 10px;
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
text-transform: uppercase;
|
||||
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
.checkbox-wrapper {
|
||||
padding: 2px;
|
||||
margin-left: 10px;
|
||||
#site_nav_local_views a:hover, #site_nav_local_views .current a {
|
||||
color: #fff;
|
||||
text-decoration: none;
|
||||
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 );
|
||||
}
|
||||
|
||||
.form_notice .checkbox-wrapper {
|
||||
display: inline;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.form_settings .checkbox-wrapper label.checkbox {
|
||||
margin-left: 0px;
|
||||
margin-top: 6px;
|
||||
line-height: 1.2em;
|
||||
left: -3px;
|
||||
float: none;
|
||||
}
|
||||
|
||||
.checkbox-wrapper #notice_private {
|
||||
display:none;
|
||||
}
|
||||
|
||||
.checkbox-wrapper.unchecked label.checkbox {
|
||||
padding-left: 20px;
|
||||
background: url(../images/lock_open.png) no-repeat 0px 0px;
|
||||
opacity: 0.6;
|
||||
}
|
||||
|
||||
.checkbox-wrapper.unchecked label.checkbox:hover {
|
||||
opacity: 1;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.checkbox-wrapper.checked label.checkbox {
|
||||
padding-left: 20px;
|
||||
background: url(../images/lock.png) no-repeat 0px 0px;
|
||||
color: red;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.checkbox-wrapper.checked label.checkbox:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#aside_primary {
|
||||
width: 218px;
|
||||
float: left;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
left: 802px;
|
||||
padding: 22px 10px 40px 10px;
|
||||
margin-top: 0px;
|
||||
background: none;
|
||||
}
|
||||
/* aside primary */
|
||||
|
||||
#aside_primary .section {
|
||||
width: 100%;
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
font-size: 0.88em;
|
||||
}
|
||||
|
||||
|
|
@ -708,6 +373,8 @@ address {
|
|||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
|
||||
}
|
||||
|
||||
/* notices etc */
|
||||
|
||||
#content h1 {
|
||||
border-bottom: 3px solid #A6ADBF;
|
||||
color: #A6ADBF;
|
||||
|
|
@ -716,37 +383,11 @@ address {
|
|||
text-transform: none;
|
||||
}
|
||||
|
||||
#notices_primary {
|
||||
margin-top: -5px;
|
||||
}
|
||||
|
||||
#content .notice {
|
||||
padding-bottom: 4px;
|
||||
border-bottom: 2px dotted #eee;
|
||||
}
|
||||
|
||||
.notice {
|
||||
line-height: 1.36em;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
#content .notice .author .photo {
|
||||
left: 0px;
|
||||
top: 7px;
|
||||
}
|
||||
|
||||
#content .notice .entry-title {
|
||||
min-height: 35px;
|
||||
}
|
||||
|
||||
#showstream .notice .entry-title {
|
||||
min-height: 1px;
|
||||
}
|
||||
|
||||
#shownotice .notice .entry-title {
|
||||
min-height:123px;
|
||||
}
|
||||
|
||||
.notice div.entry-content {
|
||||
font-size: 0.88em;
|
||||
line-height: 1.2em;
|
||||
|
|
@ -775,147 +416,17 @@ div.entry-content a.response:after {
|
|||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.threaded-replies {
|
||||
clear: both;
|
||||
float: left;
|
||||
width: 458px;
|
||||
margin-left: 59px;
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
padding-right: 2px;
|
||||
border-left: 3px solid #ECECF2;
|
||||
background: #fafafa;
|
||||
color: #222;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
.threaded-replies:empty {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.user_in .threaded-replies {
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
.threaded-replies a {
|
||||
color: #3e3e8c;
|
||||
}
|
||||
|
||||
#content .notice .threaded-replies .notice,
|
||||
#content .notice .threaded-replies .notice-data {
|
||||
width: 440px;
|
||||
min-height: 1px;
|
||||
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 .notice .threaded-replies .entry-title {
|
||||
min-height: 1px;
|
||||
}
|
||||
|
||||
#content .threaded-replies .notice .author .photo {
|
||||
height: 24px;
|
||||
width: 24px;
|
||||
top: 12px;
|
||||
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
|
||||
#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: 6px !important;
|
||||
}
|
||||
|
||||
#content .notice .threaded-replies .notice div.entry-content.notice-faves {
|
||||
margin-top: 2px !important;
|
||||
}
|
||||
|
||||
#content .notice .threaded-replies .notice .notice-options {
|
||||
margin-top: 5px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
.threaded-replies li {
|
||||
list-style-type: none;
|
||||
}
|
||||
|
||||
.threaded-replies .notice-reply-comments {
|
||||
margin: 2px 0px 4px 10px;
|
||||
}
|
||||
|
||||
.threaded-replies .placeholder {
|
||||
margin: 10px;
|
||||
width: 426px;
|
||||
padding: 4px 4px 4px 6px;
|
||||
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);
|
||||
color: #888;
|
||||
}
|
||||
|
||||
.threaded-replies .notice-reply {
|
||||
clear: left;
|
||||
position: relative;
|
||||
padding: 10px;
|
||||
padding-bottom: 44px;
|
||||
}
|
||||
|
||||
.threaded-replies .form_notice textarea {
|
||||
width: 395px;
|
||||
}
|
||||
|
||||
.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;
|
||||
margin-top: -44px;
|
||||
}
|
||||
|
||||
.threaded-replies .form_notice .error,
|
||||
.threaded-replies .form_notice .success,
|
||||
.threaded-replies .form_notice .notice-status {
|
||||
width: 390px;
|
||||
}
|
||||
|
||||
.threaded-replies .to-selector {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.user_in.realtime-popup .notice div.entry-content {
|
||||
max-width: 320px;
|
||||
}
|
||||
|
||||
|
||||
.realtime-popup .threaded-replies {
|
||||
margin-left: 15px;
|
||||
}
|
||||
|
|
@ -929,35 +440,11 @@ div.entry-content a.response:after {
|
|||
right: 10px !important;
|
||||
}
|
||||
|
||||
#content .notice .notice {
|
||||
width: 100%;
|
||||
margin-left: 0;
|
||||
margin-top: 16px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.notice .notice {
|
||||
background-color:rgba(200, 200, 200, 0.050);
|
||||
}
|
||||
.notice .notice .notice {
|
||||
background-color:rgba(200, 200, 200, 0.100);
|
||||
}
|
||||
.notice .notice .notice .notice {
|
||||
background-color:rgba(200, 200, 200, 0.150);
|
||||
}
|
||||
.notice .notice .notice .notice .notice {
|
||||
background-color:rgba(200, 200, 200, 0.300);
|
||||
}
|
||||
|
||||
.pagination {
|
||||
height: 1.2em;
|
||||
}
|
||||
|
||||
#jOverlayContent button {
|
||||
top: 20px;
|
||||
right: 36px;
|
||||
}
|
||||
|
||||
.entity_profile {
|
||||
float: left;
|
||||
width: 360px;
|
||||
|
|
@ -1039,19 +526,6 @@ background-color:rgba(200, 200, 200, 0.300);
|
|||
color: #3e3e8c;
|
||||
}
|
||||
|
||||
#footer {
|
||||
position: relative;
|
||||
top: -6px;
|
||||
color: #000;
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
-webkit-border-top-left-radius: 6px;
|
||||
-webkit-border-top-right-radius: 6px;
|
||||
-moz-border-radius-topleft: 6px;
|
||||
-moz-border-radius-topright: 6px;
|
||||
border-top-left-radius: 6px;
|
||||
border-top-right-radius: 6px;
|
||||
}
|
||||
|
||||
#footer a {
|
||||
color: #3e3e8c;
|
||||
|
|
@ -1062,15 +536,11 @@ background-color:rgba(200, 200, 200, 0.300);
|
|||
}
|
||||
|
||||
.error, .success, .notice-status {
|
||||
background-color: #F7E8E8;
|
||||
padding: 4px 10px;
|
||||
-webkit-border-radius: 6px;
|
||||
-moz-border-radius: 6px;
|
||||
border-radius: 6px;
|
||||
}
|
||||
.success, .notice-status {
|
||||
background-color: #f2f2f2;
|
||||
}
|
||||
|
||||
|
||||
.form_notice input.submit, .form_settings input.submit, .form_settings input.cancel, #form_invite input.submit {
|
||||
height: 1.9em;
|
||||
|
|
@ -1110,29 +580,6 @@ background-color:rgba(200, 200, 200, 0.300);
|
|||
text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.5);
|
||||
}
|
||||
|
||||
.form_settings input.checkbox, .form_settings input.radio {
|
||||
margin-left: 24%;
|
||||
margin-top: 2px;
|
||||
position: relative;
|
||||
left: -14px;
|
||||
}
|
||||
|
||||
.form_settings label.checkbox, .form_settings label.radio {
|
||||
width: auto;
|
||||
max-width: 60%;
|
||||
position: relative;
|
||||
left: -30px;
|
||||
}
|
||||
|
||||
.form_settings li input.radio {
|
||||
clear: left;
|
||||
}
|
||||
|
||||
.form_settings label.radio {
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
#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%;
|
||||
|
|
@ -1911,7 +1358,9 @@ li.notice-answer + li.notice {
|
|||
font-weight: bold;
|
||||
text-transform: none;
|
||||
line-height: 1em;
|
||||
margin-bottom: 30px;
|
||||
margin-bottom: 20px;
|
||||
position: relative;
|
||||
top: -4px;
|
||||
}
|
||||
|
||||
#site_nav_local_views a.company_logo:hover {
|
||||
|
|
@ -1921,8 +1370,8 @@ li.notice-answer + li.notice {
|
|||
}
|
||||
|
||||
.company_logo img {
|
||||
max-width: 96px;
|
||||
margin-bottom: 10px;
|
||||
max-width: 138px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.company_logo span {
|
||||
|
|
@ -1933,5 +1382,4 @@ a.company_logo:hover span {
|
|||
text-decoration: underline;
|
||||
}
|
||||
|
||||
|
||||
}/*end of @media screen, projection, tv*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue