Merge pull request #9912 from nextcloud/search-standard

New search standard and user search

Author: skjnldsv

.drone.yml

@@ -20,14 +20,14 @@ pipeline:
      - ./build/vue-builds.sh ./settings/js/settings-vue.js
     when:
       matrix:
-        TESTS: vue-builds
+        TESTS: vue-build-settings
   vue-build-updatenotification:
     image: node
     commands:
      - ./build/vue-builds.sh ./apps/updatenotification/js/merged.js
     when:
       matrix:
-        TESTS: vue-builds
+        TESTS: vue-build-updatenotification
   checkers:
     image: nextcloudci/php7.0:php7.0-19
     commands:
@@ -683,7 +683,8 @@ pipeline:
 matrix:
   include:
     - TESTS: checkers
-    - TESTS: vue-builds
+    - TESTS: vue-build-settings
+    - TESTS: vue-build-updatenotification
     - TESTS: nodb-codecov
       ENABLE_REDIS: true
     - TESTS: db-codecov

apps/files/css/files.scss

@@ -603,7 +603,7 @@ table tr.summary td {
 	padding-top: 20px;
 }
 .summary .info {
-	margin-left: 40px;
+	margin-left: 35px; /* td has padding of 15, col width is 50 */
 }
 
 table.dragshadow {

apps/files/js/search.js

@@ -139,7 +139,7 @@
 				this.fileList = fileList;
 			};
 
-			OC.Plugins.register('OCA.Search', this);
+			OC.Plugins.register('OCA.Search.Core', this);
 		},
 		attach: function(search) {
 			var self = this;

core/css/styles.scss

@@ -299,32 +299,35 @@ body {
 	overflow-x: auto;
 }
 
-#emptycontent, .emptycontent {
+/* EMPTY CONTENT DISPLAY ------------------------------------------------------------ */
+
+#emptycontent,
+.emptycontent {
 	color: nc-lighten($color-main-text, 53%);
 	text-align: center;
 	margin-top: 30vh;
 	width: 100%;
-}
-
-#app-sidebar #emptycontent, #app-sidebar .emptycontent {
-	margin-top: 10vh;
-}
-
-#emptycontent.emptycontent-search, .emptycontent.emptycontent-search {
-	position: static;
-}
-
-#emptycontent h2, .emptycontent h2 {
-	margin-bottom: 10px;
-	line-height: 150%;
-}
-
-#emptycontent [class^='icon-'], .emptycontent [class^='icon-'], #emptycontent [class*=' icon-'], .emptycontent [class*=' icon-'] {
-	background-size: 64px;
-	height: 64px;
-	width: 64px;
-	margin: 0 auto 15px;
-	opacity: .4;
+	#app-sidebar & {
+		margin-top: 10vh;
+	}
+	.emptycontent-search {
+		position: static;
+	}
+	h2 {
+		margin-bottom: 10px;
+		line-height: 150%;
+	}
+	[class^='icon-'],
+	[class*='icon-'] {
+		background-size: 64px;
+		height: 64px;
+		width: 64px;
+		margin: 0 auto 15px;
+		&:not([class^='icon-loading']),
+		&:not([class*='icon-loading']) {
+			opacity: .4;
+		}
+	}
 }
 
 /* LOG IN & INSTALLATION ------------------------------------------------------------ */

core/img/actions/checkmark-color.svg

@@ -0,0 +1,102 @@
+/*
+ * @copyright Copyright (c) 2018 Jan-Christoph Borchardt <hey@jancborchardt.net>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#searchresults {
+	overflow-x: hidden;
+	text-overflow: ellipsis;
+	padding-top: 51px; /* table row is 51px height */
+	box-sizing: border-box;
+	z-index: 75;
+	/* account for margin-bottom in files list */
+	margin-top: -250px;
+	table {
+		border-spacing: 0;
+		table-layout: fixed;
+		top: 0;
+		width: 100%;
+	}
+	tr {
+		&.result {
+			border-bottom: 1px solid $color-border;
+			* {
+				cursor: pointer;
+			}
+		}
+		&.template {
+			display: none;
+		}
+		&:hover,
+		&.current {
+			background-color: nc-darken($color-main-background, 3%);
+		}
+		td {
+			padding: 5px 9px;
+			font-style: normal;
+			vertical-align: middle;
+			border-bottom: none;
+			&.icon {
+				text-align: right;
+				width: 40px;
+				height: 40px;
+				padding: 5px 0;
+				background-position: right center;
+				background-repeat: no-repeat;
+			}
+			.has-selection:not(.hidden) ~ &.icon {
+				width: 50px;
+				padding-left: 41px;
+				background-size: 32px;
+			}
+		}
+
+		.name,
+		.text,
+		.path {
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+		}
+		.text {
+			white-space: normal;
+			color: #545454;
+		}
+		.path {
+			opacity: 0.5;
+		}
+		.text em {
+			color: #545454;
+			font-weight: bold;
+			opacity: 1;
+		}
+	}
+	.hidden {
+		display: none;
+	}
+	&.filter-empty {
+		/* remove whitespace on bottom when no search results, to fix layout */
+		margin-top: 0 !important;
+	}
+	.status.summary .info {
+		margin-left: 100px;
+	}
+}