Skip to content

Commit 9222341

Browse files
author
Yeliazar
committed
updated Email page
1 parent 90d7e0d commit 9222341

File tree

6 files changed

+30
-25
lines changed

6 files changed

+30
-25
lines changed

src/components/Sidebar/NavLink/NavLink.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060

6161
.badge {
6262
float: right;
63-
line-height: 8px;
64-
margin-top: 6px;
65-
margin-right: 15px;
66-
padding: 7px;
63+
line-height: 10px;
64+
margin-top: 20px;
65+
margin-right: 20px;
66+
font-size: 0.875em;
6767
background: var(--sidebar-badge-bg);
6868

6969
@media (min-width: map_get($grid-breakpoints, lg)) and (min-height: $screen-lg-height), (max-width: map_get($grid-breakpoints, md) - 1px) {

src/components/Sidebar/NavLink/NavLink.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<i v-else :class="fullIconName"></i>
77
</span>
88
{{header}} <sup v-if="label" :class="'text-' + labelColor" class="headerLabel">{{label}}</sup>
9-
<b-badge v-if="badge" variant="info" pill>{{badge}}</b-badge>
9+
<b-badge v-if="badge" class="badge" variant="info" pill>{{badge}}</b-badge>
1010
</router-link>
1111
</li>
1212
<li v-else-if="childrenLinks" :class="{headerLink: true, className}">

src/pages/Email/Email.vue

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,21 @@
22
<div class="email-page">
33
<div class="pageTopLine">
44
<h1 class="page-title">Email - <span class="fw-semi-bold">Inbox</span></h1>
5-
<b-alert
6-
:show="isNotificationOpen"
7-
variant="success"
8-
:class="{ alertTransform: true, alertAfter: alertAfter }"
9-
dismissible
10-
>
11-
<p class="m-0 mr-4">Hey! This is a <span class="fw-semi-bold">real app</span>
12-
with CRUD and Search functions. Have fun!</p>
13-
</b-alert>
5+
<!-- <b-alert-->
6+
<!-- :show="isNotificationOpen"-->
7+
<!-- color="warning"-->
8+
<!-- variant="warning"-->
9+
<!-- :class="{ alertTransform: true, alertAfter: alertAfter }"-->
10+
<!-- dismissible-->
11+
<!-- >-->
12+
<!-- <p class="m-0 ms-4">Hey! This is a <span class="fw-semi-bold">real app</span>-->
13+
<!-- with CRUD and Search functions. Have fun!</p>-->
14+
<!-- </b-alert>-->
15+
<div class="alert alert-warning alert-dismissible fade show" role="alert" v-if="isNotificationOpen" @click="closeNotification">
16+
<p class="me-3 my-1">Hey! This is a <span class="fw-semi-bold">real app</span>
17+
with CRUD and Search functions. Have fun!</p>
18+
<button type="button" class="btn-close ms-2 my-1" data-bs-dismiss="alert" aria-label="Close"></button>
19+
</div>
1420
</div>
1521
<div class="view">
1622
<b-row>

src/pages/Email/components/Filters/Filters.vue

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<template>
22
<div class="col-lg-3 col-xl-2 col-xs-12">
3-
<b-button
4-
variant="info"
5-
class="btn-block"
3+
<button
4+
class="btn btn-primary btn-block text-white"
65
@click="compose(true)"
76
>
87
Compose
9-
</b-button>
8+
</button>
109
<div class="mb mt">
1110
<b-button
1211
v-for="button in mainButtons"
@@ -16,7 +15,7 @@
1615
variant="transparent"
1716
>
1817
{{button.title}}
19-
<b-badge v-if="button.notifications" :variant="button.lable || 'default'" pill>
18+
<b-badge v-if="button.notifications" :class="`btn-${button.lable ? button.lable : 'primary' }`" class="text-white" pill>
2019
{{button.notifications}}
2120
</b-badge>
2221
</b-button>
@@ -57,9 +56,9 @@ export default {
5756
{ id: 4, title: 'Trash', filter: 'trash' },
5857
],
5958
quickViewButtons: [
60-
{ id: 0, title: 'Work', colour: 'danger' },
61-
{ id: 1, title: 'Private', colour: 'white' },
62-
{ id: 2, title: 'Saved', colour: '' },
59+
{ id: 0, title: 'Work', colour: 'primary' },
60+
{ id: 1, title: 'Private', colour: 'info' },
61+
{ id: 2, title: 'Saved', colour: 'success' },
6362
],
6463
};
6564
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
v-model="currentPage"
55
:total-rows="rows"
66
:per-page="perPage"
7-
class="ml-auto"
7+
class="ms-auto"
88
></b-pagination>
99
<span v-else>
1010
<b-button variant="default" class="mb" @click="openMessage(null)">

src/pages/Email/components/MessageTableHeader/MessageTableHeader.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<template>
22
<div class="messageTableHeader">
33
<div>
4-
<b-dropdown text="Select" variant="default" size="sm">
4+
<b-dropdown text="Select" variant="gray-default" size="sm">
55
<b-dropdown-item-button @click="chooseAll">All</b-dropdown-item-button>
66
<b-dropdown-item-button @click="chooseNone">None</b-dropdown-item-button>
77
<b-dropdown-divider />
88
<b-dropdown-item-button @click="chooseRead">Read</b-dropdown-item-button>
99
<b-dropdown-item-button @click="chooseUnread">Unread</b-dropdown-item-button>
1010
</b-dropdown>
11-
<b-dropdown text="Actions" variant="default" size="sm" class="ml-2">
11+
<b-dropdown text="Actions" variant="gray-default" size="sm" class="ms-2">
1212
<b-dropdown-item-button>Reply</b-dropdown-item-button>
1313
<b-dropdown-item-button>Forward</b-dropdown-item-button>
1414
<b-dropdown-item-button>Archive</b-dropdown-item-button>

0 commit comments

Comments
 (0)