From dcd3268c601c2dd7816cdc3c80ea7536586ad5fe Mon Sep 17 00:00:00 2001 From: Manuel Ebert Date: Mon, 4 Mar 2013 15:56:16 -0800 Subject: [PATCH] Updated Readme from master --- bake.sh | 7 ++++--- css/jrnl.css | 25 +++++++++++++++++++--- index.html | 58 ++++++++++++++++++++++++++-------------------------- 3 files changed, 55 insertions(+), 35 deletions(-) diff --git a/bake.sh b/bake.sh index 48a2ea0e..e2bde10e 100755 --- a/bake.sh +++ b/bake.sh @@ -3,9 +3,10 @@ git checkout master README.md git checkout master CHANGELOG.md markdown2 README.md > tmp_readme markdown2 CHANGELOG.md > tmp_log -sed -i 's/
  • \[/
  • \[/g' tmp_log -sed -i 's/\[Fixed\]/Fixed<\/span>/g' tmp_log -sed -i 's/\[Improved\]/Improved<\/span>/g' tmp_log +sed -i.bak 's/
  • \[/
  • \[/g' tmp_log +sed -i.bak 's/\[Fixed\]/Fixed<\/span>/g' tmp_log +sed -i.bak 's/\[Improved\]/Improved<\/span>/g' tmp_log +sed -i.bak 's/\[New\]/New<\/span>/g' tmp_log cat templates/header.html tmp_readme tmp_log templates/footer.html > index.html rm tmp_readme tmp_log git add index.html diff --git a/css/jrnl.css b/css/jrnl.css index 21e1dd3b..72abf915 100644 --- a/css/jrnl.css +++ b/css/jrnl.css @@ -17,7 +17,7 @@ li.badge { -webkit-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; - background-color: #97B931; + background-color: #a81b51; box-shadow: inset 0px 1px 0px rgba(255,255,255,.5); -webkit-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5); -moz-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5); @@ -40,7 +40,26 @@ li.badge { box-shadow: inset 0px 1px 0px rgba(255,255,255,.5); -webkit-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5); -moz-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5); - -o-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5); + -o-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5); + padding: 2px 5px; + color: white; + text-shadow: 0px 1px 0px rgba(0,0,0,.3); + font-weight: bold; + font-family: "Maven Pro", "Junction", "Helvetica Neue", Helvetica, Sans; + font-size: 10pt; + margin-right: 5px; +} + +.change-new { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; + background-color: #8ac237; + box-shadow: inset 0px 1px 0px rgba(255,255,255,.5); + -webkit-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5); + -moz-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5); + -o-box-shadow: inset 0px 1px 0px rgba(255,255,255,.5); padding: 2px 5px; color: white; text-shadow: 0px 1px 0px rgba(0,0,0,.3); @@ -172,4 +191,4 @@ blockquote p{ .nav li:hover a, .nav a:hover { background: #3c3c3c; box-shadow: inset 0px 3px 3px 0px rgba(0,0,0,.1); -} \ No newline at end of file +} diff --git a/index.html b/index.html index 978bdf7d..ef2519f3 100644 --- a/index.html +++ b/index.html @@ -305,91 +305,91 @@ with open("my_journal.txt") as f:

    1.0.0 (March 4, 2013)

      -
    • [New] Integrates seamlessly with DayOne
      • -
    • [Improved] Each journal can have individual settings
      • -
    • [Fixed] A bug where jrnl would not go into compose mode
      • -
    • [Fixed] A bug where jrnl would not add entries without timestamp
      • -
    • [Fixed] Support for parsedatetime 1.x
      • +
    • New Integrates seamlessly with DayOne
      • +
    • Improved Each journal can have individual settings
      • +
    • Fixed A bug where jrnl would not go into compose mode
      • +
    • Fixed A bug where jrnl would not add entries without timestamp
      • +
    • Fixed Support for parsedatetime 1.x

    0.3.2 (July 5, 2012)

      -
    • [Improved] Converts \n to new lines (if using directly on a command line, make sure to wrap your entry with quotes).
      • +
    • Improved Converts \n to new lines (if using directly on a command line, make sure to wrap your entry with quotes).

    0.3.1 (June 16, 2012)

      -
    • [Improved] Supports deleting of last entry.
      • -
    • [Fixed] Fixes a bug where --encrypt or --decrypt without a target file would not work.
      • -
    • [Improved] Supports a config option for setting word wrap.
      • -
    • [Improved] Supports multiple journal files.
      • +
    • Improved Supports deleting of last entry.
      • +
    • Fixed Fixes a bug where --encrypt or --decrypt without a target file would not work.
      • +
    • Improved Supports a config option for setting word wrap.
      • +
    • Improved Supports multiple journal files.

    0.3.0 (May 24, 2012)

      -
    • [Fixed] Dates such as "May 3" will now be interpreted as being in the past if the current day is at least 28 days in the future
      • -
    • [Fixed] Bug where composed entry is lost when the journal file fails to load
      • +
    • Fixed Dates such as "May 3" will now be interpreted as being in the past if the current day is at least 28 days in the future
      • +
    • Fixed Bug where composed entry is lost when the journal file fails to load
    • Changed directory structure and install scripts (removing the necessity to make an alias from jrnl to jrnl.py)

    0.2.4 (May 21, 2012)

      -
    • [Fixed] Parsing of new lines in journal files and entries
      • -
    • [Improved] Adds support for encrypting and decrypting into new files
      • +
    • Fixed Parsing of new lines in journal files and entries
      • +
    • Improved Adds support for encrypting and decrypting into new files

    0.2.3 (May 3, 2012)

      -
    • [Improved] Adds a -short option that will only display the titles of entries (or, when filtering by tags, the context of the tag)
      • -
    • [Improved] Adds tag export
      • -
    • [Improved] Adds coloured highlight of tags (by default, highlights all tags - when filtering by tags, only highlights search tags)
      • -
    • [Improved] .jrnl_config will get automatically updated when updating jrnl to a new version
      • +
    • Improved Adds a -short option that will only display the titles of entries (or, when filtering by tags, the context of the tag)
      • +
    • Improved Adds tag export
      • +
    • Improved Adds coloured highlight of tags (by default, highlights all tags - when filtering by tags, only highlights search tags)
      • +
    • Improved .jrnl_config will get automatically updated when updating jrnl to a new version

    0.2.2 (April 17, 2012)

      -
    • [Improved] Adds --encrypt and --decrypt to encrypt / decrypt existing journal files
      • -
    • [Improved] Adds markdown export (kudos to dedan)
      • +
    • Improved Adds --encrypt and --decrypt to encrypt / decrypt existing journal files
      • +
    • Improved Adds markdown export (kudos to dedan)

    0.2.1 (April 17, 2012)

      -
    • [Improved] Submitted to PyPi.
      • +
    • Improved Submitted to PyPi.

    0.2.0 (April 16, 2012)

      -
    • [Improved] Encrypts using CBC
      • -
    • [Fixed] key has been renamed to password in config to avoid confusion. (The key use to encrypt and decrypt a journal is the SHA256-hash of the password.)
      • +
    • Improved Encrypts using CBC
      • +
    • Fixed key has been renamed to password in config to avoid confusion. (The key use to encrypt and decrypt a journal is the SHA256-hash of the password.)

    0.1.1 (April 15, 2012)

      -
    • [Fixed] Removed unnecessary print commands
      • -
    • [Improved] Created the documentation
      • +
    • Fixed Removed unnecessary print commands
      • +
    • Improved Created the documentation

    0.1.0 (April 13, 2012)

      -
    • [Improved] Supports encrypted journals using AES encryption
      • -
    • [Improved] Support external editors for composing entries
      • +
    • Improved Supports encrypted journals using AES encryption
      • +
    • Improved Support external editors for composing entries

    0.0.2 (April 5, 2012)

      -
    • [Improved] Filtering by tags and dates
      • -
    • [Fixed] Now using dedicated classes for Journals and entries
      • +
    • Improved Filtering by tags and dates
      • +
    • Fixed Now using dedicated classes for Journals and entries

    0.0.1 (March 29, 2012)