table design

This commit is contained in:
Nicolas Bally 2014-05-14 19:32:39 +02:00
parent dfea2d90a1
commit b6fd37a128
4 changed files with 28 additions and 6 deletions

View File

@ -8,6 +8,7 @@
@import "public/thikbox"; @import "public/thikbox";
img{ img{
max-width:100%; max-width:100%;
} }
@ -131,7 +132,11 @@ body {
font-weight: bold; font-weight: bold;
font-size: 16px; } font-size: 16px; }
body p { body p {
text-align: justify; } text-align: justify;
table p{
text-align:left;
}
}
body cite { body cite {
padding: 10px; padding: 10px;
display: block; } display: block; }
@ -356,3 +361,17 @@ body {
.actu_accueil img { .actu_accueil img {
float: right; float: right;
margin: 10px; } margin: 10px; }
body #main #contenu .condensed{
th, td{
p{
margin:5px 0;
}
padding-top:0;
padding-bottom:0;
}
}

View File

@ -4,7 +4,7 @@ class TableContent < ActiveRecord::Base
has_many :table_rows, :include => :cel_tables, :order => :position has_many :table_rows, :include => :cel_tables, :order => :position
has_many :cel_tables, :through => :table_rows has_many :cel_tables, :through => :table_rows
STYLES = [["avec bordures",1],["sans bordures",2]] STYLES = [["avec bordures",1],["avec bordures, condensé",2]]
after_create do after_create do

View File

@ -56,7 +56,7 @@
-else -else
%table %table{:class =>("condensed" if input.style == 2)}
-table_rows = input.table_rows -table_rows = input.table_rows

View File

@ -4,10 +4,13 @@
# Ensure the SQLite 3 gem is defined in your Gemfile # Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3' # gem 'sqlite3'
development: development:
adapter: sqlite3 adapter: mysql2
database: db/development.sqlite3 encoding: utf8
database: crossey
pool: 5 pool: 5
timeout: 5000 username: crossey
password: crossey
host: 127.0.0.1
# Warning: The database defined as "test" will be erased and # Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake". # re-generated from your development database when you run "rake".