Merge pull request #71 from nextcloud/bugfix/noid/images

UI polishing
nextcloud · Jul 24, 2018 · dce1fb3 · dce1fb3
2 parents cb0397b + ee02d59
commit dce1fb3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/css/firstrunwizard.scss b/css/firstrunwizard.scss
@@ -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;
@@ -73,6 +73,7 @@
 	}
 	.content {
 		padding: 20px;
+		width: 100%;
 	}
 	p {
 		margin-bottom: 20px;
@@ -137,6 +138,9 @@
 	.prev, .next {
 		flex-grow: 1;
 		flex-basis: 200px;
+		button {
+			padding: 12px;
+		}
 	}
 	.next {
 		text-align: right;
@@ -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 {
@@ -194,7 +198,9 @@
 			opacity: .7;
 			display: block;
 			height: 50px;
+			width: 50px;
 			background-size: 40px;
+			margin: auto;
 		}
 		h2 {
 			margin: 10px 0 10px 0;
@@ -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 {

diff --git a/templates/page.clients.php b/templates/page.clients.php
@@ -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>

diff --git a/templates/page.values.php b/templates/page.values.php
@@ -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>

diff --git a/templates/personal-settings.php b/templates/personal-settings.php
@@ -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')); ?>" />
 			<?php p($l->t('Connect your contacts'));?>
 		</a>
 		<a target="_blank" class="button" href="<?php p(link_to_docs('user-webdav')); ?>">