Merge remote-tracking branch 'origin/gh-pages'

Conflicts: index.html
Gemorroj · Jan 26, 2013 · 16ee687 · 16ee687
2 parents 06dd076 + b7c6621
commit 16ee687
Showing 1 changed file with 81 additions and 11 deletions.
diff --git a/index.html b/index.html
@@ -1,13 +1,83 @@
 <!DOCTYPE html>
 <html>
-    <head>
-        <meta charset="utf-8"/>
-        <title>NoAds Advanced [background]</title>
-        <script type='text/javascript' src='includes/noads-translation.js'></script>
-        <script type='text/javascript' src='includes/noads-common.js'></script>
-        <script type='text/javascript' src='includes/noads-options.js'></script>
-        <script type='text/javascript' src='scripts/noads-importer.js'></script>
-        <script type='text/javascript' src='scripts/noads-background.js'></script>
-    </head>
-    <body></body>
-</html>
+<head>
+  <meta charset='utf-8'>
+
+  <title>Dither/noads-advanced @ GitHub</title>
+
+  <style type="text/css">
+    body {
+      margin-top: 1.0em;
+      background-color: #cd96f5;
+      font-family: Helvetica, Arial, FreeSans, san-serif;
+      color: #000000;
+    }
+    #container {
+      margin: 0 auto;
+      width: 700px;
+    }
+    h1 { font-size: 3.8em; color: #32690a; margin-bottom: 3px; }
+    h1 .small { font-size: 0.4em; }
+    h1 a { text-decoration: none }
+    h2 { font-size: 1.5em; color: #32690a; }
+    h3 { text-align: center; color: #32690a; }
+    a { color: #32690a; }
+    .description { font-size: 1.2em; margin-bottom: 30px; margin-top: 30px; font-style: italic;}
+    .download { float: right; }
+    pre { background: #000; color: #fff; padding: 15px;}
+    hr { border: 0; width: 80%; border-bottom: 1px solid #aaa}
+    .footer { text-align:center; padding-top:30px; font-style: italic; }
+  </style>
+</head>
+
+<body>
+  <a href="http://github.com/Dither/noads-advanced"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
+
+  <div id="container">
+
+    <div class="download">
+      <a href="http://github.com/Dither/noads-advanced/zipball/master">
+        <img border="0" width="90" src="http://github.com/images/modules/download/zip.png"></a>
+      <a href="http://github.com/Dither/noads-advanced/tarball/master">
+        <img border="0" width="90" src="http://github.com/images/modules/download/tar.png"></a>
+    </div>
+
+    <h1><a href="http://github.com/Dither/noads-advanced">noads-advanced</a>
+      <span class="small">by <a href="http://github.com/Dither">Dither</a></span></h1>
+
+    <div class="description">
+      Advertisement blocking filter for Opera
+    </div>
+
+    <p>This Opera extension allows users to filter advertisements from web pages using the following methods:
+CSS-selectors
+DefineMagicFunction
+URL-filters
+JavaScript blocker</p><h2>Install</h2>
+<p>Drag and drop config.xml from the extensions directory to Opera browser window. Configure the extension and download filters.</p>
+<h2>License</h2>
+<p>Apache License 2.0</p>
+<h2>Authors</h2>
+<p>Dither<br/><br/>      </p>
+
+
+    <h2>Download</h2>
+    <p>
+      You can download this project in either
+      <a href="http://github.com/Dither/noads-advanced/zipball/master">zip</a> or
+      <a href="http://github.com/Dither/noads-advanced/tarball/master">tar</a> formats.
+    </p>
+    <p>You can also clone the project with <a href="http://git-scm.com">Git</a>
+      by running:
+      <pre>$ git clone git://github.com/Dither/noads-advanced</pre>
+    </p>
+
+    <div class="footer">
+      get the source code on GitHub : <a href="http://github.com/Dither/noads-advanced">Dither/noads-advanced</a>
+    </div>
+
+  </div>
+
+
+</body>
+</html>