Merge remote-tracking branch 'origin/master'

syshex · syshex · commit c28ffc6a6bc9 · 2018-07-19T09:49:10.000+01:00
diff --git a/src/VueBootstrapTable.vue b/src/VueBootstrapTable.vue
@@ -91,7 +91,7 @@
         table; width: 100%;
     }
 */
-    .spinner {
+    .vue-table-loading .spinner {
         border: 16px solid #f3f3f3; /* Light grey */
         border-top: 16px solid #3498db; /* Blue */
         border-radius: 50%;
@@ -690,4 +690,4 @@
         events: {
         }
     }
-</script>
+</script>

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@`
`91`	`91`	`table; width: 100%;`
`92`	`92`	`}`
`93`	`93`	`*/`
`94`		`- .spinner {`
	`94`	`+ .vue-table-loading .spinner {`
`95`	`95`	`border: 16px solid #f3f3f3; /* Light grey */`
`96`	`96`	`border-top: 16px solid #3498db; /* Blue */`
`97`	`97`	`border-radius: 50%;`
`@@ -690,4 +690,4 @@`
`690`	`690`	`events: {`
`691`	`691`	`}`
`692`	`692`	`}`
`693`		`-</script>`
	`693`	`+</script>`