Browse Source

Merge pull request #636 from cdswyda/formulabar

样式优化,工具栏在拖动高度后单元格下拉仍居中显示
master
Dushusir 4 years ago
committed by GitHub
parent
commit
47d57155f0
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      gulpfile.js
  2. 2
      src/controllers/constant.js
  3. 9
      src/css/luckysheet-core.css

10
gulpfile.js

@ -32,6 +32,13 @@ const babel = require('@rollup/plugin-babel').default;
// Distinguish development and production environments // Distinguish development and production environments
const production = process.env.NODE_ENV === 'production' ? true : false; const production = process.env.NODE_ENV === 'production' ? true : false;
const pkg = require('./package.json');
const banner = `/*! @preserve
* ${pkg.name}
* version: ${pkg.version}
* https://github.com/mengshukeji/Luckysheet
*/`;
// uglify js Compression configuration https://github.com/mishoo/UglifyJS#minify-options // uglify js Compression configuration https://github.com/mishoo/UglifyJS#minify-options
const uglifyOptions = { const uglifyOptions = {
compress: { compress: {
@ -192,7 +199,7 @@ async function core() {
name: 'luckysheet', name: 'luckysheet',
sourcemap: true, sourcemap: true,
inlineDynamicImports:true, inlineDynamicImports:true,
banner: banner
}); });
if(production){ if(production){
@ -202,6 +209,7 @@ async function core() {
name: 'luckysheet', name: 'luckysheet',
sourcemap: true, sourcemap: true,
inlineDynamicImports:true, inlineDynamicImports:true,
banner: banner
}); });
} }

2
src/controllers/constant.js

@ -45,7 +45,7 @@ const gridHTML = function(){
</div> </div>
</div> </div>
<div class="luckysheet-wa-calculate-help-tool"> <div class="luckysheet-wa-calculate-help-tool">
<i class="fa fa-caret-down" aria-hidden="true" style="margin-top: 7px;"></i> <i class="fa fa-caret-down" aria-hidden="true"></i>
</div> </div>
</div> </div>
<div id="luckysheet-wa-functionbox-cancel" class="luckysheet-wa-functionbox"> <div id="luckysheet-wa-functionbox-cancel" class="luckysheet-wa-functionbox">

9
src/css/luckysheet-core.css

@ -860,7 +860,8 @@
left: 0; left: 0;
position: absolute; position: absolute;
right: 0; right: 0;
top: 6px; top: 50%;
transform: translateY(-50%);
resize: none; resize: none;
/* border: 1px #b9b9b9 solid; */ /* border: 1px #b9b9b9 solid; */
font-family: arial, sans, sans-serif; font-family: arial, sans, sans-serif;
@ -897,6 +898,12 @@
border-left: 1px solid transparent; border-left: 1px solid transparent;
border-right: 1px solid transparent; border-right: 1px solid transparent;
} }
.luckysheet-wa-calculate-help-tool .fa-caret-down {
position: absolute;
top: 50%;
left: 3px;
transform: translateY(-50%);
}
.luckysheet-wa-calculate-help-tool:hover { .luckysheet-wa-calculate-help-tool:hover {
background: #EFEFEF; background: #EFEFEF;

Loading…
Cancel
Save