Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

comit do dia

  • Loading branch information...
commit 11b581e5e73dd85bb8247eb9f7f8fdac1df3e965 1 parent b96dc5a
@julioprotzek julioprotzek authored
Showing with 439 additions and 776 deletions.
  1. +6 −0 Gemfile
  2. +41 −0 Gemfile.lock
  3. +55 −0 README
  4. +28 −0 compass.config
  5. +51 −0 config.ru
  6. +0 −653 css/960.css
  7. +0 −93 css/style.css
  8. +0 −2  img/.gitignore
  9. +2 −0  { → public}/.htaccess
  10. 0  { → public}/apple-touch-icon.png
  11. 0  { → public}/crossdomain.xml
  12. 0  { → public}/favicon.ico
  13. 0  { → public}/humans.txt
  14. 0  {img → public/images}/background.jpg
  15. 0  {img → public/images}/foto1.jpg
  16. 0  {img → public/images}/foto2.jpg
  17. 0  {img → public/images}/foto3.jpg
  18. 0  {img → public/images}/foto4.jpg
  19. 0  {img → public/images}/logo.png
  20. BIN  public/images/serve-logo.png
  21. 0  {js → public/javascripts}/libs/jquery-1.6.2.js
  22. 0  {js → public/javascripts}/libs/jquery-1.6.2.min.js
  23. 0  {js → public/javascripts}/libs/modernizr-2.0.6.min.js
  24. 0  {js → public/javascripts}/mylibs/.gitignore
  25. 0  {js → public/javascripts}/plugins.js
  26. 0  {js → public/javascripts}/script.js
  27. 0  {css → public/stylesheets}/normalize.css
  28. +133 −0 public/stylesheets/style.css
  29. +28 −8 {css → stylesheets}/style.sass
  30. 0  tmp/restart.txt
  31. +76 −0 views/index.slim
  32. +19 −20 index.html → views/temp.html
View
6 Gemfile
@@ -0,0 +1,6 @@
+source :rubygems
+
+gem 'compass'
+gem 'compass-960-plugin'
+gem 'serve'
+gem 'slim'
View
41 Gemfile.lock
@@ -0,0 +1,41 @@
+GEM
+ remote: http://rubygems.org/
+ specs:
+ activesupport (3.1.0)
+ multi_json (~> 1.0)
+ chunky_png (1.2.1)
+ compass (0.11.5)
+ chunky_png (~> 1.2)
+ fssm (>= 0.2.7)
+ sass (~> 3.1)
+ compass-960-plugin (0.10.4)
+ compass (>= 0.10.0)
+ fssm (0.2.7)
+ i18n (0.6.0)
+ multi_json (1.0.3)
+ rack (1.3.2)
+ rack-test (0.6.1)
+ rack (>= 1.0)
+ sass (3.1.7)
+ serve (1.5.1)
+ activesupport (~> 3.0)
+ i18n
+ rack (~> 1.2)
+ rack-test (~> 0.5)
+ tilt (~> 1.3)
+ tzinfo
+ slim (1.0.2)
+ temple (~> 0.3.3)
+ tilt (~> 1.3.2)
+ temple (0.3.3)
+ tilt (1.3.3)
+ tzinfo (0.3.29)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ compass
+ compass-960-plugin
+ serve
+ slim
View
55 README
@@ -1,3 +1,58 @@
+10/09/2011
+Participantes:
+ Joao
+ Raul
+ Julio
+ Michelle
+ Flavio
+ Willian
+ Edson
+ Fabio
+
+=)
+ conseguimos implementar o site em todas as tecnologias propostas
+ fizemos varias refatoracoes
+ 5 minutos pra cada um foi mais produtivo
+ deixar um co-piloto fixo por um tempo
+ aprendemos varias coisas novas
+
+=(
+ nao comitamos NOVAMENTE
+ nao rolou de importar css e js com as tags do rails
+ teve gente que saiu no meio do dojo
+ faltou startar os 5 minutos as vezes
+
+
+================================
+Data: 03/09/2011
+
+Quem veio
+ - Julio
+ - Joao
+ - Michelle
+ - Renan
+ - Ale
+ - Renato
+ - Gabriel
+ - Francislene
+ - Willian
+ - Daniel
+ - Fabio
+
+:]
+-
+- Terminamos html/css
+- Ficou profissa
+- O Joao acha LEGAL todo mundo participar
+- hack na navegação (css)
+
+
+:[
+- Faltou commitar
+- ficou PS
+- exposé atrapalhou
+
+
Data: 27/08/2011
Quem veio?
View
28 compass.config
@@ -0,0 +1,28 @@
+#
+# Compass Configuration
+#
+
+# HTTP paths
+http_path = '/'
+http_stylesheets_path = '/stylesheets'
+http_images_path = '/images'
+http_javascripts_path = '/javascripts'
+
+# File system locations
+sass_dir = 'stylesheets'
+css_dir = 'public/stylesheets'
+images_dir = 'public/images'
+javascripts_dir = 'public/javascripts'
+
+# Set to true for easier debugging
+line_comments = false
+
+# CSS output style - :nested, :expanded, :compact, or :compressed
+output_style = :expanded
+
+# Determine whether Compass asset helper functions generate relative
+# or absolute paths
+relative_assets = true
+
+# Learn more:
+# http://compass-style.org/docs/tutorials/configuration-reference/
View
51 config.ru
@@ -0,0 +1,51 @@
+#\ -p 4000
+
+require 'rubygems'
+require 'bundler'
+
+begin
+ Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+ $stderr.puts e.message
+ $stderr.puts "Run `bundle install` to install missing gems"
+ exit e.status_code
+end
+
+require 'serve'
+require 'serve/rack'
+
+# The project root directory
+root = ::File.dirname(__FILE__)
+
+# Compile Sass on the fly with the Sass plugin. Some production environments
+# don't allow you to write to the file system on the fly (like Heroku).
+# Remove this conditional if you want to compile Sass in production.
+if ENV['RACK_ENV'] != 'production'
+ require 'sass'
+ require 'sass/plugin/rack'
+ require 'compass'
+ require 'ninesixty'
+ require 'slim'
+
+
+ Compass.add_project_configuration(root + '/compass.config')
+ Compass.configure_sass_plugin!
+
+ use Sass::Plugin::Rack # Sass Middleware
+end
+
+# Other Rack Middleware
+use Rack::ShowStatus # Nice looking 404s and other messages
+use Rack::ShowExceptions # Nice looking errors
+
+# Rack Application
+if ENV['SERVER_SOFTWARE'] =~ /passenger/i
+ # Passendger only needs the adapter
+ run Serve::RackAdapter.new(root + '/views')
+else
+ # Use Rack::Cascade and Rack::Directory on other platforms for static assets
+ run Rack::Cascade.new([
+ Serve::RackAdapter.new(root + '/views'),
+ Rack::Directory.new(root + '/public')
+ ])
+end
View
653 css/960.css
@@ -1,653 +0,0 @@
-/*
- 960 Grid System ~ Core CSS.
- Learn more ~ http://960.gs/
-
- Licensed under GPL and MIT.
-*/
-
-/*
- Forces backgrounds to span full width,
- even if there is horizontal scrolling.
- Increase this if your layout is wider.
-
- Note: IE6 works fine without this fix.
-*/
-
-body {
- min-width: 960px;
-}
-
-/* `Container
-----------------------------------------------------------------------------------------------------*/
-
-.container_12,
-.container_16 {
- margin-left: auto;
- margin-right: auto;
- width: 960px;
-}
-
-/* `Grid >> Global
-----------------------------------------------------------------------------------------------------*/
-
-.grid_1,
-.grid_2,
-.grid_3,
-.grid_4,
-.grid_5,
-.grid_6,
-.grid_7,
-.grid_8,
-.grid_9,
-.grid_10,
-.grid_11,
-.grid_12,
-.grid_13,
-.grid_14,
-.grid_15,
-.grid_16 {
- display: inline;
- float: left;
- margin-left: 10px;
- margin-right: 10px;
-}
-
-.push_1, .pull_1,
-.push_2, .pull_2,
-.push_3, .pull_3,
-.push_4, .pull_4,
-.push_5, .pull_5,
-.push_6, .pull_6,
-.push_7, .pull_7,
-.push_8, .pull_8,
-.push_9, .pull_9,
-.push_10, .pull_10,
-.push_11, .pull_11,
-.push_12, .pull_12,
-.push_13, .pull_13,
-.push_14, .pull_14,
-.push_15, .pull_15 {
- position: relative;
-}
-
-.container_12 .grid_3,
-.container_16 .grid_4 {
- width: 220px;
-}
-
-.container_12 .grid_6,
-.container_16 .grid_8 {
- width: 460px;
-}
-
-.container_12 .grid_9,
-.container_16 .grid_12 {
- width: 700px;
-}
-
-.container_12 .grid_12,
-.container_16 .grid_16 {
- width: 940px;
-}
-
-/* `Grid >> Children (Alpha ~ First, Omega ~ Last)
-----------------------------------------------------------------------------------------------------*/
-
-.alpha {
- margin-left: 0;
-}
-
-.omega {
- margin-right: 0;
-}
-
-/* `Grid >> 12 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .grid_1 {
- width: 60px;
-}
-
-.container_12 .grid_2 {
- width: 140px;
-}
-
-.container_12 .grid_4 {
- width: 300px;
-}
-
-.container_12 .grid_5 {
- width: 380px;
-}
-
-.container_12 .grid_7 {
- width: 540px;
-}
-
-.container_12 .grid_8 {
- width: 620px;
-}
-
-.container_12 .grid_10 {
- width: 780px;
-}
-
-.container_12 .grid_11 {
- width: 860px;
-}
-
-/* `Grid >> 16 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_16 .grid_1 {
- width: 40px;
-}
-
-.container_16 .grid_2 {
- width: 100px;
-}
-
-.container_16 .grid_3 {
- width: 160px;
-}
-
-.container_16 .grid_5 {
- width: 280px;
-}
-
-.container_16 .grid_6 {
- width: 340px;
-}
-
-.container_16 .grid_7 {
- width: 400px;
-}
-
-.container_16 .grid_9 {
- width: 520px;
-}
-
-.container_16 .grid_10 {
- width: 580px;
-}
-
-.container_16 .grid_11 {
- width: 640px;
-}
-
-.container_16 .grid_13 {
- width: 760px;
-}
-
-.container_16 .grid_14 {
- width: 820px;
-}
-
-.container_16 .grid_15 {
- width: 880px;
-}
-
-/* `Prefix Extra Space >> Global
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .prefix_3,
-.container_16 .prefix_4 {
- padding-left: 240px;
-}
-
-.container_12 .prefix_6,
-.container_16 .prefix_8 {
- padding-left: 480px;
-}
-
-.container_12 .prefix_9,
-.container_16 .prefix_12 {
- padding-left: 720px;
-}
-
-/* `Prefix Extra Space >> 12 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .prefix_1 {
- padding-left: 80px;
-}
-
-.container_12 .prefix_2 {
- padding-left: 160px;
-}
-
-.container_12 .prefix_4 {
- padding-left: 320px;
-}
-
-.container_12 .prefix_5 {
- padding-left: 400px;
-}
-
-.container_12 .prefix_7 {
- padding-left: 560px;
-}
-
-.container_12 .prefix_8 {
- padding-left: 640px;
-}
-
-.container_12 .prefix_10 {
- padding-left: 800px;
-}
-
-.container_12 .prefix_11 {
- padding-left: 880px;
-}
-
-/* `Prefix Extra Space >> 16 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_16 .prefix_1 {
- padding-left: 60px;
-}
-
-.container_16 .prefix_2 {
- padding-left: 120px;
-}
-
-.container_16 .prefix_3 {
- padding-left: 180px;
-}
-
-.container_16 .prefix_5 {
- padding-left: 300px;
-}
-
-.container_16 .prefix_6 {
- padding-left: 360px;
-}
-
-.container_16 .prefix_7 {
- padding-left: 420px;
-}
-
-.container_16 .prefix_9 {
- padding-left: 540px;
-}
-
-.container_16 .prefix_10 {
- padding-left: 600px;
-}
-
-.container_16 .prefix_11 {
- padding-left: 660px;
-}
-
-.container_16 .prefix_13 {
- padding-left: 780px;
-}
-
-.container_16 .prefix_14 {
- padding-left: 840px;
-}
-
-.container_16 .prefix_15 {
- padding-left: 900px;
-}
-
-/* `Suffix Extra Space >> Global
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .suffix_3,
-.container_16 .suffix_4 {
- padding-right: 240px;
-}
-
-.container_12 .suffix_6,
-.container_16 .suffix_8 {
- padding-right: 480px;
-}
-
-.container_12 .suffix_9,
-.container_16 .suffix_12 {
- padding-right: 720px;
-}
-
-/* `Suffix Extra Space >> 12 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .suffix_1 {
- padding-right: 80px;
-}
-
-.container_12 .suffix_2 {
- padding-right: 160px;
-}
-
-.container_12 .suffix_4 {
- padding-right: 320px;
-}
-
-.container_12 .suffix_5 {
- padding-right: 400px;
-}
-
-.container_12 .suffix_7 {
- padding-right: 560px;
-}
-
-.container_12 .suffix_8 {
- padding-right: 640px;
-}
-
-.container_12 .suffix_10 {
- padding-right: 800px;
-}
-
-.container_12 .suffix_11 {
- padding-right: 880px;
-}
-
-/* `Suffix Extra Space >> 16 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_16 .suffix_1 {
- padding-right: 60px;
-}
-
-.container_16 .suffix_2 {
- padding-right: 120px;
-}
-
-.container_16 .suffix_3 {
- padding-right: 180px;
-}
-
-.container_16 .suffix_5 {
- padding-right: 300px;
-}
-
-.container_16 .suffix_6 {
- padding-right: 360px;
-}
-
-.container_16 .suffix_7 {
- padding-right: 420px;
-}
-
-.container_16 .suffix_9 {
- padding-right: 540px;
-}
-
-.container_16 .suffix_10 {
- padding-right: 600px;
-}
-
-.container_16 .suffix_11 {
- padding-right: 660px;
-}
-
-.container_16 .suffix_13 {
- padding-right: 780px;
-}
-
-.container_16 .suffix_14 {
- padding-right: 840px;
-}
-
-.container_16 .suffix_15 {
- padding-right: 900px;
-}
-
-/* `Push Space >> Global
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .push_3,
-.container_16 .push_4 {
- left: 240px;
-}
-
-.container_12 .push_6,
-.container_16 .push_8 {
- left: 480px;
-}
-
-.container_12 .push_9,
-.container_16 .push_12 {
- left: 720px;
-}
-
-/* `Push Space >> 12 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .push_1 {
- left: 80px;
-}
-
-.container_12 .push_2 {
- left: 160px;
-}
-
-.container_12 .push_4 {
- left: 320px;
-}
-
-.container_12 .push_5 {
- left: 400px;
-}
-
-.container_12 .push_7 {
- left: 560px;
-}
-
-.container_12 .push_8 {
- left: 640px;
-}
-
-.container_12 .push_10 {
- left: 800px;
-}
-
-.container_12 .push_11 {
- left: 880px;
-}
-
-/* `Push Space >> 16 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_16 .push_1 {
- left: 60px;
-}
-
-.container_16 .push_2 {
- left: 120px;
-}
-
-.container_16 .push_3 {
- left: 180px;
-}
-
-.container_16 .push_5 {
- left: 300px;
-}
-
-.container_16 .push_6 {
- left: 360px;
-}
-
-.container_16 .push_7 {
- left: 420px;
-}
-
-.container_16 .push_9 {
- left: 540px;
-}
-
-.container_16 .push_10 {
- left: 600px;
-}
-
-.container_16 .push_11 {
- left: 660px;
-}
-
-.container_16 .push_13 {
- left: 780px;
-}
-
-.container_16 .push_14 {
- left: 840px;
-}
-
-.container_16 .push_15 {
- left: 900px;
-}
-
-/* `Pull Space >> Global
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .pull_3,
-.container_16 .pull_4 {
- left: -240px;
-}
-
-.container_12 .pull_6,
-.container_16 .pull_8 {
- left: -480px;
-}
-
-.container_12 .pull_9,
-.container_16 .pull_12 {
- left: -720px;
-}
-
-/* `Pull Space >> 12 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .pull_1 {
- left: -80px;
-}
-
-.container_12 .pull_2 {
- left: -160px;
-}
-
-.container_12 .pull_4 {
- left: -320px;
-}
-
-.container_12 .pull_5 {
- left: -400px;
-}
-
-.container_12 .pull_7 {
- left: -560px;
-}
-
-.container_12 .pull_8 {
- left: -640px;
-}
-
-.container_12 .pull_10 {
- left: -800px;
-}
-
-.container_12 .pull_11 {
- left: -880px;
-}
-
-/* `Pull Space >> 16 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_16 .pull_1 {
- left: -60px;
-}
-
-.container_16 .pull_2 {
- left: -120px;
-}
-
-.container_16 .pull_3 {
- left: -180px;
-}
-
-.container_16 .pull_5 {
- left: -300px;
-}
-
-.container_16 .pull_6 {
- left: -360px;
-}
-
-.container_16 .pull_7 {
- left: -420px;
-}
-
-.container_16 .pull_9 {
- left: -540px;
-}
-
-.container_16 .pull_10 {
- left: -600px;
-}
-
-.container_16 .pull_11 {
- left: -660px;
-}
-
-.container_16 .pull_13 {
- left: -780px;
-}
-
-.container_16 .pull_14 {
- left: -840px;
-}
-
-.container_16 .pull_15 {
- left: -900px;
-}
-
-/* `Clear Floated Elements
-----------------------------------------------------------------------------------------------------*/
-
-/* http://sonspring.com/journal/clearing-floats */
-
-.clear {
- clear: both;
- display: block;
- overflow: hidden;
- visibility: hidden;
- width: 0;
- height: 0;
-}
-
-/* http://www.yuiblog.com/blog/2010/09/27/clearfix-reloaded-overflowhidden-demystified */
-
-.clearfix:before,
-.clearfix:after,
-.container_12:before,
-.container_12:after,
-.container_16:before,
-.container_16:after {
- content: '.';
- display: block;
- overflow: hidden;
- visibility: hidden;
- font-size: 0;
- line-height: 0;
- width: 0;
- height: 0;
-}
-
-.clearfix:after,
-.container_12:after,
-.container_16:after {
- clear: both;
-}
-
-/*
- The following zoom:1 rule is specifically for IE6 + IE7.
- Move to separate stylesheet if invalid CSS is a problem.
-*/
-
-.clearfix,
-.container_12,
-.container_16 {
- zoom: 1;
-}
View
93 css/style.css
@@ -1,93 +0,0 @@
-body {
- background: #000;
-}
-
-#background {
- background: url(../img/background.jpg) no-repeat -50px -125px;
- width: 330px;
- height: 1045px;
- position: absolute;
- top: 0;
- z-index: -1;
- right: 0;
-}
-
-#logo {
- width: 181px;
- height: 97px;
- background: url(../img/logo.png) no-repeat;
- margin: 0 50px 0 0;
-}
-
-article {
- color: #FFF;
- margin-top:60px;
- font-family: arial, sans-serif;
-}
-
-article h1 {
- border-top:1px solid #ba0000;
- color: #AFAFAF;
- font-family: Georgia, serif;
- font-size:18px;
- padding-top: 15px;
-}
-
-#logo, .menu {
- float: left;
-}
-
-.menu { width: 700px; }
-
-.menu a {
- color: white;
- text-decoration: none;
- font: 18px Georgia, serif;
- float: left;
- display: block;
- padding: 50px 25px 20px ;
-}
-
-.menu a:hover {
- background: #b60000;
-}
-
-.current{
- background: #e90000;
-}
-
-.perfil{
- margin-top:15px;
-}
-
-.perfil img{
- float:left;
-}
-
-.perfil h3, .perfil p{
- margin-left: 80px;
- margin-top: 0;
- margin-bottom: 5px;
- font-size: 12px;
-
-}
-.perfil p {
- /*margin-top: 0;
- margin-bottom: 0;*/
-
-}
-footer {
- margin-top: 37px;
- border-top:1px solid #888888;
- text-align: right;
- color: #888888;
-}
-
-.menu ul:hover .current {
- background: rgba(233,0,0,0.5);
-}
-
-.menu ul:hover .current:hover {
- background: rgb(233,0,0);
-}
-
View
2  img/.gitignore
@@ -1,2 +0,0 @@
-!.gitignore
-
View
2  .htaccess → public/.htaccess
@@ -501,3 +501,5 @@ Options -Indexes
<IfModule php5_module>
php_value session.cookie_httponly true
</IfModule>
+
+Options +MultiViews
View
0  apple-touch-icon.png → public/apple-touch-icon.png
File renamed without changes
View
0  crossdomain.xml → public/crossdomain.xml
File renamed without changes
View
0  favicon.ico → public/favicon.ico
File renamed without changes
View
0  humans.txt → public/humans.txt
File renamed without changes
View
0  img/background.jpg → public/images/background.jpg
File renamed without changes
View
0  img/foto1.jpg → public/images/foto1.jpg
File renamed without changes
View
0  img/foto2.jpg → public/images/foto2.jpg
File renamed without changes
View
0  img/foto3.jpg → public/images/foto3.jpg
File renamed without changes
View
0  img/foto4.jpg → public/images/foto4.jpg
File renamed without changes
View
0  img/logo.png → public/images/logo.png
File renamed without changes
View
BIN  public/images/serve-logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  js/libs/jquery-1.6.2.js → public/javascripts/libs/jquery-1.6.2.js
File renamed without changes
View
0  js/libs/jquery-1.6.2.min.js → public/javascripts/libs/jquery-1.6.2.min.js
File renamed without changes
View
0  js/libs/modernizr-2.0.6.min.js → ...c/javascripts/libs/modernizr-2.0.6.min.js
File renamed without changes
View
0  js/mylibs/.gitignore → public/javascripts/mylibs/.gitignore
File renamed without changes
View
0  js/plugins.js → public/javascripts/plugins.js
File renamed without changes
View
0  js/script.js → public/javascripts/script.js
File renamed without changes
View
0  css/normalize.css → public/stylesheets/normalize.css
File renamed without changes
View
133 public/stylesheets/style.css
@@ -0,0 +1,133 @@
+body {
+ background: black;
+ line-height: 150%;
+}
+
+header {
+ display: inline;
+ float: left;
+ margin-left: 10px;
+ margin-right: 10px;
+ width: 940px;
+}
+
+#container {
+ margin-left: auto;
+ margin-right: auto;
+ width: 960px;
+}
+
+#content article {
+ display: inline;
+ float: left;
+ margin-left: 10px;
+ margin-right: 10px;
+ width: 220px;
+}
+#content article:last-child {
+ display: inline;
+ float: left;
+ margin-left: 10px;
+ margin-right: 10px;
+ width: 300px;
+}
+
+#background {
+ background: url(../images/background.jpg) no-repeat -50px -125px;
+ width: 330px;
+ height: 1045px;
+ position: absolute;
+ top: 0;
+ z-index: -1;
+ right: 0;
+}
+
+#logo {
+ margin: 0 50px 0 0;
+ float: left;
+ text-indent: -119988px;
+ overflow: hidden;
+ text-align: left;
+ background-image: url('../images/logo.png?1314452678');
+ background-repeat: no-repeat;
+ background-position: 50% 50%;
+ width: 181px;
+ height: 97px;
+}
+
+article {
+ color: white;
+ margin-top: 60px;
+ font-family: arial, sans-serif;
+}
+article h1 {
+ border-top: 1px solid #ba0000;
+ color: #afafaf;
+ font-family: Georgia, serif;
+ font-size: 18px;
+ padding-top: 15px;
+}
+
+.menu {
+ float: left;
+ width: 700px;
+}
+.menu a {
+ color: white;
+ text-decoration: none;
+ font: 18px Georgia, serif;
+ float: left;
+ display: block;
+ padding: 50px 25px 20px;
+}
+.menu a:hover {
+ background: #b60000;
+}
+
+.current {
+ background: #e90000;
+}
+
+.perfil {
+ *zoom: 1;
+ margin-top: 15px;
+}
+.perfil:after {
+ content: "";
+ display: table;
+ clear: both;
+}
+.perfil img {
+ float: left;
+}
+.perfil h3 {
+ margin-left: 80px;
+ margin-top: 0;
+ margin-bottom: 5px;
+ font-size: 12px;
+}
+.perfil p {
+ margin-left: 80px;
+ margin-top: 0;
+ margin-bottom: 5px;
+ font-size: 12px;
+}
+
+footer {
+ margin-top: 37px;
+ border-top: 1px solid #888888;
+ text-align: right;
+ color: #888888;
+ display: inline;
+ float: left;
+ margin-left: 10px;
+ margin-right: 10px;
+ width: 940px;
+}
+
+.menu ul:hover .current {
+ background: rgba(233, 0, 0, 0.5);
+}
+.menu ul:hover .current:hover {
+ background: #e90000;
+}
View
36 css/style.sass → stylesheets/style.sass
@@ -1,8 +1,27 @@
+@import 960/grid
+@import compass/utilities/general/clearfix
+@import compass/typography/text/replacement
+
+$ninesixty-columns: 12
+
body
background: #000
+ line-height: 150%
+
+header
+ +grid(12)
+
+#container
+ +grid-container
+
+#content
+ article
+ +grid(3)
+ article:last-child
+ +grid(4)
#background
- background: url(../img/background.jpg) no-repeat -50px -125px
+ background: url(../images/background.jpg) no-repeat -50px -125px
width: 330px
height: 1045px
position: absolute
@@ -11,10 +30,10 @@ body
right: 0
#logo
- width: 181px
- height: 97px
- background: url(../img/logo.png) no-repeat
margin: 0 50px 0 0
+ float: left
+ +replace-text-with-dimensions('logo.png')
+
article
color: #FFF
@@ -25,10 +44,8 @@ article
color: #AFAFAF
font-family: Georgia, serif
font-size: 18px
- padding-top: 15px
-
-#logo
- float: left
+ padding-top: 15px
+
.menu
float: left
@@ -47,6 +64,7 @@ article
background: #e90000
.perfil
+ +pie-clearfix
margin-top: 15px
img
float: left
@@ -60,12 +78,14 @@ article
margin-top: 0
margin-bottom: 5px
font-size: 12px
+
footer
margin-top: 37px
border-top: 1px solid #888888
text-align: right
color: #888888
+ +grid(12)
.menu ul:hover .current
background: rgba(233, 0, 0, 0.5)
View
0  tmp/restart.txt
No changes.
View
76 views/index.slim
@@ -0,0 +1,76 @@
+doctype html
+/[if lt IE 7]
+ html.no-js.ie6.oldie lang="pt-BR"
+/[if IE 7]
+ html.no-js.ie7.oldie lang="pt-BR"
+/[if IE 8]
+ html.no-js.ie8.oldie lang="pt-BR"
+/[if gte IE 8]
+ html.no-js lang="pt-BR"
+head
+ meta charset="utf-8"
+ meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"
+ title= "Friends of Hong Kong"
+ meta name="description" content="Ballet"
+ meta name="author" content="Dojo Brasília"
+ meta name="viewport" content="width=device-width, initial-scale=1.0"
+ link rel="stylesheet" href="stylesheets/normalize.css"
+ link rel="stylesheet" href="stylesheets/style.css"
+ script src="javascripts/libs/modernizr-2.0.6.min.js"
+
+body
+ #background
+ #container
+ header
+ h1#logo Friends
+ nav.menu
+ ul
+ li
+ a.current href="#" Início
+ li
+ a href="#" Sobre nós
+ li
+ a href="#" Produções
+ li
+ a href="#" Galeria
+ li
+ a href="#" Vídeos
+ li
+ a href="#" Contato
+
+ #content
+ article
+ img src="images/foto1.jpg"
+ h1 Lorem ipsum dolor sit amet, consectetuer
+ p Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Maecenas faucibus mollis interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam porta sem malesuada magna mollis euismod. Curabitur blandit tempus porttitor.
+ p Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Etiam porta sem malesuada magna mollis euismod. Curabitur blandit tempus porttitor.
+
+ article
+ img src="images/foto2.jpg"
+ h1 Lorem ipsum dolor sit amet, consectetuer
+ p Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Maecenas faucibus mollis interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam porta sem malesuada magna mollis euismod. Curabitur blandit tempus porttitor.
+
+ article
+ h1 Lorem ipsum dolor sit amet, consectetuer
+ p Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Maecenas faucibus mollis interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam porta sem malesuada magna mollis euismod. Curabitur blandit tempus porttitor.
+
+ p Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Etiam porta sem malesuada magna mollis euismod. Curabitur blandit tempus porttitor.
+
+ .perfil
+ img src="images/foto3.jpg" alt="fulana"
+ h3 Nulla vitae elit libero, a pharetra augue.
+ p Morbi interdum mollis sapien. Sed ac. Phasellus lacinia, magna a ullamcorper laoreet, lectus arcu pulvinar risus, vitae.
+
+ .perfil
+ img src="images/foto4.jpg" alt="fulano"
+ h3 Sed vel lacus. Mauris nibh felis
+ p Varius, adipiscing in, lacinia vel, tellus. Suspendisse ac urna. Etiam pellentesque mauris ut lectus.
+
+
+ footer
+ p Nullam Vulputate Nibh
+
+/[if lt IE 7]
+ script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"
+ javascript:
+ window.attachEvent("onload",function(){CFInstall.check({mode:"overlay"})})
View
39 index.html → views/temp.html 100755 → 100644
@@ -14,22 +14,21 @@
<meta name="viewport" content="width=device-width,initial-scale=1">
<!-- CSS concatenated and minified via ant build script-->
- <link rel="stylesheet" href="css/normalize.css">
- <link rel="stylesheet" href="css/960.css">
- <link rel="stylesheet" href="css/style.css">
+ <link rel="stylesheet" href="stylesheets/normalize.css">
+ <link rel="stylesheet" href="stylesheets/style.css">
<!-- end CSS-->
- <script src="js/libs/modernizr-2.0.6.min.js"></script>
+ <script src="javascripts/libs/modernizr-2.0.6.min.js"></script>
</head>
<body>
<div id="background"></div>
- <div class="container_12">
- <header class="grid_12">
- <h1 id="logo" class="ir">Friends</h1>
+ <div id = "container">
+ <header>
+ <h1 id="logo">Friends</h1>
<nav class="menu">
- <ul class="clearfix">
+ <ul>
<li><a class="current" href="#">Início</a></li>
<li><a href="#">Sobre nós</a></li>
<li><a href="#">Produções</a></li>
@@ -42,38 +41,38 @@ <h1 id="logo" class="ir">Friends</h1>
<div id="content">
- <article class="grid_3">
- <img src="img/foto1.jpg">
+ <article>
+ <img src="images/foto1.jpg">
<h1>Lorem ipsum dolor sit amet, consectetuer </h1>
Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Maecenas faucibus mollis interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam porta sem malesuada magna mollis euismod. Curabitur blandit tempus porttitor.
Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Etiam porta sem malesuada magna mollis euismod. Curabitur blandit tempus porttitor.
</article>
- <article class="grid_3">
- <img src="img/foto2.jpg">
+ <article>
+ <img src="images/foto2.jpg">
<h1>Lorem ipsum dolor sit amet, consectetuer </h1>
<p>Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Maecenas faucibus mollis interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam porta sem malesuada magna mollis euismod. Curabitur blandit tempus porttitor.</p>
</article>
- <article class="grid_4">
+ <article>
<h1>Lorem ipsum dolor sit amet, consectetuer </h1>
Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Maecenas faucibus mollis interdum. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam porta sem malesuada magna mollis euismod. Curabitur blandit tempus porttitor.
Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Etiam porta sem malesuada magna mollis euismod. Curabitur blandit tempus porttitor.
- <div class="perfil clearfix">
- <img src="img/foto3.jpg" alt="fulana">
+ <div class="perfil">
+ <img src="images/foto3.jpg" alt="fulana">
<h3>Nulla vitae elit libero, a pharetra augue.</h3>
<p>Morbi interdum mollis sapien. Sed ac. Phasellus lacinia, magna a ullamcorper laoreet, lectus arcu pulvinar risus, vitae.</p>
</div>
- <div class="perfil clearfix">
- <img src="img/foto4.jpg" alt="fulano">
+ <div class="perfil">
+ <img src="images/foto4.jpg" alt="fulano">
<h3>Sed vel lacus. Mauris nibh felis</h3>
<p>Varius, adipiscing in, lacinia vel, tellus. Suspendisse ac urna. Etiam pellentesque mauris ut lectus.</p>
</div>
</article>
</div>
- <footer class="grid_12">
+ <footer>
<p>Nullam Vulputate Nibh</p>
</footer>
@@ -81,11 +80,11 @@ <h1 id="logo" class="ir">Friends</h1>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js"></script>
- <script>window.jQuery || document.write('<script src="js/libs/jquery-1.6.2.min.js"><\/script>')</script>
+ <script>window.jQuery || document.write('<script src="javascripts/libs/jquery-1.6.2.min.js"><\/script>')</script>
<!-- scripts concatenated and minified via ant build script-->
- <script defer src="js/script.js"></script>
+ <script defer src="javascripts/script.js"></script>
<!-- end scripts-->
Please sign in to comment.
Something went wrong with that request. Please try again.