Merge pull request #418 from nextcloud/develop-0.9

Develop 0.9
nextcloud · Nov 14, 2018 · 726f077 · 726f077
2 parents 07c6463 + 7c78f5a
commit 726f077
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 1,359 deletions.
diff --git a/css/main.scss b/css/main.scss
@@ -23,7 +23,7 @@ h1 {
 	h2 {
 		margin-top: 12px;
 	}
-	#breadcrump {
+	.breadcrumb {
 		flex-grow: 1;
 		overflow: hidden;
 

diff --git a/css/vote.scss b/css/vote.scss
@@ -157,7 +157,7 @@ $user-column-width: 265px;
 	&.active {
 		cursor: pointer;
 		border: 2px solid;
-		border-radius: 4px;
+		border-radius: var(--border-radius);
 		box-sizing: border-box;
 		&.unvoted {
 		background-color: $bg-maybe;
@@ -215,7 +215,7 @@ $user-column-width: 265px;
 		background-position-y: 9px;
 		background-position-x: center;
 		text-shadow: 1px 1px var(--color-box-shadow);
-		color: #fff;
+		color: var(--color-main-text);
 		min-width: 34px;
 		text-align: center;
 		&.no-comments {
@@ -304,7 +304,7 @@ $user-column-width: 265px;
 				.poll-cell {
 					border:none;
 					border-radius: 0;
-					border-top: 1px solid #ddd;
+					border-top: 1px solid var(--color-border-dark);
 					background-color: transparent;
 					padding: 0 2px;
 					&.active {
@@ -372,7 +372,7 @@ $user-column-width: 265px;
 		flex-wrap: wrap;
 		align-items: center;
 		position: fixed;
-		background-color: #fff;
+		background-color: var(--color-main-background);
 		bottom: 0;
 		left: 0;
 		width: 100%;

diff --git a/js/create-poll.js b/js/create-poll.js
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "md5": "^2.2.1",
     "moment": "^2.22.1",
     "nextcloud-axios": "^0.1.2",
-    "nextcloud-vue": "^0.4.2",
+    "nextcloud-vue": "^0.4.3",
     "v-tooltip": "^2.0.0-rc.33",
     "velocity-animate": "^1.5.1",
     "vue": "^2.5.16",

diff --git a/src/js/components/_base-breadcrump.vue → src/js/components/_base-breadcrumb.vue b/src/js/components/_base-breadcrump.vue → src/js/components/_base-breadcrumb.vue
@@ -21,11 +21,9 @@
   -->
 
 <template>
-<div class="breadcrump">
-	<div class="crumb svg">
-		<a :href="indexPage">
-			<img class="svg" :src="imagePath" alt="Home">
-		</a>
+<div class="breadcrumb">
+	<div class="crumb svg crumbhome">
+		<a class="icon-home" :href="indexPage">Home</a>
 	</div>
 	<div class="crumb svg last">
 		<span v-text="intitle" />
@@ -45,7 +43,7 @@ export default {
 </script>
 
 <style lang="scss">
-.breadcrump {
+.breadcrumb {
     flex-grow: 1;
 }
 </style>
diff --git a/src/js/components/_base-controls.vue b/src/js/components/_base-controls.vue
@@ -22,16 +22,16 @@
 
 <template>
 <div class="controls">
-	<breadcrump :index-page="indexPage" :intitle="intitle"></breadcrump>
+	<breadcrumb :index-page="indexPage" :intitle="intitle"></breadcrumb>
 	<slot></slot>
 </div>
 </template>
 
 <script>
-import Breadcrump from './_base-breadcrump.vue'
+import Breadcrumb from './_base-breadcrumb.vue'
 export default {
 	components: {
-		Breadcrump
+		Breadcrumb
 	},
 	props: ['intitle', 'indexPage'],
 }
@@ -60,7 +60,7 @@ export default {
         }
     }
 
-    .breadcrump {
+    .breadcrumb {
         overflow: hidden;
         min-width: 35px;
         div.crumb:last-child {

diff --git a/src/js/components/shareDiv.vue b/src/js/components/shareDiv.vue
@@ -129,7 +129,8 @@ export default {
     left: -13px;
 }
 
-.multiselect.multiselect-vue {
-    width: 100%;
+.multiselect {
+	width: 100% !important;
+	max-width: 100% !important;
 }
 </style>
diff --git a/templates/goto.tmpl.php b/templates/goto.tmpl.php
@@ -112,13 +112,11 @@
 	<div id="app-content" class="<?php p($statusClass . ' ' . $pollTypeClass . ' ' . $maybe); ?>">
 		<div id="controls" class="controls">
 
-			<div id="breadcrump" class="breadcrump">
+			<div class="breadcrumb">
 
 	<?php if (User::isLoggedIn()) : ?>
-				<div class="crumb svg">
-					<a href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>">
-						<img class="svg" src="<?php print_unescaped(Template::image_path('core', 'places/home.svg')); ?>" alt="Home">
-					</a>
+				<div class="crumb svg crumbhome">
+					<a class="icon-home" href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>"> Home </a>
 				</div>
 	<?php endif; ?>
 

diff --git a/templates/main.tmpl.php b/templates/main.tmpl.php
@@ -43,11 +43,9 @@
 
 	<div id="app-content">
 		<div id="controls">
-			<div class="breadcrump">
-				<div class="crumb svg last">
-					<a href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>">
-						<img class="svg" src="<?php print_unescaped(Template::image_path('core', 'places/home.svg')); ?>" alt="Home">
-					</a>
+			<div class="breadcrumb">
+				<div class="crumb svg crumbhome">
+					<a class="icon-home" href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>"> Home </a>
 				</div>
 			</div>
 			<div class="actions creatable" style="">