Skip to content

Commit

Permalink
docs, styles updated, Makefile updated
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Smith committed May 12, 2013
1 parent 92c1bf8 commit 1ce1a9f
Show file tree
Hide file tree
Showing 5 changed files with 192 additions and 140 deletions.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: auto build test clean
.PHONY: auto build test docs clean

auto: build

Expand All @@ -10,6 +10,10 @@ test:
rm -f .coverage
. local/bin/activate && nosetests --all-modules --with-coverage arrow tests

docs:
touch docs/index.rst
cd docs; make html

clean:
rm -rf local
rm -f arrow/*.pyc tests/*.pyc
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Get started
>>> utc = arrow.utcnow()
>>> utc
<Arrow [2013-05-11T21:23:58.970460+00:00]>
>>>
>>>
>>> utc = utc.replace(hours=-1)
>>> utc
<Arrow [2013-05-11T20:23:58.970460+00:00]>
Expand All @@ -68,7 +68,7 @@ Get started
Documentation
-------------

Documentation is available at `crsmithdev.com/arrow <http://crsmithdev.com/arrow>`_
Documentation is available at `crsmithdev.com/arrow <http://crsmithdev.com/arrow>`_.

History
-------
Expand Down
17 changes: 10 additions & 7 deletions arrow/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def get(*args, **kwargs):
>>> import arrow
**No** inputs to get **current UTC time**::
**No inputs** to get current UTC time::
>>> arrow.get()
<Arrow [2013-05-08T05:51:43.316458+00:00]>
Expand All @@ -23,27 +23,27 @@ def get(*args, **kwargs):
>>> arrow.get(1367992474.293378)
<Arrow [2013-05-08T05:54:34.293378+00:00]>
>>>
>>> arrow.get(1367992474)
<Arrow [2013-05-08T05:54:34+00:00]>
>>>
>>> arrow.get('1367992474.293378')
<Arrow [2013-05-08T05:54:34.293378+00:00]>
>>>
>>> arrow.get('1367992474')
<Arrow [2013-05-08T05:54:34+00:00]>
**One str**, convertible to a timezone, or **tzinfo**, to get the current time in that timezone::
>>> arrow.get('local')
<Arrow [2013-05-07T22:57:11.793643-07:00]>
>>>
>>> arrow.get('US/Pacific')
<Arrow [2013-05-07T22:57:15.609802-07:00]>
>>>
>>> arrow.get('-07:00')
<Arrow [2013-05-07T22:57:22.777398-07:00]>
>>>
>>> arrow.get(tz.tzlocal())
<Arrow [2013-05-07T22:57:28.484717-07:00]>
Expand Down Expand Up @@ -170,10 +170,13 @@ def now(tz=None):
>>> import arrow
>>> arrow.now()
<Arrow [2013-05-07T22:19:11.363410-07:00]>
>>> arrow.now('US/Pacific')
<Arrow [2013-05-07T22:19:15.251821-07:00]>
>>> arrow.now('+02:00')
<Arrow [2013-05-08T07:19:25.618646+02:00]>
>>> arrow.now('local')
<Arrow [2013-05-07T22:19:39.130059-07:00]>
'''
Expand Down
7 changes: 2 additions & 5 deletions docs/_themes/f6/static/f6.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@

/* -- page layout ----------------------------------------------------------- */

div.highlight {
background: #f0f0f0
}

body {
font-family: 'Source Sans Pro', sans-serif;
font-size: 16px;
Expand Down Expand Up @@ -240,6 +236,7 @@ hr {
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
background: #f0f0f0 !important;
}

.highlighted {
Expand All @@ -253,7 +250,7 @@ pre {
font-style: normal;
font-size: 0.9em;
letter-spacing: 0.015em;
line-height: 120%;
line-height: 130%;
padding: 0.7em;
white-space: pre-wrap; /* css-3 */
white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
Expand Down
Loading

0 comments on commit 1ce1a9f

Please sign in to comment.