Skip to content

Commit

Permalink
Merge branch 'release/0.10.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Chi-Yu committed Dec 16, 2017
2 parents d95278e + 95c38f5 commit 045976b
Show file tree
Hide file tree
Showing 59 changed files with 1,548 additions and 202 deletions.
80 changes: 0 additions & 80 deletions docs/css/carousel.css

This file was deleted.

2 changes: 2 additions & 0 deletions docs/css/ekko-lightbox.css

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

101 changes: 94 additions & 7 deletions docs/css/main.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,98 @@
body {
padding-top: 50px;
padding-bottom: 30px;
padding-top: 3rem;
padding-bottom: 1rem;
color: #5a5a5a;
}

.navbar-brand > img {
display: inline-block;
margin-top: -17px;
margin-bottom: -15px;
margin-right: 5px;
body.home .carousel {
margin-bottom: 2rem;
}

.carousel-caption {
right: 0;
left: 0;
bottom: 3rem;
z-index: 10;
}

.carousel-item {
min-height: 22rem;
background: #777 no-repeat 50% 50%;
background-size: cover;
}

.carousel-item .row {
min-height: 22rem;
}

.carousel-item .row .col-sm-6 {
min-height: 22rem;
}

.carousel-item .row .col-sm-6 .img-fluid {
max-height: 98%;
}

.carousel-control-next,
.carousel-control-prev {
width: 5%;
}

.carousel-item {
background-image: url("../img/carousel.png");
}

.featurette-divider {
margin: 1rem 0;
}

.featurette-heading {
font-weight: 300;
line-height: 1;
letter-spacing: -.05rem;
}

@media (min-width: 40em) {
.carousel-caption p {
margin-bottom: 1.25rem;
font-size: 1.25rem;
line-height: 1.4;
}

.featurette-heading {
font-size: 50px;
}
}

@media (min-width: 62em) {
.featurette-heading {
margin-top: 2rem;
}
}

.marketing img.rounded-circle {
width: 140px;
height: 140px;
}

.album {
padding-top: 2rem;
padding-bottom: 1rem;
background-color: #f7f7f7;
}

.card {
float: left;
width: 33.333%;
padding: .75rem;
margin-bottom: 1rem;
border: 0;
}

.card > a {
margin-bottom: .75rem;
}

.card-text {
font-size: 85%;
}
Binary file added docs/img/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 27 additions & 16 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@
<meta name="googlebot" content="index, follow">
<meta name="rating" content="general">
<title>Dark :: A dark Theme for TeamSpeak 3</title>
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="css/font-awesome.min.css" rel="stylesheet">
<link href="css/carousel.css" rel="stylesheet">
<link href="./css/bootstrap.min.css" rel="stylesheet">
<link href="./css/font-awesome.min.css" rel="stylesheet">
<link href="./css/main.css" rel="stylesheet">
</head>
<body class="home">

<header>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<a class="navbar-brand" href="#">
<img src="img/logo.png" width="30" height="30" class="d-inline-block align-top" alt="">
Dark
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse"
Expand All @@ -26,11 +27,17 @@
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="/">
<i class="fa fa-picture-o"></i>
<a class="nav-link" href="./">
<i class="fa fa-info-circle"></i>
About <span class="sr-only">(current)</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="./screenshots/">
<i class="fa fa-picture-o"></i>
Screenshots
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://github.com/randomhost/teamspeak-dark" target="_blank">
<i class="fa fa-github"></i>
Expand All @@ -47,7 +54,6 @@

<div id="myCarousel" class="carousel slide" data-ride="carousel">
<div class="carousel-inner">

<div class="carousel-item active" id="carousel-theme">
<div class="container">
<div class="row">
Expand All @@ -59,11 +65,18 @@ <h1>Dark</h1>
popular voice communication software. How did that happen?
</p>
<p>
<a class="btn btn-lg btn-primary" href="https://github.com/randomhost/teamspeak-dark/releases"
role="button">
<i class="fa fa-download"></i>
Download now
</a>
<span class="btn-group">
<a class="btn btn-lg btn-primary" href="https://github.com/randomhost/teamspeak-dark/releases/latest"
role="button">
<i class="fa fa-download"></i>
Download
</a>
<a class="btn btn-lg btn-secondary" href="./screenshots/"
role="button">
<i class="fa fa-picture-o"></i>
Screenshots
</a>
</span>
</p>
</div>
</div>
Expand All @@ -73,12 +86,10 @@ <h1>Dark</h1>
</div>
</div>
</div>

</div>
</div>

<div class="container marketing">

<div class="row featurette">
<div class="col-md-9">
<h2 class="featurette-heading">Custom Icon Pack</h2>
Expand Down Expand Up @@ -142,8 +153,8 @@ <h2 class="featurette-heading">Custom Radio Buttons</h2>

</main>

<script src="js/jquery.min.js"></script>
<script src="js/popper.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="./js/jquery.min.js"></script>
<script src="./js/popper.min.js"></script>
<script src="./js/bootstrap.min.js"></script>
</body>
</html>
Loading

0 comments on commit 045976b

Please sign in to comment.