Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 2a397fe

Browse files
author
Yeliazar
committed
migration boostrap v4 to v5, fix paddings, margins, text display, position
1 parent 4832c29 commit 2a397fe

File tree

17 files changed

+64
-64
lines changed

17 files changed

+64
-64
lines changed

‎src/components/Notifications/NotificationsDemo/Messages.vue‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<img class="rounded-circle" src="../../../assets/people/a2.jpg" alt="people" />
66
<i class="status status-bottom bg-success" />
77
</span>
8-
<time class="text-link help float-right">10 sec ago</time>
8+
<time class="text-link help float-end">10 sec ago</time>
99
<h6 class="m-0 fw-bold mb-1">Chris Gray</h6>
1010
<p class="deemphasize text-ellipsis m-0">Hey! What&apos;s up? So many times since we</p>
1111
</b-list-group-item>
@@ -14,7 +14,7 @@
1414
<img class="rounded-circle" src="../../../assets/people/a5.jpg" alt="people" />
1515
<i class="status status-bottom bg-success" />
1616
</span>
17-
<time class="text-link help float-right">2 min ago</time>
17+
<time class="text-link help float-end">2 min ago</time>
1818
<h6 class="m-0 mb-1">Jamey Brownlow</h6>
1919
<p class="deemphasize text-ellipsis m-0">
2020
Good news coming tonight. Seems they agreed to proceed
@@ -25,7 +25,7 @@
2525
<img class="rounded-circle" src="../../../assets/people/a1.jpg" alt="people" />
2626
<i class="status status-bottom bg-warning" />
2727
</span>
28-
<time class="text-link help float-right">9 min ago</time>
28+
<time class="text-link help float-end">9 min ago</time>
2929
<h6 class="m-0 mb-1">Livia Walsh</h6>
3030
<p class="deemphasize text-ellipsis m-0">Check out my latest email plz!</p>
3131
</b-list-group-item>
@@ -34,7 +34,7 @@
3434
<img class="rounded-circle" src="../../../assets/people/a6.jpg" alt="people" />
3535
<i class="status status-bottom bg-danger" />
3636
</span>
37-
<time class="text-link help float-right">12:56 AM</time>
37+
<time class="text-link help float-end">12:56 AM</time>
3838
<h6 class="m-0 mb-1">Jaron Fitzroy</h6>
3939
<p class="deemphasize text-ellipsis m-0">What about summer break?</p>
4040
</b-list-group-item>
@@ -43,7 +43,7 @@
4343
<img class="rounded-circle" src="../../../assets/people/a4.jpg" alt="people" />
4444
<i class="status status-bottom bg-gray-light" />
4545
</span>
46-
<time class="text-link help float-right">Yesterday</time>
46+
<time class="text-link help float-end">Yesterday</time>
4747
<h6 class="m-0 mb-1">Mike Lewis</h6>
4848
<p class="deemphasize text-ellipsis m-0">
4949
Just ain&apos;t sure about the weekend now. 90% I&apos;ll make it.
@@ -54,7 +54,7 @@
5454
<img class="rounded-circle" src="../../../assets/people/a6.jpg" alt="people" />
5555
<i class="status status-bottom bg-success" />
5656
</span>
57-
<time class="text-link help float-right">Apr 23</time>
57+
<time class="text-link help float-end">Apr 23</time>
5858
<h6 class="m-0 mb-1">Freda Edison</h6>
5959
<p class="deemphasize text-ellipsis m-0">
6060
Hey what&apos;s up? Me and Monica going for a lunch somewhere. Wanna join?

‎src/components/Notifications/NotificationsDemo/Progress.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<b-list-group class="listGroup thin-scroll">
33
<b-list-group-item class="listGroupItem">
4-
<span class="text-muted float-right">60%</span>
4+
<span class="text-muted float-end">60%</span>
55
<h6 class="m-0 mb-1 text-gray">
66
<strong>Urgent:</strong>
77
&nbsp;Rails 4.1.0 upgrade
@@ -10,7 +10,7 @@
1010
<span class="help-block">3 notes added by James 2h ago...</span>
1111
</b-list-group-item>
1212
<b-list-group-item class="listGroupItem">
13-
<span class="text-muted float-right">83%</span>
13+
<span class="text-muted float-end">83%</span>
1414
<h6 class="m-0 mb-1 text-gray">
1515
<strong>Primary:</strong>
1616
&nbsp;Sing Web App
@@ -19,7 +19,7 @@
1919
<span class="help-block">verifying stable probability status</span>
2020
</b-list-group-item>
2121
<b-list-group-item class="listGroupItem">
22-
<span class="text-muted float-right">44%</span>
22+
<span class="text-muted float-end">44%</span>
2323
<h6 class="m-0 mb-1">
2424
<span class="circle bg-gray-dark text-warning"
2525
v-b-tooltip.hover title="2 issues require your attention" placement="bottom">
@@ -32,15 +32,15 @@
3232
<span class="help-block">last update: 2h ago</span>
3333
</b-list-group-item>
3434
<b-list-group-item class="listGroupItem">
35-
<span class="text-muted float-right">86%</span>
35+
<span class="text-muted float-end">86%</span>
3636
<h6 class="m-0 mb-1 deemphasize text-gray">
3737
Complete project planning
3838
</h6>
3939
<b-progress class="progress-xs m-0" variant="danger" :value="86" :max="100"/>
4040
<span class="help-block">no, no way this is not working...</span>
4141
</b-list-group-item>
4242
<b-list-group-item class="listGroupItem">
43-
<span class="text-muted float-right">100%</span>
43+
<span class="text-muted float-end">100%</span>
4444
<h6 class="m-0 mb-1 deemphasize text-gray">
4545
<strong>Completed:</strong>
4646
&nbsp;Instruct newbies on coding standards

‎src/documentation/pages/Libs.vue‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
<h3>Font-awesome</h3>
2828
<p>The iconic SVG, font, and CSS toolkit</p>
2929
<h4>Examples</h4>
30-
<i class="fa fa-arrow-left fa-2x mr"></i>
31-
<i class="fa fa-github fa-2x mr"></i>
32-
<i class="fa fa-bath fa-2x mr"></i>
33-
<i class="fa fa-grav fa-2x mr"></i>
30+
<i class="fa fa-arrow-left fa-2x me-1"></i>
31+
<i class="fa fa-github fa-2x me-1"></i>
32+
<i class="fa fa-bath fa-2x me-1"></i>
33+
<i class="fa fa-grav fa-2x me-1"></i>
3434
<i class="fa fa-telegram fa-2x"></i>
3535
<vue-code-highlight>{{fontAwesomeCode}}</vue-code-highlight>
3636
<p class="lead">Want to see examples?
@@ -44,10 +44,10 @@
4444
<h3>Glyphicons-halflings</h3>
4545
<p>TIncludes over 250 glyphs in font format from the Glyphicon Halflings set</p>
4646
<h4>Examples</h4>
47-
<i class="glyphicon glyphicon-asterisk mr"></i>
48-
<i class="glyphicon glyphicon-heart mr"></i>
49-
<i class="glyphicon glyphicon-home mr"></i>
50-
<i class="glyphicon glyphicon-refresh mr"></i>
47+
<i class="glyphicon glyphicon-asterisk me-1"></i>
48+
<i class="glyphicon glyphicon-heart me-1"></i>
49+
<i class="glyphicon glyphicon-home me-1"></i>
50+
<i class="glyphicon glyphicon-refresh me-1"></i>
5151
<i class="glyphicon glyphicon-camera"></i>
5252
<vue-code-highlight>{{glyphiconCode}}</vue-code-highlight>
5353
<p class="lead">Want to see examples?
@@ -61,11 +61,11 @@
6161
<h3>Line-awesome</h3>
6262
<p>A single file that replaces Font Awesome with modern line icons.</p>
6363
<h4>Examples</h4>
64-
<i class="la la-arrow-left la-2x mr"></i>
65-
<i class="la la-github la-2x mr"></i>
66-
<i class="la la-facebook la-2x mr"></i>
64+
<i class="la la-arrow-left la-2x me-0"></i>
65+
<i class="la la-github la-2x me-0"></i>
66+
<i class="la la-facebook la-2x me-0"></i>
6767
<vue-code-highlight>{{lineAwesomeCode}}</vue-code-highlight>
68-
<p className="lead">Want to see examples?
68+
<p class="lead">Want to see examples?
6969
<router-link to="/app/ui/icons">Click</router-link>
7070
</p>
7171
<p>For more examples and documentation please refer to <a href="https://github.com/FortAwesome/Font-Awesome"
@@ -78,7 +78,7 @@
7878
<h4>Example</h4>
7979
<mavon-editor id="markdown-editor" language="en"/>
8080
<vue-code-highlight>&lt;mavon-editor id="markdown-editor" language="en" v-model="mdContent"/&gt;</vue-code-highlight>
81-
<p className="lead">Want to see examples?
81+
<p class="lead">Want to see examples?
8282
<router-link to="/app/ui/icons">Click</router-link>
8383
</p>
8484
<p>For more examples and documentation please refer to <a href="https://github.com/hinesboy/mavonEditor"
@@ -321,19 +321,19 @@
321321
intPhoneModel: null,
322322
datepickerText: '',
323323
defaultSelect: 'Andromeda Galaxy',
324-
fontAwesomeCode: '<i ></i>\n' +
325-
'<i class="fa fa-github fa-2x mr"></i>\n' +
326-
'<i class="fa fa-bath fa-2x mr"></i>\n' +
327-
'<i class="fa fa-grav fa-2x mr"></i>\n' +
324+
fontAwesomeCode: '<i class="fa fa-arrow-left fa-2x me-0"></i>\n' +
325+
'<i class="fa fa-github fa-2x me-0"></i>\n' +
326+
'<i class="fa fa-bath fa-2x me-0"></i>\n' +
327+
'<i class="fa fa-grav fa-2x me-0"></i>\n' +
328328
'<i class="fa fa-telegram fa-2x"></i>',
329-
glyphiconCode: '<i class="glyphicon glyphicon-asterisk mr"></i>\n' +
330-
'<i class="glyphicon glyphicon-heart mr"></i>\n' +
331-
'<i class="glyphicon glyphicon-home mr"></i>\n' +
332-
'<i class="glyphicon glyphicon-refresh mr"></i>\n' +
329+
glyphiconCode: '<i class="glyphicon glyphicon-asterisk me-0"></i>\n' +
330+
'<i class="glyphicon glyphicon-heart me-0"></i>\n' +
331+
'<i class="glyphicon glyphicon-home me-0"></i>\n' +
332+
'<i class="glyphicon glyphicon-refresh me-0"></i>\n' +
333333
'<i class="glyphicon glyphicon-camera"></i>',
334-
lineAwesomeCode: '<i class="la la-arrow-left la-2x mr"></i>\n' +
335-
'<i class="la la-github la-2x mr"></i>\n' +
336-
'<i class="la la-facebook la-2x mr"></i>',
334+
lineAwesomeCode: '<i class="la la-arrow-left la-2x me-0"></i>\n' +
335+
'<i class="la la-github la-2x me-0"></i>\n' +
336+
'<i class="la la-facebook la-2x me-0"></i>',
337337
vueColorCode: '<b-input-group class="colorpicker-wrapper">\n' +
338338
' <input type="text" class="form-control" :value="color.hex"/>\n' +
339339
' <Chrome\n' +

‎src/documentation/pages/Pages.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ routes: [
7070
</Widget>
7171
<Widget id="E-Commerce">
7272
<h3>E-commerce</h3>
73-
<p class="alert alert-secondary font-weight-bold"><span class="text-warning">Important note.</span> This
73+
<p class="alert alert-secondary fw-bold"><span class="text-warning">Important note.</span> This
7474
section is fully supported by <a
7575
href="https://github.com/flatlogic/nodejs-backend" rel="noopener noreferrer" target="_blank">Node.js
7676
backend</a> data.

‎src/documentation/pages/ScrollSpyComponent.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div class="border-left pl-4 d-md-down-none scrollspy">
2+
<div class="border-start ps-4 d-md-down-none scrollspy">
33
<h6 class="fw-semi-bold text-uppercase">{{title}}</h6>
44
<b-list-group v-b-scrollspy="150">
55
<b-list-group-item @click="scrollToId(id)" v-for="id in ids" :key="id" :to="'#' + id">{{id.split('-').join(' ')}}</b-list-group-item>

‎src/pages/Dashboard/Dashboard.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
>
209209
<div v-for="notification in mock.notifications"
210210
class="d-flex align-items-start" :key="notification.id">
211-
<i :class="`la la-${notification.icon} mr text-${notification.color}`" />
211+
<i :class="`la la-${notification.icon} me-0 text-${notification.color}`" />
212212
<p
213213
:class="{ 'mb-0': notification.id === mock.notifications.length - 1 }"
214214
v-html="notification.content"

‎src/pages/Dashboard/components/BigStat/BigStat.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
rotate-${bounce.profit ? '315' : '45'}`"
3737
/>
3838
</div>
39-
<p class="text-muted mb-0 mr"><small>Bounce Rate</small></p>
39+
<p class="text-muted mb-0 me-0"><small>Bounce Rate</small></p>
4040
</div>
4141
</div>
4242
</div>

‎src/pages/Dashboard/components/Task/Task.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/>
1010
<label :for="`checkbox${task.id}`" />
1111
</div>
12-
<div class="task-content pl-2">
12+
<div class="task-content ps-2">
1313
<p class="text-muted mb-xs"><small>{{task.type}}</small></p>
1414
<h6>{{task.title}}</h6>
1515
<p class="text-muted"><small>{{task.time}}</small></p>

‎src/pages/Email/components/MessageTable/MessageTable.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<td class="messageClip">
7575
<i v-show="message.attachments" class="fa fa-paperclip" />
7676
</td>
77-
<td class="text-right">{{message.date}}</td>
77+
<td class="text-end">{{message.date}}</td>
7878
</tr>
7979
</tbody>
8080
</table>

‎src/pages/Profile/Profile.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@
4646
<b-col md="7" xs="12">
4747
<div class="stats-row mt-3">
4848
<div class="profileStat stat-item">
49-
<p class="profileStatValue value text-right">251</p>
49+
<p class="profileStatValue value text-end">251</p>
5050
<h6 class="name">Posts</h6>
5151
</div>
5252
<div class="profileStat stat-item">
53-
<p class="profileStatValue value text-right">9.38%</p>
53+
<p class="profileStatValue value text-end">9.38%</p>
5454
<h6 class="name">Conversion</h6>
5555
</div>
5656
<div class="profileStat stat-item">
57-
<p class="profileStatValue value text-right">842</p>
57+
<p class="profileStatValue value text-end">842</p>
5858
<h6 class="name">Followers</h6>
5959
</div>
6060
</div>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /