Skip to content

Commit

Permalink
modularize homepage css a bit more and remove polymer-ui-toolbar usage
Browse files Browse the repository at this point in the history
  • Loading branch information
ebidel committed Jul 18, 2014
1 parent b6cda7f commit e194a6e
Show file tree
Hide file tree
Showing 18 changed files with 49 additions and 144 deletions.
1 change: 0 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ kramdown:
# coderay_css: class

# Site globals used throughout docs.
load_platform: true
project_title: Polymer
latest_version: 0.3.4
add_permalinks: true # adds permalinks to heading tags.
Expand Down
6 changes: 2 additions & 4 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<footer>
<div>
<!-- <polymer-flex-layout align="center"></polymer-flex-layout> -->
<polymer-ui-toolbar>
<div class="links">
<a href="/docs/start/getting-the-code.html">
<paper-button icon="archive" label="Get {{site.project_title}}" raisedButton></paper-button>
</a>
Expand All @@ -17,8 +16,7 @@
<a href="https://github.com/Polymer/polymer/issues/new">
<paper-button icon="bug-report" label="File a bug"></paper-button>
</a>
</polymer-ui-toolbar>

</div>
<p id="copyright">&copy; 2014 {{site.project_title}} Authors. Code licensed under the <a href="https://github.com/polymer/polymer/blob/master/LICENSE" target="_blank">BSD License</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.</p>
</div>
</footer>
Expand Down
25 changes: 15 additions & 10 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,25 @@
<link rel="publisher" href="https://plus.google.com/107187849809354688692">
<link rel="shortcut icon" href="/images/logos/p-logo-16.png">
<link href="//fonts.googleapis.com/css?family=RobotoDraft:300,400,500|Source+Code+Pro:400,500,700" rel="stylesheet">
<link href="/css/site2.css?{{site.time | date: '%Y%m%d'}}" rel="stylesheet">

{% if page.layout == 'home' %}
{% comment %}homepage.css includes site2.css {% endcomment %}
<link href="/css/homepage.css?{{site.time | date: '%Y%m%d'}}" rel="stylesheet">
{% else %}
<link href="/css/site2.css?{{site.time | date: '%Y%m%d'}}" rel="stylesheet">
{% endif %}
<link href="/css/site2_sd_rules.css?{{site.time | date: '%Y%m%d'}}" rel="stylesheet" shim-shadowdom>

{% for item in page.stylesheets %}
<link rel="stylesheet" href="{{item}}?{{site.time | date: '%Y%m%d'}}" shim-shadowdom>
{% endfor %}

{% if site.load_platform %}
<script src="/platform.js?{{site.time | date: '%Y%m%d'}}"></script>
<!-- TODO: remove when https://github.com/Polymer/polymer/issues/391 is fixed -->
<link rel="import" href="/components/polymer/polymer.html">
{% if page.layout == 'home' %}
<link rel="import" href="/elements/homepage_elements.vulcanized.html?{{site.time | date: '%Y%m%d'}}">
{% else %}
<link rel="import" href="/elements/common_elements.vulcanized.html?{{site.time | date: '%Y%m%d'}}">
{% endif %}
<script src="/platform.js?{{site.time | date: '%Y%m%d'}}"></script>
<!-- TODO: remove when https://github.com/Polymer/polymer/issues/391 is fixed -->
<link rel="import" href="/components/polymer/polymer.html">

{% if page.layout == 'home' %}
<link rel="import" href="/elements/homepage_elements.vulcanized.html?{{site.time | date: '%Y%m%d'}}">
{% else %}
<link rel="import" href="/elements/common_elements.vulcanized.html?{{site.time | date: '%Y%m%d'}}">
{% endif %}
2 changes: 1 addition & 1 deletion css/homepage.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/mobile.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/paper-button.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e194a6e

Please sign in to comment.