Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI polishing #71

Merged
merged 6 commits into from
Jul 24, 2018
Merged

UI polishing #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ecc609
Fix logo and background
juliusknorr Jul 11, 2018
7341e4d
Increase button padding to have 44px min clickability
juliusknorr Jul 11, 2018
338a90a
Fix icons after server icon changes
juliusknorr Jul 23, 2018
f47a701
Fix mobile rendering
juliusknorr Jul 23, 2018
a409d9b
Fix IE11 rendering
juliusknorr Jul 23, 2018
ee02d59
Fix icons
MorrisJobke Jul 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions css/firstrunwizard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
#firstrunwizard .firstrunwizard-header {
padding: 20px 12px;
background-color: #0082c9;
background-image: url($image-login-background);
background-image: $image-login-background;
background-position: 50% 50%;
background-repeat: no-repeat;
background-size: cover;
color: #fff;
text-align: center;
}
#firstrunwizard .firstrunwizard-header .logo {
background-image: url($image-logo);
background-image: $image-logo;
background-repeat: no-repeat;
background-size: 175px;
background-position: center;
Expand Down Expand Up @@ -73,6 +73,7 @@
}
.content {
padding: 20px;
width: 100%;
}
p {
margin-bottom: 20px;
Expand Down Expand Up @@ -137,6 +138,9 @@
.prev, .next {
flex-grow: 1;
flex-basis: 200px;
button {
padding: 12px;
}
}
.next {
text-align: right;
Expand All @@ -145,7 +149,7 @@
list-style-type: circle;
list-style-position: inside;
padding: 0;
margin: 10px 0 0;
margin: 12px 0 0;
color: $color-primary;
font-size: 120%;
li {
Expand Down Expand Up @@ -194,7 +198,9 @@
opacity: .7;
display: block;
height: 50px;
width: 50px;
background-size: 40px;
margin: auto;
}
h2 {
margin: 10px 0 10px 0;
Expand Down Expand Up @@ -227,12 +233,17 @@
max-width: 100% !important;
width: 100%;
}
#wizard-values li {
.page #wizard-values li {
min-width: 100%;
overflow: hidden;
display: flex;
span {
min-width: 50px;
padding-right: 20px;
}
span, h2 {
font-size: 12px;
float:left;
text-align: left;
}
}
.page .content {
Expand Down
9 changes: 3 additions & 6 deletions templates/page.clients.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,17 @@
<h2><?php p($l->t('Connect your desktop apps to %s', array($theme->getName()))); ?></h2>
<a target="_blank" class="button"
href="<?php p(link_to_docs('user-sync-calendars')) ?>">
<img class="appsmall appsmall-calendar svg" alt=""
src="<?php p(image_path('core', 'places/calendar-dark.svg')); ?>"/>
<span class="icon icon-calendar-dark"></span>
<?php p($l->t('Connect your calendar')); ?>
</a>
<a target="_blank" class="button"
href="<?php p(link_to_docs('user-sync-contacts')) ?>">
<img class="appsmall appsmall-contacts svg" alt=""
src="<?php p(image_path('core', 'places/contacts-dark.svg')); ?>"/>
<span class="icon icon-contacts-dark"></span>
<?php p($l->t('Connect your contacts')); ?>
</a>
<a target="_blank" class="button"
href="<?php p(link_to_docs('user-webdav')); ?>">
<img class="appsmall svg" alt=""
src="<?php p(image_path('files', 'folder.svg')); ?>"/>
<span class="icon icon-files-dark"></span>
<?php p($l->t('Access files via WebDAV')); ?>
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/page.values.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<h2><?php p($l->t('Host your data and files where you decide')); ?></h2>
</li>
<li>
<span class="icon-share"></span>
<span class="icon-shared"></span>
<h2><?php p($l->t('Open Standards and Interoperability')); ?></h2>
</li>
<li>
Expand Down
4 changes: 2 additions & 2 deletions templates/personal-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@
<div class="clientslinks">
<a target="_blank" class="button" href="<?php p(link_to_docs('user-sync-calendars')) ?>">
<img class="appsmall appsmall-calendar svg" alt=""
src="<?php p(image_path('core', 'places/calendar-dark.svg')); ?>" />
src="<?php p(image_path('core', 'places/calendar.svg')); ?>" />
<?php p($l->t('Connect your calendar'));?>
</a>
<a target="_blank" class="button" href="<?php p(link_to_docs('user-sync-contacts')) ?>">
<img class="appsmall appsmall-contacts svg" alt=""
src="<?php p(image_path('core', 'places/contacts-dark.svg')); ?>" />
src="<?php p(image_path('core', 'places/contacts.svg')); ?>" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@juliushaertl I fixed the icons in here as well 😉

<?php p($l->t('Connect your contacts'));?>
</a>
<a target="_blank" class="button" href="<?php p(link_to_docs('user-webdav')); ?>">
Expand Down