maj
This commit is contained in:
Nicolas Bally
parent
2f006fbd5e
commit
a1632bfe4d
23
Gemfile.lock
23
Gemfile.lock
@ -31,12 +31,6 @@ GEM
|
|||||||
arel (3.0.2)
|
arel (3.0.2)
|
||||||
bcrypt-ruby (3.0.1)
|
bcrypt-ruby (3.0.1)
|
||||||
builder (3.0.4)
|
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)
|
carrierwave (0.7.1)
|
||||||
activemodel (>= 3.2.0)
|
activemodel (>= 3.2.0)
|
||||||
activesupport (>= 3.2.0)
|
activesupport (>= 3.2.0)
|
||||||
@ -71,7 +65,6 @@ GEM
|
|||||||
activesupport (>= 3.1, < 4.1)
|
activesupport (>= 3.1, < 4.1)
|
||||||
haml (~> 3.1)
|
haml (~> 3.1)
|
||||||
railties (>= 3.1, < 4.1)
|
railties (>= 3.1, < 4.1)
|
||||||
highline (1.6.15)
|
|
||||||
hike (1.2.1)
|
hike (1.2.1)
|
||||||
i18n (0.6.1)
|
i18n (0.6.1)
|
||||||
journey (1.0.4)
|
journey (1.0.4)
|
||||||
@ -89,13 +82,6 @@ GEM
|
|||||||
sassy-math (>= 1.2)
|
sassy-math (>= 1.2)
|
||||||
multi_json (1.5.0)
|
multi_json (1.5.0)
|
||||||
mysql2 (0.3.11)
|
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)
|
nokogiri (1.5.5)
|
||||||
orm_adapter (0.4.0)
|
orm_adapter (0.4.0)
|
||||||
polyglot (0.3.3)
|
polyglot (0.3.3)
|
||||||
@ -129,9 +115,7 @@ GEM
|
|||||||
rdoc (3.12)
|
rdoc (3.12)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
redcarpet (2.2.2)
|
redcarpet (2.2.2)
|
||||||
rmagick (2.13.1)
|
rmagick (2.13.4)
|
||||||
rvm-capistrano (1.2.7)
|
|
||||||
capistrano (>= 2.0.0)
|
|
||||||
sass (3.2.3)
|
sass (3.2.3)
|
||||||
sass-rails (3.2.5)
|
sass-rails (3.2.5)
|
||||||
railties (~> 3.2.0)
|
railties (~> 3.2.0)
|
||||||
@ -167,7 +151,6 @@ PLATFORMS
|
|||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
capistrano
|
|
||||||
carrierwave
|
carrierwave
|
||||||
coffee-rails (~> 3.2.1)
|
coffee-rails (~> 3.2.1)
|
||||||
compass-rails
|
compass-rails
|
||||||
@ -181,8 +164,10 @@ DEPENDENCIES
|
|||||||
rails (= 3.2.9)
|
rails (= 3.2.9)
|
||||||
redcarpet
|
redcarpet
|
||||||
rmagick
|
rmagick
|
||||||
rvm-capistrano
|
|
||||||
sass-rails (~> 3.2.3)
|
sass-rails (~> 3.2.3)
|
||||||
sqlite3
|
sqlite3
|
||||||
uglifier (>= 1.0.3)
|
uglifier (>= 1.0.3)
|
||||||
zurb-foundation (>= 3.2)
|
zurb-foundation (>= 3.2)
|
||||||
|
|
||||||
|
BUNDLED WITH
|
||||||
|
1.15.4
|
||||||
|
|||||||
@ -1,179 +1,30 @@
|
|||||||
$baseFontSize : 16px;
|
$baseFontSize : 16px;
|
||||||
$importantModNum : 20px;
|
$importantModNum : 20px;
|
||||||
$headerFontFamily : 'OpenSansRegular','helvetica', 'san-serif';
|
$headerFontFamily : 'Lato','helvetica', 'san-serif';
|
||||||
$headerFontWeight : bold;
|
$headerFontWeight : bold;
|
||||||
$ratio : 1.35;
|
$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{
|
body{
|
||||||
font-family : 'OpenSansRegular','helvetica', 'san-serif';
|
font-family : 'Lato','helvetica', 'san-serif';
|
||||||
|
|
||||||
color:#333333;
|
color:#333333;
|
||||||
font-size:100px !important;
|
|
||||||
|
|
||||||
|
text-align:center;
|
||||||
|
.create_simple{
|
||||||
#top_anchor{
|
font-size:1.3em;
|
||||||
position:absolute;
|
}
|
||||||
top:0px;
|
.logo{
|
||||||
left:0px;
|
img{
|
||||||
display:none;
|
display:block;
|
||||||
}
|
width:350px;
|
||||||
|
margin:60px auto;
|
||||||
|
}
|
||||||
#logo{
|
}
|
||||||
width:120px;
|
a{
|
||||||
margin:1em;
|
color:black;
|
||||||
}
|
text-decoration:none;
|
||||||
|
}
|
||||||
|
|
||||||
.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;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
%meta{ :"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8" }
|
%meta{ :"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8" }
|
||||||
%meta{ :"name" => "Description", :content => @description }
|
%meta{ :"name" => "Description", :content => @description }
|
||||||
%meta{ :"name" => "Keywords", :content => @keywords }
|
%meta{ :"name" => "Keywords", :content => @keywords }
|
||||||
|
<link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,700i" rel="stylesheet">
|
||||||
%meta{ :"name" => "viewport", :content => "width=device-width, initial-scale=1.0" }
|
%meta{ :"name" => "viewport", :content => "width=device-width, initial-scale=1.0" }
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,34 +1,19 @@
|
|||||||
-@title = "Nicolas Bally"
|
-@title = "Quartz Agence"
|
||||||
-@description = "Photographie, design, développement."
|
-@description = "Communiquer, simplifier, valoriser votre activité"
|
||||||
-@keywords = "Photographie, design, développement"
|
-@keywords = "Photographie, design, développement"
|
||||||
|
|
||||||
|
|
||||||
.logo
|
.logo
|
||||||
=image_tag "logo.png", :id => "logo"
|
=image_tag "/logo.png", :id => "logo"
|
||||||
.create_simple
|
.create_simple
|
||||||
=image_tag "4.jpg"
|
Communiquer, simplifier, valoriser votre activité
|
||||||
.row
|
.coming_soon
|
||||||
.four.columns{:onclick => "document.location.href='http://art.nicolasbally.com'", :style => "cursor:pointer;"}
|
Site prochainement en ligne
|
||||||
%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.
|
|
||||||
|
|
||||||
|
|
||||||
.bottom
|
.bottom
|
||||||
%p.contact
|
%p.contact
|
||||||
Nicolas Bally - info@nicolasbally.com - +33 (0) 677 548 239
|
Nicolas Bally -
|
||||||
%p.blog{:onclick => "document.location.href='http://blog.nicolasbally.com'", :style => "cursor:pointer;"}
|
=link_to "contact@quartz-agence.com", "mailto:contact@quartz-agence.com"
|
||||||
=link_to "Le blog : actualité, réflexions, dossiers >", "http://blog.nicolasbally.com", :title => "Nicolas Bally, le blog."
|
=" - +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."
|
||||||
58
db/schema.rb
58
db/schema.rb
@ -11,62 +11,6 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended to check this file into your version control system.
|
# It's strongly recommended to check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(:version => 20120912065146) do
|
ActiveRecord::Schema.define(:version => 0) 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
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
public/logo.png
Normal file
BIN
public/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 46 KiB |
Loading…
x
Reference in New Issue
Block a user