Skip to content

Commit

Permalink
Tste
Browse files Browse the repository at this point in the history
  • Loading branch information
@thiagourias
thiagourias committed Mar 27, 2019
1 parent fb6aa16 commit 35511fa
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 16 deletions.
55 changes: 55 additions & 0 deletions app/assets/stylesheets/main.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -676,4 +676,59 @@ body { padding: 2em; }
.tamanhoRowSocial{
width: 49%;
margin-right: 1%;
}
.inputPropertiesPhoto{
position: relative;
margin: 0;
border: 1px solid #c7cdd0;
padding: 4px 8px;
*padding: 8px 4px 0 4px;
background: #fff;
font: inherit;
font-family: 'Fabriga', Helvetica Neue, Helevetica, Arial, sans-serif;
color: #183643;
-webkit-border-radius: 2px;
border-radius: 2px;
background-clip: padding-box;
-webkit-box-shadow: inset 0 1px 1px #D8DCDF;
-moz-box-shadow: inset 0 1px 1px #D8DCDF;
box-shadow: inset 0 1px 1px #D8DCDF;
-moz-transition: border 0.2s ease-in-out, background 0.2s ease-in-out;
-o-transition: border 0.2s ease-in-out, background 0.2s ease-in-out;
-webkit-transition: border 0.2s ease-in-out, background 0.2s ease-in-out;
transition: border 0.2s ease-in-out, background 0.2s ease-in-out;

}
.mb1pc{
margin-bottom: 1% !important;
}

.btn-successImp{
background-color: #00c851!important;
border-color: #00c851 !important;
color: #fff!important;
}
.btn-dangerImp{
background-color: #4285f4!important;
border-color: #4285f4 !important;
color: #fff!important;
}
.btn-successImp:hover{
background-color: #32d373!important;
border-color: #32d373 !important;
}
.btn-dangerImp:hover{
background-color: #5491f5!important;
border-color: #5491f5 !important;
}
.btn{
color: white !important;
}
.hoverPrimary:hover{
background-color: #5491f5!important;
border-color: #5491f5 !important;
}
.hoverSuccess:hover{
background-color: #32d373!important;
border-color: #32d373 !important;
}
2 changes: 1 addition & 1 deletion public/painel_user.css → app/assets/stylesheets/painel_user.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11123,7 +11123,7 @@ div.confirmedSales {
.btn-secondary,
.sw-image-edit__file-upload-button,
.btn-white {
color: #000 !important;
color: #000;
width: auto
}

Expand Down
10 changes: 5 additions & 5 deletions app/views/users/_form.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<div>
<div class="card-body">
<div class="container">
<h3 class="titleProperties">Registrar Conta</h3>
<div class="d-flex justify-content-center h-100">
<div class="card tamanhoCardSign">
<div class="card-body text-color">
<h3 class="titleProperties">Registrar Conta</h3>
<%= form_for @user do |f| %>

<div class="form-container-2">
Expand Down Expand Up @@ -65,9 +65,9 @@
</div>

<div class="form-container-2">
<label class="inputCampos2">
<label class="inputPropertiesPhoto">
<%= f.file_field :avatar, placeholder: "Escolher Imagem de Perfil" %>
<%= f.label :avatar, 'Escolher Imagem de Perfil', class: 'custom-file-label' %>
<%= f.label :avatar, '⠀', class: '' %>
</label>
</div>

Expand All @@ -86,11 +86,11 @@
<div class="card-body row" style="margin: 0px !important; padding: 0px !important;">

<div class="classPaddingVoltar" style="padding: 1%;">
<%= link_to 'Voltar', :back, class: "btn btn-primary btn-block block" %>
<%= link_to 'Voltar', :back, class: "btn btn-primary btn-block block hoverPrimary" %>
</div>

<div class="classPaddingConcluir" style="padding: 1%;">
<button type="submit" name="action" type="button" class="btn btn-success btn-block block">Concluir</button>
<button type="submit" name="action" type="button" class="btn btn-success btn-block block hoverSuccess">Concluir</button>
</div>
</div>
<% end %>
Expand Down
21 changes: 11 additions & 10 deletions app/views/users/edit.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

<header class="business-header bg-signin">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center align">
<div>
<div class="card-body">
<div class="container">
<h3 class="titleProperties">Atualizar Perfil</h3>

<div class="d-flex justify-content-center h-100">
<div class="card tamanhoCardSign">
<div class="card-body text-color">
<h3 class="titleProperties">Atualizar Perfil</h3>
<%= form_for @user do |f| %>
<div class="form-container-2">
<label>
Expand All @@ -35,7 +35,6 @@
</label>
</div>


<div class="form-container-2">
<label>
<%= f.text_field :birth, 'data-mask': '00/00/0000', class: 'inputCampos', placeholder: "Data de Nascimento", :required => true %>
Expand All @@ -48,23 +47,25 @@
</label>
</div>

<div class="custom-file">
<%= f.file_field :avatar, class: 'custom-file-input' %>
<%= f.label :avatar, 'Escolher Imagem de Perfil', class: 'custom-file-label' %>
<div class="form-container-2">
<label class="inputPropertiesPhoto">
<%= f.file_field :avatar, placeholder: "Escolher Imagem de Perfil" %>
<%= f.label :avatar, '⠀', class: '' %>
</label>
</div>

<div class="form-container-2">
<%= f.password_field :password, id: "Password", placeholder: "Nova Senha" %>
<%= f.password_field :password, id: "Password", placeholder: "Nova Senha", class:'mb1pc' %>
<%= f.password_field :password_confirmation, placeholder: "Confirmação de nova senha" %>
<div class="pwstrength_viewport_progress"></div>
</div>

<div class="card-body row" style="margin: 0px !important;">
<div class="half" style="padding: 1%">
<%= link_to 'Voltar', :back, class: "btn btn-primary btn-lg btn-block" %>
<a href="/painel" class="btn btn-dangerImp btn-block block displaybck white"> Voltar</a>

</div>
<div class="half" style="padding: 1%">
<button type="submit" name="action" type="button" class="btn btn-success btn-lg btn-block">Concluir</button>
<button type="submit" name="action" type="button" class="btn btn-successImp btn-block block displaybck white">Concluir</button>
</div>
</div>
<% end %>
Expand Down

0 comments on commit 35511fa

Please sign in to comment.