merge conflicts

This commit is contained in:
Brandon Rosage 2019-03-04 10:15:30 -06:00
commit ecb0a06940
3 changed files with 1446 additions and 2 deletions

1434
_data/colors.json Normal file

File diff suppressed because it is too large Load diff

View file

@ -12,12 +12,12 @@
</div>
<div class="d-flex f6">
{% if repository.stargazers_count %}
<a href="" class="d-inline-block link-gray mr-4">
<a href="{{ repository.html_url }}/stargazers" class="d-inline-block link-gray mr-4">
<svg class="octicon octicon-star mr-1" viewBox="0 0 14 16" version="1.1" width="14" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M14 6l-4.9-.64L7 1 4.9 5.36 0 6l3.6 3.26L2.67 14 7 11.67 11.33 14l-.93-4.74L14 6z"></path></svg>{{ repository.stargazers_count }}
</a>
{% endif %}
{% if repository.forks_count %}
<a href="" class="d-inline-block link-gray mr-4">
<a href="{{ repository.html_url }}/network/members" class="d-inline-block link-gray mr-4">
<svg class="octicon octicon-git-branch mr-1" viewBox="0 0 10 16" version="1.1" width="10" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M10 5c0-1.11-.89-2-2-2a1.993 1.993 0 0 0-1 3.72v.3c-.02.52-.23.98-.63 1.38-.4.4-.86.61-1.38.63-.83.02-1.48.16-2 .45V4.72a1.993 1.993 0 0 0-1-3.72C.88 1 0 1.89 0 3a2 2 0 0 0 1 1.72v6.56c-.59.35-1 .99-1 1.72 0 1.11.89 2 2 2 1.11 0 2-.89 2-2 0-.53-.2-1-.53-1.36.09-.06.48-.41.59-.47.25-.11.56-.17.94-.17 1.05-.05 1.95-.45 2.75-1.25S8.95 7.77 9 6.73h-.02C9.59 6.37 10 5.73 10 5zM2 1.8c.66 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2C1.35 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2zm0 12.41c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zm6-8c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"></path></svg>{{ repository.forks_count }}
</a>
{% endif %}

View file

@ -10,3 +10,13 @@ body {
.github-component {
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;
}
.repo-language-color {
filter: brightness(125%) !important;
border-radius: 50%;
display: inline-block;
height: 12px;
position: relative;
top: 2px;
width: 12px;
}