Merge branch 'newlayoutnovo' into 'master'

Newlayoutnovo



See merge request !96

app/assets/stylesheets/application.scss

@@ -499,7 +499,7 @@ table.tipo1 p {
 	margin: 5px;
 	padding: 0px 35px;
 	}
-  .left-edge {
+  .left-edge1 {
     position:absolute;
     left: -35px;
   }

app/views/devise/registrations/new.html.erb

@@ -17,19 +17,19 @@
              <%= f.file_field :avatar%>
           </div>
         </font><br/></br>
-         <div class="col-md-10">
-             <p style="line-height: 170%">
-               <div class="col-md-10">
-                 <span class="pull-right">Nome:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <div class="col-md-10">
+            <p style="line-height: 170%">
+              <div class="col-md-10">
+                <span class="pull-right">Nome:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                  <%= f.text_field :name, autofocus: true, required: true , style:"width:335px;"%></span><br/>
-             </p>
-             <p style="line-height: 15%"><br/></p>
-             <p style="line-height: 170%">
+            </p>
+            <p style="line-height: 15%"><br/></p>
+            <p style="line-height: 170%">
                  <span class="pull-right">Email:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                  <%= f.email_field :email, :value => params[:email], required: true, style:"width:335px;" %></span><br/>
             </p>
-             <p style="line-height: 15%"><br/></p>
-             <p style="line-height: 170%">
+            <p style="line-height: 15%"><br/></p>
+            <p style="line-height: 170%">
                  <span class="pull-right">Senha:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                    <%= f.password_field :password, autocomplete: "off", style:"width:335px;" %><br/>
                    <% if @minimum_password_length %>
@@ -42,24 +42,25 @@
               <div class="col-md-10">
                 <span class="pull-right">Confirmar senha:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                  <%= f.password_field :password_confirmation, autocomplete: "off", style:"width:335px;"  %>
-               </span>
-             </div><br/><br/></p>
-        </div>
-         <div class="container-fluid">
-          <div class="col-md-offset-3 col-md-5">
-            <div class="center_data">
-              <div class="col-md-6">
-                <br/><span class="pull-right">Já possui conta?</span><br/>
-                  <span class="pull-right"><%= render "devise/shared/links"%></span>
-              </div>
-              <div class=" col-md-5">
-                <br/><span class="pull-right"><%= f.submit "Cadastrar", :class=> "but but-shadow but-rc"  %></span><br/>
+                </span>
+              </div><br/><br/></p>
+            </div>
+            <div class="container-fluid">
+              <div class="col-md-offset-3 col-md-5">
+                <div class="center_data">
+                  <div class="col-md-6">
+                    <br/><span class="pull-right">Já possui conta?</span><br/>
+                    <span class="pull-right"><%= render "devise/shared/links"%></span>
+                  </div>
+                  <div class=" col-md-5">
+                    <br/><span class="pull-right"><%= f.submit "Cadastrar", :class=> "but but-shadow but-rc"  %></span><br/>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
         </div>
-     </div>
-   </div>
- </div>
+      </div>
+    </div>
 </div>
 <% end %>

app/views/welcome/collection.html.erb

@@ -18,10 +18,10 @@
   <div class="container-fluid">
   <a class="navbar-brand" href="#"><font color="FFFFFF">x arquivo(s) selecionado(s)</font></a>
   <ul class="nav navbar-nav navbar-right">
-    <li class="set-align"><a href="#"><span class="left-edge"><%= image_tag image_path("icons/Download_01.png"), class: "logo-image",size: "35x35" %></span><font color="FFFFFF"> Salvar no <br>computador</font></br></a></li>
-    <li class="set-align"><a href="#"><span class="left-edge"><%= image_tag image_path("icons/Copiar_Seleção.png"), class: "logo-image",size: "35x35" %></span><font color="FFFFFF"> Copiar <br>para</font></br></a></li>
-    <li class="set-align"><a href="#"><span class="left-edge"><%= image_tag image_path("icons/Mover_Seleção.png"), class: "logo-image",size: "35x35" %></span><font color="FFFFFF"> Mover <br>para</font></br></a></li>
-    <li class="set-align"><a href="#"><span class="left-edge"><%= image_tag image_path("icons/Remover_da_Coleção_Seleção.png"), class: "logo-image",size: "35x35" %></span><font color="FFFFFF"> Remover da <br>coleção</font></br></a></li>
+    <li class="set-align"><a href="#"><span class="left-edge1"><%= image_tag image_path("icons/Download_01.png"), class: "logo-image",size: "35x35" %></span><font color="FFFFFF"> Salvar no <br>computador</font></br></a></li>
+    <li class="set-align"><a href="#"><span class="left-edge1"><%= image_tag image_path("icons/Copiar_Seleção.png"), class: "logo-image",size: "35x35" %></span><font color="FFFFFF"> Copiar <br>para</font></br></a></li>
+    <li class="set-align"><a href="#"><span class="left-edge1"><%= image_tag image_path("icons/Mover_Seleção.png"), class: "logo-image",size: "35x35" %></span><font color="FFFFFF"> Mover <br>para</font></br></a></li>
+    <li class="set-align"><a href="#"><span class="left-edge1"><%= image_tag image_path("icons/Remover_da_Coleção_Seleção.png"), class: "logo-image",size: "35x35" %></span><font color="FFFFFF"> Remover da <br>coleção</font></br></a></li>
   </ul>
   </div>
 </nav>