summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRandy Morgan <[email protected]>2012-04-09 19:14:04 +0900
committerRandy Morgan <[email protected]>2012-04-09 19:14:04 +0900
commitc5abe63eee3f1435473afcbdbdea7990caef7bf3 (patch)
tree6c31ae40103f9b86f5c7973d53591751b3835930
parent8c14a6846d53a23e442275346bca85f714a1df48 (diff)
downloadcaxlsx-c5abe63eee3f1435473afcbdbdea7990caef7bf3.tar.gz
caxlsx-c5abe63eee3f1435473afcbdbdea7990caef7bf3.zip
credit where credit is due, some docs changes and removing the befor_script from travis as it requires rake in the deps it seems.
-rw-r--r--.travis.yml1
-rw-r--r--README.md2
-rw-r--r--lib/axlsx/stylesheet/styles.rb2
3 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index d2298044..a5e3963e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
language: ruby
-before_script: "gem install rake"
notifications:
irc: "irc.freenode.org#axlsx"
email:
diff --git a/README.md b/README.md
index a8562670..75e00283 100644
--- a/README.md
+++ b/README.md
@@ -525,6 +525,8 @@ Please see the {file:CHANGELOG.md} document for past release information.
[joekain](https://github.com/joekain) - for keeping our references working even in the double digits!
+[moskrin](https://github.com/moskrin) - for keeping border creation on the edge.
+
#Copyright and License
----------
diff --git a/lib/axlsx/stylesheet/styles.rb b/lib/axlsx/stylesheet/styles.rb
index cd8c7139..5a890033 100644
--- a/lib/axlsx/stylesheet/styles.rb
+++ b/lib/axlsx/stylesheet/styles.rb
@@ -133,7 +133,7 @@ module Axlsx
# @option options [String] font_name The name of the font to use
# @option options [Integer] num_fmt The number format to apply
# @option options [String] format_code The formatting to apply. If this is specified, num_fmt is ignored.
- # @option options [Integer] border The border style to use.
+ # @option options [Integer|Hash] border The border style to use.
# @option options [String] bg_color The background color to apply to the cell
# @option options [Boolean] hidden Indicates if the cell should be hidden
# @option options [Boolean] locked Indicates if the cell should be locked