Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
This commit is contained in:
commit
11f45e57d9
13
install.php
13
install.php
@ -335,6 +335,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
|||||||
<head>
|
<head>
|
||||||
<title>Install StatusNet</title>
|
<title>Install StatusNet</title>
|
||||||
<link rel="shortcut icon" href="favicon.ico"/>
|
<link rel="shortcut icon" href="favicon.ico"/>
|
||||||
|
<link rel="stylesheet" type="text/css" href="theme/base/css/display.css" media="screen, projection, tv"/>
|
||||||
<link rel="stylesheet" type="text/css" href="theme/neo/css/display.css" media="screen, projection, tv"/>
|
<link rel="stylesheet" type="text/css" href="theme/neo/css/display.css" media="screen, projection, tv"/>
|
||||||
<!--[if IE]><link rel="stylesheet" type="text/css" href="theme/base/css/ie.css" /><![endif]-->
|
<!--[if IE]><link rel="stylesheet" type="text/css" href="theme/base/css/ie.css" /><![endif]-->
|
||||||
<!--[if lte IE 6]><link rel="stylesheet" type="text/css" theme/base/css/ie6.css" /><![endif]-->
|
<!--[if lte IE 6]><link rel="stylesheet" type="text/css" theme/base/css/ie6.css" /><![endif]-->
|
||||||
@ -351,8 +352,14 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
|||||||
<span class="fn org">StatusNet</span>
|
<span class="fn org">StatusNet</span>
|
||||||
</a>
|
</a>
|
||||||
</address>
|
</address>
|
||||||
|
<div id="site_nav_global_primary"></div>
|
||||||
</div>
|
</div>
|
||||||
<div id="core">
|
<div id="core">
|
||||||
|
<div id="aside_primary_wrapper">
|
||||||
|
<div id="content_wrapper">
|
||||||
|
<div id="site_nav_local_views_wrapper">
|
||||||
|
<div id="site_nav_local_views"></div>
|
||||||
|
|
||||||
<div id="content">
|
<div id="content">
|
||||||
<div id="content_inner">
|
<div id="content_inner">
|
||||||
<h1>Install StatusNet</h1>
|
<h1>Install StatusNet</h1>
|
||||||
@ -362,7 +369,13 @@ $installer->main();
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div id="aside_primary" class="aside"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id="footer"></div>
|
||||||
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@ -698,7 +698,6 @@ font-style:italic;
|
|||||||
}
|
}
|
||||||
|
|
||||||
#shownotice .notice .entry-title {
|
#shownotice .notice .entry-title {
|
||||||
margin-left:110px;
|
|
||||||
font-size:2.2em;
|
font-size:2.2em;
|
||||||
min-height:123px;
|
min-height:123px;
|
||||||
font-size: 1.6em;
|
font-size: 1.6em;
|
||||||
@ -885,7 +884,7 @@ content: ":";
|
|||||||
}
|
}
|
||||||
|
|
||||||
.threaded-replies:empty {
|
.threaded-replies:empty {
|
||||||
display: none;
|
margin-bottom: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.user_in .threaded-replies {
|
.user_in .threaded-replies {
|
||||||
|
@ -1350,6 +1350,27 @@ li.notice-answer + li.notice {
|
|||||||
padding-left: 20px;
|
padding-left: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Blog specific styles */
|
||||||
|
|
||||||
|
label[for=blog-entry-content] {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
#input_form_blog td {
|
||||||
|
padding-top: 0px;
|
||||||
|
padding-bottom: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#input_form_blog td.mceToolbar {
|
||||||
|
padding-top: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Poll specific styles */
|
||||||
|
|
||||||
|
.notice div.poll-content {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
/* SNOD CompanyLogo styling */
|
/* SNOD CompanyLogo styling */
|
||||||
|
|
||||||
#site_nav_local_views a.company_logo {
|
#site_nav_local_views a.company_logo {
|
||||||
|
Loading…
Reference in New Issue
Block a user