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

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

Updated design presentation and dropzone to GtiLab UI classes

See merge request gitlab-org/gitlab!44304
parents 3676ff81 efcf250d
......@@ -286,7 +286,7 @@ export default {
<template>
<div
ref="presentationViewport"
class="h-100 w-100 p-3 overflow-auto position-relative"
class="gl-h-full gl-w-full gl-p-5 overflow-auto gl-relative"
:style="presentationStyle"
@mousedown="onPresentationMousedown"
@mousemove="onPresentationMousemove"
......@@ -297,7 +297,7 @@ export default {
@touchend="onPresentationMouseup"
@touchcancel="onPresentationMouseup"
>
<div class="h-100 w-100 d-flex align-items-center position-relative">
<div class="gl-h-full gl-w-full gl-display-flex gl-align-items-center gl-relative">
<design-image
v-if="image"
:image="image"
......
......@@ -83,7 +83,7 @@ export default {
<template>
<div
class="w-100 position-relative"
class="gl-w-full gl-relative"
@dragstart.prevent.stop
@dragend.prevent.stop
@dragover.prevent.stop
......@@ -93,7 +93,7 @@ export default {
>
<slot>
<button
class="card design-dropzone-card design-dropzone-border w-100 h-100 gl-align-items-center gl-justify-content-center gl-p-3"
class="card design-dropzone-card design-dropzone-border gl-w-full gl-h-full gl-align-items-center gl-justify-content-center gl-p-3"
@click="openFileUpload"
>
<div
......@@ -127,9 +127,9 @@ export default {
<transition name="design-dropzone-fade">
<div
v-show="dragging && !isDraggingDesign"
class="card design-dropzone-border design-dropzone-overlay w-100 h-100 position-absolute d-flex-center p-3 bg-white"
class="card design-dropzone-border design-dropzone-overlay gl-w-full gl-h-full gl-absolute gl-display-flex gl-align-items-center gl-justify-content-center gl-p-3 gl-bg-white"
>
<div v-show="!isDragDataValid" class="mw-50 text-center">
<div v-show="!isDragDataValid" class="mw-50 gl-text-center">
<h3 :class="{ 'gl-font-base gl-display-inline': !hasDesigns }">{{ __('Oh no!') }}</h3>
<span>{{
__(
......@@ -137,7 +137,7 @@ export default {
)
}}</span>
</div>
<div v-show="isDragDataValid" class="mw-50 text-center">
<div v-show="isDragDataValid" class="mw-50 gl-text-center">
<h3 :class="{ 'gl-font-base gl-display-inline': !hasDesigns }">{{ __('Incoming!') }}</h3>
<span>{{ __('Drop your designs to start your upload.') }}</span>
</div>
......
......@@ -2,10 +2,10 @@
exports[`Design management design presentation component currentCommentForm is equal to current annotation position when isAnnotating is true 1`] = `
<div
class="h-100 w-100 p-3 overflow-auto position-relative"
class="gl-h-full gl-w-full gl-p-5 overflow-auto gl-relative"
>
<div
class="h-100 w-100 d-flex align-items-center position-relative"
class="gl-h-full gl-w-full gl-display-flex gl-align-items-center gl-relative"
>
<design-image-stub
image="test.jpg"
......@@ -25,10 +25,10 @@ exports[`Design management design presentation component currentCommentForm is e
exports[`Design management design presentation component currentCommentForm is null when isAnnotating is false 1`] = `
<div
class="h-100 w-100 p-3 overflow-auto position-relative"
class="gl-h-full gl-w-full gl-p-5 overflow-auto gl-relative"
>
<div
class="h-100 w-100 d-flex align-items-center position-relative"
class="gl-h-full gl-w-full gl-display-flex gl-align-items-center gl-relative"
>
<design-image-stub
image="test.jpg"
......@@ -47,10 +47,10 @@ exports[`Design management design presentation component currentCommentForm is n
exports[`Design management design presentation component currentCommentForm is null when isAnnotating is true but annotation position is falsey 1`] = `
<div
class="h-100 w-100 p-3 overflow-auto position-relative"
class="gl-h-full gl-w-full gl-p-5 overflow-auto gl-relative"
>
<div
class="h-100 w-100 d-flex align-items-center position-relative"
class="gl-h-full gl-w-full gl-display-flex gl-align-items-center gl-relative"
>
<design-image-stub
image="test.jpg"
......@@ -69,10 +69,10 @@ exports[`Design management design presentation component currentCommentForm is n
exports[`Design management design presentation component renders empty state when no image provided 1`] = `
<div
class="h-100 w-100 p-3 overflow-auto position-relative"
class="gl-h-full gl-w-full gl-p-5 overflow-auto gl-relative"
>
<div
class="h-100 w-100 d-flex align-items-center position-relative"
class="gl-h-full gl-w-full gl-display-flex gl-align-items-center gl-relative"
>
<!---->
......@@ -83,10 +83,10 @@ exports[`Design management design presentation component renders empty state whe
exports[`Design management design presentation component renders image and overlay when image provided 1`] = `
<div
class="h-100 w-100 p-3 overflow-auto position-relative"
class="gl-h-full gl-w-full gl-p-5 overflow-auto gl-relative"
>
<div
class="h-100 w-100 d-flex align-items-center position-relative"
class="gl-h-full gl-w-full gl-display-flex gl-align-items-center gl-relative"
>
<design-image-stub
image="test.jpg"
......
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