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

author Samantha Doherty <sammy@status.net>

Tue, 26 Jul 2011 19:21:40 +0000 (15:21 -0400)

committer Samantha Doherty <sammy@status.net>

Tue, 26 Jul 2011 19:21:40 +0000 (15:21 -0400)
author Samantha Doherty <sammy@status.net>
Tue, 26 Jul 2011 19:21:40 +0000 (15:21 -0400)
committer Samantha Doherty <sammy@status.net>
Tue, 26 Jul 2011 19:21:40 +0000 (15:21 -0400)
diff --git a/install.php b/install.php

index a468d2a6f00a2710c4877156e853225fbb1b7bb2..5cb46e27d2ae9234fa5d41afa2199d64ad037208 100644 (file)
--- a/install.php
+++ b/install.php
@@ -335,6 +335,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
      <head>
          <title>Install StatusNet</title>
         <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"/>
          <!--[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]-->
@@ -351,8 +352,14 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
                          <span class="fn org">StatusNet</span>
                      </a>
                  </address>
+                <div id="site_nav_global_primary"></div>
              </div>
              <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_inner">
                          <h1>Install StatusNet</h1>
@@ -362,7 +369,13 @@ $installer->main();
  ?>
                     </div>
                  </div>
+
+                <div id="aside_primary" class="aside"></div>
+               </div>
+              </div>
+             </div>
              </div>
+            <div id="footer"></div>
          </div>
      </body>
  </html>
diff --git a/theme/base/css/display.css b/theme/base/css/display.css

index b31680b4ad3fbbd9bb671eefd7c781aa52b60159..1f4d2f3f15da298e748fdebce08ef800c558ac2b 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -698,7 +698,6 @@ font-style:italic;
  }
  
  #shownotice .notice .entry-title {
-    margin-left:110px;
      font-size:2.2em;
      min-height:123px;
      font-size: 1.6em;
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css

index e23f64e557fb0356808d092d01417690657de0d8..d8bb5fc6930ddaf5a085bb552a9860d81e86ecad 100644 (file)
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -1350,6 +1350,27 @@ li.notice-answer + li.notice {
      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 */
  
  #site_nav_local_views a.company_logo {
author	Samantha Doherty <sammy@status.net>
	Tue, 26 Jul 2011 19:21:40 +0000 (15:21 -0400)
committer	Samantha Doherty <sammy@status.net>
	Tue, 26 Jul 2011 19:21:40 +0000 (15:21 -0400)
install.php		patch \| blob \| history
theme/base/css/display.css		patch \| blob \| history
theme/neo/css/display.css		patch \| blob \| history