Skip to content

Commit 75c4014

Browse files
TheElectronWillTheElectronWill
committed
Fix the front page
1 parent df2136c commit 75c4014

File tree

4 files changed

+73
-103
lines changed

4 files changed

+73
-103
lines changed

‎doc-tool/bootstrap-theme/theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ $headings-font-family: $font-family-sans-serif;
4040
@import "node_modules/bootstrap/scss/grid";
4141
@import "node_modules/bootstrap/scss/tables";
4242
@import "node_modules/bootstrap/scss/buttons";
43+
@import "node_modules/bootstrap/scss/transitions";
44+
@import "node_modules/bootstrap/scss/nav";
4345
@import "node_modules/bootstrap/scss/navbar";
4446
@import "node_modules/bootstrap/scss/breadcrumb";
4547
@import "node_modules/bootstrap/scss/badge";

‎doc-tool/resources/css/bootstrap.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/_includes/logo-page.html

Lines changed: 29 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,41 @@
11
<div class="page red exactly-one-page">
2-
<div id="header">
3-
<nav class="nav nav-pills">
4-
<li class="nav-item">
5-
<a class="nav-link" href="#getting-started">
6-
Try it now
7-
</a>
8-
</li>
9-
<li class="nav-item">
10-
<a class="nav-link" href="{{ site.baseurl }}/blog/index.html">
11-
Blog
12-
</a>
13-
</li>
14-
<li class="nav-item">
15-
<a class="nav-link" href="{{ site.baseurl }}/docs/index.html">
16-
Docs
17-
</a>
18-
</li>
19-
<!--
20-
<li class="nav-item">
21-
<a class="nav-link" href="#build-status">
22-
Community Projects
23-
</a>
24-
</li>
25-
-->
26-
<li class="nav-item">
27-
<a class="nav-link" href="https://github.com/lampepfl/dotty">
28-
<img id="github-logo" src="{{ site.baseurl }}/images/github-logo.svg" />
29-
</a>
30-
</li>
31-
</nav>
32-
</div>
33-
<div id="mobile-header">
34-
<nav class="navbar navbar-light">
35-
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsed-header" aria-controls="collapsed-header" aria-expanded="false" aria-label="Toggle navigation">
36-
&#9776;
2+
<header>
3+
<nav class="navbar navbar-expand-md navbar-dark">
4+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarContent">
5+
<i class="fas fa-bars"></i>
376
</button>
38-
<div class="collapse" id="collapsed-header">
39-
<div class="bg-inverse p-a-1">
40-
<ul>
41-
<li class="nav-item">
42-
<a class="nav-link" href="#getting-started">
43-
Try it now
44-
</a>
45-
</li>
46-
<li class="nav-item">
47-
<a class="nav-link" href="{{ site.baseurl }}/blog/index.html">
48-
Blog
49-
</a>
50-
</li>
51-
<li class="nav-item">
52-
<a class="nav-link" href="{{ site.baseurl }}/docs/index.html">
53-
Docs
54-
</a>
55-
</li>
56-
<!--
57-
<li class="nav-item">
58-
<a class="nav-link" href="#build-status">
59-
Community Projects
60-
</a>
61-
</li>
62-
-->
63-
<li class="nav-item">
64-
<a class="nav-link" href="https://github.com/lampepfl/dotty">
65-
<img id="github-logo" src="{{ site.baseurl }}/images/github-logo.svg" />
66-
</a>
67-
</li>
68-
</ul>
69-
</div>
7+
<div class="collapse navbar-collapse" id="navbarContent">
8+
<ul class="navbar-nav ml-auto mr-0">
9+
<li class="nav-item">
10+
<a class="nav-link" href="#getting-started">
11+
Try it now
12+
</a>
13+
</li>
14+
<li class="nav-item">
15+
<a class="nav-link" href="{{ site.baseurl }}/blog/index.html">
16+
Blog
17+
</a>
18+
</li>
19+
<li class="nav-item">
20+
<a class="nav-link" href="{{ site.baseurl }}/docs/index.html">
21+
Docs
22+
</a>
23+
</li>
24+
<li class="nav-item">
25+
<a class="nav-link" href="https://github.com/lampepfl/dotty">
26+
<i class="fab fa-github"></i>
27+
</a>
28+
</li>
29+
</ul>
7030
</div>
7131
</nav>
72-
</div>
32+
</header>
7333
<div class="scala-logo-container">
74-
<p><img src="{{ site.baseurl }}/images/scala-logo.svg" alt="image" /></p>
34+
<p><img src="{{ site.baseurl }}/images/dotty-logo-white.svg" alt="image" /></p>
7535
<div class="centered-subtitle">
7636
<h1 id="dotty">Dotty</h1>
7737
<p>A next generation compiler for Scala</p>
7838
<p>(scroll down for more info)</p>
7939
</div>
8040
</div>
8141
</div>
82-

‎docs/css/default.css

Lines changed: 41 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,59 @@
1-
@import url(https://fonts.googleapis.com/css?family=Droid+Sans);
21
@import url(https://fonts.googleapis.com/css?family=Lobster);
3-
@import url(https://fonts.googleapis.com/css?family=Raleway:700);
4-
@import url(https://fonts.googleapis.com/css?family=Lato:700);
5-
@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700,900);
62

73
html, body {
8-
box-sizing: border-box;
9-
scroll-behavior: smooth;
10-
}
11-
12-
*, *:before, *:after {
13-
box-sizing: inherit;
4+
box-sizing: border-box;
5+
scroll-behavior: smooth;
146
}
157

168
body {
17-
height: 100%;
18-
width: 100%;
19-
margin: 0;
20-
padding: 0;
21-
background: #de332e;
22-
font-family: 'Source Sans Pro', sans-serif;
23-
overflow-x: hidden;
9+
height: 100%;
10+
width: 100%;
11+
margin: 0;
12+
padding: 0;
13+
font-family: 'Source Sans Pro', sans-serif;
2414
}
2515

26-
div#header {
27-
height: 59px;
28-
width: 100%;
29-
z-index: 1;
30-
position: relative;
31-
overflow: hidden;
16+
header {
17+
font-size: 24px;
18+
}
19+
header .nav-item i {
20+
font-size: 1.5em;
21+
}
22+
.navbar-dark .navbar-nav .nav-link, .navbar-dark .navbar-toggler {
23+
color: white;
24+
}
25+
.navbar-dark .navbar-toggler {
26+
border: none;
27+
padding: 0;
28+
font-size: 1.5em;
29+
}
30+
.navbar #navbarContent {
31+
background: #ca445e;
32+
z-index: 100;
33+
box-shadow: 0px 10px 40px #ca445e;
3234
}
3335

34-
div#mobile-header {
35-
display: none;
36+
.gitter-chat-embed {
37+
top: 0;
38+
bottom: 0;
39+
}
40+
aside {
41+
margin: 0;
42+
padding: 0;
3643
}
3744

3845
div.page {
39-
min-height: 100vh;
40-
width: 100%;
41-
padding: 15px 10px;
42-
min-width: 700px;
43-
position: relative;
44-
font-weight: 300;
46+
min-height: 100vh;
47+
width: 100%;
48+
padding: 15px 10px;
49+
min-width: 700px;
50+
position: relative;
51+
font-weight: 300;
4552
}
4653

4754
div.page.exactly-one-page {
48-
max-height: 100vh;
55+
max-height: 100vh;
56+
padding: 0;
4957
}
5058

5159
div.page > div.centered {
@@ -189,6 +197,7 @@ div.scala-logo-container > p > img {
189197
max-width: 100%;
190198
height: 60%;
191199
display: block;
200+
width: 100%;
192201
}
193202

194203
h1#dotty {

0 commit comments

Comments
 (0)