Commit f12d9f9f authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch 'ntepluhina-refactor-to-gitlab-ui' into 'master'

Update design image and scaler to GitLab UI classes

See merge request gitlab-org/gitlab!44619
parents 17faea01 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>
......
...@@ -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-100" name="media-broken" :size="48" /> <gl-icon v-if="imageError" class="gl-text-gray-200" name="media-broken" :size="48" />
<img <img
v-show="!imageError" v-show="!imageError"
ref="contentImg" ref="contentImg"
......
...@@ -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"
> >
......
...@@ -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-100" class="gl-text-gray-200"
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"
> >
<!----> <!---->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment