Skip to content

/uBlock

Loading…

Readme update #959

Merged
merged 6 commits into from
+22 −5

Labels

None yet

Milestone

No milestone

Assignee

No one assigned

2 participants

@chrisaljoudi @gorhill
@chrisaljoudi
Owner
chrisaljoudi commented

The diff view is messy and nondescriptive; please see resulting file in the readme-update branch.

@gorhill I didn't want to commit this to master this without consulting your opinion.

@gorhill gorhill merged commit 2d8ec83 into master
1 check passed

1 check passed

Details continuous-integration/travis-ci/push The Travis CI build passed
@chrisaljoudi chrisaljoudi deleted the readme-update branch
@ahmadassaf ahmadassaf pushed a commit to ahmadassaf/uBlock that referenced this pull request
@gorhill gorhill this fixes #959 139cbc5
@ahmadassaf ahmadassaf added a commit to ahmadassaf/uBlock that referenced this pull request
@ahmadassaf ahmadassaf Merge branch 'master' of https://github.com/gorhill/uBlock … 
* 'master' of https://github.com/gorhill/uBlock: (24 commits)
  reverting last change
  code review
  new redirect engine: this fixes #949 (the video ad part)
  this fixes #959
  this takes care of last-resort ads
  will wait for fix of travis-ci/travis-ci#5145
  still trying to fix travis
  trying to fix travis' automated build
  new revision for dev build
  #955: merging 1.3.6 changes
  this hopefully fixes #955
  translation work from https://crowdin.com/project/ublock
  this fixes #951
  new revision for dev build
  #948: undo first attempt at fix
  reportedly this fixes #948
  this fixes #948
  #948: this possibly addresses the 1st reported error case
  bump version for dev build
  this addresses #909
  ...
 7a1f6f1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 8, 2015

  1. First attempt at cleaning up the header

    committed
    eb4da22

  2. Markdown is great for styling, right?

    committed
    87308b3

  3. More header fixes (links, etc)

    committed
    077bd5b

  4. Cleanup markup/HTML mess; make code readable (somewhat)

    committed
    4ac6795

  5. Tweaks to spacing

    committed
    4b75a86

  6. add IPA

    committed
    82052b6
This page is out of date. Refresh to see the latest.
Unified Split
Showing with 22 additions and 5 deletions.
  1. +22 −5 README.md
View
27 README.md
@@ -1,10 +1,27 @@
-# <sub><img src="https://raw.githubusercontent.com/gorhill/uBlock/master/doc/img/icon38@2x.png" height="38" width="38"></sub> uBlock&nbsp;<sup>[<img src="https://travis-ci.org/gorhill/uBlock.svg?branch=master" height="12">](https://travis-ci.org/gorhill/uBlock)</sup>
-
-<sup>pronounce _you-block_ as in "you decide what enters your browser"</sup>
+<h1 align="center">
+<sub>
+<img src="https://raw.githubusercontent.com/gorhill/uBlock/master/doc/img/icon38@2x.png"
+ height="38"
+ width="38">
+</sub>
+uBlock
+</h1>
+<p align="center">
+<sup> <!-- Pronounciation -->
+ pronounced <i>you-block</i> (<code>/ˈjuːˌblɒk/</code>) — <i>you</i> decide what enters your browser.
+</sup>
+<br>
+<sup> <!-- Languages -->
+ <img src="https://raw.githubusercontent.com/gorhill/uBlock/master/doc/img/languageicon-36.png" width="18" height="18">
+ <sup>
+ English, <a href="https://github.com/fang5566/uBlock#-%C2%B5block">
+ Chinese (中文) </a>
+ </sup>
+</sup>
+</p>
-<img src="https://raw.githubusercontent.com/gorhill/uBlock/master/doc/img/languageicon-36.png" width="18" height="18"></sub>&nbsp;<sup>English, [Chinese (中文)](https://github.com/fang5566/uBlock#-%C2%B5block)</sup>
-**An efficient blocker add-on for various browsers. Fast, potent, and lean.**
+**An efficient blocker add-on for various browsers. Fast, potent, and lean.**&nbsp;&nbsp;[<img src="https://travis-ci.org/gorhill/uBlock.svg?branch=master" height="12">](https://travis-ci.org/gorhill/uBlock)
* [Purpose & General Info](#philosophy)
* [Performance and Efficiency](#performance)
Something went wrong with that request. Please try again.