fixed merge conflicts

vhx · Sep 27, 2017 · 9b22069 · 9b22069
2 parents e51c55d + ab070c7
commit 9b22069
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.5.3
+**2017-9-27**
+* depreciated navy close icon, sidebars.
+
 ### 1.5.2
 **2017-9-27**
 * depreciated teal radio stack buttons.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.5.2
+1.5.3
diff --git a/app/public/quartz.js b/app/public/quartz.js
@@ -1252,7 +1252,11 @@ vhxm.components.shared.sidebar.ui.container = {
   view: function view(ctrl) {
     return m('.c-sidebar.bg-white.shadow--gray' + (vhxm.components.shared.sidebar.state.isLoaded() ? '' : '.loader-slate.loader--cover-hide.loader--large.is-loading'), {
       config: vhxm.components.shared.sidebar.state.isOpen() ? ctrl.animatorIn : ctrl.animatorOut
+<<<<<<< HEAD
     }, vhxm.components.shared.sidebar.state.isLoaded() ? [m('a.c-sidebar--close.icon-circle.icon-x-navy.icon--xsmall', {
+=======
+    }, vhxm.components.shared.sidebar.state.isLoaded() ? [m('a.c-sidebar--close.icon-circle.icon-x-black.icon--xsmall', {
+>>>>>>> master
       onclick: function onclick() {
         setTimeout(function () {
           vhxm.components.shared.sidebar.toggle('close');

diff --git a/dist/component-sidebar.js b/dist/component-sidebar.js
@@ -135,7 +135,7 @@ vhxm.components.shared.sidebar.ui.container = {
   view: function view(ctrl) {
     return m('.c-sidebar.bg-white.shadow--gray' + (vhxm.components.shared.sidebar.state.isLoaded() ? '' : '.loader-slate.loader--cover-hide.loader--large.is-loading'), {
       config: vhxm.components.shared.sidebar.state.isOpen() ? ctrl.animatorIn : ctrl.animatorOut
-    }, vhxm.components.shared.sidebar.state.isLoaded() ? [m('a.c-sidebar--close.icon-circle.icon-x-navy.icon--xsmall', {
+    }, vhxm.components.shared.sidebar.state.isLoaded() ? [m('a.c-sidebar--close.icon-circle.icon-x-black.icon--xsmall', {
       onclick: function onclick() {
         setTimeout(function () {
           vhxm.components.shared.sidebar.toggle('close');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vhx/quartz",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "VHX Style Guide and JS Components.",
   "homepage": "https://github.com/vhx/quartz",
   "author": "VHX",

diff --git a/quartz-js/components/sidebar/sidebar.ui.js b/quartz-js/components/sidebar/sidebar.ui.js
@@ -4,7 +4,7 @@ vhxm.components.shared.sidebar.ui.container = {
     return m('.c-sidebar.bg-white.shadow--gray' + (vhxm.components.shared.sidebar.state.isLoaded() ? '' : '.loader-slate.loader--cover-hide.loader--large.is-loading'), {
       config: vhxm.components.shared.sidebar.state.isOpen() ? ctrl.animatorIn : ctrl.animatorOut
     }, vhxm.components.shared.sidebar.state.isLoaded() ? [
-      m('a.c-sidebar--close.icon-circle.icon-x-navy.icon--xsmall', {
+      m('a.c-sidebar--close.icon-circle.icon-x-black.icon--xsmall', {
         onclick: function() {
           setTimeout(function() {
             vhxm.components.shared.sidebar.toggle('close');