Skip to content

Commit

Permalink
各系统主题定制
Browse files Browse the repository at this point in the history
  • Loading branch information
Greenbook committed Mar 10, 2019
1 parent 7da620f commit 49a5524
Show file tree
Hide file tree
Showing 15 changed files with 113 additions and 22 deletions.
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@
"> 1%",
"last 2 versions",
"not ie <= 8"
]
/*,
],
"gitHooks": {
"pre-commit": "lint-staged"
},
Expand All @@ -69,5 +68,5 @@
"vue-cli-service lint",
"git add"
]
}*/
}
}
2 changes: 1 addition & 1 deletion src/components/main/business.less
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
}
.header-con{
background: #fff;
//background: #fff;
padding: 0 20px;
width: 100%;
}
Expand Down
5 changes: 3 additions & 2 deletions src/components/main/business.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<Layout style="height: 100%" class="main">
<Layout style="height: 100%" class="main business">
<Header class="header-con">
<header-bar :collapsed="collapsed" @on-coll-change="handleCollapsedChange">
<header-bar :collapsed="collapsed" :crumbable="crumbable" @on-coll-change="handleCollapsedChange">
<user :message-unread-count="unreadCount" :user-avator="userAvator"/>
<!--<language v-if="$config.useI18n" @on-lang-change="setLocal" style="margin-right: 10px;" :lang="local"/>-->
<!--<error-store v-if="$config.plugin['error-store'] && $config.plugin['error-store'].showInHeader" :has-read="hasReadErrorPage" :count="errorCount"></error-store>-->
Expand Down Expand Up @@ -61,6 +61,7 @@ export default {
data () {
return {
collapsed: false,
crumbable: false,
isFullscreen: false,
backUrl: '/front/guide'
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/main/freight.less
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
}
}
.header-con {
background: #fff;
//background: #fff;
padding: 0 20px;
width: 100%;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/main/freight.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<Layout style="height: 100%" class="main">
<Layout style="height: 100%" class="main freight">
<Header class="header-con">
<header-bar :collapsed="collapsed" :siderable="siderable" :crumbable="crumbable" @on-coll-change="handleCollapsedChange">
<div slot="top-menu" class="top-menu">
Expand Down Expand Up @@ -43,8 +43,8 @@ import ErrorStore from './components/error-store'
import { mapMutations, mapActions, mapGetters } from 'vuex'
import { getNewTagList, getNextRoute, routeEqual } from '@/libs/util'
import routers from '@/router/routers'
import '@/theme/freight/index.less'
import './freight.less'
import '@/theme/freight/index.less'
export default {
name: 'Business',
components: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/main/guide.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<Layout style="height: 100%" class="main">
<Layout style="height: 100%" class="main admin">
<Header class="header-con">
<header-bar :collapsed="collapsed" @on-coll-change="handleCollapsedChange" :siderable="false" :crumbable="false">
<user :message-unread-count="unreadCount" :user-avator="userAvator"/>
Expand Down Expand Up @@ -31,6 +31,7 @@ import GoBack from './components/go-back'
import ErrorStore from './components/error-store'
import { mapMutations, mapActions, mapGetters } from 'vuex'
import './main.less'
import '@/theme/admin/index.less'
export default {
name: 'Guide',
components: {
Expand Down
4 changes: 3 additions & 1 deletion src/components/main/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
}
}
.header-con{
background: #fff;
//background: #2F4056;
padding: 0 20px;
width: 100%;
color: #ffffff;
}
.main-layout-con{
height: 100%;
Expand Down Expand Up @@ -78,3 +79,4 @@
.ivu-select-dropdown.ivu-dropdown-transfer{
max-height: 400px;
}

6 changes: 4 additions & 2 deletions src/components/main/main.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<Layout style="height: 100%" class="main">
<Layout style="height: 100%" class="main admin">
<Header class="header-con">
<header-bar :collapsed="collapsed" @on-coll-change="handleCollapsedChange">
<header-bar :collapsed="collapsed" :crumbable="crumbable" @on-coll-change="handleCollapsedChange">
<user :message-unread-count="unreadCount" :user-avator="userAvator"/>
<!--<language v-if="$config.useI18n" @on-lang-change="setLocal" style="margin-right: 10px;" :lang="local"/>-->
<!--<error-store v-if="$config.plugin['error-store'] && $config.plugin['error-store'].showInHeader" :has-read="hasReadErrorPage" :count="errorCount"></error-store>-->
Expand Down Expand Up @@ -44,6 +44,7 @@ import routers from '@/router/routers'
import minLogo from '@/assets/images/logo-min.jpg'
import maxLogo from '@/assets/images/logo.jpg'
import './main.less'
import '@/theme/admin/index.less'
export default {
name: 'Main',
components: {
Expand All @@ -61,6 +62,7 @@ export default {
collapsed: false,
minLogo,
maxLogo,
crumbable: false,
isFullscreen: false
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/main/student.less
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
}
.header-con{
background: #fff;
//background: #fff;
padding: 0 20px;
width: 100%;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/main/ticket.less
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
}
}
.header-con{
background: #fff;
//background: #fff;
padding: 0 20px;
width: 100%;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/main/ticket.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<Layout style="height: 100%" class="main">
<Layout style="height: 100%" class="main ticket">
<Header class="header-con">
<header-bar :collapsed="collapsed" :siderable="siderable" :crumbable="crumbable" @on-coll-change="handleCollapsedChange">
<div slot="top-menu" class="top-menu">
Expand Down Expand Up @@ -43,8 +43,8 @@ import ErrorStore from './components/error-store'
import { mapMutations, mapActions, mapGetters } from 'vuex'
import { getNewTagList, getNextRoute, routeEqual } from '@/libs/util'
import routers from '@/router/routers'
import '@/theme/ticket/index.less'
import './ticket.less'
import '@/theme/ticket/index.less'
export default {
name: 'Business',
components: {
Expand Down
50 changes: 50 additions & 0 deletions src/theme/admin/index.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@

.admin {

.ivu-layout-header {
background-color: #2F9688;
}
.ivu-layout-sider {
background-color: #2F9688;
}
.ivu-menu-dark, .ivu-menu-submenu-title {
background-color: #2F9688;
}
.ivu-menu-dark.ivu-menu-vertical .ivu-menu-opened {
background: #226A62;
}
.ivu-menu-dark.ivu-menu-vertical .ivu-menu-opened .ivu-menu-submenu-title {
background: #226A62;
}
.ivu-menu-dark.ivu-menu-vertical .ivu-menu-opened .ivu-menu-submenu-title {
background: #226A62;
}
.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item, .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title {
background: #226A62;
}
.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu):hover, .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu):hover {
background: #5FB878 !important;
color: #ffffff;
}
.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu), .ivu-menu-dark.ivu-menu-vertical .ivu-menu-item-active:not(.ivu-menu-submenu):hover, .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title-active:not(.ivu-menu-submenu):hover {
background: #5FB878 !important;
color: #ffffff;
}
.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item:hover, .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title:hover {
background: #5FB878 !important;
color: #ffffff;
}
}

.qib-form .ivu-form-item {
margin-bottom: 5px;
}
.qib-form .ivu-divider-horizontal {
margin: 5px 0;
}
.main .ivu-card-head {
padding: 5px 16px;
}
.main .ivu-card-body {
padding: 5px 16px;
}
26 changes: 23 additions & 3 deletions src/theme/business/index.less
Original file line number Diff line number Diff line change
@@ -1,12 +1,32 @@
@import '../../../node_modules/iview/src/styles/index.less';

// Border color
@border-color-base : #5cadff; // outside
@border-color-split : #e8eaec; // inside
@border-width-base : 1px; // width of the border for a component
@border-style-base : solid; // style of a components border


.business {
.ivu-layout-header {
background-color: #2F4056;
}
.ivu-layout-sider {
background-color: #2F4056;
}
.ivu-menu-dark, .ivu-menu-submenu-title {
background-color: #2F4056;
}
.ivu-menu-dark.ivu-menu-vertical .ivu-menu-opened {
background: #2F4056;
}
.ivu-menu-dark.ivu-menu-vertical .ivu-menu-opened .ivu-menu-submenu-title {
background: #2F4056;
}
.ivu-menu-dark.ivu-menu-vertical .ivu-menu-opened .ivu-menu-submenu-title {
background: #2F4056;
}
.ivu-menu-dark.ivu-menu-vertical .ivu-menu-item, .ivu-menu-dark.ivu-menu-vertical .ivu-menu-submenu-title {
background: #2F4056;
}
}

.qib-form .ivu-form-item {
margin-bottom: 5px;
Expand Down
9 changes: 9 additions & 0 deletions src/theme/freight/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@
@border-style-base : solid; // style of a components border


.freight {
.ivu-menu-horizontal {
height: 64px;
line-height: 64px;
}
.ivu-layout-header {
background-color: #AA3130;
}
}

.qib-form .ivu-form-item {
margin-bottom: 5px;
Expand Down
11 changes: 9 additions & 2 deletions src/theme/ticket/index.less
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
@import '../../../node_modules/iview/src/styles/index.less';

// Border color
@border-color-base : #5cadff; // outside
@border-color-split : #e8eaec; // inside
@border-width-base : 1px; // width of the border for a component
@border-style-base : solid; // style of a components border


.ticket {
.ivu-menu-horizontal {
height: 64px;
line-height: 64px;
}
.ivu-layout-header {
background-color: #50314F;
}
}

.qib-form .ivu-form-item {
margin-bottom: 5px;
Expand Down

0 comments on commit 49a5524

Please sign in to comment.