Skip to content

Coperativa css fix #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
evandroguedes wants to merge 8 commits into
base: sprint-1.5
Choose a base branch
from
Open

Coperativa css fix #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f9d879b
First commit
evandroguedes Jun 14, 2018
a72d8cd
Removing filestyle
evandroguedes Jun 14, 2018
b58aa22
Now the coperativa forms looks like the catador form
evandroguedes Jun 14, 2018
009d394
Minor fixes
evandroguedes Jun 14, 2018
4edeb57
Merge branch 'sprint-1.5' of https://github.com/PimpAPP/pimp-site int…
evandroguedes Jun 14, 2018
39d5283
Fixing orphan div
evandroguedes Jun 14, 2018
a7457d4
Merge branch 'sprint-1.5' of https://github.com/PimpAPP/pimp-site int…
evandroguedes Jun 14, 2018
75b9b80
Putting the select on the right place.
evandroguedes Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/app/cadastro/cadastro.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ hr {
}

input[type="text"],
textarea[type="text"],
textarea,
input[type="number"] {
border-radius: 20px;
}
Expand Down Expand Up @@ -220,10 +220,6 @@ span.glyphicon-camera {
color: #ededed;
}

.container-extra-padding {

}

.agm-map-container-inner {
width: inherit;
height: inherit;
Expand Down
221 changes: 89 additions & 132 deletions src/app/cadastro/cadastro.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,153 +548,110 @@

<!-- MAP -->
<div *ngIf="showMap">
<div class="row">
<div class="col-lg-12 map-title-container">
<h4>LOCAL DE TRABALHO</h4>
</div>
<div class="row">
<div class="col-lg-12 map-title-container">
<h4>LOCAL DE TRABALHO</h4>
</div>
<!-- -----------New Row---------- -->
<div class="row">
<!-- ----------Col 2nd for the form------------------- -->
<div class="col-lg-12 map-container">
<agm-map [latitude]="mapLatitude"
[longitude]="mapLongitude"
[zoom]="zoom"
[streetViewControl]="false"
[scrollwheel]="false"
(mapClick)="onClickMap($event)"

style="height: 315px">
</div>
<!-- -----------New Row---------- -->
<div class="row">
<!-- ----------Col 2nd for the form------------------- -->
<div class="col-lg-12 map-container">
<agm-map [latitude]="mapLatitude"
[longitude]="mapLongitude"
[zoom]="zoom"
[streetViewControl]="false"
[scrollwheel]="false"
(mapClick)="onClickMap($event)"

<agm-marker [latitude]="markLat"
[longitude]="markLng"
[markerDraggable]="true"
[iconUrl]=""
(dragEnd)="onMoveMark($event)"></agm-marker>

</agm-map>
<!-- -----------End of 2nd col------- -->
</div>
style="height: 315px">

<agm-marker [latitude]="markLat"
[longitude]="markLng"
[markerDraggable]="true"
[iconUrl]=""
(dragEnd)="onMoveMark($event)"></agm-marker>

</agm-map>
<!-- -----------End of 2nd col------- -->
</div>

<!-- ----------Col 1nd for the form------------------- -->
<div class="col-lg-12">
<!-- --------1st row of the colm--------- -->
<div>
<div style="width: 28%; float: left; margin-right: 2%;">
<div class="form-group">
<!-- <input type="text"
class="form-control"
name="state"
placeholder="Estado"
[(ngModel)]="catador.state"
(focusout)="addressFocusOut()"
maxlength="128"> -->

<select class="form-control"
id="state"
name="state"
[(ngModel)]="catador.state">
</select>
</div>
</div>
<div style="width: 28%; float: left; margin-right: 2%;">
<div class="form-group">
<!-- <input type="text"
class="form-control"
placeholder="Cidade"
id="city"
name="city"
[(ngModel)]="catador.city"
required
(focusout)="addressFocusOut()"
maxlength="64"> -->
<select class="form-control"
id="city"
name="city"
[(ngModel)]="catador.city"
(change)="addressFocusOut()">
</select>
</div>
</div>
<div style="width: 40%; float: left">
<div class="form-group">
<input type="text"
class="form-control"
placeholder="Bairro"
id="address_region"
name="address_region"
[(ngModel)]="catador.address_region"
(focusout)="addressFocusOut()"
maxlength="128">
</div>
<!-- ----------Col 1nd for the form------------------- -->
<div class="col-lg-12">
<!-- --------1st row of the colm--------- -->
<div>
<div style="width: 28%; float: left; margin-right: 2%;">
<div class="form-group">
<select class="form-control"
id="state"
name="state"
[(ngModel)]="catador.state">
</select>
</div>
</div>
<div style="width: 28%; float: left; margin-right: 2%;">
<div class="form-group">
<select class="form-control"
id="city"
name="city"
[(ngModel)]="catador.city">
</select>
</div>
</div>
<!-- <div class="row">
<div class="col-md-12">
<div class="form-group">
<select class="form-control"
id="state"
name="state"
[(ngModel)]="catador.state">
</select>
</div>
<div style="width: 40%; float: left">
<div class="form-group">
<input type="text"
class="form-control"
placeholder="Bairro"
id="address_region"
name="address_region"
[(ngModel)]="catador.address_region"
(focusout)="addressFocusOut()"
maxlength="128">
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="form-group">
<select class="form-control"
id="city"
name="city"
[(ngModel)]="catador.city">
</select>
</div>
</div>
<!-- --------2th row of the colm--------- -->
<div>
<div class="input-col-left">
<div class="form-group">
<input type="text"
class="form-control"
placeholder="Rua"
required
id="address_base"
name="address_base"
[(ngModel)]="catador.address_base"
(focusout)="addressFocusOut()"
maxlength="500">
</div>
</div> -->

<div class="row">
<div class="col-md-12 ">
<div class="input-col-left">
<div class="form-group">
<input type="text"
class="form-control"
placeholder="Rua"
required
id="address_base"
name="address_base"
[(ngModel)]="catador.address_base"
(focusout)="addressFocusOut()"
maxlength="500">
</div>
</div>
<div class="input-col-right">
<div class="form-group">
<input type="number"
class="form-control"
placeholder="nº"
id="number"
name="number"
[(ngModel)]="catador.number">
</div>
</div>
</div>
<div class="input-col-right">
<div class="form-group">
<input type="number"
class="form-control"
placeholder="nº"
id="number"
name="number"
[(ngModel)]="catador.number">
</div>
</div>
</div>
<!-- --------------End of row-------------- -->
<!-- -----------End of 1stcol------- -->
</div>
<!-- --------------End of row-------------- -->
</div>
<div class="row buttons-wrapper">
<div class="col-md-6 col-xs-6 col-sm-6">
<button type="button" (click)="toggleMap()" value="CANCELA" id="name-group" class="cancel-button btn-danger btn">CANCELAR</button>
</div>
<div class="row buttons-wrapper">
<div class="col-md-6 col-xs-6 col-sm-6">
<button type="button" (click)="toggleMap()" value="CANCELA" id="name-group" class="cancel-button btn-danger btn">CANCELAR</button>
</div>

<div class="col-md-6 col-xs-6 col-sm-6">
<button type="submit" id="name-group" class="primary-button btn btn-success" value="CONFIRMA">CONFIRMAR</button>
</div>
<div class="col-md-6 col-xs-6 col-sm-6">
<button type="submit" id="name-group" class="primary-button btn btn-success" value="CONFIRMA">CONFIRMAR</button>
</div>
</div>
<!-- #EOF MAP -->

</div>
<!-- #EOF MAP -->
</form>
</div>

Expand Down
Loading