Merge

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogArchives.cshtml

@@ -6,7 +6,6 @@
     IEnumerable<KeyValuePair<ArchiveData, int>> archives = Model.Archives;
 }
 <div class="archives">
-    <h3>@T("Archives")</h3>
     @if (archives.Count() > 20) {
     <ul class="years">
         @{

src/Orchard.Web/Modules/Orchard.Comments/AdminMenu.cs

@@ -8,7 +8,7 @@ namespace Orchard.Comments {
         public string MenuName { get { return "admin"; } }
 
         public void GetNavigation(NavigationBuilder builder) {
-            builder.Add(T("Comments"), "10",
+            builder.Add(T("Comments"), "2.75",
                 menu => menu.Add(T("List"), "0", item => item.Action("Index", "Admin", new { area = "Orchard.Comments" })
                     .Permission(Permissions.ManageComments)));
         }

src/Orchard.Web/Modules/Orchard.Search/Styles/orchard-search-search.css

@@ -15,4 +15,13 @@ form.search input {
 }
 .search-results {
     clear:both;
-}
+}
+
+.search-form input[type="text"] { float: left; }
+.search-form button[type="submit"] { float: left; margin: 0; margin-left: 6px; }
+
+/*Search widget styles. More syles could be added here to target specific zones.*/
+.widget-search-form {
+    float:right;
+ }
+

src/Orchard.Web/Modules/Orchard.Search/Views/Parts/Search.SearchForm.cshtml

@@ -1,5 +1,10 @@
 @using Orchard.Search.ViewModels;
 
+@{
+    Style.Require("Search");
+}
+
+
 @using(Html.BeginForm("index", "search", new { area = "Orchard.Search" }, FormMethod.Get, new { @class = "search-form" })) { 
     <fieldset>
         @Html.TextBox("q", (SearchViewModel)Model.ViewModel.Query)

src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css

@@ -71,7 +71,7 @@ header, footer, aside, nav, article { display: block; }
     visibility: hidden;
 }
 
-.zone:after /* Self clears every zone container */
+.zone:after, .widget-control:after /* .zone:after self clears every zone container - .widget-control:after self clears any floats used in a widget */
 {
     content: ".";
     display: block;
@@ -424,13 +424,6 @@ nav ul
 .widgets {}
 .widget h1 { font-size: 1.077em; }
 
-/* Search */
-/* Search widget shuld go into the sidebar for proper styling */
-/* TODO: (mibach) Generic any zone compatible search widget */
-.search-form {}
-.search-form input[type="text"] { float: left; }
-.search-form button[type="submit"] { float: left; margin: 0; margin-left: 6px; }
-
 /* Edit Mode Widgets */
 /* These are the edit controls that appear when you're logged-in */
 .widget-control { position: relative; border: 1px dotted #5f97af; }