merge in master after merging a pull request, add comment

lib/scaffolding.less

@@ -81,11 +81,12 @@ body {
 .container-fluid {
   padding: 0 20px;
   .clearfix();
-  .sidebar {
+  > .sidebar {
     float: left;
     width: 220px;
   }
-  .content {
+  // TODO in v2: rename this and .popover .content to be more specific
+  > .content {
     min-width: 700px;
     max-width: 1180px;
     margin-left: 240px;
@@ -106,4 +107,4 @@ a {
     color: @linkColorHover;
     text-decoration: underline;
   }
-}
+}