Merge branch 'release/2.6.2983' into master-v2

craftcms · Jun 9, 2017 · 18023f3 · 18023f3
2 parents 0ddd553 + c2d8402
commit 18023f3
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,16 @@
 Craft CMS Changelog
 ===================
 
-## 2.6.2982 - 2017-06-07
+## 2.6.2983 - 2017-06-09
+
+### Changed
+- Date pickers’ “Previous” and “Next” buttons are now represented as arrows. ([#1538](https://github.com/craftcms/cms/issues/1538))
+- Updated Yii to 1.1.19.
+
+### Fixed
+- Fixed a bug where doctype and XML declarations were getting stripped out of SVG files on upload.
+
+## 2.6.2982 - 2017-06-07 [CRITICAL]
 
 ### Changed
 - Updated Redactor II to 2.6.

diff --git a/composer.json b/composer.json
@@ -20,6 +20,10 @@
         {
             "type": "vcs",
             "url": "https://github.com/pixelandtonic/yii"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/pixelandtonic/svg-sanitizer"
         }
     ],
     "require": {
@@ -30,8 +34,8 @@
         "pixelandtonic/imagine": "v0.7.1.1",
         "lsolesen/pel": "0.9.4.2",
         "pclzip/pclzip": "2.8.2",
-        "enshrined/svg-sanitize": "0.5.3",
-        "yiisoft/yii": "dev-master"
+        "yiisoft/yii": "1.1.19.1",
+        "enshrined/svg-sanitize": "0.5.3.1"
     },
     "require-dev": {
         "phpunit/phpunit": "4.8.16",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Info.php b/src/Info.php
@@ -1,6 +1,6 @@
 <?php
 namespace Craft;
 
-define('CRAFT_VERSION', '2.6.2982');
+define('CRAFT_VERSION', '2.6.2983');
 define('CRAFT_SCHEMA_VERSION', '2.6.9');
 define('CRAFT_MIN_VERSION_REQUIRED', '2.6.2922');
diff --git a/src/resources/css/craft.css b/src/resources/css/craft.css
diff --git a/src/resources/css/craft.css.map b/src/resources/css/craft.css.map
diff --git a/src/resources/sass/craft.scss b/src/resources/sass/craft.scss
@@ -1554,6 +1554,18 @@ body .selectize-dropdown .active { @include menu-option-active-styles; }
 .ui-datepicker-header { padding: 8px 8px 4px; }
 .ui-datepicker-prev { @include floatleft; }
 .ui-datepicker-next { @include floatright; }
+.ui-datepicker-prev span,
+.ui-datepicker-next span { display: none; }
+.ui-datepicker-prev:after,
+.ui-datepicker-next:after { @include icon; width: 20px; margin-top: -2px; line-height: 20px !important; text-align: center; }
+.ui-datepicker-prev:after {
+	body.ltr & { content: 'leftangle'; }
+	body.rtl & { content: 'rightangle'; }
+}
+.ui-datepicker-next:after {
+	body.ltr & { content: 'rightangle'; }
+	body.rtl & { content: 'leftangle'; }
+}
 .ui-datepicker-title { text-align: center; }
 .ui-datepicker-calendar th,
 .ui-datepicker-calendar td { padding: 2px; }