Merge branch 'master' into css-registry

Conflicts: docs/CHANGES.rst
collective · Aug 7, 2013 · 6d3f29c · 6d3f29c
2 parents 65d83c7 + e7e5890
commit 6d3f29c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
@@ -6,9 +6,11 @@ There's a frood who really knows where his towel is
 
 - Move CSS to registry_css (closes `#244`_). [agnogueira]
 
+- Collection tile now fulfills the configured image size (fixes `#239`_).
+  [cleberjsantos]
+
 - Friendly layout for tile configuration (closes `#133`_). [agnogueira]
 
-- Fix configuration tile (closes `#239`_). [cleberjsantos]
 
 1.0a4 (2013-07-27)
 ^^^^^^^^^^^^^^^^^^
@@ -216,4 +218,3 @@ There's a frood who really knows where his towel is
 .. _`#206`: https://github.com/collective/collective.cover/issues/206
 .. _`#218`: https://github.com/collective/collective.cover/issues/218
 .. _`#239`: https://github.com/collective/collective.cover/issues/239
-.. _`#239`: https://github.com/collective/collective.cover/issues/244
diff --git a/src/collective/cover/static/contentchooser.css b/src/collective/cover/static/contentchooser.css
@@ -43,7 +43,7 @@
     background: #fff;
     position: relative;
     right: 0;
-    top: 0px;
+    top: 0;
     z-index: 999;
     font-weight: bold;
     float: right;
@@ -62,16 +62,16 @@
 
 .current {
     background: #fff;
-    border-top-right-radius: 0.5em;
-    border-top-left-radius: 0.5em;
-    -webkit-border-top-right-radius: 0.5em;
     -webkit-border-top-left-radius: 0.5em;
+    -webkit-border-top-right-radius: 0.5em;
     -moz-border-radius-topleft: 0.5em;
     -moz-border-radius-topright: 0.5em;
+    border-top-left-radius: 0.5em;
+    border-top-right-radius: 0.5em;
 }
 
 div.input {
-    margin: 10px 0px;
+    margin: 10px 0;
     width: 200px;
     padding: 3px 15px;
     border-radius: 36px;
@@ -82,7 +82,7 @@ div.input {
 
 input[type="text"].contentchooser-content-trees,
 input[type="text"]#contentchooser-content-trees {
-    border: 0px solid;
+    border: 0 solid;
     width: 100%;
     height: 16px;
     background: transparent;

diff --git a/src/collective/cover/static/layout_edit.css b/src/collective/cover/static/layout_edit.css
@@ -36,8 +36,6 @@
     position: relative;
 }
 
-}
-
 /* SIDEBAR */
 
 #sidebar .btn {
@@ -151,8 +149,8 @@
     position:absolute;
     width:100%;
     height:100%;
-    top:0px;
-    left:0px;
+    top:0;
+    left:0;
     visibility:hidden;
 }
 .layout .row-guide {
@@ -342,5 +340,5 @@
 .order-box {position: absolute;top: 0;right: 0;}
 .visibility-box {position: absolute; top: 0; left: 0;}
 .visibility-box>span {display: none;}
-.visibility-no {background: url('visibility.png') no-repeat 0px 4px;}
-.visibility-yes {background: url('visibility.png') no-repeat -22px 4px;}
+.visibility-no {background: url('visibility.png') no-repeat 0 4px;}
+.visibility-yes {background: url('visibility.png') no-repeat -22px 4px;}