Commit 437d73b1 authored by Reza Sahebgharan's avatar Reza Sahebgharan

fix(background color for mobile): set background color for mobile build

parent 1a2ad098
Pipeline #632 passed with stages
in 46 minutes and 38 seconds
...@@ -76,4 +76,4 @@ networks: ...@@ -76,4 +76,4 @@ networks:
docker-compose up -d --force-recreate docker-compose up -d --force-recreate
- goto localhost - goto localhost
\ No newline at end of file \ No newline at end of file
...@@ -33,12 +33,79 @@ ...@@ -33,12 +33,79 @@
// import EditWorkList from '../components/EditWorkList.vue'; // import EditWorkList from '../components/EditWorkList.vue';
// import WorkList from '../components/Worklist.vue'; // import WorkList from '../components/Worklist.vue';
// import AppVersion from '../views/AppVersion.vue';
// const routes = [{
// path: '/',
// component: () =>
// import ('../views/Home.vue'),
// name: 'Home'
// },
// {
// path: '/appversion',
// component: AppVersion,
// name: 'AppVersion'
// },
// {
// path: '/signin',
// component: () =>
// import ('../views/Login.vue'),
// name: 'signin'
// },
// {
// path: '/signup',
// component: () =>
// import ('../views/Register.vue'),
// name: 'signup'
// },
// {
// path: '/changePassword',
// component: () =>
// import ('../views/ChangePassword.vue'),
// name: 'changePassword'
// }, {
// path: '/main',
// component: () =>
// import ('../views/Main.vue'),
// name: 'main',
// children: [{
// path: "worklist",
// name: "worklist",
// components: {
// default: () =>
// import ('../components/Worklist.vue'),
// edit_worklist: () =>
// import ('../components/EditWorkList.vue')
// }
// }]
// }
// ];
// export default routes;
import Login from '../views/Login.vue';
import Home from '../views/Home.vue';
import Register from '../views/Register.vue';
import ChangePassword from '../views/ChangePassword.vue';
import Main from '../views/Main.vue';
import EditWorkList from '../components/EditWorkList.vue';
import WorkList from '../components/Worklist.vue';
import AppVersion from '../views/AppVersion.vue'; import AppVersion from '../views/AppVersion.vue';
const routes = [{ const routes = [{
path: '/', path: '/',
component: () => component: Home,
import ('../views/Home.vue'),
name: 'Home' name: 'Home'
}, },
{ {
...@@ -48,34 +115,28 @@ const routes = [{ ...@@ -48,34 +115,28 @@ const routes = [{
}, },
{ {
path: '/signin', path: '/signin',
component: () => component: Login,
import ('../views/Login.vue'),
name: 'signin' name: 'signin'
}, },
{ {
path: '/signup', path: '/signup',
component: () => component: Register,
import ('../views/Register.vue'),
name: 'signup' name: 'signup'
}, },
{ {
path: '/changePassword', path: '/changePassword',
component: () => component: ChangePassword,
import ('../views/ChangePassword.vue'),
name: 'changePassword' name: 'changePassword'
}, { }, {
path: '/main', path: '/main',
component: () => component: Main,
import ('../views/Main.vue'),
name: 'main', name: 'main',
children: [{ children: [{
path: "worklist", path: "worklist",
name: "worklist", name: "worklist",
components: { components: {
default: () => default: WorkList,
import ('../components/Worklist.vue'), edit_worklist: EditWorkList
edit_worklist: () =>
import ('../components/EditWorkList.vue')
} }
}] }]
} }
......
...@@ -2,8 +2,12 @@ ...@@ -2,8 +2,12 @@
<v-app id="inspire"> <v-app id="inspire">
<auth-header btnToProp="signin" btnLabel="Register.loginBtn" btnIconName="mdi-login"></auth-header> <auth-header btnToProp="signin" btnLabel="Register.loginBtn" btnIconName="mdi-login"></auth-header>
<v-content> <v-content>
<v-container fluid class="align-center fill-height backgroundImg"> <v-container
<v-row justify="center" class="loginCard" > style="background-color:rgb(94, 181, 177,.85)"
fluid
class="align-center fill-height backgroundImg"
>
<v-row justify="center" class="loginCard">
<v-col xs="8" sm="6" md="4" lg="3"> <v-col xs="8" sm="6" md="4" lg="3">
<v-card class="elevation-12 roundedCard" light elevation="24"> <v-card class="elevation-12 roundedCard" light elevation="24">
<v-toolbar color="rgb(94, 181, 177,.85)" dark> <v-toolbar color="rgb(94, 181, 177,.85)" dark>
...@@ -61,7 +65,6 @@ ...@@ -61,7 +65,6 @@
</v-row> </v-row>
</v-container> </v-container>
</v-form> </v-form>
</v-card-text> </v-card-text>
<v-card-actions> <v-card-actions>
<v-spacer></v-spacer> <v-spacer></v-spacer>
...@@ -237,7 +240,6 @@ img { ...@@ -237,7 +240,6 @@ img {
z-index: 1; z-index: 1;
} }
.backgroundImg { .backgroundImg {
overflow-y: hidden; overflow-y: hidden;
} }
......
...@@ -3,7 +3,12 @@ ...@@ -3,7 +3,12 @@
<v-app id="inspire"> <v-app id="inspire">
<auth-header btnToProp="signup" btnLabel="Login.registerBtn" btnIconName="mdi-account-plus"></auth-header> <auth-header btnToProp="signup" btnLabel="Login.registerBtn" btnIconName="mdi-account-plus"></auth-header>
<v-content> <v-content>
<v-container fluid fill-height class="align-center backgroundImg"> <v-container
style="background-color:rgb(94, 181, 177,.85)"
fluid
fill-height
class="align-center backgroundImg"
>
<v-row justify="center" class="loginCard"> <v-row justify="center" class="loginCard">
<v-col xs="8" sm="6" md="4" lg="3"> <v-col xs="8" sm="6" md="4" lg="3">
<v-card class="elevation-12 roundedCard" light elevation="24"> <v-card class="elevation-12 roundedCard" light elevation="24">
...@@ -187,13 +192,21 @@ export default { ...@@ -187,13 +192,21 @@ export default {
<style scoped> <style scoped>
.backgroundImg { .backgroundImg {
background-color: #abdae4ad; background-image: -moz-linear-gradient(
background-image: linear-gradient(
141deg, 141deg,
#9fb8ad 0%, #9fb8ad 0%,
#1fc8db 51%, #1fc8db 51%,
#2ce8ceb0 75% #2ce8ceb0 75%
); );
background-image: -webkit-linear-gradient(
141deg,
#9fb8ad 0%,
#1fc8db 51%,
#2ce8ceb0 75%
);
}
div.backgroundImg {
background-color: #abdae4ad !important;
} }
img { img {
......
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
<v-app id="inspire"> <v-app id="inspire">
<auth-header btnToProp="signin" btnLabel="Register.loginBtn" btnIconName="mdi-login"></auth-header> <auth-header btnToProp="signin" btnLabel="Register.loginBtn" btnIconName="mdi-login"></auth-header>
<v-content> <v-content>
<v-container fluid class="align-center fill-height backgroundImg"> <v-container
style="background-color:rgb(94, 181, 177,.85)"
fluid
class="align-center fill-height backgroundImg"
>
<v-row justify="center" class="loginCard"> <v-row justify="center" class="loginCard">
<v-col xs="8" sm="6" md="4" lg="3"> <v-col xs="8" sm="6" md="4" lg="3">
<v-card class="elevation-12 roundedCard" light elevation="24"> <v-card class="elevation-12 roundedCard" light elevation="24">
...@@ -223,7 +227,6 @@ img { ...@@ -223,7 +227,6 @@ img {
z-index: 1; z-index: 1;
} }
.backgroundImg { .backgroundImg {
overflow-y: hidden; overflow-y: hidden;
} }
......
...@@ -2,7 +2,7 @@ App.info({ ...@@ -2,7 +2,7 @@ App.info({
id: 'marcopacs.karname.ir', id: 'marcopacs.karname.ir',
name: 'karname-app', name: 'karname-app',
version: "0.0.1" version: "0.0.1"
}) });
App.setPreference('android-targetSdkVersion', '19') App.setPreference('android-targetSdkVersion', '19');
App.accessRule('*'); App.accessRule('*');
\ No newline at end of file
{ {
"worklistUrl": "http://192.168.0.49:8086" "worklistUrl": "http://staging.karname.ir:8086"
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment