diff --git a/.vscode/launch.json b/.vscode/launch.json
index 67fa574841..916aad4702 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -13,7 +13,8 @@
"${workspaceFolder}/**/*.js"
],
"envFile": "${workspaceFolder}/.env",
- "outputCapture": "std"
- }
+ "outputCapture": "std",
+ },
]
+
}
diff --git a/assets/styles/base/_basic.scss b/assets/styles/base/_basic.scss
index 075f917674..aabf1b1482 100644
--- a/assets/styles/base/_basic.scss
+++ b/assets/styles/base/_basic.scss
@@ -69,8 +69,6 @@ BUTTON,
}
}
-
-
A {
@include link-color(var(--link-text), var(--link-hover-text));
diff --git a/assets/styles/themes/_dark.scss b/assets/styles/themes/_dark.scss
index 1840bfcb7f..e198f634d1 100644
--- a/assets/styles/themes/_dark.scss
+++ b/assets/styles/themes/_dark.scss
@@ -17,7 +17,7 @@
$light : #6C6C76;
//dark secondary
- $ligher : #B6B6C2;
+ $lighter : #B6B6C2;
// dark main text
$lightest : #FFFFFF;
@@ -50,8 +50,9 @@
--login-bg : #{$darkest};
--body-bg : #{$darker};
- --body-text : #{$lightest};
- --scrollbar-thumb : #{$lighter};
+ --body-text : #{$lighter};
+ --scrollbar-thumb : #{$medium};
+ --scrollbar-thumb-dropdown : #{$darker};
--header-bg : #{$primary};
--box-bg : #{$darker};
--border : #{$medium};
@@ -100,3 +101,4 @@
--tabbed-border : #{$medium};
--tabbed-container-bg : #{$darkest};
}
+
diff --git a/assets/styles/themes/_light.scss b/assets/styles/themes/_light.scss
index 2606b2dd17..96e1378b16 100644
--- a/assets/styles/themes/_light.scss
+++ b/assets/styles/themes/_light.scss
@@ -59,6 +59,7 @@ $selected: rgba($primary, .5);
--body-bg : white;
--body-text : black;
--scrollbar-thumb : #{$dark};
+ --scrollbar-thumb-dropdown : #{$lighter};
--scrollbar-track : transparent;
--disabled-bg : #{$disabled};
--header-bg : #{$primary};
diff --git a/assets/styles/vendor/vue-select.scss b/assets/styles/vendor/vue-select.scss
index 6b3c016788..4cd4331007 100644
--- a/assets/styles/vendor/vue-select.scss
+++ b/assets/styles/vendor/vue-select.scss
@@ -3,6 +3,7 @@
font-family: inherit;
}
+
.v-select,
.v-select * {
box-sizing: border-box;
@@ -38,6 +39,11 @@
text-align: left;
list-style: none;
background: var(--dropdown-bg);
+ &::-webkit-scrollbar-thumb {
+ background-color: var(--scrollbar-thumb-dropdown) !important;
+ border-radius: 4px;
+ }
+
}
.vs__dropdown-option {
@@ -80,6 +86,7 @@
display: flex;
align-items: center;
padding: 4px 6px 0 3px;
+ pointer-events: none;
}
.vs--searchable .vs__dropdown-toggle {
@@ -154,28 +161,6 @@ $transition-duration: 150ms;
}
}
-.vs__selected {
- display: flex;
- align-items: center;
- background-color: #f0f0f0;
- border: 1px solid var(--dropdown-border);
- border-radius: 4px;
- color: #333;
- margin: 4px 2px 0px 2px;
- padding: 0 0.25em;
-}
-
-.vs__deselect {
- display: inline-flex;
- appearance: none;
- margin-left: 4px;
- padding: 0;
- border: 0;
- cursor: pointer;
- background: none;
- fill: rgba(60,60,60,0.5);
- text-shadow: 0 1px 0 #fff;
-}
/* States */
@@ -192,3 +177,26 @@ $transition-duration: 150ms;
display: none;
}
}
+
+.vs__selected {
+ display: flex;
+ align-items: center;
+ background-color: #f0f0f0;
+ border: 1px solid var(--dropdown-border);
+ border-radius: 4px;
+ color: var(--body-text);
+ margin: 4px 2px 0px 2px;
+ padding: 0 0.25em;
+}
+
+.vs__deselect {
+ display: inline-flex;
+ appearance: none;
+ margin-left: 4px;
+ padding: 0;
+ border: 0;
+ cursor: pointer;
+ background: none;
+ fill: rgba(60,60,60,0.26);
+ text-shadow: 0 1px 0 #fff
+}
diff --git a/components/GithubDropdowns.vue b/components/GithubDropdowns.vue
new file mode 100644
index 0000000000..55c0d85f06
--- /dev/null
+++ b/components/GithubDropdowns.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/cru/rio.cattle.io.v1.service/index.vue b/components/cru/rio.cattle.io.v1.service/index.vue
index ce3d0644a2..8495167229 100644
--- a/components/cru/rio.cattle.io.v1.service/index.vue
+++ b/components/cru/rio.cattle.io.v1.service/index.vue
@@ -28,7 +28,7 @@ export default {
Security,
Upgrading,
Volumes,
- Footer,
+ Footer
},
mixins: [CreateEditView],
diff --git a/package.json b/package.json
index f644676d0f..c55f7467b8 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,8 @@
"build": "./node_modules/.bin/nuxt build",
"analyze": "./node_modules/.bin/nuxt build --analyze",
"start": "./node_modules/.bin/nuxt start",
- "generate": "./node_modules/.bin/nuxt generate"
+ "generate": "./node_modules/.bin/nuxt generate",
+ "dev-debug": "node --inspect ./node_modules/.bin/nuxt"
},
"dependencies": {
"@innologica/vue-dropdown-menu": "^0.1.3",
diff --git a/pages/auth/verify.vue b/pages/auth/verify.vue
index 17a406595c..0cfe86d7f4 100644
--- a/pages/auth/verify.vue
+++ b/pages/auth/verify.vue
@@ -1,7 +1,6 @@