Merge branch 'develop' into feature/nonce-in-admin

themes/grav/js/admin-all.js

@@ -472,9 +472,17 @@ $(function () {
 
             newItem.attr('data-collection-item', newItem.attr('data-collection-item').replace('*', key));
             newItem.attr('data-collection-key', key);
-            newItem.find('[name]').each(function () {
+
-                $(this).attr('name', $(this).attr('name').replace('*', key));
+            var replaceAttribute = function replaceAttribute(attribute) {
+                newItem.find('[' + attribute + ']').each(function () {
+                    $(this).attr(attribute, $(this).attr(attribute).replace('*', key));
                 });
+            };
+
+            replaceAttribute('name');
+            replaceAttribute('data-grav-field-name');
+            replaceAttribute('id');
+            replaceAttribute('for');
 
             holder.append(newItem);
             button.data('key-index', ++key);

themes/grav/scss/template/_admin.scss

@@ -215,6 +215,12 @@ $update-height: 3rem;
         height: $topbar-height;
         padding: 0 $padding-default;
 
+        @include breakpoint(mobile-only) {
+            height: 7.2rem;
+            margin-top: -5.5rem;
+            position: relative;
+        }
+
         h1 {
             @extend %vertical-align;
 
@@ -222,9 +228,25 @@ $update-height: 3rem;
                 > i:first-child:before {
                    content: "\f0c9";
                 }
-                @include transform(inherit);
+                transform: inherit;
                 top: 5px;
                 font-size: 1.2rem;
+                display: block;
+                text-align: center;
+                padding: 20px 0px;
+                margin-top: -90px;
+                z-index: 2;
+            }
+
+            @media only all and (max-width: 381px) {
+                margin-top: -138px;
+            }
+
+            .fa-th {
+                @include breakpoint(mobile-only) {
+                    cursor: pointer;
+                    float: left;
+                }
             }
         }
 
@@ -233,13 +255,13 @@ $update-height: 3rem;
             padding: 0;
 
             @include breakpoint(mobile-only) {
-                @include transform(inherit);
+                text-align: center;
-                top: inherit;
+                display: block;
-                bottom: 5px;
+                float: none;
-                position: absolute;
+                margin: 5rem auto 0px;
-                right: 1rem;
+                padding-top: 70px;
-
             }
+
         }
 
         .preview {
@@ -332,7 +354,7 @@ $update-height: 3rem;
         @include transition (top 0.15s ease-out);
 
         @include breakpoint(mobile-only) {
-            top: 5.2rem;
+            top: 7.2rem;
             padding-bottom: 8rem;
             padding-top: 0rem;
         }
@@ -348,6 +370,7 @@ $update-height: 3rem;
         padding: 2.5rem;
 
         @include breakpoint(mobile-only) {
+            top: 7.2rem;
             left: 0;
         }
     }

themes/grav/scss/template/_pages.scss

@@ -236,7 +236,6 @@
         vertical-align: inherit;
 
         @include breakpoint(mobile-only) {
-            width: 100%;
         }
     }