[FIX] web: about odoo: correct bootstrap structure inside the modal
authorSimon Lejeune <sle@openerp.com>
Wed, 10 Sep 2014 12:59:00 +0000 (14:59 +0200)
committerSimon Lejeune <sle@openerp.com>
Thu, 11 Sep 2014 09:55:30 +0000 (11:55 +0200)
Bootstrap's container class has a fixed width, using it in a modal
with the previous commit allowing an horizontal scrollbar makes the
layout goes crazy. Use container-fluid instead and cleaned some css.

addons/web/static/src/css/base.css
addons/web/static/src/css/base.sass
addons/web/static/src/xml/base.xml

index 71eeea9..fb02252 100644 (file)
   text-align: center;
   margin: 10px 0 0;
 }
-.openerp .oe_about .user-details .user-info-block .navigation {
-  float: left;
-  width: auto;
-  padding: 0;
-  margin-left: 25%;
-  list-style: none;
-  border: 1px solid #a24689;
-}
-.openerp .oe_about .user-details .user-info-block .navigation li {
-  float: left;
-}
 .openerp .oe_about .user-details .user-info-block .navigation li a {
-  padding: 20px 30px;
-  float: left;
+  padding: 10px 20px;
 }
 .openerp .oe_about .user-details .user-info-block .navigation li.active a {
   background: #a24689;
index 51d931a..9205683 100644 (file)
@@ -869,17 +869,9 @@ $sheet-padding: 16px
                     text-align: center
                     margin: 10px 0 0
                 .navigation
-                    float: left
-                    width: auto
-                    padding: 0
-                    margin-left: 25%
-                    list-style: none
-                    border: 1px solid $link-color-odoo
                     li
-                        float: left
                         a
-                            padding: 20px 30px
-                            float: left
+                            padding: 10px 20px
                         &.active a
                             background: $link-color-odoo
                             color: #fff
index cfaa54e..32ef66d 100644 (file)
 <t t-name="UserMenu.about">
 
     <div class="oe_about">
-      <a class="oe_activate_debug_mode oe_right label label-primary" href="?debug" >Activate the developer mode</a>
 
-
-
-        <div class="container">
-            <div class="">
-                <div class="col-sm-6 col-md-6 user-details">
+        <div class="container-fluid">
+            <div class="row">
+                <a class="oe_activate_debug_mode oe_right label label-primary" href="?debug" >Activate the developer mode</a>
+            </div>
+            <div class="row">
+                <div class="col-sm-offset-2 col-md-offset-2 col-sm-8 col-md-8 user-details">
                     <div class="user-image">
                         <img src="/web/static/src/img/logo2.png" alt="Odoo (Formerly OpenERP)" title="Odoo (Formerly OpenERP)" class="img-circle"/>
                     </div>
                             <h3>Version <t t-esc="version_info.server_version"/></h3>
                         </div>
 
-                        <ul class="navigation">
+                        <ul class="list-inline text-center navigation">
                             <li class="active">
                                 <a data-toggle="tab" href="#settings">
                                     <span class="glyphicon glyphicon-cog"></span>
             </div>
         </div>
     </div>
-
 </t>
 
 <t t-name="WebClient.timezone_notification">