Skip to content

Commit

Permalink
Release 3.4.6 (#6325)
Browse files Browse the repository at this point in the history
* Updated CHANGELOG

* Updated css, icon and font files

* Bumped version to 3.4.6
  • Loading branch information
czpython committed Mar 26, 2018
1 parent 67b234c commit 79ee900
Show file tree
Hide file tree
Showing 25 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
=== 3.4.6 (unreleased) ===
=== 3.4.6 (2018-03-26) ===

* Changed the way drag and drop works in the page tree. The page has to be
selected first before moving.
Expand Down
2 changes: 1 addition & 1 deletion cms/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-

__version__ = '3.4.6rc1'
__version__ = '3.4.6'

default_app_config = 'cms.apps.CMSConfig'
3 changes: 3 additions & 0 deletions cms/static/cms/css/3.4.6/cms.base.css

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions cms/static/cms/css/3.4.6/cms.pagetree.css

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions cms/static/cms/css/3.4.6/cms.welcome.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
3 changes: 0 additions & 3 deletions cms/static/cms/css/3.4.6rc1/cms.base.css

This file was deleted.

3 changes: 0 additions & 3 deletions cms/static/cms/css/3.4.6rc1/cms.pagetree.css

This file was deleted.

3 changes: 0 additions & 3 deletions cms/static/cms/css/3.4.6rc1/cms.welcome.css

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
12 changes: 6 additions & 6 deletions cms/static/cms/sass/components/_iconography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
// default font file generated by gulp
@font-face {
font-family: "django-cms-iconfont";
src: url("../../fonts/3.4.6rc1/django-cms-iconfont.eot");
src: url("../../fonts/3.4.6rc1/django-cms-iconfont.eot#iefix") format("eot"),
url("../../fonts/3.4.6rc1/django-cms-iconfont.woff2") format("woff2"),
url("../../fonts/3.4.6rc1/django-cms-iconfont.woff") format("woff"),
url("../../fonts/3.4.6rc1/django-cms-iconfont.ttf") format("truetype"),
url("../../fonts/3.4.6rc1/django-cms-iconfont.svg#django-cms-iconfont") format("svg");
src: url("../../fonts/3.4.6/django-cms-iconfont.eot");
src: url("../../fonts/3.4.6/django-cms-iconfont.eot#iefix") format("eot"),
url("../../fonts/3.4.6/django-cms-iconfont.woff2") format("woff2"),
url("../../fonts/3.4.6/django-cms-iconfont.woff") format("woff"),
url("../../fonts/3.4.6/django-cms-iconfont.ttf") format("truetype"),
url("../../fonts/3.4.6/django-cms-iconfont.svg#django-cms-iconfont") format("svg");
font-weight: normal;
font-style: normal;
}
Expand Down

0 comments on commit 79ee900

Please sign in to comment.