css colonnes

This commit is contained in:
Nicolas Bally 2014-06-22 17:49:28 +02:00
parent efb5592bd0
commit b65e5f2d75
3 changed files with 28 additions and 2 deletions

View File

@ -0,0 +1,21 @@
/*!
* Bootstrap v2.3.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
*/
// Core variables and mixins
@import "variables.less"; // Modify this for custom colors, font-sizes, etc
@import "mixins.less";
// CSS Reset
@import "reset.less";
// Grid system and page structure
@import "scaffolding.less";
@import "grid.less";
@import "layouts.less";

View File

@ -1,3 +1,5 @@
@import "admin/framework/bootstrap-public.less";
@import "shared/formtastic"; @import "shared/formtastic";
@import "public/prettyPhoto"; @import "public/prettyPhoto";
@ -242,7 +244,8 @@ body {
padding-bottom: 10px; padding-bottom: 10px;
padding-left: 10px; } padding-left: 10px; }
body #main #contenu { body #main #contenu {
margin-left: 260px; width:670px;
float:right;
padding: 10px; padding: 10px;
padding-top: 3px; } padding-top: 3px; }
body #main #contenu table { body #main #contenu table {
@ -255,6 +258,7 @@ body {
border: 1px solid #990000; border: 1px solid #990000;
padding: 10px; } padding: 10px; }
body #main #contenu ul { body #main #contenu ul {
padding-left: 50px; padding-left: 50px;
list-style: square; } list-style: square; }
body #main #contenu ul li { body #main #contenu ul li {
@ -285,6 +289,7 @@ body {
margin: 5px 0px 5px 0px; margin: 5px 0px 5px 0px;
background: #fafafa; } background: #fafafa; }
body #bottom { body #bottom {
clear:both;
height: 78px; height: 78px;
position: relative; position: relative;
width: 950px; width: 950px;

View File

@ -102,7 +102,7 @@
%br %br
%br %br
=image_tag('style/une.gif', :style => "width:497px;") =image_tag('style/une.gif', :style => "width:497px;")
#contenu{:style => ("padding-right:201px;background:url('/images/style/fond.png') repeat-y top right" if @accueil).to_s} #contenu{:style => ("margin-left:260px;float:none;width:auto;padding-right:201px;background:url('/images/style/fond.png') repeat-y top right" if @accueil).to_s}
-if flash[:notice] -if flash[:notice]
#flash_notice #flash_notice
=raw flash[:notice] =raw flash[:notice]