Skip to content
This repository has been archived by the owner on Jul 28, 2019. It is now read-only.

Commit

Permalink
Merge pull request #12 from Social-chan/dev-0.x
Browse files Browse the repository at this point in the history
v0.5.0
  • Loading branch information
d8vjork committed Jul 3, 2017
2 parents 92af59a + 0c17984 commit ae8df8c
Show file tree
Hide file tree
Showing 51 changed files with 5,518 additions and 1,526 deletions.
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# EditorConfig is awesome: http://EditorConfig.org

root = true

[*]
indent_style = space
indent_size = 2
end_of_line = crlf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ src
.jekyll-metadata

*.zip
package-lock.json
npm-debug.log
node_modules
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
</p>
</p>

<center>

![GitHub (pre-)release](https://img.shields.io/github/release/Social-chan/Tadaima/all.svg?style=flat-square) [![npm package](https://img.shields.io/npm/v/tadaima.svg?style=flat-square)](https://www.npmjs.com/package/tadaima) [![npm downloads](https://img.shields.io/npm/dt/tadaima.svg?style=flat-square)](https://github.com/Social-chan/Hikari/releases) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://raw.githubusercontent.com/Social-chan/Tadaima/master/LICENSE) [![Patreon donation](https://img.shields.io/badge/patreon-donate-orange.svg?style=flat-square)](https://www.patreon.com/d8vjork) [![Paypal donation](https://img.shields.io/badge/paypal-donate-blue.svg?style=flat-square)](https://www.paypal.me/d8vjork) [![Coverage Status](https://img.shields.io/coveralls/Social-chan/Tadaima/master.svg?style=flat-square)](https://coveralls.io/github/Social-chan/Tadaima?branch=master)
</center>

## Getting starter
A quick and small introduction:

Expand All @@ -16,9 +21,6 @@ A quick and small introduction:

**Note: We're releasing the first beta, so the project is under alpha pre-release versions and should not be used with production purposes.**

## Status
[![Coverage Status](https://coveralls.io/repos/github/Social-chan/Tadaima/badge.svg?branch=master)](https://coveralls.io/github/Social-chan/Tadaima?branch=master)

## To-Do
We're centering on browser compatibility and framework features, and better documentation page in near future.

Expand Down
3 changes: 1 addition & 2 deletions dist/css/tadaima.min.css

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/css/tadaima.min.css.map

This file was deleted.

2 changes: 1 addition & 1 deletion docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Pure CSS Framework
twitter_username: d8vjork
github_username: d8vjork
authors: Social-chan Team and Tadaima contributors
current_version: 0.4.0
current_version: 0.5.0

# Server
encoding: UTF-8
Expand Down
21 changes: 20 additions & 1 deletion docs/_includes/footer.html
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
<script src="//cdn.jsdelivr.net/jquery/3.2.1/jquery.slim.min.js"></script>
<footer>
<nav>
<ul>
<li>
<a href="#">Síguenos</a>
<ul>
<li>
<a href="https://www.facebook.com/socialchan.sn/" target="_blank">Facebook</a>
</li>
<li>
<a href="https://twitter.com/social_chan" target="_blank">Twitter</a>
</li>
</ul>
</li>
<li>
<a href="https://social-chan.com">Social-chan</a>
</li>
</ul>
</nav>
</footer>
10 changes: 5 additions & 5 deletions docs/_includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">

<title>
{% if page.title %}
{{ site.title }} &middot; {{ page.title }}
{% else %}
{{ site.title }} &middot; {{ site.description }}
{% endif %}
{% if page.title %}
{{ site.title }} &middot; {{ page.title }}
{% else %}
{{ site.title }} &middot; {{ site.description }}
{% endif %}
</title>

{% include social.html %}
Expand Down
84 changes: 42 additions & 42 deletions docs/_includes/page-header.html
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
<section class="okaeri">
<h2>{{ page.title }}</h2>
{{ page.description }}
<div class="action">
<a href="https://github.com/Social-chan/Tadaima/releases/download/v{{ site.current_version }}/tadaima-{{ site.current_version }}.zip"
class="primary" role="button">
<i class="icon-download-cloud"></i> Download
</a>
</div>
<nav>
{% if page.group == "getting-started" %}
<li class="active">
{% else %}
<li>
{% endif %}
<a href="{{ site.baseurl }}/">Getting started</a>
</li>
{% if page.group == "components" %}
<li class="active">
{% else %}
<li>
{% endif %}
<a href="{{ site.baseurl }}/components">Components</a>
</li>
{% if page.group == "mixes" %}
<li class="active">
{% else %}
<li>
{% endif %}
<a href="{{ site.baseurl }}/mixes">Mixes</a>
</li>
{% if jekyll.environment == "development" %}
{% if page.group == "blueprints" %}
<li class="active">
{% else %}
<li>
{% endif %}
<a href="{{ site.baseurl }}/blueprints">Blueprints</a>
</li>
{% endif %}
</nav>
</section>
<header class="okaeri">
<h2>{{ page.title }}</h2>
{{ page.description }}
<div class="action">
<a href="https://github.com/Social-chan/Tadaima/releases/download/v{{ site.current_version }}/tadaima-{{ site.current_version }}.zip"
class="primary" role="button">
<i class="icon-download-cloud"></i> Download
</a>
</div>
<nav>
{% if page.group == "getting-started" %}
<li class="active">
{% else %}
<li>
{% endif %}
<a href="{{ site.baseurl }}/getting-starter">Getting started</a>
</li>
{% if page.group == "components" %}
<li class="active">
{% else %}
<li>
{% endif %}
<a href="{{ site.baseurl }}/components">Components</a>
</li>
{% if page.group == "mixes" %}
<li class="active">
{% else %}
<li>
{% endif %}
<a href="{{ site.baseurl }}/mixes">Mixes</a>
</li>
{% if jekyll.environment == "development" %}
{% if page.group == "blueprints" %}
<li class="active">
{% else %}
<li>
{% endif %}
<a href="{{ site.baseurl }}/blueprints">Blueprints</a>
</li>
{% endif %}
</nav>
</header>
48 changes: 26 additions & 22 deletions docs/_includes/sidebar-menu.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
<div class="off-canvas">
<i class="icon-menu"></i>
</div>

<nav class="vertical">
<ul>
<li class="active">
<a href="#">
<i class="icon-home"></i>
</a>
</li>
<li>
<a href="#">
<i class="icon-left-bubbles"></i>
</a>
</li>
<li>
<a href="#">
<i class="icon-square-quill"></i>
</a>
</li>
<li>
<a href="#">
<i class="icon-user-card"></i>
</a>
</li>
</ul>
<ul>
<li class="active">
<a href="#" class="tooltip-right" aria-label="Top tooltip">
<i class="icon-home"></i>
</a>
</li>
<li>
<a href="#" class="tooltip-right" aria-label="Top tooltip">
<i class="icon-left-bubbles"></i>
</a>
</li>
<li>
<a href="#" class="tooltip-right" aria-label="Top tooltip">
<i class="icon-square-quill"></i>
</a>
</li>
<li>
<a href="#" class="tooltip-right" aria-label="Top tooltip">
<i class="icon-user-card"></i>
</a>
</li>
</ul>
</nav>
18 changes: 11 additions & 7 deletions docs/_layouts/home.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<!DOCTYPE html>
<html lang="es">
<head>
{% include header.html %}
{% include header.html %}
</head>
<body>
{% include sidebar-menu.html %}
<div class="wrapper container">
{% include page-header.html %}
{{ content }}
</div>
{% include footer.html %}
<div class="container">
{% include page-header.html %}
{{ content }}
{% include footer.html %}
</div>

<script src="//cdn.jsdelivr.net/jquery/3.2.1/jquery.slim.min.js"></script>
<script src="//cdn.jsdelivr.net/anchorjs/3.2.2/anchor.min.js"></script>
<script src="//cdn.jsdelivr.net/npm/clipboard@1/dist/clipboard.min.js"></script>
<script src="/dist/js/docs.js"></script>
</body>
</html>
Loading

0 comments on commit ae8df8c

Please sign in to comment.