summaryrefslogtreecommitdiff
path: root/addons/web/static/src/css
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2012-09-05 11:00:50 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2012-09-05 11:00:50 +0200
commit9a5cbb33f74647e6270d45dd2c7b25c133aa1e35 (patch)
tree5bfd670591c0e5dbcca09f9dd440def85cc746f7 /addons/web/static/src/css
parent514b2e2b7e3720876b6445e66bf7fbc637654bc9 (diff)
parent60d68f81930ce9a3f735163c2e319a38b8f34f82 (diff)
[IMP] modified default style of ul/li to best fit html semantic
bzr revid: nicolas.vanhoren@openerp.com-20120905090050-tze9qtiw22g1p3fz
Diffstat (limited to 'addons/web/static/src/css')
-rw-r--r--addons/web/static/src/css/Makefile2
-rw-r--r--addons/web/static/src/css/base.css136
-rw-r--r--addons/web/static/src/css/base.sass41
3 files changed, 158 insertions, 21 deletions
diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile
index eca044497ef..d6b4f4b2fc8 100644
--- a/addons/web/static/src/css/Makefile
+++ b/addons/web/static/src/css/Makefile
@@ -1,3 +1,3 @@
base.css: base.sass
- sass -t expanded base.sass base.css
+ sass --trace -t expanded base.sass base.css
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index de30642dfd6..a05b1bc25e5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -97,13 +97,6 @@
background-image: -o-linear-gradient(top, #eeeeee, #dedede);
background-image: linear-gradient(to bottom, #eeeeee, #dedede);
}
-.openerp ul, .openerp li, .openerp ol {
- margin: 0;
- padding: 0;
-}
-.openerp li {
- list-style-type: none;
-}
.openerp input, .openerp textarea, .openerp select {
padding: 2px 4px;
border: 1px solid #cccccc;
@@ -118,6 +111,39 @@
.openerp h4 {
margin: 4px 0;
}
+.openerp .oe_semantic_html_override_ul {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_semantic_html_override_ul ul, .openerp .oe_semantic_html_override_ul ol, .openerp .oe_semantic_html_override_ul li {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_semantic_html_override_ul li {
+ list-style-type: none;
+}
+.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_semantic_html_override ul ul, .openerp .oe_semantic_html_override ul ol, .openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol ul, .openerp .oe_semantic_html_override ol ol, .openerp .oe_semantic_html_override ol li {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li {
+ list-style-type: none;
+}
+.openerp ul.oe_semantic_html_override {
+ margin: 0;
+ padding: 0;
+}
+.openerp ul.oe_semantic_html_override ul, .openerp ul.oe_semantic_html_override ol, .openerp ul.oe_semantic_html_override li {
+ margin: 0;
+ padding: 0;
+}
+.openerp ul.oe_semantic_html_override li {
+ list-style-type: none;
+}
.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
display: inline-block;
border: 1px solid #ababab;
@@ -589,6 +615,26 @@
padding: 0 16px;
list-style: none;
zoom: 1;
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_notebook ul, .openerp .oe_notebook ol, .openerp .oe_notebook li {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_notebook li {
+ list-style-type: none;
+}
+.openerp .oe_notebook ul, .openerp .oe_notebook ol {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_notebook ul ul, .openerp .oe_notebook ul ol, .openerp .oe_notebook ul li, .openerp .oe_notebook ol ul, .openerp .oe_notebook ol ol, .openerp .oe_notebook ol li {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_notebook ul li, .openerp .oe_notebook ol li {
+ list-style-type: none;
}
.openerp .oe_notebook.ui-corner-all {
-moz-border-radius: 0;
@@ -893,6 +939,17 @@
-webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
}
+.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane ol {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_login .oe_login_pane ul ul, .openerp .oe_login .oe_login_pane ul ol, .openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol ul, .openerp .oe_login .oe_login_pane ol ol, .openerp .oe_login .oe_login_pane ol li {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li {
+ list-style-type: none;
+}
.openerp .oe_login .oe_login_pane h2 {
margin-top: 0;
font-size: 18px;
@@ -972,6 +1029,17 @@
background-image: -o-linear-gradient(top, #646060, #262626);
background-image: linear-gradient(to bottom, #646060, #262626);
}
+.openerp .oe_topbar ul, .openerp .oe_topbar ol {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_topbar ul ul, .openerp .oe_topbar ul ol, .openerp .oe_topbar ul li, .openerp .oe_topbar ol ul, .openerp .oe_topbar ol ol, .openerp .oe_topbar ol li {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_topbar ul li, .openerp .oe_topbar ol li {
+ list-style-type: none;
+}
.openerp .oe_topbar .oe_topbar_item {
display: block;
padding: 5px 10px 7px;
@@ -1044,6 +1112,17 @@
text-shadow: 0 1px 1px white;
padding-bottom: 16px;
}
+.openerp .oe_leftbar ul, .openerp .oe_leftbar ol {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_leftbar ul ul, .openerp .oe_leftbar ul ol, .openerp .oe_leftbar ul li, .openerp .oe_leftbar ol ul, .openerp .oe_leftbar ol ol, .openerp .oe_leftbar ol li {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li {
+ list-style-type: none;
+}
.openerp a.oe_logo {
width: 220px;
display: block;
@@ -1136,16 +1215,16 @@
width: 100%;
display: inline-block;
}
-.openerp .oe_secondary_submenu > li {
+.openerp .oe_secondary_submenu li {
position: relative;
- padding: 1px 0 1px 20px;
+ padding: 1px 0 1px 20px !important;
}
-.openerp .oe_secondary_submenu > li a {
+.openerp .oe_secondary_submenu li a {
display: block;
color: #4c4c4c;
padding: 2px 4px 2px 0;
}
-.openerp .oe_secondary_submenu > li .oe_menu_label {
+.openerp .oe_secondary_submenu li .oe_menu_label {
position: absolute;
top: 1px;
right: 1px;
@@ -1246,6 +1325,17 @@
width: 100%;
table-layout: fixed;
}
+.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header ol {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_view_manager table.oe_view_manager_header ul ul, .openerp .oe_view_manager table.oe_view_manager_header ul ol, .openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol ul, .openerp .oe_view_manager table.oe_view_manager_header ol ol, .openerp .oe_view_manager table.oe_view_manager_header ol li {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li {
+ list-style-type: none;
+}
.openerp .oe_view_manager table.oe_view_manager_header .oe_header_row {
clear: both;
text-shadow: 0 1px 1px white;
@@ -1946,7 +2036,7 @@
max-width: 650px;
margin: 0 0 10px 0;
}
-.openerp .oe_form div.oe_form_configuration p {
+.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol {
color: #aaaaaa;
max-width: 650px;
}
@@ -2376,6 +2466,28 @@
.openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option {
margin-top: 10px;
}
+.openerp .oe_form_field_status {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_form_field_status ul ul, .openerp .oe_form_field_status ul ol, .openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol ul, .openerp .oe_form_field_status ol ol, .openerp .oe_form_field_status ol li {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li {
+ list-style-type: none;
+}
+.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol, .openerp .oe_form_field_status li {
+ margin: 0;
+ padding: 0;
+}
+.openerp .oe_form_field_status li {
+ list-style-type: none;
+}
.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
display: none;
}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 82c8e1a57ab..438f59df11f 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -124,6 +124,19 @@ $sheet-max-width: 860px
content: $icon-name
color: $color
+@mixin ul-html-override()
+ margin: 0
+ padding: 0
+ ul, ol, li
+ margin: 0
+ padding: 0
+ li
+ list-style-type: none
+
+@mixin semantic-html-override()
+ ul, ol
+ @include ul-html-override()
+
// }}}
@media print
@@ -178,11 +191,6 @@ $sheet-max-width: 860px
@include vertical-gradient(#f0f0fa, #eeeef6)
.zebra tbody tr:hover td
@include vertical-gradient(#eee, #dedede)
- ul, li, ol
- margin: 0
- padding: 0
- li
- list-style-type: none
input, textarea, select
padding: 2px 4px
border: 1px solid #ccc
@@ -192,6 +200,12 @@ $sheet-max-width: 860px
vertical-align: middle
h4
margin: 4px 0
+ .oe_semantic_html_override_ul
+ @include ul-html-override
+ .oe_semantic_html_override
+ @include semantic-html-override
+ ul.oe_semantic_html_override
+ @include ul-html-override
// }}}
// Button style {{{
a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
@@ -497,6 +511,8 @@ $sheet-max-width: 860px
padding: 0 16px
list-style: none
zoom: 1
+ @include ul-html-override
+ @include semantic-html-override
.oe_notebook.ui-corner-all
@include radius(0)
.oe_notebook:before, .oe_notebook:after
@@ -716,6 +732,7 @@ $sheet-max-width: 860px
text-align: left
@include radius(8px)
@include box-shadow(0 0 18px rgba(0, 0, 0, 0.9))
+ @include semantic-html-override
h2
margin-top: 0
font-size: 18px
@@ -781,6 +798,7 @@ $sheet-max-width: 860px
height: 31px
border-top: solid 1px #d3d3d3
@include vertical-gradient(#646060, #262626)
+ @include semantic-html-override
.oe_topbar_item
display: block
padding: 5px 10px 7px
@@ -831,6 +849,7 @@ $sheet-max-width: 860px
border-right: 1px solid $tag-border
text-shadow: 0 1px 1px white
padding-bottom: 16px
+ @include semantic-html-override
a.oe_logo
width: 220px
display: block
@@ -908,9 +927,9 @@ $sheet-max-width: 860px
margin: 0
width: 100%
display: inline-block
- > li
+ li
position: relative
- padding: 1px 0 1px 20px
+ padding: 1px 0 1px 20px !important
a
display: block
color: #4c4c4c
@@ -995,6 +1014,7 @@ $sheet-max-width: 860px
table.oe_view_manager_header
width: 100%
table-layout: fixed
+ @include semantic-html-override
.oe_header_row
//min-height: 26px
//line-height: 26px
@@ -1532,7 +1552,7 @@ $sheet-max-width: 860px
max-width: 650px
margin: 0 0 10px 0
div.oe_form_configuration
- p
+ p, ul, ol
color: #aaa
max-width: 650px
label
@@ -1848,6 +1868,11 @@ $sheet-max-width: 860px
li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option
margin-top: 10px
// }}}
+ // FormView.fieldstatus {{{
+ .oe_form_field_status
+ @include semantic-html-override
+ @include ul-html-override
+ // }}}
// FormView.one2many {{{
.oe_form .oe_form_field_one2many > .oe_view_manager
.oe_list_pager_single_page