[Python-modules-commits] [djangocms-admin-style] 03/08: record new upstream branch created by importing djangocms-admin-style_1.2.2+dfsg.orig.tar.gz and merge it

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository djangocms-admin-style.

commit 3662d92c4c85e7912623d892e83ddca4aff5bd9e
Merge: 6920b1b 95d8a38
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sun Jun 19 15:11:12 2016 +0200

    record new upstream branch created by importing djangocms-admin-style_1.2.2+dfsg.orig.tar.gz and merge it

 PKG-INFO                                           |   2 +-
 debian/.git-dpm                                    |  14 +-
 djangocms_admin_style.egg-info/PKG-INFO            |   2 +-
 djangocms_admin_style.egg-info/SOURCES.txt         |  24 +--
 djangocms_admin_style/__init__.py                  |   2 +-
 djangocms_admin_style/sass/components/_base.scss   |  21 ++-
 .../sass/components/_changelist.scss               |  90 ++++-----
 .../sass/components/_content.scss                  |  87 +++++----
 .../sass/components/_dashboard.scss                |   3 +-
 djangocms_admin_style/sass/components/_dialog.scss |  29 +++
 djangocms_admin_style/sass/components/_forms.scss  | 201 +++++++++++++--------
 djangocms_admin_style/sass/components/_header.scss |   2 +-
 djangocms_admin_style/sass/components/_icons.scss  |   2 +-
 djangocms_admin_style/sass/components/_mobile.scss |  89 +++++----
 djangocms_admin_style/sass/components/_modal.scss  |  36 ++--
 .../sass/components/_sideframe.scss                |   6 +
 djangocms_admin_style/sass/components/_tables.scss |   3 +
 .../sass/djangocms-admin-frontend.scss             |  11 --
 djangocms_admin_style/sass/djangocms-admin.scss    |   4 +
 djangocms_admin_style/sass/mixins/_all.scss        |   1 +
 djangocms_admin_style/sass/mixins/_custom.scss     |   1 +
 djangocms_admin_style/sass/mixins/_zindex.scss     |  32 ++++
 djangocms_admin_style/sass/settings/_cms.scss      |  10 +-
 djangocms_admin_style/sass/settings/_custom.scss   |   8 -
 .../css/djangocms-admin-frontend.css               |   1 -
 .../djangocms_admin_style/css/djangocms-admin.css  |   2 +-
 .../{ => djangocms_admin_style}/js/base-admin.js   |   6 +
 .../js/drag-touch-support.js                       |   0
 .../static/filer/icons/file_32x32.png              | Bin 1594 -> 0 bytes
 .../static/filer/icons/file_48x48.png              | Bin 1739 -> 0 bytes
 .../static/filer/icons/nofile_48x48.png            | Bin 2132 -> 0 bytes
 .../static/filer/icons/plainfolder_128x128.png     | Bin 2293 -> 0 bytes
 .../static/filer/icons/plainfolder_32x32.png       | Bin 1430 -> 0 bytes
 .../static/filer/icons/plainfolder_48x48.png       | Bin 15628 -> 0 bytes
 .../static/filer/icons/unfiled_folder_32x32.png    | Bin 2744 -> 0 bytes
 .../static/filer/icons/unfiled_folder_48x48.png    | Bin 2777 -> 0 bytes
 .../static/icons/plainfolder_128x128.png           | Bin 2293 -> 0 bytes
 .../templates/admin/base_site.html                 |   8 +-
 .../templates/admin/delete_confirmation.html       |   5 +-
 .../templates/admin/inc/branding.html              |  15 +-
 40 files changed, 431 insertions(+), 286 deletions(-)

diff --cc debian/.git-dpm
index edc196e,0000000..5ad39fd
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 025c61c2873d73ac835be2196a4f4ba3b7fb0955
- 025c61c2873d73ac835be2196a4f4ba3b7fb0955
- 025c61c2873d73ac835be2196a4f4ba3b7fb0955
- 025c61c2873d73ac835be2196a4f4ba3b7fb0955
- djangocms-admin-style_1.1.0+dfsg.orig.tar.gz
- 5a3f45cf0c0a53796a8b390c1c752048a5dfc24d
- 1496891
++95d8a38b936022a52ad4018149efd93e6cb8954e
++95d8a38b936022a52ad4018149efd93e6cb8954e
++95d8a38b936022a52ad4018149efd93e6cb8954e
++95d8a38b936022a52ad4018149efd93e6cb8954e
++djangocms-admin-style_1.2.2+dfsg.orig.tar.gz
++8df0a9ffacb6ac540d085a31d6bb06070ac888f2
++1488051

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/djangocms-admin-style.git