Merge branch 'release/0.3.2'

pixelandtonic · Apr 2, 2019 · 23a805b · 23a805b
2 parents f8eaeec + 6b44422
commit 23a805b
Show file tree

Hide file tree

Showing 16 changed files with 192 additions and 103 deletions.
diff --git a/dist/craftui.cjs.js b/dist/craftui.cjs.js
diff --git a/dist/craftui.css b/dist/craftui.css
@@ -619,8 +619,8 @@ button.c-btn {
 .c-btn:not(.outline),
 a.c-btn:not(.outline),
 button.c-btn:not(.outline) {
-  -webkit-box-shadow: 0 2px 6px 0 rgba(0, 0, 0, .2);
-          box-shadow: 0 2px 6px 0 rgba(0, 0, 0, .2);
+  -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .1);
+          box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .1);
 }
 
 .c-btn:not([disabled]):hover,
@@ -923,6 +923,19 @@ body.rtl .c-checkbox input {
   height: 4rem;
 }
 
+body.ltr .c-radio input {
+  margin-right: .5rem;
+}
+
+body.rtl .c-radio input {
+  margin-left: .5rem;
+}
+
+.c-radio .instructions {
+  color: #8795a1;
+  font-size: .875rem;
+}
+
 .c-lightswitch .c-lightswitch-input label {
   position: relative;
   display: block;
@@ -974,9 +987,10 @@ body.rtl .c-lightswitch .c-lightswitch-input label .slider:before {
   background-color: #38c172;
 }
 
+.c-lightswitch .c-lightswitch-input label input:active+.slider,
 .c-lightswitch .c-lightswitch-input label input:focus+.slider {
-  -webkit-box-shadow: 0 0 1px #38c172;
-          box-shadow: 0 0 1px #38c172;
+  -webkit-box-shadow: 0 0 0 2px rgba(52, 144, 220, .5);
+          box-shadow: 0 0 0 2px rgba(52, 144, 220, .5);
 }
 
 .c-lightswitch .c-lightswitch-input label input:checked+.slider:before {
@@ -1000,28 +1014,15 @@ body.rtl .c-lightswitch .c-lightswitch-input label .slider:before {
   cursor: default;
 }
 
-body.ltr .c-radio input {
-  margin-right: .5rem;
-}
-
-body.rtl .c-radio input {
-  margin-left: .5rem;
-}
-
-.c-radio .instructions {
-  color: #8795a1;
-  font-size: .875rem;
-}
-
 .c-spinner {
   display: inline-block;
 }
 
 .c-spinner>.animation {
   -webkit-animation: rotator .7s linear infinite;
           animation: rotator .7s linear infinite;
-  width: 22px;
-  height: 22px;
+  width: 20px;
+  height: 20px;
   border-radius: 50%;
   border: 2px solid transparent;
   border-top-color: transparent !important;
@@ -1030,6 +1031,11 @@ body.rtl .c-radio input {
   border-bottom-color: #555;
 }
 
+.c-spinner.sm>.animation {
+  width: 16px;
+  height: 16px;
+}
+
 .c-spinner.lg>.animation {
   width: 32px;
   height: 32px;

diff --git a/dist/craftui.es.js b/dist/craftui.es.js
diff --git a/dist/craftui.js b/dist/craftui.js
diff --git a/dist/craftui.min.css b/dist/craftui.min.css
diff --git a/dist/craftui.min.css.map b/dist/craftui.min.css.map
diff --git a/dist/craftui.min.js b/dist/craftui.min.js
diff --git a/dist/craftui.min.js.map b/dist/craftui.min.js.map
diff --git a/docs/src/stories/spinner.stories.js b/docs/src/stories/spinner.stories.js
@@ -9,7 +9,7 @@ storiesOf('Components|Spinner', module)
         props: {
             size: {
                 type: String,
-                default: select('size', ['base', 'lg'], 'base')
+                default: select('size', ['sm', 'base', 'lg'], 'base')
             },
         },
     }), { notes: { markdown: SpinnerNotesMD } })