diff --git a/Gemfile.lock b/Gemfile.lock index 8d6b744..7a5acc0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,12 +31,6 @@ GEM arel (3.0.2) bcrypt-ruby (3.0.1) builder (3.0.4) - capistrano (2.13.5) - highline - net-scp (>= 1.0.0) - net-sftp (>= 2.0.0) - net-ssh (>= 2.0.14) - net-ssh-gateway (>= 1.1.0) carrierwave (0.7.1) activemodel (>= 3.2.0) activesupport (>= 3.2.0) @@ -71,7 +65,6 @@ GEM activesupport (>= 3.1, < 4.1) haml (~> 3.1) railties (>= 3.1, < 4.1) - highline (1.6.15) hike (1.2.1) i18n (0.6.1) journey (1.0.4) @@ -89,13 +82,6 @@ GEM sassy-math (>= 1.2) multi_json (1.5.0) mysql2 (0.3.11) - net-scp (1.0.4) - net-ssh (>= 1.99.1) - net-sftp (2.0.5) - net-ssh (>= 2.0.9) - net-ssh (2.6.2) - net-ssh-gateway (1.1.0) - net-ssh (>= 1.99.1) nokogiri (1.5.5) orm_adapter (0.4.0) polyglot (0.3.3) @@ -129,9 +115,7 @@ GEM rdoc (3.12) json (~> 1.4) redcarpet (2.2.2) - rmagick (2.13.1) - rvm-capistrano (1.2.7) - capistrano (>= 2.0.0) + rmagick (2.13.4) sass (3.2.3) sass-rails (3.2.5) railties (~> 3.2.0) @@ -167,7 +151,6 @@ PLATFORMS ruby DEPENDENCIES - capistrano carrierwave coffee-rails (~> 3.2.1) compass-rails @@ -181,8 +164,10 @@ DEPENDENCIES rails (= 3.2.9) redcarpet rmagick - rvm-capistrano sass-rails (~> 3.2.3) sqlite3 uglifier (>= 1.0.3) zurb-foundation (>= 3.2) + +BUNDLED WITH + 1.15.4 diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 96c4f5d..7311dde 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -1,179 +1,30 @@ $baseFontSize : 16px; $importantModNum : 20px; -$headerFontFamily : 'OpenSansRegular','helvetica', 'san-serif'; +$headerFontFamily : 'Lato','helvetica', 'san-serif'; $headerFontWeight : bold; $ratio : 1.35; -@import "compass"; -@import "foundation"; -a:hover{ -color:#8dbe42; - -} -.bottom{ - - a{ - - color:white; - text-decoration:none; - - - } - float:right; - text-align:right; - -} - -.blog{ - -display:inline-block; -padding:10px 20px; -background:#ff0000; -} - -.contact{ -display:inline-block; -padding:10px; -} - - - -h3{ -font-size:16px; -font-weight:normal; -font-family : 'OpenSansRegular','helvetica', 'san-serif'; -color:black; - -} -.row{ - -width:100%; - -clear:both; - -.columns{ -border:5px solid white; -margin-bottom:1em; -img{ -margin-bottom:1em; -} -.comming_soon{ -display:none; -position:absolute; -bottom:-2em; -right:0px; - -} - -&:hover{ -border:5px solid #8dbe42; -.comming_soon{ -display:block; - -} -} -} - - -} - - body{ - font-family : 'OpenSansRegular','helvetica', 'san-serif'; + font-family : 'Lato','helvetica', 'san-serif'; color:#333333; - font-size:100px !important; - - - #top_anchor{ - position:absolute; - top:0px; - left:0px; - display:none; - } - - - #logo{ - width:120px; - margin:1em; - } - - - .logo{ - - float:left; - } - .create_simple{ - width:66.6%; - float:right; - background:#8dbe42; - text-align:right; - img{ - margin: 5em 1em 1em 1em; - } - - } - - - - - - - - - - - - -} - - -h3{ - -a{ - color:#313232; - } -} -@media only screen and (min-width: 1000px){ -.bottom{ -position:relative; -top:-3em; - -} - - -} - -@media only screen and (min-width: 1300px){ -.bottom{ -position:relative; -top:-5em; - -} - - -} - -@media only screen and (max-width: 767px){ -.logo, .create_simple{ -float:none; -text-align:center !important; -width:100% !important; - - - -} - -.create_simple img{ -margin-top:0.6em !important; -margin:0.3em !important; - - -} - - + text-align:center; + .create_simple{ + font-size:1.3em; + } + .logo{ + img{ + display:block; + width:350px; + margin:60px auto; + } + } + a{ + color:black; + text-decoration:none; + } } diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index fc41de5..301072c 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -5,7 +5,7 @@ %meta{ :"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8" } %meta{ :"name" => "Description", :content => @description } %meta{ :"name" => "Keywords", :content => @keywords } - + %meta{ :"name" => "viewport", :content => "width=device-width, initial-scale=1.0" } diff --git a/app/views/pages_content/index.html.haml b/app/views/pages_content/index.html.haml index 6011777..facf22c 100644 --- a/app/views/pages_content/index.html.haml +++ b/app/views/pages_content/index.html.haml @@ -1,34 +1,19 @@ --@title = "Nicolas Bally" --@description = "Photographie, design, développement." +-@title = "Quartz Agence" +-@description = "Communiquer, simplifier, valoriser votre activité" -@keywords = "Photographie, design, développement" .logo - =image_tag "logo.png", :id => "logo" + =image_tag "/logo.png", :id => "logo" .create_simple - =image_tag "4.jpg" -.row - .four.columns{:onclick => "document.location.href='http://art.nicolasbally.com'", :style => "cursor:pointer;"} - %h3=link_to "Nicolas Bally, Artiste Photographe", "http://art.nicolasbally.com", :title => "Nicolas Bally, artiste photographe." - =image_tag "1.jpg" - - - .four.columns{:style => "opacity:0.7;"} - %h3=link_to "Nicolas Bally, Design & Communication", "http://nicolasbally.com", :title => "Nicolas Bally, Design & Communication", :onclick => "return false;", :style => "cursor:default;" - =image_tag "2.jpg" - .comming_soon - Site bientôt en ligne. - - - .four.columns{:style => "opacity:0.7;"} - %h3=link_to "Nicolas Bally, Sites et Applications Web", "http://nicolasbally.com", :title => "Nicolas Bally, Sites et Applications Web", :onclick => "return false;", :style => "cursor:default;" - =image_tag "3.jpg" - .comming_soon - Site bientôt en ligne. - - + Communiquer, simplifier, valoriser votre activité +.coming_soon + Site prochainement en ligne .bottom - %p.contact - Nicolas Bally - info@nicolasbally.com - +33 (0) 677 548 239 - %p.blog{:onclick => "document.location.href='http://blog.nicolasbally.com'", :style => "cursor:pointer;"} - =link_to "Le blog : actualité, réflexions, dossiers >", "http://blog.nicolasbally.com", :title => "Nicolas Bally, le blog." \ No newline at end of file + %p.contact + Nicolas Bally - + =link_to "contact@quartz-agence.com", "mailto:contact@quartz-agence.com" + =" - +33 (0) 677 548 239" + -if false + %p.blog{:onclick => "document.location.href='http://blog.nicolasbally.com'", :style => "cursor:pointer;"} + =link_to "Le blog : actualité, réflexions, dossiers >", "http://blog.nicolasbally.com", :title => "Nicolas Bally, le blog." \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index 0dcb6b9..b5e6a79 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,62 +11,6 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20120912065146) do - - create_table "note_files", :force => true do |t| - t.string "file" - t.string "name" - t.string "slug" - t.text "description" - t.integer "user_id" - t.integer "note_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - create_table "notes", :force => true do |t| - t.string "subject" - t.text "message" - t.integer "user_id" - t.integer "topic_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "notes", ["user_id"], :name => "index_notes_on_user_id" - - create_table "topics", :force => true do |t| - t.string "title" - t.text "description" - t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "topics", ["user_id"], :name => "index_topics_on_user_id" - - create_table "users", :force => true do |t| - t.string "username", :default => "", :null => false - t.string "name" - t.string "firstname" - t.string "email", :default => "", :null => false - t.string "encrypted_password", :default => "", :null => false - t.string "reset_password_token" - t.datetime "reset_password_sent_at" - t.datetime "remember_created_at" - t.integer "sign_in_count", :default => 0 - t.datetime "current_sign_in_at" - t.datetime "last_sign_in_at" - t.string "current_sign_in_ip" - t.string "last_sign_in_ip" - t.string "authentication_token" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - - add_index "users", ["authentication_token"], :name => "index_users_on_authentication_token", :unique => true - add_index "users", ["email"], :name => "index_users_on_email", :unique => true - add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true - add_index "users", ["username"], :name => "index_users_on_username", :unique => true +ActiveRecord::Schema.define(:version => 0) do end diff --git a/public/liloo/enregistrement-1.m4a b/public/liloo/enregistrement-1.m4a deleted file mode 100644 index 9003981..0000000 Binary files a/public/liloo/enregistrement-1.m4a and /dev/null differ diff --git a/public/liloo/enregistrement-2.m4a b/public/liloo/enregistrement-2.m4a deleted file mode 100644 index 14628d0..0000000 Binary files a/public/liloo/enregistrement-2.m4a and /dev/null differ diff --git a/public/liloo/enregistrement-3.m4a b/public/liloo/enregistrement-3.m4a deleted file mode 100644 index fb522d1..0000000 Binary files a/public/liloo/enregistrement-3.m4a and /dev/null differ diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000..69c7152 Binary files /dev/null and b/public/logo.png differ