sane table based layouting for oe_main

bzr revid: al@openerp.com-20120327222041-kum3fp8nopnnbcdp
This commit is contained in:
Antony Lesuisse 2012-03-28 00:20:41 +02:00
parent 92b3a975f3
commit d6d9e2602d
4 changed files with 65 additions and 80 deletions

View File

@ -0,0 +1,3 @@
base.css: base.sass
sass -t expanded base.sass base.css

View File

@ -10,18 +10,14 @@
.openerp2 a {
text-decoration: none;
}
.openerp2 .oe_webclient .oe_application {
position: absolute;
top: 33px;
bottom: 0;
left: 222px;
right: 0;
.openerp2 .oe_left {
float: left;
}
.openerp2 .oe_webclient .oe_application a {
color: #8a89ba;
.openerp2 .oe_right {
float: right;
}
.openerp2 .oe_webclient .oe_application a:hover {
text-decoration: underline;
.openerp2 .oe_clear {
clear: both;
}
.openerp2 .oe_content_full_screen .oe_application {
top: 0;
@ -30,6 +26,10 @@
.openerp2 .oe_content_full_screen .topbar, .openerp2 .oe_content_full_screen .leftbar {
display: none;
}
.openerp2 .oe_webclient {
width: 100%;
height: 100%;
}
.openerp2 .oe_topbar {
width: 100%;
height: 31px;
@ -88,19 +88,15 @@
.openerp2 .oe_topbar .oe_topbar_avatar {
vertical-align: top;
}
.openerp2 .oe_leftbarbg {
position: fixed;
width: 220px;
top: 0;
left: 0;
.openerp2 .oe_main {
width: 100%;
height: 100%;
background: #f0eeee;
border-right: 1px solid #afafb6;
z-index: -1;
border-spacing: 0px;
}
.openerp2 .oe_leftbar {
float: left;
width: 221px;
background: #f0eeee;
border-right: 1px solid #afafb6;
text-shadow: 0 1px 1px white;
}
.openerp2 a.oe_logo {
@ -132,6 +128,12 @@
color: #c81010;
font-style: italic;
}
.openerp2 .oe_application a {
color: #8a89ba;
}
.openerp2 .oe_application a:hover {
text-decoration: underline;
}
.openerp2 .oe_menu {
float: left;
padding: 0;
@ -328,15 +330,6 @@
-webkit-box-shadow: none;
-box-shadow: none;
}
.openerp2 .oe_left {
float: left;
}
.openerp2 .oe_right {
float: right;
}
.openerp2 .oe_clear {
clear: both;
}
.openerp2 .oe_form {
border: 1px solid black;
margin: 5%;

View File

@ -1,8 +1,8 @@
// Variables {{{
$colour4: #8a89ba
//$colour4: #d14836
// }}}
// Mixins {{{
@mixin vertical-gradient($startColor: #555, $endColor: #333)
background-color: $startColor
@ -61,21 +61,14 @@ $colour4: #8a89ba
a
text-decoration: none
// }}}
// WebClient {{{
.oe_webclient
.oe_application
position: absolute
top: 33px
bottom: 0
left: 222px
right: 0
a
color: $colour4
&:hover
text-decoration: underline
// Generic classes {{{
.oe_left
float: left
.oe_right
float: right
.oe_clear
clear: both
// }}}
// Fullscreen mode {{{
.oe_content_full_screen
.oe_application
@ -84,7 +77,11 @@ $colour4: #8a89ba
.topbar, .leftbar
display: none
// }}}
// Webclient {{{
.oe_webclient
width: 100%
height: 100%
// }}}
// Topbar {{{
.oe_topbar
width: 100%
@ -128,20 +125,17 @@ $colour4: #8a89ba
.oe_topbar_avatar
vertical-align: top
// }}}
// Leftbar {{{
.oe_leftbarbg
position: fixed
width: 220px
top: 0
left: 0
// Main {{{
.oe_main
width: 100%
height: 100%
border-spacing: 0px
// }}}
// Leftbar {{{
.oe_leftbar
width: 221px
background: #f0eeee
border-right: 1px solid #afafb6
z-index: -1
.oe_leftbar
float: left
width: 221px
text-shadow: 0 1px 1px white
a.oe_logo
display: block
@ -168,7 +162,13 @@ $colour4: #8a89ba
color: #c81010
font-style: italic
// }}}
// Application {{{
.oe_application
a
color: $colour4
&:hover
text-decoration: underline
// }}}
// Menu {{{
.oe_menu
float: left
@ -259,7 +259,6 @@ $colour4: #8a89ba
border-right: 4px solid transparent
border-top: 4px solid #4c4c4c
// }}}
// UserMenu {{{
.oe_user_menu
float: right
@ -321,15 +320,6 @@ $colour4: #8a89ba
@include vertical-gradient(#292929, #191919)
@include box-shadow(none)
// }}}
// Generic classes {{{
.oe_left
float: left
.oe_right
float: right
.oe_clear
clear: both
// }}}
// FormView Layout {{{
.oe_form
border: 1px solid black
@ -361,7 +351,6 @@ $colour4: #8a89ba
.oe_form_label_help[for], .oe_form_label[for]
white-space: nowrap
// }}}
// Transitional overrides for old styles {{{
.openerp
.oe_form_field_many2one

View File

@ -24,19 +24,19 @@
<div class="oe_user_menu_placeholder"/>
<div class="oe_systray"/>
</div>
<div class="oe_main">
<div class="oe_leftbarbg"/>
<div class="oe_leftbar">
<a href="#" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
<div class="oe_secondary_menus_container"/>
<div class="oe_footer">
Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>
</div>
</div>
<div class="oe_application"/>
</div>
<table class="oe_main">
<tr>
<td class="oe_leftbar" valign="top">
<a href="#" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
<div class="oe_secondary_menus_container"/>
<div class="oe_footer">
Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>
</div>
</td>
<td class="oe_application">
</td>
</tr>
</table>
</div>
</t>
<t t-name="Loading">