Skip to content

Commit 008a942

Browse files
authored
Merge pull request #73 from nextcloud/feature/82/intro-slide
Add image as first slide
2 parents feccb79 + a1ef9e7 commit 008a942

4 files changed

Lines changed: 68 additions & 6 deletions

File tree

css/firstrunwizard.scss

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#cboxLoadedContent {
44
border-radius: 3px;
5+
overflow: hidden !important;
56
}
67

78
#firstrunwizard .firstrunwizard-header {
@@ -24,10 +25,6 @@
2425
margin: 0 auto;
2526
}
2627

27-
#firstrunwizard .firstrunwizard-content {
28-
margin: 12px;
29-
}
30-
3128
#firstrunwizard h1 {
3229
font-size: 40px;
3330
font-weight: 300;
@@ -56,7 +53,7 @@
5653
}
5754

5855
#firstrunwizard .page {
59-
margin-bottom: 60px;
56+
margin-bottom: 46px;
6057
display: flex;
6158
flex-direction: row;
6259
flex-wrap: wrap;
@@ -112,6 +109,22 @@
112109
}
113110
}
114111
#firstrunwizard {
112+
113+
.page {
114+
margin: 12px;
115+
margin-bottom: 60px;
116+
}
117+
.page.intro {
118+
margin: 0;
119+
margin-bottom: -50px;
120+
.content {
121+
padding: 0;
122+
background-image: url('../img/intro.png');
123+
background-position: center;
124+
background-size: cover;
125+
height: 50vh;
126+
}
127+
}
115128
.content-clients {
116129
width: 100%;
117130
text-align: center;
@@ -133,7 +146,8 @@
133146
.wizard-navigation {
134147
display: flex;
135148
position: absolute;
136-
bottom: 10px;
149+
bottom: 0;
150+
padding: 12px;
137151
width: calc(100% - 24px);
138152
.prev, .next {
139153
flex-grow: 1;
@@ -251,3 +265,15 @@
251265
}
252266
}
253267
}
268+
269+
@media only screen and (max-width: 768px) {
270+
271+
.position-indicator {
272+
display: none;
273+
}
274+
275+
#firstrunwizard .page #wizard-values li {
276+
margin: 0;
277+
}
278+
279+
}

img/intro.png

603 KB
Loading

templates/page.intro.php

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
/**
3+
* @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
4+
*
5+
* @author Julius Härtl <jus@bitgrid.net>
6+
*
7+
* @license GNU AGPL version 3 or any later version
8+
*
9+
* This program is free software: you can redistribute it and/or modify
10+
* it under the terms of the GNU Affero General Public License as
11+
* published by the Free Software Foundation, either version 3 of the
12+
* License, or (at your option) any later version.
13+
*
14+
* This program is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
* GNU Affero General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Affero General Public License
20+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
21+
*
22+
*/
23+
24+
/**
25+
* @var array $_
26+
* @var \OCP\IL10N $l
27+
* @var \OCP\Defaults $theme
28+
*/
29+
?>
30+
31+
<div class="page intro" data-title="<?php p($l->t('A safe home for all your data')); ?>" data-subtitle="">
32+
<div class="content">
33+
34+
</div>
35+
</div>

templates/wizard.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
<div class="firstrunwizard-content">
2828
<?php
29+
print_unescaped($this->inc('page.intro'));
2930
print_unescaped($this->inc('page.values'));
3031
print_unescaped($this->inc('page.clients'));
3132

0 commit comments

Comments
 (0)