Merge pull request connamara#4 from ryoung/master

show container name and updated styles

Author: ryoung

app/assets/stylesheets/cms/page_content_editing.css.scss

@@ -5,6 +5,7 @@
 .cms-container {
  border: 1px solid #c0c0c0;
  margin: 15px 0;
+ min-height: 100px;
 }
 
 .cms-container:hover {
@@ -17,4 +18,14 @@
  margin-right: auto;
  display:block;
  margin-bottom: 5px;
+}
+
+.cms-container-description {
+ font-size: 10px;
+ text-align: center;
+}
+
+.cms-container-description hr {
+ border-top: 1px solid #c0c0c0;
+ margin: 0px 0px 5px 0px;
 }

app/views/cms/pages/_simple_container.html.erb

@@ -1,4 +1,5 @@
 <div class="cms-container" data-container="<%= container %>">
+ <div class="cms-container-description"><%= name %><hr/></div>
  <%= content %>
  <%= image_tag "cms/plus.png",
  :class => 'cms-add-content',