fixing merge conflicts

vhx · Sep 27, 2017 · e51c55d · e51c55d
2 parents b427770 + a465997
commit e51c55d
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 80 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.5.2
+**2017-9-27**
+* depreciated teal radio stack buttons.
+
 ### 1.5.1
 **2017-9-20**
 * depreciated navy search icon.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.5.1
+1.5.2
diff --git a/app/public/app.js b/app/public/app.js
@@ -1641,7 +1641,7 @@ Q.components.guide.styleguide.ui.radio.container = {
                 ]
               }),
               m.component(vhxm.components.shared.radio.ui.container, {
-                color: 'teal',
+                color: 'vimeo-blue',
                 name: 'horz-teal',
                 items: [
                   {
@@ -1681,7 +1681,7 @@ Q.components.guide.styleguide.ui.radio.container = {
                 ]
               }),
               m.component(vhxm.components.shared.radio.ui.container, {
-                color: 'teal',
+                color: 'vimeo-blue',
                 stacked: true,
                 name: 'stacked-teal',
                 items: [
@@ -1706,7 +1706,7 @@ Q.components.guide.styleguide.ui.radio.container = {
           view: function() {
             return m('div', [
               m.component(vhxm.components.shared.radio.ui.container, {
-                color: 'teal',
+                color: 'vimeo-blue',
                 buttons: true,
                 name: 'stacked-button',
                 items: [
@@ -3360,4 +3360,4 @@ m.route.mode = 'pathname';
 
 m.route(document.getElementById('quartz'), '/', {
   '/:type/:guide': Q.layouts.standard.ui.container
-});
+});
diff --git a/app/public/components.css b/app/public/components.css
@@ -812,7 +812,7 @@
   Admin Radio
 ......................................*/
 .form .radio-gray,
-.form .radio-teal {
+.form .radio-vimeo-blue {
   position: relative;
   display: inline-block;
   width: 100%;
@@ -833,29 +833,29 @@
   /* color styles
   ...................................*/ }
   .form .radio-gray input[type="radio"],
-  .form .radio-teal input[type="radio"] {
+  .form .radio-vimeo-blue input[type="radio"] {
     display: none; }
   .form .radio-gray li,
-  .form .radio-teal li {
+  .form .radio-vimeo-blue li {
     display: inline-block;
     margin-right: 10px; }
     .form .radio-gray li:after,
-    .form .radio-teal li:after {
+    .form .radio-vimeo-blue li:after {
       clear: both; }
     .form .radio-gray li:before, .form .radio-gray li:after,
-    .form .radio-teal li:before,
-    .form .radio-teal li:after {
+    .form .radio-vimeo-blue li:before,
+    .form .radio-vimeo-blue li:after {
       content: " ";
       display: table; }
   .form .radio-gray label,
-  .form .radio-teal label {
+  .form .radio-vimeo-blue label {
     display: block;
     height: 20px;
     line-height: 20px;
     margin: 0px;
     box-sizing: border-box; }
     .form .radio-gray label .radio--icon,
-    .form .radio-teal label .radio--icon {
+    .form .radio-vimeo-blue label .radio--icon {
       position: relative;
       display: inline-block;
       width: 20px;
@@ -869,7 +869,7 @@
       border-radius: 20px;
       transition: box-shadow .2s ease, color .2s ease; }
       .form .radio-gray label .radio--icon .circle-top,
-      .form .radio-teal label .radio--icon .circle-top {
+      .form .radio-vimeo-blue label .radio--icon .circle-top {
         opacity: 0;
         transition: opacity .2s ease;
         display: block;
@@ -879,14 +879,14 @@
         top: 4px;
         left: 4px; }
         .form .radio-gray label .radio--icon .circle-top span,
-        .form .radio-teal label .radio--icon .circle-top span {
+        .form .radio-vimeo-blue label .radio--icon .circle-top span {
           display: block;
           width: 10px;
           height: 10px;
           background: #869AA5;
           border-radius: 10px; }
       .form .radio-gray label .radio--icon .circle-bottom,
-      .form .radio-teal label .radio--icon .circle-bottom {
+      .form .radio-vimeo-blue label .radio--icon .circle-bottom {
         opacity: 0;
         transition: opacity .2s ease;
         display: block;
@@ -896,7 +896,7 @@
         bottom: 4px;
         left: 4px; }
         .form .radio-gray label .radio--icon .circle-bottom span,
-        .form .radio-teal label .radio--icon .circle-bottom span {
+        .form .radio-vimeo-blue label .radio--icon .circle-bottom span {
           position: relative;
           top: -5px;
           display: block;
@@ -905,47 +905,47 @@
           background: #5E7887;
           border-radius: 10px; }
     .form .radio-gray label .radio--label,
-    .form .radio-teal label .radio--label {
+    .form .radio-vimeo-blue label .radio--label {
       float: left;
       height: 20px; }
   .form .radio-gray input[type="radio"]:checked + label .radio--icon .circle-top, .form .radio-gray input[type="radio"]:checked + label .radio--icon .circle-bottom,
-  .form .radio-teal input[type="radio"]:checked + label .radio--icon .circle-top,
-  .form .radio-teal input[type="radio"]:checked + label .radio--icon .circle-bottom {
+  .form .radio-vimeo-blue input[type="radio"]:checked + label .radio--icon .circle-top,
+  .form .radio-vimeo-blue input[type="radio"]:checked + label .radio--icon .circle-bottom {
     opacity: 1;
     transition: opacity .2s ease; }
   .form .radio-gray.radio--stacked, .form .radio-gray.radio--buttons,
-  .form .radio-teal.radio--stacked,
-  .form .radio-teal.radio--buttons {
+  .form .radio-vimeo-blue.radio--stacked,
+  .form .radio-vimeo-blue.radio--buttons {
     display: block;
     height: auto; }
     .form .radio-gray.radio--stacked li, .form .radio-gray.radio--buttons li,
-    .form .radio-teal.radio--stacked li,
-    .form .radio-teal.radio--buttons li {
+    .form .radio-vimeo-blue.radio--stacked li,
+    .form .radio-vimeo-blue.radio--buttons li {
       display: block;
       margin-right: 0px;
       margin-bottom: 10px; }
   .form .radio-gray.radio--buttons li,
-  .form .radio-teal.radio--buttons li {
+  .form .radio-vimeo-blue.radio--buttons li {
     height: auto !important; }
     .form .radio-gray.radio--buttons li label,
-    .form .radio-teal.radio--buttons li label {
+    .form .radio-vimeo-blue.radio--buttons li label {
       padding: 10px;
       min-height: 58px; }
     .form .radio-gray.radio--buttons li .radio--label,
     .form .radio-gray.radio--buttons li label,
-    .form .radio-teal.radio--buttons li .radio--label,
-    .form .radio-teal.radio--buttons li label {
+    .form .radio-vimeo-blue.radio--buttons li .radio--label,
+    .form .radio-vimeo-blue.radio--buttons li label {
       height: auto !important; }
     .form .radio-gray.radio--buttons li .radio--icon,
-    .form .radio-teal.radio--buttons li .radio--icon {
+    .form .radio-vimeo-blue.radio--buttons li .radio--icon {
       margin-top: 8px;
       background: white; }
-  .form .radio-gray.radio-teal .circle-top span,
-  .form .radio-teal.radio-teal .circle-top span {
-    background: #22B9B0 !important; }
-  .form .radio-gray.radio-teal .circle-bottom span,
-  .form .radio-teal.radio-teal .circle-bottom span {
-    background: #149A97 !important; }
+  .form .radio-gray.radio-vimeo-blue .circle-top span,
+  .form .radio-vimeo-blue.radio-vimeo-blue .circle-top span {
+    background: #00adef !important; }
+  .form .radio-gray.radio-vimeo-blue .circle-bottom span,
+  .form .radio-vimeo-blue.radio-vimeo-blue .circle-bottom span {
+    background: #0088cc !important; }
 
 .c-select--search {
   background-position: right 8px center; }

diff --git a/app/public/quartz.js b/app/public/quartz.js
@@ -733,7 +733,7 @@ vhxm.components.shared.radio.state = function () {
 };vhxm.components.shared.radio.ui.container = {
   controller: vhxm.components.shared.radio.controller,
   view: function view(ctrl, opts) {
-    return m('form.form', [m('ul.radio-' + (opts.color ? opts.color : 'teal') + (opts.stacked ? '.radio--stacked' : opts.buttons ? '.radio--buttons' : ''), [opts.items.map(function (item, index) {
+    return m('form.form', [m('ul.radio-' + (opts.color ? opts.color : 'vimeo-blue') + (opts.stacked ? '.radio--stacked' : opts.buttons ? '.radio--buttons' : ''), [opts.items.map(function (item, index) {
       var is_checked = ctrl.state.isChecked() === item.value;
       return m('li', [m('input', {
         id: opts.name + '-' + index,
@@ -747,13 +747,13 @@ vhxm.components.shared.radio.state = function () {
         name: opts.name,
         value: item.value,
         checked: is_checked
-      }), m('label' + (opts.buttons ? '.btn-' + (is_checked ? 'teal' : 'gray') + '.btn--fill.btn-radio.margin-bottom-medium' : ''), {
+      }), m('label' + (opts.buttons ? '.btn-' + (is_checked ? 'vimeo-blue' : 'gray') + '.btn--fill.btn-radio.margin-bottom-medium' : ''), {
         for: opts.name + '-' + index
       }, [m.component(vhxm.components.shared.radio.ui.icon), m('span.radio--label.text-left' + (opts.buttons ? '.padding-left-small' : '') + (opts.stacked ? '.truncate.truncate--xlarge' : ''), {
         style: {
           marginTop: !opts.buttons || opts.buttons && item.label.title ? '0px' : '8px'
         }
-      }, opts.buttons ? [m('strong.text-2' + (is_checked ? '.text--white' : '.text--navy'), item.label.title ? item.label.title : item.label), item.label.descriptor ? m('p.text-4' + (is_checked ? '.text--white' : ''), item.label.descriptor) : ''] : item.label)]), item.template ? m('div.clear.padding-top-xsmall', [item.template]) : '']);
+      }, opts.buttons ? [m('strong.text-2' + (is_checked ? '.text--white' : '.text--black'), item.label.title ? item.label.title : item.label), item.label.descriptor ? m('p.text-4' + (is_checked ? '.text--white' : ''), item.label.descriptor) : ''] : item.label)]), item.template ? m('div.clear.padding-top-xsmall', [item.template]) : '']);
     })])]);
   }
 };
@@ -1503,4 +1503,4 @@ vhxm.components.shared.select.ui.list.empty = {
   view: function view() {
     return m('li.padding-horz-large.padding-top-small.padding-bottom-medium.text--gray.text-center', 'No results');
   }
-};
+};
diff --git a/dist/component-radio.css b/dist/component-radio.css
@@ -34,7 +34,7 @@
   Admin Radio
 ......................................*/
 .form .radio-gray,
-.form .radio-teal {
+.form .radio-vimeo-blue {
   position: relative;
   display: inline-block;
   width: 100%;
@@ -55,29 +55,29 @@
   /* color styles
   ...................................*/ }
   .form .radio-gray input[type="radio"],
-  .form .radio-teal input[type="radio"] {
+  .form .radio-vimeo-blue input[type="radio"] {
     display: none; }
   .form .radio-gray li,
-  .form .radio-teal li {
+  .form .radio-vimeo-blue li {
     display: inline-block;
     margin-right: 10px; }
     .form .radio-gray li:after,
-    .form .radio-teal li:after {
+    .form .radio-vimeo-blue li:after {
       clear: both; }
     .form .radio-gray li:before, .form .radio-gray li:after,
-    .form .radio-teal li:before,
-    .form .radio-teal li:after {
+    .form .radio-vimeo-blue li:before,
+    .form .radio-vimeo-blue li:after {
       content: " ";
       display: table; }
   .form .radio-gray label,
-  .form .radio-teal label {
+  .form .radio-vimeo-blue label {
     display: block;
     height: 20px;
     line-height: 20px;
     margin: 0px;
     box-sizing: border-box; }
     .form .radio-gray label .radio--icon,
-    .form .radio-teal label .radio--icon {
+    .form .radio-vimeo-blue label .radio--icon {
       position: relative;
       display: inline-block;
       width: 20px;
@@ -91,7 +91,7 @@
       border-radius: 20px;
       transition: box-shadow .2s ease, color .2s ease; }
       .form .radio-gray label .radio--icon .circle-top,
-      .form .radio-teal label .radio--icon .circle-top {
+      .form .radio-vimeo-blue label .radio--icon .circle-top {
         opacity: 0;
         transition: opacity .2s ease;
         display: block;
@@ -101,14 +101,14 @@
         top: 4px;
         left: 4px; }
         .form .radio-gray label .radio--icon .circle-top span,
-        .form .radio-teal label .radio--icon .circle-top span {
+        .form .radio-vimeo-blue label .radio--icon .circle-top span {
           display: block;
           width: 10px;
           height: 10px;
           background: #869AA5;
           border-radius: 10px; }
       .form .radio-gray label .radio--icon .circle-bottom,
-      .form .radio-teal label .radio--icon .circle-bottom {
+      .form .radio-vimeo-blue label .radio--icon .circle-bottom {
         opacity: 0;
         transition: opacity .2s ease;
         display: block;
@@ -118,7 +118,7 @@
         bottom: 4px;
         left: 4px; }
         .form .radio-gray label .radio--icon .circle-bottom span,
-        .form .radio-teal label .radio--icon .circle-bottom span {
+        .form .radio-vimeo-blue label .radio--icon .circle-bottom span {
           position: relative;
           top: -5px;
           display: block;
@@ -127,44 +127,44 @@
           background: #5E7887;
           border-radius: 10px; }
     .form .radio-gray label .radio--label,
-    .form .radio-teal label .radio--label {
+    .form .radio-vimeo-blue label .radio--label {
       float: left;
       height: 20px; }
   .form .radio-gray input[type="radio"]:checked + label .radio--icon .circle-top, .form .radio-gray input[type="radio"]:checked + label .radio--icon .circle-bottom,
-  .form .radio-teal input[type="radio"]:checked + label .radio--icon .circle-top,
-  .form .radio-teal input[type="radio"]:checked + label .radio--icon .circle-bottom {
+  .form .radio-vimeo-blue input[type="radio"]:checked + label .radio--icon .circle-top,
+  .form .radio-vimeo-blue input[type="radio"]:checked + label .radio--icon .circle-bottom {
     opacity: 1;
     transition: opacity .2s ease; }
   .form .radio-gray.radio--stacked, .form .radio-gray.radio--buttons,
-  .form .radio-teal.radio--stacked,
-  .form .radio-teal.radio--buttons {
+  .form .radio-vimeo-blue.radio--stacked,
+  .form .radio-vimeo-blue.radio--buttons {
     display: block;
     height: auto; }
     .form .radio-gray.radio--stacked li, .form .radio-gray.radio--buttons li,
-    .form .radio-teal.radio--stacked li,
-    .form .radio-teal.radio--buttons li {
+    .form .radio-vimeo-blue.radio--stacked li,
+    .form .radio-vimeo-blue.radio--buttons li {
       display: block;
       margin-right: 0px;
       margin-bottom: 10px; }
   .form .radio-gray.radio--buttons li,
-  .form .radio-teal.radio--buttons li {
+  .form .radio-vimeo-blue.radio--buttons li {
     height: auto !important; }
     .form .radio-gray.radio--buttons li label,
-    .form .radio-teal.radio--buttons li label {
+    .form .radio-vimeo-blue.radio--buttons li label {
       padding: 10px;
       min-height: 58px; }
     .form .radio-gray.radio--buttons li .radio--label,
     .form .radio-gray.radio--buttons li label,
-    .form .radio-teal.radio--buttons li .radio--label,
-    .form .radio-teal.radio--buttons li label {
+    .form .radio-vimeo-blue.radio--buttons li .radio--label,
+    .form .radio-vimeo-blue.radio--buttons li label {
       height: auto !important; }
     .form .radio-gray.radio--buttons li .radio--icon,
-    .form .radio-teal.radio--buttons li .radio--icon {
+    .form .radio-vimeo-blue.radio--buttons li .radio--icon {
       margin-top: 8px;
       background: white; }
-  .form .radio-gray.radio-teal .circle-top span,
-  .form .radio-teal.radio-teal .circle-top span {
-    background: #22B9B0 !important; }
-  .form .radio-gray.radio-teal .circle-bottom span,
-  .form .radio-teal.radio-teal .circle-bottom span {
-    background: #149A97 !important; }
+  .form .radio-gray.radio-vimeo-blue .circle-top span,
+  .form .radio-vimeo-blue.radio-vimeo-blue .circle-top span {
+    background: #00adef !important; }
+  .form .radio-gray.radio-vimeo-blue .circle-bottom span,
+  .form .radio-vimeo-blue.radio-vimeo-blue .circle-bottom span {
+    background: #0088cc !important; }
diff --git a/dist/component-radio.js b/dist/component-radio.js
@@ -30,7 +30,7 @@ vhxm.components.shared.radio.state = function () {
 vhxm.components.shared.radio.ui.container = {
   controller: vhxm.components.shared.radio.controller,
   view: function view(ctrl, opts) {
-    return m('form.form', [m('ul.radio-' + (opts.color ? opts.color : 'teal') + (opts.stacked ? '.radio--stacked' : opts.buttons ? '.radio--buttons' : ''), [opts.items.map(function (item, index) {
+    return m('form.form', [m('ul.radio-' + (opts.color ? opts.color : 'vimeo-blue') + (opts.stacked ? '.radio--stacked' : opts.buttons ? '.radio--buttons' : ''), [opts.items.map(function (item, index) {
       var is_checked = ctrl.state.isChecked() === item.value;
       return m('li', [m('input', {
         id: opts.name + '-' + index,
@@ -44,13 +44,13 @@ vhxm.components.shared.radio.ui.container = {
         name: opts.name,
         value: item.value,
         checked: is_checked
-      }), m('label' + (opts.buttons ? '.btn-' + (is_checked ? 'teal' : 'gray') + '.btn--fill.btn-radio.margin-bottom-medium' : ''), {
+      }), m('label' + (opts.buttons ? '.btn-' + (is_checked ? 'vimeo-blue' : 'gray') + '.btn--fill.btn-radio.margin-bottom-medium' : ''), {
         for: opts.name + '-' + index
       }, [m.component(vhxm.components.shared.radio.ui.icon), m('span.radio--label.text-left' + (opts.buttons ? '.padding-left-small' : '') + (opts.stacked ? '.truncate.truncate--xlarge' : ''), {
         style: {
           marginTop: !opts.buttons || opts.buttons && item.label.title ? '0px' : '8px'
         }
-      }, opts.buttons ? [m('strong.text-2' + (is_checked ? '.text--white' : '.text--navy'), item.label.title ? item.label.title : item.label), item.label.descriptor ? m('p.text-4' + (is_checked ? '.text--white' : ''), item.label.descriptor) : ''] : item.label)]), item.template ? m('div.clear.padding-top-xsmall', [item.template]) : '']);
+      }, opts.buttons ? [m('strong.text-2' + (is_checked ? '.text--white' : '.text--black'), item.label.title ? item.label.title : item.label), item.label.descriptor ? m('p.text-4' + (is_checked ? '.text--white' : ''), item.label.descriptor) : ''] : item.label)]), item.template ? m('div.clear.padding-top-xsmall', [item.template]) : '']);
     })])]);
   }
 };