Skip to content

Commit 43dfcd3

Browse files
elirehemaelirehema
committed
Update button
1 parent 344b018 commit 43dfcd3

File tree

8 files changed

+71
-60
lines changed

8 files changed

+71
-60
lines changed

‎assets/css/_btn.scss

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
1-
button {
2-
&.button {
3-
background-color: $button_color;
1+
.button {
2+
background-color: $button_color;
3+
span {
4+
color: $color_white;
5+
font-weight: normal;
6+
font-size: small;
7+
}
8+
&.cancel {
49
span {
5-
color: $color_white;
6-
font-weight: normal;
7-
font-size: small;
8-
}
9-
&.cancel {
10-
span {
11-
color: white;
12-
}
13-
background-color: $color_cream !important;
14-
}
15-
&.upload {
16-
background-color: $color_teal !important;
17-
}
18-
&.warning {
19-
background-color: $color_warning !important;
20-
span.v-btn__content {
21-
color: $color_white !important;
22-
}
23-
}
24-
&.delete {
25-
background-color: red !important;
26-
}
27-
&.error {
28-
background-color: $color_error !important;
10+
color: white;
2911
}
30-
i {
31-
font-weight: bold;
12+
background-color: $color_cream !important;
13+
}
14+
&.upload {
15+
background-color: $color_teal !important;
16+
}
17+
&.warning {
18+
background-color: $color_warning !important;
19+
span.v-btn__content {
20+
color: $color_white !important;
3221
}
3322
}
23+
&.delete {
24+
background-color: red !important;
25+
}
26+
&.error {
27+
background-color: $color_error !important;
28+
}
29+
i {
30+
font-weight: bold;
31+
}
3432
}

‎assets/css/_colors.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$color_primary: #2f4454 !global;
1+
$color_primary: #2f4454;
22
$color_accent: #000000;
33
$color_secondary: #ffffff;
44
$color_success: #4caf50;
@@ -10,10 +10,11 @@ $color_milky: #fdfff5;
1010
$color_teal: #00897b;
1111
$color_whitish: #f5f5f5;
1212
$color_dlue: #303edb;
13-
$color_white: #ffffff !global;
13+
$color_white: #ffffff;
1414
$button_color: #2cb673;
1515
$color_cream: #c67f43;
1616

17+
$button_color: #24a0ed;
1718
$color_drygreen: #2cb673;
1819

1920
@mixin whitecolor {

‎assets/css/styles.css

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1839,36 +1839,36 @@ th span {
18391839
overflow: hidden;
18401840
}
18411841

1842-
button.button {
1843-
background-color: #2cb673;
1842+
.button {
1843+
background-color: #24a0ed;
18441844
}
1845-
button.button span {
1845+
.button span {
18461846
color: #ffffff;
18471847
font-weight: normal;
18481848
font-size: small;
18491849
}
1850-
button.button.cancel {
1850+
.button.cancel {
18511851
background-color: #c67f43 !important;
18521852
}
1853-
button.button.cancel span {
1853+
.button.cancel span {
18541854
color: white;
18551855
}
1856-
button.button.upload {
1856+
.button.upload {
18571857
background-color: #00897b !important;
18581858
}
1859-
button.button.warning {
1859+
.button.warning {
18601860
background-color: #fb8c00 !important;
18611861
}
1862-
button.button.warning span.v-btn__content {
1862+
.button.warning span.v-btn__content {
18631863
color: #ffffff !important;
18641864
}
1865-
button.button.delete {
1865+
.button.delete {
18661866
background-color: red !important;
18671867
}
1868-
button.button.error {
1868+
.button.error {
18691869
background-color: #ff0000 !important;
18701870
}
1871-
button.button i {
1871+
.button i {
18721872
font-weight: bold;
18731873
}
18741874

‎assets/css/styles.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
@import "_colors";
12
@import "_fonts";
23
@import "_mixin";
34
@import "_body";
4-
@import "_colors";
55
@import "_breadcrumb";
66
@import "_cards";
77
@import "_theme";

‎components/patients/PatientListing.vue

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,35 @@
1515
@update:page="updatePagination"
1616
>
1717
<template v-slot:top>
18-
<v-toolbar flat class="primary" dark>
18+
<v-toolbar flat color="primary">
1919
<v-spacer></v-spacer>
20-
<v-text-field
21-
v-model="search"
22-
append-icon="search"
23-
label="Enter search text ..."
24-
single-line
25-
hide-details
26-
rounded
27-
filled
28-
height="40"
29-
></v-text-field
30-
>&nbsp;&nbsp;
20+
<v-col cols="12" md="3">
21+
<v-text-field
22+
v-model="search"
23+
prepend-inner-icon="mdi-magnify"
24+
label="Search group by name, id"
25+
single-line
26+
hide-details
27+
outlined
28+
filled
29+
rounded
30+
height="40"
31+
dense
32+
class="search mr-2"
33+
clearable
34+
autocomplete="off"
35+
light
36+
></v-text-field>
37+
</v-col>
3138

3239
<div v-if="hasPermission('ALL_FUNCTIONS', 'CREATE_PATIENT')">
33-
<v-btn x-large v-if="isMdAndUp" class="button" to="/patients/add"
34-
><v-icon>mdi-plus</v-icon
40+
<v-btn
41+
rounded
42+
v-if="isMdAndUp"
43+
class="button"
44+
color="button"
45+
to="/patients/add"
46+
><v-icon left>mdi-plus</v-icon
3547
>{{ $t("label.button.btnnewpatient") }}</v-btn
3648
>
3749
<v-btn fab v-else class="button" to="/patients/add"

‎nuxt.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default {
2121

2222
env: {
2323
baseUrl: 'http://159.203.183.129:8080/api/',
24-
localUrl: 'http://localhost:8080/api/'
24+
localUrl: 'http://192.168.1.45:8080/api/'
2525
},
2626

2727
// Global page headers (https://go.nuxtjs.dev/config-head)

‎plugins/vuetify.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default (ctx) => {
3535
teal: "#00897B",
3636
whitish: "F5F5F5",
3737
dlue: "#1520A6",
38-
button: "#02532b"
38+
button: "#24a0ed"
3939
}
4040

4141
},

0 commit comments

Comments
 (0)