Skip to content

Commit

Permalink
Merge pull request #45 from palantirnet/singularity-gs
Browse files Browse the repository at this point in the history
Singularity gs
  • Loading branch information
aCyborg authored Aug 22, 2016
2 parents 96c23f1 + 54dcd73 commit 6ceaad4
Show file tree
Hide file tree
Showing 30 changed files with 2,711 additions and 1,966 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ _site/
STYLEGUIDE_TEMPLATE/output_dev/
STYLEGUIDE_TEMPLATE/output_prod/
node_modules/
.idea/
.idea/
vendor/
44 changes: 22 additions & 22 deletions STYLEGUIDE_TEMPLATE/source/code/_views/component.html
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
{% extends "styleguide" %}
{% block content_wrapper %}
<div class="container">
<header class="l-column">
<h5 class="styleguide-label">Living Styleguide</h5>
<h1><a href="{{ site.url }}">{{ site.title }} Styleguide</a></h1>
</header>
</div>
<div class="component-header">
<div class="container">
<main class="l-column">
<h2 class="styleguide-title--component">{{ page.title }}</h2>
<p>{{ page.description }}</p>
</main>
</div>
<div class="container">
<header class="l-column">
<h5 class="styleguide-label">Living Styleguide</h5>
<h1><a href="{{ site.url }}/">{{ site.title }} Styleguide</a></h1>
</header>
</div>
<div class="component-header">
<div class="container">
<main class="l-column">
<h2 class="styleguide-title--component">{{ page.title }}</h2>
<p>{{ page.description }}</p>
</main>
</div>
<div class="styleguide-component">
{% if page.type == "rail" %}
<div class="container">
<div class="l-styleguide-rail">
{% else %}
<div class="container">
<div class="l-styleguide-column">
</div>
<div class="styleguide-component">
{% if page.type == "rail" %}
<div class="container">
<div class="l-styleguide-rail">
{% else %}
<div class="container">
<div class="l-styleguide-column">
{% endif %}
{% block content %}{% endblock %}
</div>
{% block content %}{% endblock %}
</div>
</div>
</div>
{% endblock %}
6 changes: 3 additions & 3 deletions STYLEGUIDE_TEMPLATE/source/code/_views/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}{{ page.title }}{% endblock %} | {{ site.title }}</title>
<!-- inject:css -->
<link rel="stylesheet" href="/code/css/styles.css">
<link rel="stylesheet" href="{{ site.url }}/code/css/styles.css">
<!-- endinject -->
<link rel="shortcut icon" href="{{ site.url }}assets/images/global/palantir-favicon.png?v=2" type="image/x-icon" />
<link rel="shortcut icon" href="{{ site.url }}/assets/images/global/palantir-favicon.png?v=2" type="image/x-icon" />
<script src="http://code.jquery.com/jquery-latest.js"></script>
</head>
<body>
{% block content_wrapper %}{% block content %}{% endblock %}{% endblock %}
{% block content_wrapper %}{% block content %}{% endblock %}{% endblock %}
</body>
</html>
28 changes: 14 additions & 14 deletions STYLEGUIDE_TEMPLATE/source/code/_views/element.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{% extends "styleguide" %}
{% block content_wrapper %}
<div class="container">
<header class="l-column">
<h5 class="styleguide-label">Living Styleguide</h5>
<h1><a href="{{ site.url }}">{{ site.title }} Styleguide</a></h1>
</header>
</div>
<div class="component-header">
<div class="container">
<main class="l-column">
<h2 class="styleguide-title--component">{{ page.title }}</h2>
<p> {{ page.description }}</p>
</main>
</div>
<div class="container">
<header class="l-column">
<h5 class="styleguide-label">Living Styleguide</h5>
<h1><a href="{{ site.url }}/">{{ site.title }} Styleguide</a></h1>
</header>
</div>
<div class="component-header">
<div class="container">
<main class="l-column">
<h2 class="styleguide-title--component">{{ page.title }}</h2>
<p> {{ page.description }}</p>
</main>
</div>
{% block content %}{% endblock %}
</div>
{% block content %}{% endblock %}
{% endblock %}
14 changes: 7 additions & 7 deletions STYLEGUIDE_TEMPLATE/source/code/_views/styleguide.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}{{ page.title }}{% endblock %} | {{ site.title }}</title>
<!-- inject:css -->
<link rel="stylesheet" href="/code/css/styles.css">
<link rel="stylesheet" href="{{ site.url }}/code/css/styles.css">
<!-- endinject -->
<link rel="shortcut icon" href="{{ site.url }}/assets/images/global/palantir-favicon.png?v=2" type="image/x-icon" />
<script src="http://code.jquery.com/jquery-latest.js"></script>
</head>
<body>
{% block content_wrapper %}{% block content %}{% endblock %}{% endblock %}
<div class="container">
<div class="l-column">
<p class="styleguide-copyright">Copyright (c) 2016 Palantir.net</p>
</div>
</div>
{% block content_wrapper %}{% block content %}{% endblock %}{% endblock %}
<div class="container">
<div class="l-column">
<p class="styleguide-copyright">Copyright (c) 2016 Palantir.net</p>
</div>
</div>
</body>
</html>
Loading

0 comments on commit 6ceaad4

Please sign in to comment.