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
2761465d
Commit
2761465d
authored
Aug 04, 2020
by
Tom Quirk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase button size to 18
parent
d55b7466
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
12 deletions
+10
-12
app/assets/javascripts/vue_shared/components/toggle_button.vue
...ssets/javascripts/vue_shared/components/toggle_button.vue
+2
-2
app/assets/stylesheets/framework/toggle.scss
app/assets/stylesheets/framework/toggle.scss
+3
-5
app/views/projects/pages_domains/_certificate.html.haml
app/views/projects/pages_domains/_certificate.html.haml
+2
-2
app/views/shared/buttons/_project_feature_toggle.html.haml
app/views/shared/buttons/_project_feature_toggle.html.haml
+2
-2
spec/frontend/vue_shared/components/toggle_button_spec.js
spec/frontend/vue_shared/components/toggle_button_spec.js
+1
-1
No files found.
app/assets/javascripts/vue_shared/components/toggle_button.vue
View file @
2761465d
...
...
@@ -76,9 +76,9 @@ export default {
@click="toggleFeature"
>
<gl-loading-icon
class=
"loading-icon"
/>
<span
class=
"toggle-icon
gl-bg-white
"
>
<span
class=
"toggle-icon"
>
<gl-icon
:size=
"1
6
"
:size=
"1
8
"
:name=
"toggleIcon"
:class=
"value ? 'gl-fill-blue-500' : 'gl-fill-gray-400'"
/>
...
...
app/assets/stylesheets/framework/toggle.scss
View file @
2761465d
...
...
@@ -53,11 +53,9 @@
border-radius
:
9px
;
background
:
$white
;
transition
:
all
0
.2s
ease
;
&
{
width
:
$default-icon-size
;
height
:
$default-icon-size
;
}
width
:
$default-icon-size
;
height
:
$default-icon-size
;
}
.loading-icon
{
...
...
app/views/projects/pages_domains/_certificate.html.haml
View file @
2761465d
...
...
@@ -19,8 +19,8 @@
"aria-label"
:
_
(
"Automatic certificate management using Let's Encrypt"
)
}
=
f
.
hidden_field
:auto_ssl_enabled?
,
class:
"js-project-feature-toggle-input"
%span
.toggle-icon
=
sprite_icon
(
"status_success_borderless"
,
size:
1
6
,
css_class:
"gl-fill-blue-500 toggle-status-checked"
)
=
sprite_icon
(
"status_failed_borderless"
,
size:
1
6
,
css_class:
"gl-fill-gray-400 toggle-status-unchecked"
)
=
sprite_icon
(
"status_success_borderless"
,
size:
1
8
,
css_class:
"gl-fill-blue-500 toggle-status-checked"
)
=
sprite_icon
(
"status_failed_borderless"
,
size:
1
8
,
css_class:
"gl-fill-gray-400 toggle-status-unchecked"
)
%p
.text-secondary.mt-3
-
docs_link_url
=
help_page_path
(
"user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md"
)
-
docs_link_start
=
"<a href=
\"
%{docs_link_url}
\"
target=
\"
_blank
\"
rel=
\"
noopener noreferrer
\"
class=
\"
text-nowrap
\"
>"
.
html_safe
%
{
docs_link_url:
docs_link_url
}
...
...
app/views/shared/buttons/_project_feature_toggle.html.haml
View file @
2761465d
...
...
@@ -12,5 +12,5 @@
-
if
yield
.
present?
=
yield
%span
.toggle-icon
=
sprite_icon
(
'status_success_borderless'
,
size:
1
6
,
css_class:
'gl-fill-blue-500 toggle-status-checked'
)
=
sprite_icon
(
'status_failed_borderless'
,
size:
1
6
,
css_class:
'gl-fill-gray-400 toggle-status-unchecked'
)
=
sprite_icon
(
'status_success_borderless'
,
size:
1
8
,
css_class:
'gl-fill-blue-500 toggle-status-checked'
)
=
sprite_icon
(
'status_failed_borderless'
,
size:
1
8
,
css_class:
'gl-fill-gray-400 toggle-status-unchecked'
)
spec/frontend/vue_shared/components/toggle_button_spec.js
View file @
2761465d
...
...
@@ -32,7 +32,7 @@ describe('Toggle Button', () => {
it
(
'
renders input status icon
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelectorAll
(
'
span.toggle-icon
'
).
length
).
toEqual
(
1
);
expect
(
vm
.
$el
.
querySelectorAll
(
'
svg.s1
6
'
).
length
).
toEqual
(
1
);
expect
(
vm
.
$el
.
querySelectorAll
(
'
svg.s1
8
'
).
length
).
toEqual
(
1
);
});
});
...
...
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