Skip to content

Commit

Permalink
1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rickyleung committed Feb 4, 2016
1 parent b7a498e commit 84568c5
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 25 deletions.
4 changes: 2 additions & 2 deletions dist/jquery.bizui.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* BizUI Framework
* @version v1.1.6
* @version v1.2.0
* @copyright 2015 Sogou, Inc.
* @link https://github.com/bizdevfe/biz-ui
*/
Expand Down Expand Up @@ -2678,7 +2678,7 @@ table.rc-table-resizing .biz-label {
}
.biz-table.biz-rowspan tr.selected,
.biz-table.biz-rowspan tr:hover {
background-color: #fff;
background-color: #ffffff;
}
.biz-table.biz-rowspan tr.sum,
.biz-table.biz-rowspan tr.sum:hover {
Expand Down
11 changes: 3 additions & 8 deletions dist/jquery.bizui.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* BizUI Framework
* @version v1.1.6
* @version v1.2.0
* @copyright 2015 Sogou, Inc.
* @link https://github.com/bizdevfe/biz-ui
*/
Expand All @@ -14,12 +14,7 @@
root['bizui'] = factory(root.$);
}
}(this, function($) {
/**
* @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/almond for details
*/
//Going sloppy to avoid 'use strict' string cost, but strict practices should
//Going sloppy to avoid 'use strict' string cost, but strict practices should
//be followed.
/*jslint sloppy: true */
/*global setTimeout: false */
Expand Down Expand Up @@ -15413,7 +15408,7 @@ define('bizui',['require','ui/Button','ui/Input','ui/Textarea','ui/Textline','ui
/**
* @property {String} version 版本号
*/
bizui.version = '1.1.6';
bizui.version = '1.2.0';

var origin = window.bizui;

Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.bizui.min.css

Large diffs are not rendered by default.

10 changes: 2 additions & 8 deletions dist/jquery.bizui.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "biz-ui",
"version": "1.1.6",
"version": "1.2.0",
"description": "A jQuery plugin for business UI components",
"keywords": [
"jQuery plugin",
Expand Down
2 changes: 1 addition & 1 deletion src/bizui.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ define(function(require) {
/**
* @property {String} version 版本号
*/
bizui.version = '1.1.6';
bizui.version = '1.2.0';

var origin = window.bizui;

Expand Down
2 changes: 1 addition & 1 deletion src/css/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* BizUI Framework
* @version v1.1.6
* @version v1.2.0
* @copyright 2015 Sogou, Inc.
* @link https://github.com/bizdevfe/biz-ui
*/
Expand Down
2 changes: 1 addition & 1 deletion src/css/theme-custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@

.biz-table.biz-rowspan tr.selected,
.biz-table.biz-rowspan tr:hover {
background-color: #fff;
background-color: #ffffff;
}

.biz-table.biz-rowspan tr.sum,
Expand Down
2 changes: 1 addition & 1 deletion src/wrapper/start.frag
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* BizUI Framework
* @version v1.1.6
* @version v1.2.0
* @copyright 2015 Sogou, Inc.
* @link https://github.com/bizdevfe/biz-ui
*/
Expand Down
2 changes: 1 addition & 1 deletion tool/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fi
echo -e "\033[0;32mAPI generating done! \033[0m"

#Version updating
V="1.1.6"
V="1.2.0"
sed -i "s/v[0-9].[0-9].[0-9]/v$V/" "../src/wrapper/start.frag"
sed -i "s/v[0-9].[0-9].[0-9]/v$V/" "../src/css/main.css"
sed -i "s/bizui.version\s=\s'[0-9].[0-9].[0-9]'/bizui.version = '$V'/" "../src/bizui.js"
Expand Down

0 comments on commit 84568c5

Please sign in to comment.