diff --git a/src/components/Layout/LayoutBasic.vue b/src/components/Layout/LayoutBasic.vue index 07e3f29..97a96df 100644 --- a/src/components/Layout/LayoutBasic.vue +++ b/src/components/Layout/LayoutBasic.vue @@ -8,6 +8,7 @@
+ @@ -17,12 +18,14 @@ import NavigationMenuBar from '@/components/Navigation/MenuBar/index' import NavigationNavBar from '@/components/Navigation/NavBar' import NavigationPageHeader from '@/components/Navigation/PageHeader' +import Settings from '@/components/Layout/components/Settings' export default { name: 'LayoutBasic', components: { NavigationMenuBar, NavigationNavBar, - NavigationPageHeader + NavigationPageHeader, + Settings } } diff --git a/src/components/Layout/components/Settings/index.vue b/src/components/Layout/components/Settings/index.vue new file mode 100644 index 0000000..34955a9 --- /dev/null +++ b/src/components/Layout/components/Settings/index.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/components/Navigation/MenuBar/index.vue b/src/components/Navigation/MenuBar/index.vue index 5d72be8..5f41392 100644 --- a/src/components/Navigation/MenuBar/index.vue +++ b/src/components/Navigation/MenuBar/index.vue @@ -17,10 +17,10 @@ :default-active="getCurrentRoute" class="menubar-menu-list" :collapse="isCollapse" - :collapse-transition="false" - :active-text-color="getActiveTextColor" @select="handleMenuSelect" > + + + + + + + + diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss index 1e40ed5..3e7189f 100644 --- a/src/styles/element-variables.scss +++ b/src/styles/element-variables.scss @@ -17,6 +17,6 @@ $--border-color-light: #dfe4ed; $--border-color-lighter: #e6ebf5; $--table-border: 1px solid #dfe6ec; -:export { - colorPrimary: $--color-primary; -} +// :export { +// colorPrimary: $--color-primary; +// } diff --git a/yarn.lock b/yarn.lock index ecf4682..1be3104 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2116,10 +2116,10 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428" integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA== -axios@^0.20.0: - version "0.20.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.20.0.tgz#057ba30f04884694993a8cd07fa394cff11c50bd" - integrity sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA== +axios@^0.21.1: + version "0.21.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== dependencies: follow-redirects "^1.10.0"