Skip to content

Commit 18ab01a

Browse files
committed
Merge branch 'v1-dev' of github.com:Dogfalo/materialize into v1-dev
2 parents 80c6881 + 03ec731 commit 18ab01a

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

jade/index/index_content.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ <h4 class="light">A modern responsive front-end framework based on Material Desi
1010
</div>
1111
<div class="row center">
1212
<a href="http://materializecss.com/getting-started.html" id="download-button" class="btn-large waves-effect waves-light">Get Started</a>
13+
<a href="https://github.com/Dogfalo/materialize/blob/v1-dev/v1-upgrade-guide.md" id="upgrade-button" class="btn-large waves-effect waves-light">Upgrade from 0.100.2</a>
1314
</div>
1415
<div class="row center"><a class="current-version-number" href="https://github.com/Dogfalo/materialize">Release: 1.0.0-rc.2</a></div>
1516
<div class="row center">

sass/_style.scss

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -220,41 +220,36 @@ ul.sidenav.sidenav-fixed {
220220
}
221221

222222
nav.top-nav {
223-
height: 122px;
223+
height: 110px;
224224
box-shadow: none;
225225
border-bottom: 1px solid $border-color;
226226
background-color: transparent;
227227

228228
h1.header {
229229
margin: 0;
230-
padding-top: 26px;
230+
padding-top: 22px;
231231
}
232232
}
233233
a.sidenav-trigger.top-nav {
234234
position: absolute;
235235
text-align: center;
236236
height: 48px;
237237
width: 48px;
238-
left: 7.5%;
239-
top: 0;
238+
top: 28px;
240239
float: none;
241240
margin-left: 1.5rem;
242241
color: color("materialize-red", "lighten-3");
243242
font-size: 36px;
244243
z-index: 2;
245244

246-
&.full {
247-
line-height: 122px;
248-
}
249-
250245
i {
251246
font-size: 32px;
252247
}
253248
}
254249

255250
@media #{$small-and-down} {
256251
a.sidenav-trigger.top-nav {
257-
left: 5%;
252+
left: 0;
258253
}
259254

260255
ul.sidenav.sidenav-fixed {
@@ -366,17 +361,19 @@ a.sidenav-trigger.top-nav {
366361
}
367362
}
368363

369-
#download-button {
364+
#download-button,
365+
#upgrade-button {
366+
&:hover {
367+
background-color: lighten(color("materialize-red", "base"), 30%);
368+
}
370369
background-color: color("materialize-red", "lighten-2");
371370
width: 260px;
372371
height: 70px;
372+
margin: 4px;
373+
padding: 0;
373374
line-height: 70px;
374375
font-size: 18px;
375376
font-weight: 400;
376-
377-
&:hover {
378-
background-color: lighten(color("materialize-red", "base"), 30%);
379-
}
380377
}
381378

382379
.promo{

0 commit comments

Comments
 (0)