#110: 兼容layui与bootstrap样式

This commit is contained in:
邹景立 2017-02-17 10:23:09 +08:00
commit c38c6136c1
2 changed files with 31 additions and 16 deletions

@ -1 +1 @@
Subproject commit 04c1460020f26d020b85140795bc12cd7a423832
Subproject commit c8c70f0787438a8915226e67e9909f9deafbf2bc

View File

@ -2,25 +2,40 @@
branches: {
}
fileChange:
/application:
newFile: !uuid '4534e2fb2994efc8310a6420ab56fe9c01d55477'
oldFile: !uuid '8bfbf477a30e653e8af6275c0ec21c7e640463e4'
/application/admin:
newFile: !uuid '9c07a14ceeb3aee2ffe6085f54586aa68d2f4188'
oldFile: !uuid '199fd8a7c6901c677de1d1848aa3134f46fe822e'
/application/admin/view:
newFile: !uuid '5044dcee1b4b5b791a00921014bed6cbebba85f6'
oldFile: !uuid 'c8b88b0b311429a902845786f880d959abbfd3e6'
/application/admin/view/config.index.html:
newFile: !uuid 'c31756dbbc4eb9171ec97b0d753c1aeab53240c0'
oldFile: !uuid '3ccbc850861c57e9f9a77744cf05cb39a98073c1'
/application/admin/view/index.main.html:
newFile: !uuid '3b63df9b11c591a6f5da51d9ec8471dcbd1dfe00'
oldFile: !uuid 'ddcf373bf0034a4b9e5933d9e53bdf3cfa071b2c'
/public:
newFile: !uuid '305166e85db34ee6d701e9b66371ab3038e0f59c'
oldFile: !uuid '6bb9e1a475254483308b049879aa7452c5c080e9'
newFile: !uuid '6b6826ef08a197e3e4c646b58837ec9ef75244a3'
oldFile: !uuid '305166e85db34ee6d701e9b66371ab3038e0f59c'
/public/static:
newFile: !uuid 'da4670accc90e791714ea3a5b7a4fc0290902c53'
oldFile: !uuid '82c45eaa5c8b1b01dce23b72c14c9be8a96648e9'
newFile: !uuid '757f4cf7effd45e73ff1ad16de2bd50ae56a31da'
oldFile: !uuid 'da4670accc90e791714ea3a5b7a4fc0290902c53'
/public/static/theme:
newFile: !uuid 'bf0a6a376db445b32003a71c9dc9d1e551233d01'
oldFile: !uuid 'cb4031eb00f44641c9c8dde1aad729c671d015bd'
newFile: !uuid '497ca02daf8465dfc9786d736d2638c11a69a30b'
oldFile: !uuid 'bf0a6a376db445b32003a71c9dc9d1e551233d01'
/public/static/theme/default:
newFile: !uuid '662f73d0f8c0fac1dc6157a2e985fc775c436117'
oldFile: !uuid '29253eb63acf26eeba39237f7c48611b380955f4'
newFile: !uuid 'b7b0f484587f5241a7b98a402cd3646fd2f42add'
oldFile: !uuid '662f73d0f8c0fac1dc6157a2e985fc775c436117'
/public/static/theme/default/css:
newFile: !uuid '88207f957cd404abc97aac7101df8369ce61da95'
oldFile: !uuid 'fd4b3b33933d9e8853654bcc6e6178d98637b74f'
/public/static/theme/default/css/login.css:
newFile: !uuid '4147f125974a64308a5ae31ef5be0eec81e5be72'
oldFile: !uuid '673202c0810cae00596cc0614f46d4150c50ae57'
gitCommitId: !uuid '04c1460020f26d020b85140795bc12cd7a423832'
newFile: !uuid '2cf6867a837eb96d7663cb7d7440f043d4aba96d'
oldFile: !uuid '88207f957cd404abc97aac7101df8369ce61da95'
/public/static/theme/default/css/console.css:
newFile: !uuid '4e9908905e3ab361a7bf55914ae11d25b70cc505'
oldFile: !uuid '05939735c4805328a91e001ab0cfc7e62b305c0c'
gitCommitId: !uuid 'c8c70f0787438a8915226e67e9909f9deafbf2bc'
renames: {
}
revisionId: 109
revisionId: 110