Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Asciiart+font #14

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Asciiart+font #14

wants to merge 20 commits into from

Commits on Jun 24, 2013

  1. [backport from Chrome App] Linespacing.

    @ahyangyi
    ahyangyi committed Jun 24, 2013
    Configuration menu
    Copy the full SHA
    4a89359 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/dev-v0.3.0' into asciiart

    @ahyangyi
    ahyangyi committed Jun 24, 2013
    Configuration menu
    Copy the full SHA
    3f6e78a View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2013

  1. Merge remote-tracking branch 'origin/master' into asciiart

    @ahyangyi
    ahyangyi committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    b68a447 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2013

  1. A Testing branch making use of RowellaSans

    @ahyangyi
    ahyangyi committed Jul 2, 2013
    Configuration menu
    Copy the full SHA
    c59071e View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2013

  1. 试试1.5倍行距（跟上个commit是个并列关系）

    @ahyangyi
    ahyangyi committed Jul 3, 2013
    Configuration menu
    Copy the full SHA
    248c7af View commit details
    Browse the repository at this point in the history

  2. 弱智错误还是先修了吧。。。

    @ahyangyi
    ahyangyi committed Jul 3, 2013
    Configuration menu
    Copy the full SHA
    1fa7e6f View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2013

  1. Merge remote-tracking branch 'rowell/master' into asciiart 

    Conflicts:
	style.css
    @ahyangyi
    ahyangyi committed Aug 23, 2013
    Configuration menu
    Copy the full SHA
    b3a83f6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'asciiart' into asciiart+font 

    Conflicts:
	style.css
    @ahyangyi
    ahyangyi committed Aug 23, 2013
    Configuration menu
    Copy the full SHA
    5fff2d8 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2014

  1. Merge remote-tracking branch 'roach/master' into asciiart+font 

    Conflicts:
	css/style.css
    @ahyangyi
    ahyangyi committed Jun 17, 2014
    Configuration menu
    Copy the full SHA
    ceb912e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'roach/master' into asciiart 

    Conflicts:
	css/style.css
    @ahyangyi
    ahyangyi committed Jun 17, 2014
    Configuration menu
    Copy the full SHA
    a589a43 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'asciiart' into asciiart+font 

    Conflicts:
	css/style.css
    @ahyangyi
    ahyangyi committed Jun 17, 2014
    Configuration menu
    Copy the full SHA
    d052889 View commit details
    Browse the repository at this point in the history

  4. Update style to make use of this font

    @ahyangyi
    ahyangyi committed Jun 17, 2014
    Configuration menu
    Copy the full SHA
    360c0ea View commit details
    Browse the repository at this point in the history

  5. Merge branch 'asciiart' into asciiart+font

    @ahyangyi
    ahyangyi committed Jun 17, 2014
    Configuration menu
    Copy the full SHA
    6b2e1b5 View commit details
    Browse the repository at this point in the history

  6. Move fonts to inside css/

    @ahyangyi
    ahyangyi committed Jun 17, 2014
    Configuration menu
    Copy the full SHA
    40b4032 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2015

  1. Merge branch 'rowell-master' into asciiart 

    Conflicts:
	css/style.css
    @ahyangyi
    ahyangyi committed Feb 10, 2015
    Configuration menu
    Copy the full SHA
    9dea2bf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'asciiart' into asciiart+font

    @ahyangyi
    ahyangyi committed Feb 10, 2015
    Configuration menu
    Copy the full SHA
    92e456f View commit details
    Browse the repository at this point in the history

Commits on May 3, 2015

  1. Merge branch 'master' of github.com:mrroach9/Rowell into asciiart

    @ahyangyi
    ahyangyi committed May 3, 2015
    Configuration menu
    Copy the full SHA
    b3582b2 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2015

  1. Merge remote-tracking branch 'roach/master' into asciiart+font

    @ahyangyi
    ahyangyi committed May 20, 2015
    Configuration menu
    Copy the full SHA
    07e7906 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'asciiart' into asciiart+font

    @ahyangyi
    ahyangyi committed May 20, 2015
    Configuration menu
    Copy the full SHA
    cbbaafa View commit details
    Browse the repository at this point in the history

  3. Revert to a regular height font

    @ahyangyi
    ahyangyi committed May 20, 2015
    Configuration menu
    Copy the full SHA
    d3704c8 View commit details
    Browse the repository at this point in the history