Skip to content

Commit 4832c29

Browse files
author
Yeliazar
committed
fix margins, update chart
1 parent bdc3ded commit 4832c29

File tree

23 files changed

+98
-97
lines changed

23 files changed

+98
-97
lines changed

‎src/components/Notifications/Notifications.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<strong>You have 13 notifications</strong>
66
</div>
77
<b-button-group id="notification-b-buttons">
8-
<b-button variant="default" @click="changeNotificationsTab(1)">Notifications</b-button>
9-
<b-button variant="default" @click="changeNotificationsTab(2)">Messages</b-button>
10-
<b-button variant="default" @click="changeNotificationsTab(3)">Progress</b-button>
8+
<b-button @click="changeNotificationsTab(1)">Notifications</b-button>
9+
<b-button @click="changeNotificationsTab(2)">Messages</b-button>
10+
<b-button @click="changeNotificationsTab(3)">Progress</b-button>
1111
</b-button-group>
1212
</header>
1313
<NewNotifictionsList v-if="newNotifications" />
@@ -20,7 +20,7 @@
2020
<b-button
2121
variant="link"
2222
@click="loadNotifications"
23-
:class="{disabled: isLoad, 'btnNotificationsReload btn-xs float-right py-0': true}"
23+
:class="{disabled: isLoad, 'btnNotificationsReload btn-xs float-end py-0': true}"
2424
>
2525
<span v-if="isLoad"><i class="la la-refresh la-spin" /> Loading...</span>
2626
<i v-else class="la la-refresh" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<p class="m-0 overflow-hidden">
6565
User <a href="#">Jeff</a> registered
6666
&nbsp;&nbsp;
67-
<b-button size="xs" variant="success" class="mr-1">Allow</b-button>
67+
<b-button size="xs" variant="success" class="me-1">Allow</b-button>
6868
<b-button size="xs" variant="danger">Deny</b-button>
6969
<time class="help-block m-0">
7070
12:18 AM

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<p class="m-0 overflow-hidden">
4242
User <a href="#">Jeff</a> registered
4343
&nbsp;&nbsp;
44-
<b-button size="xs" variant="success" class="mr-1">Allow</b-button>
44+
<b-button size="xs" variant="success" class="me-1">Allow</b-button>
4545
<b-button size="xs" variant="danger">Deny</b-button>
4646
<time class="help-block m-0">
4747
12:18 AM

‎src/documentation/DocumentationHeader.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@
33
<b-navbar-brand href="/#/documentation" class="px-4">
44
<span class="fw-semi-bold d-sm-down-none">Sing App Vue</span> &nbsp; Documentation
55
</b-navbar-brand>
6-
<b-navbar-nav class="ml-auto d-md-down-none">
7-
<b-nav-item href="https://twitter.com/flatlogic" class="mr-1">
6+
<b-navbar-nav class="ms-auto d-md-down-none">
7+
<b-nav-item href="https://twitter.com/flatlogic" class="me-1">
88
<img src="../assets/documentation/twitter-logo.svg" alt="twitter"/>
99
</b-nav-item>
10-
<b-nav-item href="https://dribbble.com/flatlogic" class="mr-1">
10+
<b-nav-item href="https://dribbble.com/flatlogic" class="me-1">
1111
<img src="../assets/documentation/dribble-logo.svg" alt="dribble"/>
1212
</b-nav-item>
13-
<b-nav-item href="https://dribbble.com/flatlogic" class="mr-1">
13+
<b-nav-item href="https://dribbble.com/flatlogic" class="me-1">
1414
<img src="../assets/documentation/facebook-logo.svg" alt="facebook"/>
1515
</b-nav-item>
16-
<b-nav-item href="https://instagram.com/flatlogiccom/" class="mr-1">
16+
<b-nav-item href="https://instagram.com/flatlogiccom/" class="me-1">
1717
<img src="../assets/documentation/instagram-logo.svg" alt="instagram"/>
1818
</b-nav-item>
19-
<b-nav-item href="https://www.linkedin.com/company/flatlogic/" class="mr-1">
19+
<b-nav-item href="https://www.linkedin.com/company/flatlogic/" class="me-1">
2020
<img src="../assets/documentation/linkedin-logo.svg" alt="linkedin"/>
2121
</b-nav-item>
22-
<b-nav-item href="https://github.com/flatlogic" class="mr-3">
22+
<b-nav-item href="https://github.com/flatlogic" class="me-3">
2323
<img src="../assets/documentation/github-logo.svg" alt="github"/>
2424
</b-nav-item>
2525
</b-navbar-nav>
26-
<b-navbar-nav class="ml-auto ml-lg-0 flex-row">
27-
<b-nav-item href="https://demo.flatlogic.com/sing-app-vue" class="d-sm-down-none mr-md-3 mr-lg-0">
26+
<b-navbar-nav class="ms-auto ms-lg-0 flex-row">
27+
<b-nav-item href="https://demo.flatlogic.com/sing-app-vue" class="d-sm-down-none me-md-3 me-lg-0">
2828
<b-button variant="default">
2929
Live Preview
3030
</b-button>
3131
</b-nav-item>
32-
<b-nav-item href="https://flatlogic.com/templates/sing-app-vue" target="_blank" class="mr-4">
32+
<b-nav-item href="https://flatlogic.com/templates/sing-app-vue" target="_blank" class="me-4">
3333
<b-button variant="warning" class="text-gray fw-semi-bold">
3434
Buy Now
3535
</b-button>

‎src/documentation/pages/Pages.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ routes: [
6464
on hover action.</p>
6565
<p>All of this component can be used on any page of the application.</p>
6666
<p>
67-
<router-link class="btn btn-primary mr-sm" to="/app/main/analytics">Analytics</router-link>
67+
<router-link class="btn btn-primary me-sm" to="/app/main/analytics">Analytics</router-link>
6868
<router-link class="btn btn-primary" to="/app/main/visits">Visits</router-link>
6969
</p>
7070
</Widget>
@@ -93,8 +93,8 @@ routes: [
9393
</b-col>
9494
</b-row>
9595
<p>
96-
<router-link class="btn btn-primary mr-sm" to="/app/ecommerce/management">Management</router-link>
97-
<router-link class="btn btn-primary mr-sm" to="/app/ecommerce/products">List</router-link>
96+
<router-link class="btn btn-primary me-sm" to="/app/ecommerce/management">Management</router-link>
97+
<router-link class="btn btn-primary me-sm" to="/app/ecommerce/products">List</router-link>
9898
<router-link class="btn btn-primary" to="/app/ecommerce/product">Details</router-link>
9999
</p>
100100
</Widget>

‎src/documentation/pages/components/Alerts.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
}, {
8080
id: 'al-4',
8181
type: 'danger',
82-
msg: '<span class="fw-semi-bold">Danger:</span> Change this and that and try again. <a class="btn btn-default btn-xs float-right mr" href="#">Ignore</a> <a class="btn btn-danger btn-xs float-right mr-xs" href="#">Take this action</a>',
82+
msg: '<span class="fw-semi-bold">Danger:</span> Change this and that and try again. <a class="btn btn-default btn-xs float-end me-1" href="#">Ignore</a> <a class="btn btn-danger btn-xs float-end me-sm-1" href="#">Take this action</a>',
8383
}]
8484
}
8585
}

‎src/documentation/pages/components/Badge.vue

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,30 +44,30 @@
4444
<b-tab title="Example" active>
4545
<h4>Pill badges</h4>
4646
<p>
47-
<b-badge class="mr-1" variant="primary" pill>Primary</b-badge>
48-
<b-badge class="mr-1" variant="info" pill>Info</b-badge>
49-
<b-badge class="mr-1" variant="warning" pill>Warning</b-badge>
50-
<b-badge class="mr-1" variant="success" pill>Success</b-badge>
51-
<b-badge class="mr-1" variant="danger" pill>Danger</b-badge>
52-
<b-badge class="mr-1" variant="secondary" pill>Secondary</b-badge>
53-
<b-badge class="mr-1" variant="light" pill>Light</b-badge>
54-
<b-badge class="mr-1" variant="dark" pill>Dark</b-badge>
47+
<b-badge class="me-1" variant="primary" pill>Primary</b-badge>
48+
<b-badge class="me-1" variant="info" pill>Info</b-badge>
49+
<b-badge class="me-1" variant="warning" pill>Warning</b-badge>
50+
<b-badge class="me-1" variant="success" pill>Success</b-badge>
51+
<b-badge class="me-1" variant="danger" pill>Danger</b-badge>
52+
<b-badge class="me-1" variant="secondary" pill>Secondary</b-badge>
53+
<b-badge class="me-1" variant="light" pill>Light</b-badge>
54+
<b-badge class="me-1" variant="dark" pill>Dark</b-badge>
5555
</p>
5656
<h4>Badges with link</h4>
5757
<p>
58-
<b-badge class="mr-1" href="#" variant="primary">Primary</b-badge>
59-
<b-badge class="mr-1" href="#" variant="info">Info</b-badge>
60-
<b-badge class="mr-1" href="#" variant="warning">Warning</b-badge>
61-
<b-badge class="mr-1" href="#" variant="success">Success</b-badge>
62-
<b-badge class="mr-1" href="#" variant="danger">Danger</b-badge>
63-
<b-badge class="mr-1" href="#" variant="secondary">Secondary</b-badge>
64-
<b-badge class="mr-1" href="#" variant="light">Light</b-badge>
65-
<b-badge class="mr-1" href="#" variant="dark">Dark</b-badge>
58+
<b-badge class="me-1" href="#" variant="primary">Primary</b-badge>
59+
<b-badge class="me-1" href="#" variant="info">Info</b-badge>
60+
<b-badge class="me-1" href="#" variant="warning">Warning</b-badge>
61+
<b-badge class="me-1" href="#" variant="success">Success</b-badge>
62+
<b-badge class="me-1" href="#" variant="danger">Danger</b-badge>
63+
<b-badge class="me-1" href="#" variant="secondary">Secondary</b-badge>
64+
<b-badge class="me-1" href="#" variant="light">Light</b-badge>
65+
<b-badge class="me-1" href="#" variant="dark">Dark</b-badge>
6666
</p>
6767
</b-tab>
6868
<b-tab title="Code">
69-
<vue-code-highlight>&lt;b-badge class="mr-1" variant="primary" pill&gt;Primary&lt;/b-badge&gt;
70-
&lt;b-badge class="mr-1" href="#" variant="primary"&gt;Primary&lt;/b-badge&gt;</vue-code-highlight>
69+
<vue-code-highlight>&lt;b-badge class="me-1" variant="primary" pill&gt;Primary&lt;/b-badge&gt;
70+
&lt;b-badge class="me-1" href="#" variant="primary"&gt;Primary&lt;/b-badge&gt;</vue-code-highlight>
7171
</b-tab>
7272
</b-tabs>
7373
</b-col>

‎src/documentation/pages/components/Buttons.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@
6464
Four separate sizes available for all use cases:
6565
from tiny 10px button to large one.
6666
</p>
67-
<b-button variant="default" size="lg" class="mb-2 mr-2">Large button</b-button>
68-
<b-button variant="primary" class="mb-2 mr-2">Default button</b-button>
69-
<b-button variant="info" size="sm" class="mb-2 mr-2">Small button</b-button>
70-
<b-button variant="success" size="xs" class="mb-2 mr-2">Tiny button</b-button>
67+
<b-button variant="default" size="lg" class="mb-2 me-2">Large button</b-button>
68+
<b-button variant="primary" class="mb-2 me-2">Default button</b-button>
69+
<b-button variant="info" size="sm" class="mb-2 me-2">Small button</b-button>
70+
<b-button variant="success" size="xs" class="mb-2 me-2">Tiny button</b-button>
7171
</b-tab>
7272
<b-tab title="Code">
73-
<vue-code-highlight>&lt;b-button variant="default" size="lg" class="mb-2 mr-2"&gt;Large button&lt;/b-button&gt;
74-
&lt;b-button variant="primary" class="mb-2 mr-2"&gt;Default button&lt;/b-button&gt;
75-
&lt;b-button variant="info" size="sm" class="mb-2 mr-2"&gt;Small button&lt;/b-button&gt;
76-
&lt;b-button variant="success" size="xs" class="mb-2 mr-2"&gt;Tiny button&lt;/b-button&gt;</vue-code-highlight>
73+
<vue-code-highlight>&lt;b-button variant="default" size="lg" class="mb-2 me-2"&gt;Large button&lt;/b-button&gt;
74+
&lt;b-button variant="primary" class="mb-2 me-2"&gt;Default button&lt;/b-button&gt;
75+
&lt;b-button variant="info" size="sm" class="mb-2 me-2"&gt;Small button&lt;/b-button&gt;
76+
&lt;b-button variant="success" size="xs" class="mb-2 me-2"&gt;Tiny button&lt;/b-button&gt;</vue-code-highlight>
7777
</b-tab>
7878
</b-tabs>
7979
</b-col>

‎src/documentation/pages/components/Card.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<hr/>
1414
<div class="d-flex justify-content-between mb-3">
1515
<div class="text-warning">
16-
<i class="la la-star mr-xs"></i>
17-
<i class="la la-star mr-xs"></i>
18-
<i class="la la-star mr-xs"></i>
19-
<i class="la la-star mr-xs"></i>
16+
<i class="la la-star me-sm-1"></i>
17+
<i class="la la-star me-sm-1"></i>
18+
<i class="la la-star me-sm-1"></i>
19+
<i class="la la-star me-sm-1"></i>
2020
<i class="la la-star"></i>
2121
</div>
2222
<span class="text-muted"><small>342 REVIEWS</small></span>
@@ -35,10 +35,10 @@
3535
&lt;hr/&gt;
3636
&lt;div class=&quot;d-flex justify-content-between mb-3&quot;&gt;
3737
&lt;div class=&quot;text-warning&quot;&gt;
38-
&lt;i class=&quot;la la-star mr-xs&quot;&gt;&lt;/i&gt;
39-
&lt;i class=&quot;la la-star mr-xs&quot;&gt;&lt;/i&gt;
40-
&lt;i class=&quot;la la-star mr-xs&quot;&gt;&lt;/i&gt;
41-
&lt;i class=&quot;la la-star mr-xs&quot;&gt;&lt;/i&gt;
38+
&lt;i class=&quot;la la-star me-xs&quot;&gt;&lt;/i&gt;
39+
&lt;i class=&quot;la la-star me-xs&quot;&gt;&lt;/i&gt;
40+
&lt;i class=&quot;la la-star me-xs&quot;&gt;&lt;/i&gt;
41+
&lt;i class=&quot;la la-star me-xs&quot;&gt;&lt;/i&gt;
4242
&lt;i class=&quot;la la-star&quot;&gt;&lt;/i&gt;
4343
&lt;/div&gt;
4444
&lt;span class=&quot;text-muted&quot;&gt;&lt;small&gt;342 REVIEWS&lt;/small&gt;&lt;/span&gt;

‎src/documentation/pages/components/Modal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<b-tabs nav-class="bg-transparent">
3030
<b-tab title="Example" active>
3131
<h3>Variations</h3>
32-
<b-button class="mr-3" @click="showLong = true" size="lg" variant="danger">Long modal</b-button>
32+
<b-button class="me-3" @click="showLong = true" size="lg" variant="danger">Long modal</b-button>
3333
<b-button @click="showLarge = true" size="lg" variant="success">Large modal</b-button>
3434

3535
<b-modal id="modal-long" title="Long content" v-model="showLong" body-bg-variant="white">

0 commit comments

Comments
 (0)