Skip to content

Commit

Permalink
Arreglados elementos de menu y detalles de diseño
Browse files Browse the repository at this point in the history
  • Loading branch information
ultrasam committed Apr 11, 2011
1 parent 75b8c51 commit b15c606
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 63 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'http://rubygems.org'

gem 'rails', '3.0.5'
gem 'rails', '3.0.6'
gem 'sqlite3'

gem 'sqlite3-ruby', :require => 'sqlite3'
Expand Down
56 changes: 28 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
actionmailer (3.0.5)
actionpack (= 3.0.5)
actionmailer (3.0.6)
actionpack (= 3.0.6)
mail (~> 2.2.15)
actionpack (3.0.5)
activemodel (= 3.0.5)
activesupport (= 3.0.5)
actionpack (3.0.6)
activemodel (= 3.0.6)
activesupport (= 3.0.6)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.4)
i18n (~> 0.5.0)
rack (~> 1.2.1)
rack-mount (~> 0.6.13)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activemodel (3.0.5)
activesupport (= 3.0.5)
activemodel (3.0.6)
activesupport (= 3.0.6)
builder (~> 2.1.2)
i18n (~> 0.4)
activerecord (3.0.5)
activemodel (= 3.0.5)
activesupport (= 3.0.5)
i18n (~> 0.5.0)
activerecord (3.0.6)
activemodel (= 3.0.6)
activesupport (= 3.0.6)
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
activeresource (3.0.5)
activemodel (= 3.0.5)
activesupport (= 3.0.5)
activesupport (3.0.5)
activeresource (3.0.6)
activemodel (= 3.0.6)
activesupport (= 3.0.6)
activesupport (3.0.6)
annotate-models (1.0.4)
arel (2.0.9)
builder (2.1.2)
Expand All @@ -48,17 +48,17 @@ GEM
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
rails (3.0.5)
actionmailer (= 3.0.5)
actionpack (= 3.0.5)
activerecord (= 3.0.5)
activeresource (= 3.0.5)
activesupport (= 3.0.5)
rails (3.0.6)
actionmailer (= 3.0.6)
actionpack (= 3.0.6)
activerecord (= 3.0.6)
activeresource (= 3.0.6)
activesupport (= 3.0.6)
bundler (~> 1.0)
railties (= 3.0.5)
railties (3.0.5)
actionpack (= 3.0.5)
activesupport (= 3.0.5)
railties (= 3.0.6)
railties (3.0.6)
actionpack (= 3.0.6)
activesupport (= 3.0.6)
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
Expand Down Expand Up @@ -92,7 +92,7 @@ PLATFORMS

DEPENDENCIES
annotate-models
rails (= 3.0.5)
rails (= 3.0.6)
rspec
rspec-rails
sqlite3
Expand Down
18 changes: 9 additions & 9 deletions app/views/layouts/_footer.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<footer>
<table>
<tr>
<td><%= link_to 'About', '#' %></td>
<td><%= link_to 'Contact', '#' %></td>
<td><a href="http://news.railstutorial.org/">News</a></td>
<td><a href="http://www.railstutorial.org/">Rails Tutorial</a></td>
<td><a href="http://twitter.com/destrozates">Webmaster</a></td>
</tr>
</table>
<ul>
<li><%= link_to '2011 kari akito producciones c.a.', root_path %></li>
<li>|</li>
<li>rif-j-29540679-7</li>
<li>|</li>
<li>todos los derechos reservados</a></li>
<li>|</li>
<li><%= link_to 'programado por', 'http://twitter.com/destrozates' %></li>
</ul>
</footer>
18 changes: 11 additions & 7 deletions app/views/layouts/_navmenu.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<nav>
<table>
<tr>
<td><%= link_to "Home", root_path %></td>
<td><%= link_to "Help", '#' %></td>
<td><%= link_to "Sign in", '#' %></td>
</tr>
</table>
<ul>
<li><p><%= link_to "acerca de", root_path, :class => "navmenu" %></li>
<li> - </li>
<li><%= link_to "servicios", '#' %></li>
<li> - </li>
<li><%= link_to "somos", '#' %></li>
<li> - </li>
<li><%= link_to "portafolio", '#' %></li>
<li> - </li>
<li><%= link_to "contacto", '#' %></li>
</ul>
</nav>
63 changes: 45 additions & 18 deletions public/stylesheets/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ body {
padding-top: 0px;
float: left;
position: relative;
top: 28px;
top: 0px;
left: 660px
}

Expand All @@ -50,13 +50,13 @@ a:visited {
/* Navigation */

nav {
float: right;
padding-top: 0px;
text-align: center;
/*float: right;*/
position: relative;
top: -100px;
right: 440px
/*right: 440px*/
}
/*

nav ul {
margin: 0;
padding: 0;
Expand All @@ -65,23 +65,25 @@ nav ul {
nav ul li {
list-style-type: none;
display: inline-block;
padding: 0.2em o;
padding-left: 5px;
padding-right: 5px;
color: #b2b2b2;
/*font-family: Arial;*/
}

nav ul li a {
padding: 0 5px;
font-weigth: bold;
font-weight: bold;
}

nav ul li a:visited {
color: #09c;
color: #b2b2b2;
}

nav ul li a:hover {
text-decoration: underline;
color: #09c;
color: #737373;
}
*/


/* Round corners */

Expand All @@ -91,16 +93,41 @@ nav ul li a:hover {
border-radius: 10px;
}

/* Footer Styling
/* Footer Styling */


footer {
text-align: center;
margin-top: 10px;
width: 710px;
position: relative;
/*width: 710px;
margin-left: auto;
margin-right: auto;
margin-right: auto;*/
}
*/
footer nav {
float: none;

footer ul {
margin: 0;
padding: 0;
}

footer ul li {
list-style-type: none;
display: inline-block;
padding-left: 5px;
padding-right: 5px;
color: #038ea4;
/*font-family: Arial;*/
}

footer ul li a {
font-weight: bold;
}

footer ul li a:visited {
color: #038ea4;
}

footer ul li a:hover {
text-decoration: underline;
color: #737373;
}

2 changes: 2 additions & 0 deletions webrat.log
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ REQUESTING PAGE: GET / with {} and HTTP headers {}
REQUESTING PAGE: GET / with {} and HTTP headers {"HTTP_REFERER"=>"/"}
REQUESTING PAGE: GET / with {} and HTTP headers {}
REQUESTING PAGE: GET / with {} and HTTP headers {"HTTP_REFERER"=>"/"}
REQUESTING PAGE: GET / with {} and HTTP headers {}
REQUESTING PAGE: GET / with {} and HTTP headers {"HTTP_REFERER"=>"/"}

0 comments on commit b15c606

Please sign in to comment.