Merge pull request #8 from EpicMorg/develop

Develop
This commit is contained in:
STAM 2018-03-26 18:58:42 +03:00 committed by GitHub
commit a70f41c880
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 6 deletions

View File

@ -9,7 +9,7 @@ Site's repo for [Metamod-r](https://github.com/theAsmodai/metamod-r) project.
### Third party things:
#### Other
[![CSS](https://img.shields.io/badge/CSS%20Framework-Bootstrap%20v4-ff69b4.svg?longCache=true&style=flat-square)](https://github.com/jgthms/bulma) [![JS](https://img.shields.io/badge/JS%20Framework-jQuery%20v3.3.1-ff69b4.svg?longCache=true&style=flat-square)](https://github.com/jquery/jquery) [![Template](https://img.shields.io/badge/Template-Cover.-ff69b4.svg?longCache=true&style=flat-square)](http://getbootstrap.com/docs/4.0/examples/cover/) [![Font](https://img.shields.io/badge/Icons-Font%20Awesome%205.8.0-ff69b4.svg?longCache=true&style=flat-square)](https://github.com/FortAwesome/Font-Awesome) [![Loader](https://img.shields.io/badge/Loader-SVG--Loaders-ff69b4.svg?longCache=true&style=flat-square)](https://github.com/SamHerbert/SVG-Loaders)
[![CSS](https://img.shields.io/badge/CSS-Bootstrap%20v4-ff69b4.svg?longCache=true&style=flat-square)](https://github.com/twbs/bootstrap) [![Theme](https://img.shields.io/badge/Theme-Superhero-ff69b4.svg?longCache=true&style=flat-square)](https://bootswatch.com/superhero/) [![Template](https://img.shields.io/badge/Template-Cover.-ff69b4.svg?longCache=true&style=flat-square)](http://getbootstrap.com/docs/4.0/examples/cover/) [![JS](https://img.shields.io/badge/JS-jQuery%20v3.3.1-ff69b4.svg?longCache=true&style=flat-square)](https://github.com/jquery/jquery) [![Font](https://img.shields.io/badge/Icons-Font%20Awesome%205.8.0-ff69b4.svg?longCache=true&style=flat-square)](https://github.com/FortAwesome/Font-Awesome) [![Loader](https://img.shields.io/badge/Loader-SVG--Loaders-ff69b4.svg?longCache=true&style=flat-square)](https://github.com/SamHerbert/SVG-Loaders)
#### Freepik's Icons
Icons made by [Freepik](http://www.freepik.com") from [Flaticon](https://www.flaticon.com) is licensed by [![Creative Commons BY 3.0 CC 3.0 BY](https://img.shields.io/badge/License-CC%203.0%20BY-orange.svg?longCache=true&style=flat-square)](http://creativecommons.org/licenses/by/3.0/).

File diff suppressed because one or more lines are too long

View File

@ -14,7 +14,7 @@
<title>Metamod-r &#128293; Official site</title>
<!-- Bootstrap core CSS -->
<link type="text/css" href="https://bootswatch.com/4/superhero/bootstrap.min.css" rel="stylesheet">
<link type="text/css" href="/assets/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom styles for this template -->
<link type="text/css" href="/assets/css/bootstrap.cover.css" rel="stylesheet">
@ -183,13 +183,28 @@
<div class="modal-dialog modal-lg modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="aboutModalLabel">About</h5>
<h5 class="modal-title" id="aboutModalLabel">&#10084; About</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
ASAP
<ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="thirdparty-tab" data-toggle="tab" href="#thirdpartyTab" role="tab" aria-controls="home" aria-selected="true">Third party</a>
</li>
<li class="nav-item">
<a class="nav-link" id="transtaltions-tab" data-toggle="tab" href="#transtaltionsTab" role="tab" aria-controls="profile" aria-selected="false">Translations</a>
</li>
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="thirdpartyTab" role="tabpanel" aria-labelledby="thirdparty-tab">
1...ASAP
</div>
<div class="tab-pane fade" id="transtaltionsTab" role="tabpanel" aria-labelledby="transtaltions-tab">
2...ASAP
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary btn-lg btn-block" data-dismiss="modal">OK</button>