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
037f33ed
Commit
037f33ed
authored
Oct 08, 2020
by
Natalia Tepluhina
Committed by
Nicolò Maria Mezzopera
Oct 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update design image and scaler to GitLab UI classes
parent
e82ac0df
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
app/assets/javascripts/design_management/components/design_scaler.vue
...avascripts/design_management/components/design_scaler.vue
+1
-1
app/assets/javascripts/design_management/components/image.vue
...assets/javascripts/design_management/components/image.vue
+2
-2
spec/frontend/design_management/components/__snapshots__/design_scaler_spec.js.snap
...ement/components/__snapshots__/design_scaler_spec.js.snap
+3
-3
spec/frontend/design_management/components/__snapshots__/image_spec.js.snap
...gn_management/components/__snapshots__/image_spec.js.snap
+5
-5
No files found.
app/assets/javascripts/design_management/components/design_scaler.vue
View file @
037f33ed
...
@@ -51,7 +51,7 @@ export default {
...
@@ -51,7 +51,7 @@ export default {
<
template
>
<
template
>
<div
class=
"design-scaler btn-group"
role=
"group"
>
<div
class=
"design-scaler btn-group"
role=
"group"
>
<button
class=
"btn"
:disabled=
"disableDecrease"
@
click=
"decrementScale"
>
<button
class=
"btn"
:disabled=
"disableDecrease"
@
click=
"decrementScale"
>
<span
class=
"
d-flex
-center gl-icon s16"
>
<span
class=
"
gl-display-flex gl-justify-content-center gl-align-items
-center gl-icon s16"
>
–
–
</span>
</span>
</button>
</button>
...
...
app/assets/javascripts/design_management/components/image.vue
View file @
037f33ed
...
@@ -93,8 +93,8 @@ export default {
...
@@ -93,8 +93,8 @@ export default {
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"
m
-auto js-design-image"
>
<div
class=
"
gl-mx-auto gl-my
-auto js-design-image"
>
<gl-icon
v-if=
"imageError"
class=
"
text-secondary-1
00"
name=
"media-broken"
:size=
"48"
/>
<gl-icon
v-if=
"imageError"
class=
"
gl-text-gray-2
00"
name=
"media-broken"
:size=
"48"
/>
<img
<img
v-show=
"!imageError"
v-show=
"!imageError"
ref=
"contentImg"
ref=
"contentImg"
...
...
spec/frontend/design_management/components/__snapshots__/design_scaler_spec.js.snap
View file @
037f33ed
...
@@ -10,7 +10,7 @@ exports[`Design management design scaler component minus and reset buttons are d
...
@@ -10,7 +10,7 @@ exports[`Design management design scaler component minus and reset buttons are d
disabled="disabled"
disabled="disabled"
>
>
<span
<span
class="
d-flex
-center gl-icon s16"
class="
gl-display-flex gl-justify-content-center gl-align-items
-center gl-icon s16"
>
>
–
–
...
@@ -48,7 +48,7 @@ exports[`Design management design scaler component minus and reset buttons are e
...
@@ -48,7 +48,7 @@ exports[`Design management design scaler component minus and reset buttons are e
class="btn"
class="btn"
>
>
<span
<span
class="
d-flex
-center gl-icon s16"
class="
gl-display-flex gl-justify-content-center gl-align-items
-center gl-icon s16"
>
>
–
–
...
@@ -85,7 +85,7 @@ exports[`Design management design scaler component plus button is disabled when
...
@@ -85,7 +85,7 @@ exports[`Design management design scaler component plus button is disabled when
class="btn"
class="btn"
>
>
<span
<span
class="
d-flex
-center gl-icon s16"
class="
gl-display-flex gl-justify-content-center gl-align-items
-center gl-icon s16"
>
>
–
–
...
...
spec/frontend/design_management/components/__snapshots__/image_spec.js.snap
View file @
037f33ed
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
exports[`Design management large image component renders image 1`] = `
exports[`Design management large image component renders image 1`] = `
<div
<div
class="
m
-auto js-design-image"
class="
gl-mx-auto gl-my
-auto js-design-image"
>
>
<!---->
<!---->
...
@@ -16,7 +16,7 @@ exports[`Design management large image component renders image 1`] = `
...
@@ -16,7 +16,7 @@ exports[`Design management large image component renders image 1`] = `
exports[`Design management large image component renders loading state 1`] = `
exports[`Design management large image component renders loading state 1`] = `
<div
<div
class="
m
-auto js-design-image"
class="
gl-mx-auto gl-my
-auto js-design-image"
isloading="true"
isloading="true"
>
>
<!---->
<!---->
...
@@ -31,7 +31,7 @@ exports[`Design management large image component renders loading state 1`] = `
...
@@ -31,7 +31,7 @@ exports[`Design management large image component renders loading state 1`] = `
exports[`Design management large image component renders media broken icon on error 1`] = `
exports[`Design management large image component renders media broken icon on error 1`] = `
<gl-icon-stub
<gl-icon-stub
class="
text-secondary-1
00"
class="
gl-text-gray-2
00"
name="media-broken"
name="media-broken"
size="48"
size="48"
/>
/>
...
@@ -39,7 +39,7 @@ exports[`Design management large image component renders media broken icon on er
...
@@ -39,7 +39,7 @@ exports[`Design management large image component renders media broken icon on er
exports[`Design management large image component sets correct classes and styles if imageStyle is set 1`] = `
exports[`Design management large image component sets correct classes and styles if imageStyle is set 1`] = `
<div
<div
class="
m
-auto js-design-image"
class="
gl-mx-auto gl-my
-auto js-design-image"
>
>
<!---->
<!---->
...
@@ -54,7 +54,7 @@ exports[`Design management large image component sets correct classes and styles
...
@@ -54,7 +54,7 @@ exports[`Design management large image component sets correct classes and styles
exports[`Design management large image component zoom sets image style when zoomed 1`] = `
exports[`Design management large image component zoom sets image style when zoomed 1`] = `
<div
<div
class="
m
-auto js-design-image"
class="
gl-mx-auto gl-my
-auto js-design-image"
>
>
<!---->
<!---->
...
...
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