Skip to content

Commit 6a6ebff

Browse files
Vishwas1Vishwas1
committed
fixed design change
1 parent fb25b14 commit 6a6ebff

File tree

11 files changed

+89
-45
lines changed

11 files changed

+89
-45
lines changed

‎src/App.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
</div>
157157
<notifications group="foo" />
158158

159-
<sidebar-menu class="sidebar-wrapper" v-if="parseAuthToken && showSideNavbar && getSelectedService" @toggle-collapse="onToggleCollapse"
159+
<sidebar-menu :relative="false" class="sidebar-wrapper" v-if="parseAuthToken && showSideNavbar && getSelectedService" @toggle-collapse="onToggleCollapse"
160160
:collapsed="isSidebarCollapsed" :theme="'white-theme'" width="220px" :menu="getSideMenu()">
161161
<div slot="header" style="border-bottom: 1px solid rgba(0,0,0,.12);">
162162
<v-list>
@@ -267,7 +267,7 @@
267267
268268
.sidebar-wrapper {
269269
min-width: 70px;
270-
margin-top: 65px;
270+
margin-top: 7.9vh;
271271
/* box-shadow: 0 0 15px 0 rgba(34, 41, 47, 0.05); */
272272
box-shadow: 0 2px 6px 0 rgba(32, 33, 37, .1);
273273
border-right: 1px solid rgba(128, 128, 128, 0.21);

‎src/assets/css/gblStyle.css‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ a {
122122
/* border: none */
123123
}
124124

125-
126125
.greyFont {
127126
color: grey
128127
}

‎src/components/element/HfButtons.vue‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,22 @@
44
depressed
55
@click="emitExecuteAction()"
66
>
7-
<span v-if="iconClass"><i :class="iconClass"></i></span>
7+
<span v-if="iconClass">
8+
<i :class="iconClass" v-if="bIcon==false"></i>
9+
<b-icon :icon="iconClass" v-else></b-icon>
10+
</span>
811
{{name}}
912
</v-btn>
1013
</template>
1114

1215
<script>
1316
export default {
1417
props:{
18+
bIcon:{
19+
type: Boolean,
20+
require: false,
21+
default: false
22+
},
1523
name:{
1624
type: String,
1725
require:true

‎src/components/login/Google.vue‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,20 @@
88
</style>
99
<template>
1010

11-
<v-btn @click="login" class="btn btn-outline-secondary" style="width: 340px;">
11+
<!-- <v-btn @click="login" class="btn btn-outline-secondary" style="width: 340px;">
1212
<i class="fab fa-google"></i> Sign In with Google
13-
</v-btn>
13+
</v-btn> -->
14+
15+
<hf-buttons name="Sign In with Google" style="width: 340px;" iconClass="fab fa-google" class="ml-auto" @executeAction="login">
16+
</hf-buttons>
1417

1518
<!-- <hf-buttons :name="getButtonText()" @executeAction="login" class="btn btn-primary btn-hypersign"></hf-buttons> -->
1619
</template>
1720

1821

1922
<script>
20-
2123
export default {
2224
name: "GoogleLogin",
23-
2425
mounted() {
2526
const authorizationToken = this.$route.query.token
2627
if (authorizationToken) {

‎src/components/login/mfa/SetupMfa.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@
6060
</ul>
6161
</v-card>
6262
<div class="mt-2">
63-
<v-btn type="button" class="btn btn-light" @click="skip()">Skip</v-btn>
63+
<!-- <v-btn type="button" class="btn btn-light" @click="skip()">Skip</v-btn> -->
64+
<hf-buttons name="Skip" class="ml-auto" @executeAction="skip">
65+
</hf-buttons>
6466
</div>
6567
</div>
6668
</template>

‎src/components/teams/AdminTeams.vue‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@
66
<div class="col-md-4">
77
</div>
88
<div class="col-md-8">
9-
<v-btn type="button" class="btn btn-outline-secondary mx-1" style="float: inline-end" title="Reload"
10-
@click="getMyRolesAction()">
9+
<!-- <v-btn type="button" class="btn btn-outline-secondary mx-1" style="float: inline-end" title="Reload"
10+
@click="getMyRolesAction()" plain>
1111
<b-icon icon="arrow-clockwise"></b-icon>
12-
</v-btn>
13-
<v-btn type="button" class="btn btn-secondary" style="float: inline-end;" @click="openSlider('add')"><i
14-
class="fa fa-gamepad" aria-hidden="true"></i> Create Custom Role</v-btn>
12+
</v-btn> -->
13+
<hf-buttons name="" title="Reload" class="mx-1" :bIcon="true" style="float: inline-end" iconClass="arrow-clockwise" @executeAction="getMyRolesAction">
14+
</hf-buttons>
15+
<hf-buttons name="Create Custom Role" title="Reload" style="float: inline-end" iconClass="fa fa-gamepad" @executeAction="openSlider('add')">
16+
</hf-buttons>
17+
<!-- <v-btn type="button" class="btn btn-secondary" plain style="float: inline-end;" @click="openSlider('add')"><i
18+
class="fa fa-gamepad" aria-hidden="true"></i> Create Custom Role</v-btn> -->
1519
</div>
1620
</div>
1721
<div class="row" v-if="getAllRoles.length > 0">
@@ -88,7 +92,7 @@
8892
</div>
8993
</b-form-group>
9094

91-
<b-button type="submit" @click="saveRole()" variant="primary">Save</b-button>
95+
<hf-buttons name="Save" @executeAction="saveRole()">Save</hf-buttons>
9296
</div>
9397
</StudioSideBar>
9498
</div>

‎src/components/teams/MyInvitions.vue‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,19 @@
1313
</div>
1414
<div class="col-md-8">
1515

16-
<v-btn type="button" class="btn btn-outline-secondary mx-1" style="float: inline-end" @click="getInvitions()"
16+
<!-- <v-btn type="button" class="btn btn-outline-secondary mx-1" style="float: inline-end" @click="getInvitions()"
1717
title="Reload">
1818
<b-icon icon="arrow-clockwise"></b-icon>
1919
</v-btn>
2020
2121
<v-btn type="button" class="btn btn-secondary" style="float: inline-end" @click="acceptInvitePopup()">
2222
<b-icon icon="hand-thumbs-up-fill"></b-icon> Accept Invition
23-
</v-btn>
23+
</v-btn> -->
24+
25+
<hf-buttons name="" title="Reload" class="mx-1" :bIcon="true" style="float: inline-end" iconClass="arrow-clockwise" @executeAction="getInvitions">
26+
</hf-buttons>
27+
<hf-buttons name="Accept Invition" title="Reload" style="float: inline-end" iconClass="fa fa-gamepad" @executeAction="acceptInvitePopup">
28+
</hf-buttons>
2429

2530
</div>
2631
</div>
@@ -52,7 +57,7 @@
5257
<div class="input-group">
5358
<input type="email" class="form-control" placeholder="Enter invition code" v-model="invitionCodeToAccept" />
5459
<div class="input-group-append">
55-
<button type="submit" class="btn btn-primary" @click="acceptedInvition">
60+
<button type="submit" class="btn btn-secondary" @click="acceptedInvition">
5661
<b-icon icon="hand-thumbs-up-fill"></b-icon> Accept
5762
</button>
5863
</div>

‎src/components/teams/TeamMembers.vue‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,20 @@
55
<div class="col-md-4">
66
</div>
77
<div class="col-md-8">
8-
<v-btn variant="link" class="btn btn-outline-secondary mx-1" style="float: inline-end"
8+
<!-- <v-btn variant="link" class="btn btn-outline-secondary mx-1" style="float: inline-end"
99
@click="getPeopleMembers()" title="Reload">
1010
<b-icon icon="arrow-clockwise"></b-icon>
11-
</v-btn>
11+
</v-btn> -->
1212

13-
<v-btn type="button" class="btn btn-secondary" style="float: inline-end" @click="inviteMemberPopup()">
13+
<hf-buttons name="" title="Reload" class="mx-1" :bIcon="true" style="float: inline-end" iconClass="arrow-clockwise" @executeAction="getPeopleMembers">
14+
</hf-buttons>
15+
16+
<hf-buttons name="Invite Member" class="ml-auto" style="float: inline-end" iconClass="fa fa-user-plus" @executeAction="inviteMemberPopup">
17+
</hf-buttons>
18+
19+
<!-- <v-btn type="button" class="btn btn-secondary" style="float: inline-end" @click="inviteMemberPopup()">
1420
<b-icon icon="person-plus-fill"></b-icon> Invite Member
15-
</v-btn>
21+
</v-btn> -->
1622
</div>
1723
</div>
1824
<div class="row" v-if="getAdminMembersgetter.length > 0">
@@ -56,9 +62,9 @@
5662
</button>
5763
</div>
5864
<div class="input-group-append">
59-
<button type="submit" class="btn btn-secondary" @click="sendInvite">
65+
<v-btn type="submit" class="btn btn-secondary" :disabled="!checkIfValidEmail" @click="sendInvite">
6066
<b-icon icon="share"></b-icon> Invite
61-
</button>
67+
</v-btn>
6268
</div>
6369

6470
<small style="color:grey; font-size: x-small;">Please make sure the user has an account on this

‎src/views/Apps.vue‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,21 @@
317317
<small>{{ serviceDescrition }}</small>
318318
</div>
319319

320-
<div v-if="selectedServiceId == 'CAVACH_API'" class="container mb-2" style="border: 1px solid #80808038;border-radius: 5px;">
321-
322-
323-
324-
<div class="form-group" v-if="
320+
<!-- <div v-if="selectedServiceId == 'CAVACH_API'" class="container mb-2" style="border: 1px solid #80808038;border-radius: 5px;"> -->
321+
322+
<div class="form-group card" v-if="selectedServiceId == 'CAVACH_API'">
323+
<b-card-header header-tag="header" class="p-1 border-0 accordin-header theme-color" role="tab" >
324+
<b-button block v-b-toggle.accordion-1 style="text-decoration:none; color:#212529;" variant="secondary"
325+
:aria-expanded="issuerConfigVisible ? 'true' : 'false'"
326+
@click="issuerConfigVisible = !issuerConfigVisible" aria-controls="collapse-1"
327+
class="text-left border-0 theme-color bg-transparant" title="Create schema configuration">Issuer
328+
Configurations
329+
<i :class="!issuerConfigVisible ? 'fa fa-arrow-down' : 'fa fa-arrow-up'" style="float:right;"></i>
330+
</b-button>
331+
</b-card-header>
332+
333+
<b-collapse id="collapse-1" class="mt-2" v-model="issuerConfigVisible" style="padding:10px">
334+
<div class="form-group" v-if="
325335
selectedServiceId == 'CAVACH_API' ||
326336
(appModel.services &&
327337
appModel.services.length > 0 &&
@@ -378,7 +388,11 @@
378388

379389
</div>
380390

381-
</div>
391+
</b-collapse>
392+
</div>
393+
394+
395+
<!-- </div> -->
382396

383397
<div class="form-group" v-if="edit === true">
384398
<tool-tip infoMessage="Select an environment"></tool-tip>
@@ -399,11 +413,11 @@
399413
</div> -->
400414

401415
<div class="form-group" v-if="edit">
402-
<hf-buttons name="Update" iconClass="fa fa-bookmark" class="btn btn-primary"
416+
<hf-buttons name="Update" class="btn btn-primary"
403417
@executeAction="updateAnAppAPIServer()"></hf-buttons>
404418
</div>
405419
<div class="form-group" v-else>
406-
<hf-buttons name="Save" iconClass="fa fa-bookmark" @executeAction="createAnApp()"></hf-buttons>
420+
<hf-buttons name="Save" @executeAction="createAnApp()"></hf-buttons>
407421
</div>
408422
</v-form>
409423
</StudioSideBar>
@@ -798,6 +812,16 @@
798812
</template>
799813

800814
<style scoped>
815+
.theme-color {
816+
background-color: #80808078;
817+
color: #212529;
818+
}
819+
820+
.bg-transparant {
821+
background-color: transparent !important;
822+
color: #212529;
823+
}
824+
801825
.v-card__actions button{
802826
background: transparent;border: 0;color: grey;
803827
}
@@ -927,7 +951,7 @@
927951
928952
.new-service-popup {
929953
padding: 20px;
930-
background: aliceblue;
954+
background: #8080801c;
931955
border-radius: 10px;
932956
}
933957
</style>
@@ -1022,6 +1046,7 @@ export default {
10221046
},
10231047
data() {
10241048
return {
1049+
issuerConfigVisible: false,
10251050
items: [
10261051
{
10271052
src: 'https://cdn.vuetifyjs.com/images/carousel/squirrel.jpg',

‎src/views/playground/CredentialStatus.vue‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010
1111
.theme-color {
12-
background-color: rgba(241, 179, 25, 0.24);
12+
background-color: #80808078;
1313
color: #212529;
1414
}
1515
@@ -31,11 +31,6 @@
3131
cursor: pointer;
3232
}
3333
34-
.theme-color {
35-
background-color: rgba(241, 179, 25, 0.24);
36-
color: #212529;
37-
}
38-
3934
.far {
4035
color: gray;
4136
font-size: 1.5em;
@@ -130,8 +125,6 @@ h5 span {
130125
</b-button>
131126
</b-card-header>
132127
<b-collapse id="collapse-1" class="mt-2" v-model="issuerConfigVisible" style="padding:10px">
133-
134-
135128
<div class="mb-1">
136129
<tool-tip infoMessage="Select issuer DID who will be author of this schema"></tool-tip>
137130
<label for="selectService"><strong>Select Issuer DID<span style="color: red">*</span>:

0 commit comments

Comments
 (0)