diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4ec60dc --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +.bundle +db/*.sqlite3 +log/*.log +tmp/ +pdf/ +csv/ +.sass-cache/ +.DS_Store +private_medias/ +public/public_medias +public/assets \ No newline at end of file diff --git a/app/assets/stylesheets/public/timeline.css.scss b/app/assets/stylesheets/public/timeline.css.scss index f91f9c7..9829160 100644 --- a/app/assets/stylesheets/public/timeline.css.scss +++ b/app/assets/stylesheets/public/timeline.css.scss @@ -28,7 +28,7 @@ top:5px; width:12px; height:12px; - border:4px solid rgba(251,163,58,1); + border:4px solid $orange; background:white; border-radius:50%; position:absolute; diff --git a/app/models/block.rb b/app/models/block.rb index e8570b5..7b855a8 100644 --- a/app/models/block.rb +++ b/app/models/block.rb @@ -17,7 +17,6 @@ class Block < ActiveRecord::Base QuoteContent: "Citation", MenuItemLinkContent: "Pavé lien", TimelineHistoryContent: "Timeline", - PetitionContent: "Petition", VideoContent: "Vidéo", }