You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by dk...@apache.org on 2019/12/23 18:03:33 UTC

[sling-org-apache-sling-app-cms] 01/01: Merge branch 'SLING-8947-grid-missing-fields'

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit 717686802ec9503fff6dbe93ead5a3bd8793e3af
Merge: d0ca4f4 1294061
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Dec 23 13:03:16 2019 -0500

    Merge branch 'SLING-8947-grid-missing-fields'

 ui/src/main/frontend/js/cms.nav.js                 |  22 ++-
 ui/src/main/frontend/scss/cms.scss                 | 212 +++++++++++----------
 ui/src/main/frontend/scss/editor.scss              | 165 ++++++++--------
 .../components/cms/contentgrid/contentgrid.jsp     |  56 +++---
 4 files changed, 253 insertions(+), 202 deletions(-)