Ver código fonte

引入bootstrap,解决和现有ui库冲突问题

Joe 4 anos atrás
pai
commit
c5c086667c
2 arquivos alterados com 5 adições e 6 exclusões
  1. 4 5
      src/layout/components/Navbar.vue
  2. 1 1
      src/main.js

+ 4 - 5
src/layout/components/Navbar.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+  <div class="navbarB">
+    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container " @toggleClick="toggleSideBar" />
 
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
 
@@ -102,7 +102,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.navbar {
+.navbarB {
   height: 50px;
   overflow: visible ;
   position: relative;
@@ -162,7 +162,6 @@ export default {
       margin-right: 30px;
 
       .avatar-wrapper {
-        margin-top: 5px;
         position: relative;
 
         .user-avatar {
@@ -176,7 +175,7 @@ export default {
           cursor: pointer;
           position: absolute;
           right: -20px;
-          top: 25px;
+          top: 21px;
           font-size: 12px;
         }
       }

+ 1 - 1
src/main.js

@@ -15,7 +15,7 @@ import App from './App'
 import store from './store'
 import router from './router'
 import permission from './directive/permission'
-// import 'bootstrap/dist/css/bootstrap.min.css'
+import 'bootstrap/dist/css/bootstrap.min.css'
 import 'bootstrap/dist/js/bootstrap.min'
 
 import './assets/icons' // icon