Skip to content

Commit 172d025

Browse files
author
Yeliazar
committed
updated modals page
1 parent b0ac67d commit 172d025

File tree

2 files changed

+33
-21
lines changed

2 files changed

+33
-21
lines changed

src/pages/Ui/Modal/Modal.vue

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
Toggle a working modal demo by clicking the button below. It
1313
will slide down and fade in from the top of the page.
1414
</p>
15-
<b-button class="mr-sm" variant="primary" v-b-modal.demo>Demo</b-button>
16-
<b-button variant="primary" v-b-modal.long>Scrolling long content</b-button>
15+
<b-button class="me-2 text-white" variant="primary" v-b-modal.demo>Demo</b-button>
16+
<b-button class="text-white" variant="primary" v-b-modal.long>Scrolling long content</b-button>
1717
</Widget>
1818
<Widget
1919
title="<h5>Optional <span class='fw-semi-bold'>Sizes</span></h5>"
@@ -24,8 +24,8 @@
2424
classes to be placed on a .modal-dialog. These sizes kick in at certain
2525
breakpoints to avoid horizontal scrollbars on narrower viewports.
2626
</p>
27-
<b-button class="mr-sm" variant="primary" v-b-modal.large>Large modal</b-button>
28-
<b-button variant="primary" v-b-modal.small>Small modal</b-button>
27+
<b-button class="me-2 text-white" variant="primary" v-b-modal.large>Large modal</b-button>
28+
<b-button class="text-white" variant="primary" v-b-modal.small>Small modal</b-button>
2929
</Widget>
3030
</b-col>
3131
<b-col xs='12' md='6'>
@@ -41,28 +41,28 @@
4141
normal grid system classes as you would anywhere else.
4242
</p>
4343
<div class="bg-light p-3">
44-
<b-button variant="primary" v-b-modal.launch>Launch</b-button>
44+
<b-button variant="primary" class="text-white" v-b-modal.launch>Launch</b-button>
4545
<pre class="bg-light border-0 w-100 h-100">
4646
<code class="text-danger">{{'&lt;b-container fluid&gt;'}}</code>
4747
<code class="text-success">{{' &lt;b-row&gt;'}}</code>
4848
<code class="text-info">{{' &lt;b-col md="4"&gt;'}}</code>
4949
<code>{{' .col-md-4'}}</code>
5050
<code class="text-info">{{' &lt;/b-col&gt;'}}</code>
51-
<code class="text-info">{{' &lt;b-col md="4" class="ml-auto"&gt;'}}</code>
52-
<code>{{' .col-md-4 .ml-auto'}}</code>
51+
<code class="text-info">{{' &lt;b-col md="4" class="ms-auto"&gt;'}}</code>
52+
<code>{{' .col-md-4 .ms-auto'}}</code>
5353
<code class="text-info">{{' &lt;/b-col&gt;'}}</code>
5454
<code class="text-success">{{' &lt;/b-row&gt;'}}</code>
5555
<code class="text-success">{{' &lt;b-row&gt;'}}</code>
56-
<code class="text-info">{{' &lt;b-col md="3" class="ml-auto"&gt;'}}</code>
57-
<code>{{' .col-md-3 .ml-auto'}}</code>
56+
<code class="text-info">{{' &lt;b-col md="3" class="ms-auto"&gt;'}}</code>
57+
<code>{{' .col-md-3 .ms-auto'}}</code>
5858
<code class="text-info">{{' &lt;/b-col&gt;'}}</code>
59-
<code class="text-info">{{' &lt;b-col md="4" class="ml-auto"&gt;'}}</code>
60-
<code>{{' .col-md-4 .ml-auto'}}</code>
59+
<code class="text-info">{{' &lt;b-col md="4" class="ms-auto"&gt;'}}</code>
60+
<code>{{' .col-md-4 .ms-auto'}}</code>
6161
<code class="text-info">{{' &lt;/b-col&gt;'}}</code>
6262
<code class="text-success">{{' &lt;/b-row&gt;'}}</code>
6363
<code class="text-success">{{' &lt;b-row&gt;'}}</code>
64-
<code class="text-info">{{' &lt;b-col md="6" class="ml-auto"&gt;'}}</code>
65-
<code>{{' .col-md-6 .ml-auto'}}</code>
64+
<code class="text-info">{{' &lt;b-col md="6" class="ms-auto"&gt;'}}</code>
65+
<code>{{' .col-md-6 .ms-auto'}}</code>
6666
<code class="text-info">{{' &lt;/b-col&gt;'}}</code>
6767
<code class="text-success">{{' &lt;/b-row&gt;'}}</code>
6868
<code class="text-danger">{{'&lt;/b-container&gt;'}}</code>
@@ -128,6 +128,7 @@
128128
versions of Lorem Ipsum.
129129
</p>
130130
</b-modal>
131+
131132
<b-modal id="large" size="lg" body-class="bg-white" title="Large modal" cancel-variant="default">
132133
Lorem ipsum dolor sit amet consectetur adipisicing elit. In, illum harum?
133134
Quidem, quisquam, natus repellat debitis veniam quia facilis magni tempora
@@ -139,27 +140,28 @@
139140
Quidem, quisquam, natus repellat debitis veniam quia facilis magni tempora
140141
cupiditate odio vitae? Eligendi nisi consequuntur vero tenetur nemo!
141142
</b-modal>
143+
142144
<b-modal id="launch" body-class="bg-white text-white" title="Modal" cancel-variant="default">
143145
<b-container fluid>
144146
<b-row>
145147
<b-col md='4'>
146148
<div class="h-100 w-100 bg-primary p-2">.col-md-4</div>
147149
</b-col>
148-
<b-col md='4' class="ml-auto">
149-
<div class="h-100 w-100 bg-primary p-2">.col-md-4 .ml-auto</div>
150+
<b-col md='4' class="ms-auto">
151+
<div class="h-100 w-100 bg-primary p-2">.col-md-4 .ms-auto</div>
150152
</b-col>
151153
</b-row>
152154
<b-row class="mt-sm">
153-
<b-col md='3' class="ml-auto">
154-
<div class="h-100 w-100 bg-primary p-2">.col-md-3 .ml-auto</div>
155+
<b-col md='3' class="ms-auto">
156+
<div class="h-100 w-100 bg-primary p-2">.col-md-3 .ms-auto</div>
155157
</b-col>
156-
<b-col md='4' class="ml-auto">
157-
<div class="h-100 w-100 bg-primary p-2">.col-md-4 .ml-auto</div>
158+
<b-col md='4' class="ms-auto">
159+
<div class="h-100 w-100 bg-primary p-2">.col-md-4 .ms-auto</div>
158160
</b-col>
159161
</b-row>
160162
<b-row class="mt-sm">
161-
<b-col md='6' class="ml-auto">
162-
<div class="h-100 w-100 bg-primary p-2">.col-md-6 .ml-auto</div>
163+
<b-col md='6' class="ms-auto">
164+
<div class="h-100 w-100 bg-primary p-2">.col-md-6 .ms-auto</div>
163165
</b-col>
164166
</b-row>
165167
</b-container>
@@ -175,3 +177,4 @@ export default {
175177
components: { Widget },
176178
};
177179
</script>
180+

src/styles/_overrides.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,3 +1024,12 @@ $slider-handle-size: 26px;
10241024
//padding: 30px 60px;
10251025
background: rgba(233,236,239,1);
10261026
}
1027+
1028+
.modal-content {
1029+
.close {
1030+
box-sizing: content-box;
1031+
border: 0;
1032+
background-color: transparent;
1033+
border-radius: 0.3rem;
1034+
}
1035+
}

0 commit comments

Comments
 (0)