diff --git a/app/assets/stylesheets/admin/framework/bootstrap-public.less b/app/assets/stylesheets/admin/framework/bootstrap-public.less new file mode 100755 index 0000000..d9bd084 --- /dev/null +++ b/app/assets/stylesheets/admin/framework/bootstrap-public.less @@ -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"; diff --git a/app/assets/stylesheets/public.less b/app/assets/stylesheets/public.less index a5bf7da..f8107ae 100644 --- a/app/assets/stylesheets/public.less +++ b/app/assets/stylesheets/public.less @@ -1,3 +1,5 @@ +@import "admin/framework/bootstrap-public.less"; + @import "shared/formtastic"; @import "public/prettyPhoto"; @@ -242,7 +244,8 @@ body { padding-bottom: 10px; padding-left: 10px; } body #main #contenu { - margin-left: 260px; + width:670px; + float:right; padding: 10px; padding-top: 3px; } body #main #contenu table { @@ -255,6 +258,7 @@ body { border: 1px solid #990000; padding: 10px; } body #main #contenu ul { + padding-left: 50px; list-style: square; } body #main #contenu ul li { @@ -285,6 +289,7 @@ body { margin: 5px 0px 5px 0px; background: #fafafa; } body #bottom { + clear:both; height: 78px; position: relative; width: 950px; diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 76082ee..350e6fd 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -102,7 +102,7 @@ %br %br =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] #flash_notice =raw flash[:notice]