Skip to content

I
Intranet
Commit 84726ff9 by Matteo
Options

Aggiunta pagina di Privacy e Sistemata grafica per Android

parent 4ae34b54
Showing with 221 additions and 29 deletions
src/app/auth/pages/login/login.page.html
......@@ -4,8 +4,8 @@
</ion-toolbar>
</ion-header>-->
<ion-content class="prova" forceOverscroll=true scroll-y=false scroll=false>
<div class="body" fullscreen>
<ion-content class="prova">
<div class="body">
<div class="contenitore">
<div class="logo-grande">
<img src="../../../../assets/icon/2p2-logo-color.svg" />
......@@ -25,13 +25,13 @@
</ion-item>
</div>
<div class="accedi" >
<ion-button size="large" type="submit" [disabled]="form.invalid" expand="block">ACCEDI</ion-button>
<ion-button size="large" type="submit" [disabled]="form.invalid" expand="block" tappable>ACCEDI</ion-button>
</div>
</ion-col>
</ion-row>
<ion-row color="primary" justify-content-center>
<div text-center class="forgot">
<a (click)='reset()'>Hai perso la password?</a>
<a (click)='reset()' tappable>Hai perso la password?</a>
</div>
</ion-row>
<ion-row color="primary" justify-content-center>
......@@ -47,7 +47,7 @@
I nostro consulenti pianificheranno una Business Call <strong>gratuita</strong> su misura per te e la tua azienda
</div>
<div class="appuntamento">
<a (click)='redirectBusiness()'>PRENOTA IL TUO APPUNTAMENTO!</a>
<a (click)='redirectBusiness()' tappable>PRENOTA IL TUO APPUNTAMENTO!</a>
</div>
</div>
</ion-col>
......
src/app/auth/pages/reset/reset.page.html
<ion-header>
<ion-toolbar>
<ion-title>Reset Page</ion-title>
</ion-toolbar>
</ion-header>
<ion-header no-border>
<ion-grid>
<ion-row color="primary" justify-content-center>
<ion-col align-self-center size-md="6" size-lg="5" size-xs="12">
<ion-toolbar class="business-toolbar">
<ion-buttons (click)="back()" slot="start">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon>
<!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>-->
</ion-buttons>
<ion-title class="logo-piccolo">
<img src="../../../../assets/icon/2p2-logo-color.svg">
</ion-title>
</ion-toolbar>
</ion-col>
</ion-row>
</ion-grid>
</ion-header>
<ion-content>
<form #form="ngForm" (ngSubmit)="reset(form)" [formGroup]="matching_email_group">
......
src/app/auth/pages/reset/reset.page.ts
......@@ -51,4 +51,9 @@ export class ResetPage implements OnInit {
ngOnInit() {
}
back()
{
this.router.navigateByUrl('/login');
}
}
src/app/pages/businesscall/businesscall.page.html
......@@ -7,10 +7,10 @@
<div class="contenitore-business">
<ion-grid>
<ion-row color="primary" justify-content-center>
<ion-col align-self-center size-md="6" size-lg="5" size-xs="12">
<ion-col align-self-center size-md="6" size-lg="5">
<ion-toolbar class="business-toolbar">
<ion-buttons (click)="back()">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back"></ion-icon>
<ion-buttons (click)="back()" slot="start">
<ion-icon name="arrow-round-back" color="#2b94d1" class="back" tappable></ion-icon>
<!--<ion-icon name="arrow-dropleft-circle" color="#2b94d1" class="back"></ion-icon>-->
</ion-buttons>
<ion-title class="logo-piccolo">
......@@ -41,14 +41,24 @@
<ion-input name="email" type="text" placeholder="Indirizzo email *" [(ngModel)]="email" required></ion-input>
</ion-item>
<ion-item class="item-no-border testo-form">
<ion-label class="testo-form">
<ion-label class="testo-form" text-wrap>
Aggiungi, se desideri, del testo libero
</ion-label>
</ion-item>
<ion-textarea name="testo" placeholder="" [(ngModel)]="testo" (ionInput)="autosize()" id="textarea"></ion-textarea>
<ion-item class="input-check item-no-border">
<ion-item class="input-check item-no-border" text-wrap>
<ion-row>
<ion-col size="2" no-padding no-margin>
<ion-item no-padding no-margin no-lines class="item-no-border">
<ion-checkbox name="privacy" [(ngModel)]="privacy" class="check"> </ion-checkbox>
<ion-label class="text-check">Ho preso visione del documento sulla <a (click)="gotoPrivacy();">privacy policy</a></ion-label>
</ion-item>
</ion-col>
<ion-col size="10" no-padding no-margin>
<ion-item no-padding no-margin no-lines class="item-no-border">
<ion-label class="text-check" text-wrap>Ho preso visione del documento sulla <a (click)="gotoPrivacy();" tappable>privacy policy</a></ion-label>
</ion-item>
</ion-col>
</ion-row>
</ion-item>
</div>
<div class="accedi">
......
src/app/pages/businesscall/businesscall.page.ts
......@@ -55,7 +55,7 @@ export class BusinesscallPage implements OnInit {
gotoPrivacy()
{
this.router.navigateByUrl('privacy');
}
reset()
......
src/app/pages/home/home.page.html
......@@ -3,14 +3,14 @@
<ion-row justify-content-center>
<ion-col align-self-center size-lg="7">
<ion-toolbar class="header">
<ion-buttons (click)="openSideBar()">
<ion-icon name="menu" style="zoom:4.0;" color="light" class="menu-show" tappable></ion-icon>
<ion-buttons (click)="openSideBar()" slot="start">
<ion-icon name="menu" color="light" class="menu-show" tappable></ion-icon>
</ion-buttons>
<ion-title class="logo-piccolo">
<img src="../../../assets/icon/2p2-logo-medium.svg">
</ion-title>
<ion-buttons (click)="logout()" slot="end">
<ion-icon name="exit" style="zoom:4.0;" color="light" class="exit" tappable></ion-icon>
<ion-icon name="exit" color="light" class="exit" tappable></ion-icon>
</ion-buttons>
</ion-toolbar>
</ion-col>
......@@ -26,7 +26,7 @@
</ion-select>
</ion-item>
<ion-item class="item-border-grey">
<ion-label>Il Cliente Selezionato è {{clienteSelezionato.denominazione}}</ion-label>
<ion-label>L'azienda selezionata è {{clienteSelezionato.denominazione}}</ion-label>
<ion-select style="visibility: hidden"></ion-select>
</ion-item>
</ion-col>
......@@ -80,7 +80,7 @@
<ion-toolbar class="menu-toolbar">
<ion-item class="menu-title item-no-border">Main Menu</ion-item>
<ion-buttons (click)="closeSideMenu()" slot="end">
<ion-icon name="close-circle-outline" style="zoom:4.0;" color="light" class="exit" tappable></ion-icon>
<ion-icon name="close-circle-outline" color="light" class="exit" tappable></ion-icon>
</ion-buttons>
</ion-toolbar>
</ion-header>
......
src/app/pages/privacy/privacy.page.scss
a{
color: #3697d1;
}
ion-content{
height: 100%;
font-family: "futura-pt",sans-serif;
font-style: normal;
font-weight: 400;
-webkit-font-smoothing: antialiased;
color: #515151;
font-size: 17px;
}
h1, h2, h3, h4, h5, strong, b{
font-family: "futura-pt-bold",sans-serif;
font-style: normal;
font-weight: 700;
color: rgb(81, 81, 81);
}
.titleh2{
font-size: 30px;
margin-top: 20px;
}
section{
width: 100%;
float: left;
padding: 30px 0;
/* padding-bottom:0px; */
}
section h1{
margin-top: 0;
}
section h2{
margin-top: 0;
font-size: 28px;
}
section.gray{
background: #eee;
}
section h2 img{
height: 47px;
width: auto;
position: relative;
top: -3px;
}
hr.hr{
border: 0;
height: 4px;
background: #f8c24f;
margin: 30px 0;
}
html{
background: #fff !important;
}
hr{
clear: both;
width: 100%;
display: block;
}
.single-product .tab-content .tab-pane .row:last-child .wrapponj .wrappino, .single-product .spessoinsieme .row:last-child .wrapponj .wrappino {
border-bottom: 0px !important;
}
.row.ruote {
margin-top: 20px;
}
.row.is-flex {
display: flex;
flex-wrap: wrap;
}
.row.is-flex > [class*='col-'] {
display: flex;
flex-direction: column;
}
/*
* And with max cross-browser enabled.
* Nobody should ever write this by hand.
* Use a preprocesser with autoprefixing.
*/
.row.is-flex {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
}
.row.is-flex > [class*='col-'] {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
}
.row.spaz-tr {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
flex-wrap: wrap;
}
.row.spaz-tr > [class*='col-'] {
display: flex;
flex-direction: column;
}
.centralzone li, .contentpost li {
padding-left: 24px;
position: relative;
margin-bottom: 8px;
}
.centralzone ul, .contentpost ul {
list-style: none;
padding: 0;
margin: 0;
margin-top:10px;
}
.centralzone li:before, .contentpost li:before {
content: "";
background-color: #3697D2;
width: 8px;
height: 8px;
position: absolute;
top: 9px;
left: 8px;
}
.centralzone h2 {
text-transform: uppercase;
border-bottom:1px solid #ddd;
}
.page .proposte {
width: 150px;
display: block;
margin:auto;
}
.page .spaceagg {
margin-top:40px;
}
\ No newline at end of file
src/app/pages/privacy/privacy.page.ts
import { Component, OnInit } from '@angular/core';
import { Router } from "@angular/router";
@Component({
selector: 'app-privacy',
......@@ -7,7 +8,12 @@ import { Component, OnInit } from '@angular/core';
})
export class PrivacyPage implements OnInit {
constructor() { }
constructor(private router: Router) { }
back()
{
this.router.navigateByUrl('/businesscall');
}
ngOnInit() {
}
......
src/global.scss
......@@ -69,14 +69,15 @@ ion-tab-bar{
color: $grigio;
font-size: 24px;
height: 100%;
width: 100%;
position: fixed;
width: 100%;
overflow-y: scroll;
//position: fixed;
}
.css-class-login-inner-scroll {
/*.css-class-login-inner-scroll {
background-color: transparent!important;
--background: transparent!important;
}
}*/
.body > * {
background-color: transparent!important;
......@@ -241,7 +242,12 @@ strong {
.back {
position:absolute;
top: 48px;
@media (min-width: 1024px) {
top:48 px;
}
/*@media (max-width: 1024px) {
top:20 px;
}*/
width: 30px;
height: 30px;
}
......@@ -388,6 +394,9 @@ strong {
}
.menu-show{
@media (min-width: 1024px) {
zoom: 4.0;
}
width: 34px;
height: 34px;
margin-left: 10px;
......@@ -401,6 +410,9 @@ strong {
}
}
.exit {
@media (min-width: 1024px) {
zoom: 4.0;
}
width: 34px;
height: 34px;
margin-right: 10px;
......@@ -436,7 +448,7 @@ strong {
margin-left: 20px;
}
.box {
width: 148px;
width: 140px;
margin: 5px 10px 5px 5px;
border: 1px solid $grigio-lite;
-webkit-box-shadow: 0px 3px 4px 0px rgba(184,184,184,1);
......
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