diff --git a/docs/App.vue b/docs/App.vue index 54eb17c1d..a61c8f2bd 100644 --- a/docs/App.vue +++ b/docs/App.vue @@ -1,4 +1,6 @@ diff --git a/docs/components/Header.vue b/docs/components/Header.vue index ef0588258..2de912c2b 100644 --- a/docs/components/Header.vue +++ b/docs/components/Header.vue @@ -59,7 +59,7 @@ a { height: $header-height; padding: 0 10px; align-items: center; - background-color: #67A1F4; + background-color: $color-blue; z-index: 10; box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); diff --git a/docs/components/Menu.vue b/docs/components/Menu.vue index 9a6f05a9e..fca353c52 100644 --- a/docs/components/Menu.vue +++ b/docs/components/Menu.vue @@ -149,7 +149,10 @@ export default { height: 100%; padding: 25px 12px; overflow: auto; - border-right: 1px solid #DDDDDD; + + @include themify() { + border-right: 1px solid themed('border-color-base'); + } ul, li { list-style: none; @@ -161,7 +164,7 @@ export default { cursor: pointer; &:hover { - color: $color-main; + color: $color-blue; } } } diff --git a/docs/style/index.scss b/docs/style/index.scss index d668d92f5..307d98a6f 100644 --- a/docs/style/index.scss +++ b/docs/style/index.scss @@ -4,7 +4,3 @@ @import 'mixins'; @import 'variables'; @import 'themes'; - -body { - background: yellowgreen; -} diff --git a/docs/style/themes.scss b/docs/style/themes.scss index 8c201240d..4a289fb56 100644 --- a/docs/style/themes.scss +++ b/docs/style/themes.scss @@ -5,6 +5,7 @@ $ev-themes: ( /* common -------------------------- */ background-color-base: $color-white, + border-color-base: #DDDDDD, font-color-base: $color-black, color-primary: #1A6AFE, color-info: #5AC8FA, @@ -17,6 +18,7 @@ $ev-themes: ( /* common -------------------------- */ background-color-base: #2D2D2D, + border-color-base: #222222, font-color-base: $color-white, color-primary: #007AFF, color-info: #64D2FF, diff --git a/docs/style/variables.scss b/docs/style/variables.scss index 79cc701d2..effc790b5 100644 --- a/docs/style/variables.scss +++ b/docs/style/variables.scss @@ -10,12 +10,12 @@ $font-family-base: inherit !default; // Common Color $color-white: #FFFFFF !default; $color-black: #0D0D0D !default; -$color-main: #67A1F4 !default; +$color-blue: #3C81F6 !default; +$color-red: #FF470E !default; +$color-yellow: #FADE4C !default; // etc $border-radius-base: 2px; -$border-solid: 1px solid; -$border-dotted: 1px dotted; // layout $header-height: 55px; diff --git a/docs/views/checkbox/index.vue b/docs/views/checkbox/index.vue index c2a288c90..6c0c352ad 100644 --- a/docs/views/checkbox/index.vue +++ b/docs/views/checkbox/index.vue @@ -1,8 +1,7 @@ + + diff --git a/src/components/radio/index.js b/src/components/radio/index.js new file mode 100644 index 000000000..02864cbc5 --- /dev/null +++ b/src/components/radio/index.js @@ -0,0 +1,7 @@ +import EvRadio from './Radio'; + +EvRadio.install = (app) => { + app.component(EvRadio.name, EvRadio); +}; + +export default EvRadio; diff --git a/src/main.js b/src/main.js index 71318ae36..4831d3479 100644 --- a/src/main.js +++ b/src/main.js @@ -1,8 +1,10 @@ import EvCheckbox from '@/components/checkbox/Checkbox.vue'; +import EvRadio from '@/components/radio/Radio.vue'; import { version } from '../package.json'; const components = [ EvCheckbox, + EvRadio, ]; const install = (app) => { diff --git a/src/style/index.scss b/src/style/index.scss index 39e6d20eb..307d98a6f 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -4,7 +4,3 @@ @import 'mixins'; @import 'variables'; @import 'themes'; - -body { - color: red; -} diff --git a/tests/unit/example.spec.js b/tests/unit/example.spec.js index 6879601cc..77c71725a 100644 --- a/tests/unit/example.spec.js +++ b/tests/unit/example.spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import Checkbox from '@/components/checkbox/Checkbox'; -describe('Checkbox.vue', () => { +describe('Radio.vue', () => { it('renders props.msg when passed', () => { const msg = 'new message'; const wrapper = shallowMount(Checkbox, {