Skip to content
This repository has been archived by the owner on Mar 8, 2021. It is now read-only.

Commit

Permalink
Transalations, reduced space between nav elems and improved styling i…
Browse files Browse the repository at this point in the history 
…n contact page
  • Loading branch information
@okeen
okeen committed Jan 11, 2012
1 parent 5edc84c commit beff082
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 48 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,4 @@ capybara-*html
.rvmrc
.rvmrc.*

!/db/development.sqlite3
6 changes: 2 additions & 4 deletions app/views/inquiries/new.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% content_for :body_content_left do %>
<div class='inquiries grid_8'>
<div id="contact" class='inquiries grid_8'>
<%=raw @page[Page.default_parts.first.to_sym] %>

<%= form_for @inquiry do |f| %>
Expand Down Expand Up @@ -31,9 +31,7 @@
<% end %>
</div>
<div class="grid_8">
<p id="contact_message">Escríbanos y nos pondremos en contacto en menos de 24h</p>
<%#*<iframe height="150" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="http://maps.google.es/maps?channel=cs&amp;q=rua+da+rosa+27&amp;ie=UTF8&amp;hq=&amp;hnear=R%C3%BAa+da+Rosa,+27,+15701+Santiago+de+Compostela,+La+Coru%C3%B1a,+Galicia&amp;gl=es&amp;ll=42.871064,-8.548575&amp;spn=0.006802,0.016512&amp;t=h&amp;z=14&amp;vpsrc=6&amp;output=embed"></iframe>%>

<p id="contact_message">
</div>

<% end %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/shared/_header.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="grid_4">
<div class="grid_6">
<div class="logo_container">
<%= image_tag image_path("LogoFelix_Grande.png"), :width=>"100%"%>
<%= image_tag image_path("felixLogo.png")%>
</div>
</div>
<div class=" prefix_2 grid_10">
<div class=" grid_10">
<p class="logo"></p>
<%= render(:partial => "/shared/menu", :locals => {
:dom_id => 'menu',
Expand Down
Binary file added db/development.sqlite3
View file
Binary file not shown.
Binary file added public/images/felixLogo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
93 changes: 56 additions & 37 deletions public/stylesheets/application.css
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
/* line 4, scss/application.scss */
header {
margin-top: 30px !important;
margin-top: 20px !important;
margin-bottom: 10px !important;
height: 150px;
}
/* line 11, scss/application.scss */
header div.logo_container {
height: 62px;
width: 221px;
}
/* line 14, scss/application.scss */
header div.logo_container img {
opacity: 1;
height: 100%;
float: left;
}
/* line 21, scss/application.scss */
Expand Down Expand Up @@ -51,114 +45,116 @@ header nav#menu ul li {
opacity: 0.6;
height: 20px;
float: left;
margin-left: 1px !important;
margin-right: 1px !important;
line-height: 20px;
background: #c1e2e5;
/*-webkit-border-radius: 4px;
-moz-border-radius: 4px 4px 4px 4px;
border-radius: 4px 4px 4px 4px;
*/
}
/* line 53, scss/application.scss */
/* line 54, scss/application.scss */
header nav#menu ul li a {
display: block;
color: white;
text-align: center;
display: block;
text-decoration: none;
}
/* line 62, scss/application.scss */
/* line 63, scss/application.scss */
header nav#menu ul li a:hover {
color: #fff;
}
/* line 67, scss/application.scss */
/* line 68, scss/application.scss */
header nav#menu ul li.selected, header nav#menu ul li:hover {
background: #5e9cae;
}
/* line 70, scss/application.scss */
/* line 71, scss/application.scss */
header nav#menu ul li.last {
margin-right: 0px;
}

/* line 74, scss/application.scss */
/* line 75, scss/application.scss */
body.main {
/*background-image: url("images/Fondo.png");
background-position: center top;
background-repeat: no-repeat;
z-index: 0;*/
}
/* line 79, scss/application.scss */
/* line 80, scss/application.scss */
body.main section#left, body.main section#right {
display: none;
}

/* line 83, scss/application.scss */
/* line 84, scss/application.scss */
body h1, body h2, body h3, body h4, body p, body a {
font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif;
text-align: justify;
}
/* line 87, scss/application.scss */
/* line 88, scss/application.scss */
body h1, body h2, body h3, body h4 {
margin-top: 15px;
margin-bottom: 20px;
}
/* line 90, scss/application.scss */
/* line 91, scss/application.scss */
body h1, body h2, body h3, body h4, body strong {
color: #5e9cae;
}
/* line 93, scss/application.scss */
/* line 94, scss/application.scss */
body h1 {
font-size: 4em;
margin-bottom: 20px;
}
/* line 97, scss/application.scss */
/* line 98, scss/application.scss */
body h2 {
font-size: 1.7em;
margin-bottom: 20px;
}
/* line 101, scss/application.scss */
/* line 102, scss/application.scss */
body h3 {
font-size: 1.3em;
margin-bottom: 10px;
}
/* line 111, scss/application.scss */
/* line 112, scss/application.scss */
body h1#body_content_title {
display: none;
}
/* line 113, scss/application.scss */
/* line 114, scss/application.scss */
body section#body div.container {
background: #5e9cae;
}
/* line 118, scss/application.scss */
/* line 119, scss/application.scss */
body section#left, body section#right {
width: 50%;
height: 425px;
}
/* line 121, scss/application.scss */
/* line 122, scss/application.scss */
body section#left ul, body section#right ul {
margin-left: 40px;
list-style: cjk-ideographic;
}
/* line 126, scss/application.scss */
/* line 127, scss/application.scss */
body section#left img, body section#right img {
margin-left: auto;
margin-right: auto;
margin-top: 10px;
display: block;
}
/* line 131, scss/application.scss */
/* line 132, scss/application.scss */
body section#left {
width: 50%;
float: left;
}
/* line 136, scss/application.scss */
/* line 137, scss/application.scss */
body section#right {
float: right;
}
/* line 138, scss/application.scss */
/* line 139, scss/application.scss */
body section#right img {
margin-top: 45px;
}
/* line 143, scss/application.scss */
/* line 144, scss/application.scss */
body footer {
margin-left: 1px;
margin-top: 33px;
Expand All @@ -168,28 +164,51 @@ body footer {
color: #5e9cae;
}

/* line 155, scss/application.scss */
/* line 156, scss/application.scss */
div#home_texts_web p {
color: white;
margin-top: 60px;
font-size: 3em;
}

/* line 161, scss/application.scss */
/* line 162, scss/application.scss */
div#home_texts_rfid p {
color: white;
margin-top: 100px;
font-size: 3em;
}

/* line 167, scss/application.scss */
/* line 168, scss/application.scss */
div#home_texts_moviles p {
color: white;
margin-top: 50px;
font-size: 3em;
}

/* line 173, scss/application.scss */
/*CONTACT*/
/* line 177, scss/application.scss */
div#contact .field label {
text-align: right;
margin-right: 10px;
color: #5e9cae;
}
/* line 182, scss/application.scss */
div#contact .field input, div#contact .field textarea {
border: 2px solid #c1e2e5;
}

/* line 187, scss/application.scss */
div#contact .message_field {
margin-left: 20px;
margin-top: 0px;
}
/* line 189, scss/application.scss */
div#contact .message_field label {
text-align: left;
margin-left: 5px;
}

/* line 196, scss/application.scss */
p#contact_message {
margin-top: 30px;
width: 100%;
Expand All @@ -199,27 +218,27 @@ p#contact_message {
color: #5e9cae;
}

/* line 184, scss/application.scss */
/* line 207, scss/application.scss */
div.project {
border-bottom: 2px solid #5e9cae;
margin-bottom: 30px;
}
/* line 185, scss/application.scss */
/* line 208, scss/application.scss */
div.project a {
text-decoration: none;
color: #5e9cae;
}
/* line 189, scss/application.scss */
/* line 212, scss/application.scss */
div.project img.logo {
margin: auto auto;
margin-top: 100px;
}
/* line 193, scss/application.scss */
/* line 216, scss/application.scss */
div.project ul.image_gallery {
display: block;
list-style: none;
}
/* line 196, scss/application.scss */
/* line 219, scss/application.scss */
div.project ul.image_gallery li {
float: left;
margin-top: 18px;
Expand Down
31 changes: 27 additions & 4 deletions public/stylesheets/scss/application.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ $felix_dark: #5E9CAE;

header {
margin: {
top:30px !important; bottom:10px !important;
top:20px !important; bottom:10px !important;
}
$header_height: 150px;
height: $header_height;
//background: white; opacity: 0.9;
div.logo_container {
height: 62px;
width:221px;
//height: 83px;
//width: 299px;
img {
opacity: 1;
height: 100%;
//height: 100%;
float: left;
}
}
Expand Down Expand Up @@ -44,6 +44,7 @@ header {
opacity: 0.6;
height: 20px;
float:left;
margin: {left: 1px !important; right: 1px !important;}
line-height: 20px;
background: $felix_light;
/*-webkit-border-radius: 4px;
Expand Down Expand Up @@ -170,6 +171,28 @@ div#home_texts_moviles p {
font-size: 3em;
}

/*CONTACT*/

div#contact .field {
label {
text-align: right;
margin: {right: 10px;}
color: $felix_dark;
}
input, textarea {
border: 2px solid $felix_light;

}
}
div#contact .message_field {
margin: {left: 20px; top: 0px;}
label {
text-align: left;
margin: {left: 5px;}

}

}
p#contact_message {
margin: {top: 30px;}
width: 100%;
Expand Down

0 comments on commit beff082

Please sign in to comment.