Merge pull request #12919 from nextcloud/oauth2/vue_scoped_css

OAuth2: move to scoped css in vue app

apps/oauth2/css/setting-admin.css

@@ -1,20 +0,0 @@
-.show-oauth-credentials {
-	padding-left: 10px;
-	opacity: 0.3;
-	cursor: pointer;
-}
-
-#oauth2 .icon-toggle,
-#oauth2 .icon-delete {
-	display: inline-block;
-	width: 16px;
-	height: 16px;
-	padding: 10px;
-	vertical-align: middle;
-}
-
-#oauth2 .grid td code {
-	display: inline-block;
-	vertical-align: middle;
-	padding: 3px;
-}

apps/oauth2/package-lock.json

@@ -1539,7 +1539,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -1954,7 +1955,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -2010,6 +2012,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -2053,12 +2056,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

apps/oauth2/src/components/OAuthItem.vue

@@ -64,3 +64,19 @@ export default {
 	}
 }
 </script>
+
+<style scoped>
+	.icon-toggle,
+	.icon-delete {
+		display: inline-block;
+		width: 16px;
+		height: 16px;
+		padding: 10px;
+		vertical-align: middle;
+	}
+	td code {
+		display: inline-block;
+		vertical-align: middle;
+		padding: 3px;
+	}
+</style>

apps/oauth2/templates/admin.php

@@ -20,7 +20,6 @@
  */
 
 script('oauth2', 'oauth2');
-style('oauth2', 'setting-admin');
 
 ?>
 

apps/oauth2/webpack.common.js

@@ -13,7 +13,11 @@ module.exports = {
       {
         test: /\.vue$/,
         loader: 'vue-loader',
-      }
+      },
+      {
+        test: /\.css$/,
+        use: ['vue-style-loader', 'css-loader']
+      },
     ]
   },
   plugins: [