forked from GNUsocial/gnu-social
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into cyi/master
This commit is contained in:
commit
87b99540ef
@ -162,6 +162,8 @@ class Action extends HTMLOutputter // lawsuit
|
||||
'media' => 'screen, projection, tv'));
|
||||
$this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
|
||||
'href="'.theme_path('css/ie.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
|
||||
$this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
|
||||
'href="'.theme_path('css/ie.css', null).'?version='.LACONICA_VERSION.'" /><![endif]');
|
||||
foreach (array(6,7) as $ver) {
|
||||
if (file_exists(theme_file('ie'.$ver.'.css'))) {
|
||||
// Yes, IE people should be put in jail.
|
||||
|
@ -507,50 +507,43 @@ position:relative;
|
||||
width:475px;
|
||||
min-height:123px;
|
||||
float:left;
|
||||
margin-bottom:17px;
|
||||
margin-bottom:18px;
|
||||
margin-left:0;
|
||||
}
|
||||
.entity_profile dt,
|
||||
#entity_statistics dt {
|
||||
font-weight:bold;
|
||||
}
|
||||
.entity_profile dd {
|
||||
display:inline;
|
||||
}
|
||||
|
||||
.entity_profile .entity_depiction {
|
||||
float:left;
|
||||
position:absolute;
|
||||
top:0;
|
||||
left:0;
|
||||
width:96px;
|
||||
margin-right:18px;
|
||||
margin-bottom:18px;
|
||||
}
|
||||
|
||||
.entity_profile .entity_fn,
|
||||
.entity_profile .entity_nickname,
|
||||
.entity_profile .entity_location,
|
||||
.entity_profile .entity_url,
|
||||
.entity_profile .entity_note,
|
||||
.entity_profile .entity_tags {
|
||||
float:left;
|
||||
clear:left;
|
||||
margin-left:113px;
|
||||
width:322px;
|
||||
margin-bottom:4px;
|
||||
width:322px;
|
||||
}
|
||||
|
||||
.entity_profile .entity_fn,
|
||||
.entity_profile .entity_nickname {
|
||||
width:auto;
|
||||
clear:none;
|
||||
}
|
||||
|
||||
.entity_profile .entity_fn {
|
||||
margin-left:11px;
|
||||
margin-right:4px;
|
||||
}
|
||||
.entity_profile .entity_fn .fn {
|
||||
display:inline;
|
||||
font-weight:bold;
|
||||
font-style:normal;
|
||||
}
|
||||
.entity_profile .nickname {
|
||||
font-style:italic;
|
||||
font-weight:bold;
|
||||
.entity_profile .entity_nickname {
|
||||
margin-left:0;
|
||||
}
|
||||
|
||||
.entity_profile .entity_fn dd:before {
|
||||
@ -568,13 +561,14 @@ display:none;
|
||||
.entity_profile h2 {
|
||||
display:none;
|
||||
}
|
||||
|
||||
/* entity_profile */
|
||||
|
||||
|
||||
/*entity_actions*/
|
||||
.entity_actions {
|
||||
float:right;
|
||||
|
||||
margin-left:28px;
|
||||
}
|
||||
.entity_actions h2 {
|
||||
display:none;
|
||||
@ -796,6 +790,7 @@ text-decoration:underline;
|
||||
.notice .entry-title {
|
||||
float:left;
|
||||
width:100%;
|
||||
overflow:auto;
|
||||
}
|
||||
#shownotice .notice .entry-title {
|
||||
font-size:2.2em;
|
||||
@ -1024,21 +1019,18 @@ display:block;
|
||||
text-decoration:none;
|
||||
font-weight:bold;
|
||||
padding:7px;
|
||||
border:1px dotted #D1D9E4;
|
||||
border-bottom:0;
|
||||
border-width:1px;
|
||||
border-style:solid;
|
||||
-moz-border-radius:7px;
|
||||
-webkit-border-radius:7px;
|
||||
border-radius:7px;
|
||||
}
|
||||
|
||||
.pagination .nav_prev a {
|
||||
-moz-border-radius-topright:7px;
|
||||
-webkit-border-top-right-radius:7px;
|
||||
padding-left:20px;
|
||||
border-left:0;
|
||||
padding-left:30px;
|
||||
}
|
||||
.pagination .nav_next a {
|
||||
-moz-border-radius-topleft:7px;
|
||||
-webkit-border-top-left-radius:7px;
|
||||
padding-right:20px;
|
||||
border-right:0;
|
||||
padding-right:30px;
|
||||
}
|
||||
/* END: NOTICE */
|
||||
|
||||
|
@ -9,7 +9,6 @@ margin-top:3px;
|
||||
height:16px;
|
||||
text-align:right;
|
||||
text-indent:0;
|
||||
color:#fff;
|
||||
width:24px;
|
||||
}
|
||||
|
||||
@ -24,7 +23,3 @@ margin-left:-7px;
|
||||
.notice div.entry-content .timestamp a {
|
||||
margin-right:4px;
|
||||
}
|
||||
|
||||
.entity_profile .entity_nickname {
|
||||
padding-right:3px;
|
||||
}
|
||||
|
@ -4,5 +4,8 @@
|
||||
.entity_profile .entity_url,
|
||||
.entity_profile .entity_note,
|
||||
.entity_profile .entity_tags {
|
||||
margin-left:55px;
|
||||
margin-left:0;
|
||||
}
|
||||
.entity_profile .entity_depiction {
|
||||
margin-bottom:123px;
|
||||
}
|
||||
|
@ -1,5 +0,0 @@
|
||||
/* IE7 specific styles */
|
||||
|
||||
#form_notice textarea {
|
||||
width:370px;
|
||||
}
|
@ -40,12 +40,12 @@ input.submit,
|
||||
#nav_register a,
|
||||
.form_settings .form_note,
|
||||
.entity_remote_subscribe {
|
||||
background-color:#A9BF4F;
|
||||
background-color:#9BB43E;
|
||||
}
|
||||
|
||||
input:focus, textarea:focus, select:focus,
|
||||
#form_notice.warning #notice_data-text {
|
||||
border-color:#A9BF4F;
|
||||
border-color:#9BB43E;
|
||||
}
|
||||
input.submit,
|
||||
#nav_register a,
|
||||
@ -65,11 +65,11 @@ color:#002E6E;
|
||||
|
||||
.notice,
|
||||
.profile {
|
||||
border-top-color:#D1D9E4;
|
||||
border-top-color:#CEE1E9;
|
||||
}
|
||||
.section .notice,
|
||||
.section .profile {
|
||||
border-top-color:#97BFD1;
|
||||
border-top-color:#87B4C8;
|
||||
}
|
||||
|
||||
|
||||
@ -116,7 +116,7 @@ background-color:#fff;
|
||||
}
|
||||
|
||||
#site_nav_local_views a {
|
||||
background-color:rgba(151, 191, 209, 0.3);
|
||||
background-color:rgba(135, 180, 200, 0.3);
|
||||
}
|
||||
#site_nav_local_views a:hover {
|
||||
background-color:rgba(255, 255, 255, 0.7);
|
||||
@ -134,13 +134,13 @@ background-color:#EFF3DC;
|
||||
|
||||
|
||||
#anon_notice {
|
||||
background-color:#97BFD1;
|
||||
background-color:#87B4C8;
|
||||
color:#fff;
|
||||
border-color:#fff;
|
||||
}
|
||||
|
||||
#showstream #anon_notice {
|
||||
background-color:#A9BF4F;
|
||||
background-color:#9BB43E;
|
||||
}
|
||||
|
||||
|
||||
@ -177,12 +177,12 @@ background-color:transparent;
|
||||
.form_group_leave input.submit
|
||||
.form_user_subscribe input.submit,
|
||||
.form_user_unsubscribe input.submit {
|
||||
background-color:#A9BF4F;
|
||||
background-color:#9BB43E;
|
||||
color:#fff;
|
||||
}
|
||||
.form_user_unsubscribe input.submit,
|
||||
.form_group_leave input.submit {
|
||||
background-color:#97BFD1;
|
||||
background-color:#87B4C8;
|
||||
}
|
||||
|
||||
.entity_send-a-message a {
|
||||
@ -274,12 +274,13 @@ background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 4
|
||||
.pagination .nav_prev a,
|
||||
.pagination .nav_next a {
|
||||
background-repeat:no-repeat;
|
||||
border-color:#CEE1E9;
|
||||
}
|
||||
.pagination .nav_prev a {
|
||||
background-image:url(../images/icons/twotone/green/arrow-left.gif);
|
||||
background-position:0 45%;
|
||||
background-position:10% 45%;
|
||||
}
|
||||
.pagination .nav_next a {
|
||||
background-image:url(../images/icons/twotone/green/arrow-right.gif);
|
||||
background-position:100% 45%;
|
||||
background-position:90% 45%;
|
||||
}
|
||||
|
9
theme/identica/css/ie.css
Normal file
9
theme/identica/css/ie.css
Normal file
@ -0,0 +1,9 @@
|
||||
/* IE specific styles */
|
||||
|
||||
.notice-options input.submit {
|
||||
color:#fff;
|
||||
}
|
||||
|
||||
#site_nav_local_views a {
|
||||
background-color:#D0DFE7;
|
||||
}
|
Binary file not shown.
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 4.9 KiB |
Loading…
Reference in New Issue
Block a user