Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
41f2c1d5
Commit
41f2c1d5
authored
May 06, 2018
by
Dennis Tang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
show button toggle value as primary text color when single project is selected
parent
b53e544c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
..._cluster_dropdowns/components/gke_project_id_dropdown.vue
+4
-1
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+4
-0
No files found.
app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
View file @
41f2c1d5
...
@@ -56,6 +56,9 @@ export default {
...
@@ -56,6 +56,9 @@ export default {
computed
:
{
computed
:
{
...
mapState
([
'
selectedProject
'
]),
...
mapState
([
'
selectedProject
'
]),
...
mapGetters
([
'
hasProject
'
]),
...
mapGetters
([
'
hasProject
'
]),
hasOneProject
()
{
return
this
.
items
.
length
===
1
;
},
isDisabled
()
{
isDisabled
()
{
return
this
.
items
.
length
<
2
;
return
this
.
items
.
length
<
2
;
},
},
...
@@ -158,7 +161,7 @@ export default {
...
@@ -158,7 +161,7 @@ export default {
:value=
"selectedProject.projectId"
:value=
"selectedProject.projectId"
/>
/>
<dropdown-button
<dropdown-button
:class=
"
{ 'gl-field-error-outline': hasErrors }"
:class=
"
{ 'gl-field-error-outline': hasErrors
, 'read-only': hasOneProject
}"
:is-disabled="isDisabled"
:is-disabled="isDisabled"
:is-loading="isLoading"
:is-loading="isLoading"
:toggle-text="toggleText"
:toggle-text="toggleText"
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
41f2c1d5
...
@@ -63,6 +63,10 @@
...
@@ -63,6 +63,10 @@
border-radius
:
$border-radius-base
;
border-radius
:
$border-radius-base
;
white-space
:
nowrap
;
white-space
:
nowrap
;
&
:disabled
.read-only
{
color
:
$gl-text-color
!
important
;
}
&
.no-outline
{
&
.no-outline
{
outline
:
0
;
outline
:
0
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment