Fix heading wrap, misc

quassy · Dec 25, 2015 · 6dbf424 · 6dbf424
1 parent 118a7be
commit 6dbf424
Show file tree

Hide file tree

Showing 8 changed files with 125 additions and 133 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -4,7 +4,7 @@ title: License
 permalink: /license/
 ---
 
-This page was originally built using Jekyll Now, which is licensed under the [MIT License](http://opensource.org/licenses/MIT). The contents (including images, posts and static pages) of the blog are licensed under [CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
+This page was originally built using Jekyll Now, which is licensed under the [MIT License](http://opensource.org/licenses/MIT). The contents (including images, posts and static pages) of this site are licensed under [CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)
 
 ## MIT License
 
@@ -29,19 +29,7 @@ This page was originally built using Jekyll Now, which is licensed under the [MI
     IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
     CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-## CC-BY-SA 4.0
-
-> Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
-
-> ### Using Creative Commons Public Licenses
-
-> Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
->
-> * __Considerations for licensors:__ Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. [More considerations for licensors](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors).
->
-> * __Considerations for the public:__ By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees).
-
-## Creative Commons Attribution-ShareAlike 4.0 International Public License
+## Creative Commons Attribution-ShareAlike 4.0 International Public License (CC-BY-SA 4.0)
 
 By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
 
@@ -196,7 +184,3 @@ b. To the extent possible, if any provision of this Public License is deemed une
 c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
 
 d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
-
-> Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at [creativecommons.org/policies](http://creativecommons.org/policies), Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
->
-> Creative Commons may be contacted at [creativecommons.org](http://creativecommons.org/).
diff --git a/README.md b/README.md
@@ -5,15 +5,13 @@ permalink: /readme/
 redirect_from: /about/
 ---
 
-A resource for 3rd party software designed for [elementary (OS)](http://elementary.io). If you find an error or want to add an app, [file a report](https://github.com/quassy/elementary-apps/issues/new) or join the [chat](https://gitter.im/quassy/elementary-apps). 
-
-Started on 1st January 2015 at [r/elementaryos](https://www.reddit.com/r/elementaryos/comments/2r0xey/third_party_development_and_apps/), [with](http://madeforelementary.tumblr.com/) [some](https://github.com/PerfectCarl/elementary-apps) [inspiration](https://github.com/elementary-fr/ideas).
+**elementary apps** is a resource for 3rd party software designed for [elementary (OS)](http://elementary.io), a fast and open desktop operating system. It was was started on 1st January 2015 at [r/elementaryos](https://www.reddit.com/r/elementaryos/comments/2r0xey/third_party_development_and_apps/), [with](http://madeforelementary.tumblr.com/) [some](https://github.com/PerfectCarl/elementary-apps) [inspiration](https://github.com/elementary-fr/ideas). It is now hosted on GitHub ([repository](https://github.com/{{ site.footer-links.github }})), so if you find an error or want to add an app, [file a report](https://github.com/{{ site.footer-links.github }}/issues/new) or join the [chat](https://gitter.im/{{ site.footer-links.github }}).
 
 ## Contribute
 
 ### App
 
-Check the [template file](https://github.com/quassy/elementary-apps/blob/gh-pages/apps/.Template.md). To add an app name the file accordingly, fill in as much info as you know and make pull request.
+Check the [template file](https://github.com/{{ site.footer-links.github }}/blob/gh-pages/apps/.Template.md). To add an app, name the file accordingly, fill in as much info as you know and make a pull request.
 
 Please mind, that `web` requires a whole url including `http(s)://` (https preferred), while all specific links only require the part after the domain. So `https://github.com/lorem` becomes `github: lorem`.
 
@@ -24,20 +22,20 @@ Guidelines:
 
 ### Screenshot
 
-Every app should have at least one, high-quality screenshot ([issue #2](https://github.com/quassy/elementary-apps/issues/2)).
+Every app should have at least one, high-quality screenshot ([issue #2](https://github.com/{{ site.footer-links.github }}/issues/2)).
 
 Guidelines:
 
- * Preferably show the app at work instead of just the welcome screen. For example a Video player should actually play a video when the screenshot is made.
+ * Preferably show the app at work instead of just the welcome screen. For example a video player should actually play a video when the screenshot is made.
  * Only capture the application window and cut off the picture right at the window border (shadows will be added by CSS), unless interaction with the desktop environment is a vital part of the app (for example Indicators).
  * Make the windows as big as necessary (should still look usable and beautiful), as small as possible.
 
 ## Links
 
 ### Blogroll
 
-* [LME Linux](http://lmelinux.net/#2015-06-07)
-* [fuck yeah, elementary OS!](http://fuckyeah-elementaryos.tumblr.com/#2015-05-04)
+* [LME Linux](http://lmelinux.net/#2015-12-10)
+* [fuck yeah, elementary OS!](http://fuckyeah-elementaryos.tumblr.com/#2015-10-25)
 * [elementary now](http://www.elementarynow.com/#2015-04-18)
 * [elementary OS Snippets](http://eos-snippets.blogspot.com/#2015-04-17)
 * [Made for elementary](http://madeforelementary.tumblr.com/#2015-02-14)
@@ -58,14 +56,14 @@ Guidelines:
 * [deviantArt](http://elementaryos.deviantart.com/) (designs and mockups)
 * [Google+](https://plus.google.com/114635553671833442612)
 * [Twitter](https://twitter.com/elementary)
- 
+
 ## Credits
 
 * Backend originally based on [Jekyll Now](https://github.com/barryclark/jekyll-now)
 * [Octicons](https://octicons.github.com)
 * Google Webfonts for Raleway (headings), Open Sans (body), Source Code Pro (monospace)
 
 Coming soon:
- 
-* [FontAwesome](http://fontawesome.io) icons 
-* Fonts [Neris](https://www.behance.net/gallery/11761457/Neris-%28free-font%29) and Source Code Pro
+
+* [FontAwesome](http://fontawesome.io) icons
+* Fonts [Neris](https://www.behance.net/gallery/11761457/Neris-%28free-font%29) and Source Code Pro
diff --git a/_config.yml b/_config.yml
@@ -10,17 +10,18 @@ avatar: /elementary-apps/img/apps-logo_4x64.png
 
 # Includes an icon in the footer for each username you enter
 footer-links:
-  dribbble: 
-  email: 
-  facebook: 
-  flickr: 
+  dribbble:
+  email:
+  facebook:
+  flickr:
   github: quassy/elementary-apps
-  instagram: 
-  linkedin: 
-  pinterest: 
+  google_plus:
+  instagram:
+  linkedin:
+  pinterest:
   rss: true
-  twitter: 
-  stackoverflow: 
+  twitter:
+  stackoverflow:
   youtube: # channel/<your_long_string> or user/<user-name>
 
 # Your disqus shortname, entering this will enable commenting on posts
@@ -34,7 +35,7 @@ piwik_analytics: true
 # Used for Sitemap.xml and your RSS feed
 url: https://quassy.github.io/elementary-apps
 
-# If you're hosting your site at a Project repository on GitHub pages 
+# If you're hosting your site at a Project repository on GitHub pages
 # (http://yourusername.github.io/repository-name)
 # and NOT your User repository (http://yourusername.github.io)
 # then add in the baseurl here, like this: "/repository-name"
@@ -65,4 +66,4 @@ gems:
 exclude:
   - Gemfile
   - Gemfile.lock
-  - .gitignore
+  - .gitignore
diff --git a/_layouts/default-beta.html b/_layouts/default-beta.html
@@ -4,37 +4,45 @@
   {% include meta.html %}
 
   <title>
-    {% if page.title %}{{ page.title }} – {% endif %}{{ site.name }}
+    {% if page.title %}{{ page.title }} – {% elsif page.generic %}{{ page.name | remove: ".md" }} – {% endif %}{{ site.name }}
   </title>
 
   <!--[if lt IE 9]>
-    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
   <![endif]-->
   <!-- load jQuery and tablesorter scripts -->
-  <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-  <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.18.4/js/jquery.tablesorter.min.js"></script>
-  <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.18.4/js/jquery.tablesorter.widgets.min.js"></script>
+  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.18.4/js/jquery.tablesorter.min.js"></script>
+  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.18.4/js/jquery.tablesorter.widgets.min.js"></script>
   <script type="text/javascript">
     $(function(){
       $(".tablesorter").tablesorter();
     });
+    if (window.location.protocol !== 'https:') {
+      window.location = 'https://' + window.location.hostname + window.location.pathname + window.location.hash;
+    }
   </script>
 
   <link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/style.css" />
-  <link rel="alternate" type="application/rss+xml" title="{{ site.name }} - {{ site.description }}" href="{{ site.baseurl }}/feed.xml" />
+  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css" />
 
-  <!-- Created with Jekyll Now - http://github.com/barryclark/jekyll-now -->
+  <link rel="alternate" type="application/rss+xml" title="{{ site.name }} - {{ site.description }}" href="{{ site.baseurl }}/feed.xml" />
 </head>
 
 <body class="beta">
   <header>
     <nav>
-      <a href="{{ site.baseurl }}/" title="{{ site.description }}" class="site-name">{{ site.name }}</a>
+      <a href="{{ site.baseurl }}/" title="{{ site.description }}" class="site-name">
+        <img src="{{ site.avatar }}" />
+        {{ site.name }}
+      </a>
       <a href="{{ site.baseurl }}/">News</a>
       <a href="{{ site.baseurl }}/apps">Apps</a>
       <a href="{{ site.baseurl }}/art">Art</a>
       <a href="{{ site.baseurl }}/others">Others</a>
       <a href="{{ site.baseurl }}/about">About</a>
+      <label for="search" title="Search with DuckDuckGo"><i class="fa fa-search"></i></label>
+      <input id="search" placeholder="Search with DuckDuckGo" type="search" required="required" />
     </nav>
   </header>
 
@@ -48,4 +56,4 @@
 
   {% include analytics.html %}
 </body>
-</html>
+</html>