summaryrefslogtreecommitdiff
path: root/addons/web
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2012-04-09 20:43:30 +0200
committerFabien Meghazi <fme@openerp.com>2012-04-09 20:43:30 +0200
commitbc92baa084205dbfbe1bc65b367ce11a8dcf9bf8 (patch)
treef2597c56e9603bcfdfe90d63f2395a24ec84fa1e /addons/web
parentcd61687d3d55a99026b970abac35435d9f7eebc9 (diff)
[IMP] Improved styles
bzr revid: fme@openerp.com-20120409184330-g8qp5pu5sonpc4tn
Diffstat (limited to 'addons/web')
-rw-r--r--addons/web/static/src/css/base.css100
-rw-r--r--addons/web/static/src/css/base.sass97
-rw-r--r--addons/web/static/src/css/base_old.css64
-rw-r--r--addons/web/static/src/xml/base.xml2
4 files changed, 164 insertions, 99 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 7b139f4004e..3887dbc9a3b 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -18,6 +18,9 @@
background: white;
position: relative;
height: 100%;
+ /* http://www.quirksmode.org/dom/inputfile.html
+ * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
+ */
}
.openerp2 a {
text-decoration: none;
@@ -1090,6 +1093,7 @@
}
.openerp2 .oe_searchview .oe_searchview_drawer {
position: absolute;
+ z-index: 1;
top: 100%;
right: 0;
background-color: white;
@@ -1312,25 +1316,6 @@
width: 100%;
white-space: nowrap;
}
-.openerp2 .oe_layout_debugging .oe_form_group {
- border: 2px dashed red;
-}
-.openerp2 .oe_layout_debugging .oe_form_group_cell {
- border: 1px solid blue;
- padding-bottom: 1em;
-}
-.openerp2 .oe_layout_debugging .oe_layout_debug_cell {
- color: white;
- background: #669966;
- font-size: 80%;
- text-align: center;
-}
-.openerp2 .oe_layout_debugging .oe_layout_debug_cell {
- display: block;
-}
-.openerp2 .oe_layout_debug_cell {
- display: none;
-}
.openerp2 .oe_form_topbar {
border-bottom: 1px solid #cacaca;
background-color: #fcfcfc;
@@ -1425,6 +1410,25 @@
.openerp2 .oe_form_label_help[for], .openerp2 .oe_form_label[for] {
white-space: nowrap;
}
+.openerp2 .oe_form .oe-binary-file-set {
+ overflow: hidden;
+ position: relative;
+ width: 45px;
+ height: 30px;
+}
+.openerp2 .oe_form input.oe-binary-file {
+ z-index: 0;
+ line-height: 0;
+ font-size: 12px;
+ position: absolute;
+ top: 1px;
+ right: 10px;
+ opacity: 0;
+ filter: alpha(opacity=0);
+ -ms-filter: "alpha(opacity=0)";
+ margin: 0;
+ padding: 0;
+}
.openerp2 .oe_horizontal_separator {
font-weight: bold;
border: 0 solid #666666;
@@ -1492,6 +1496,28 @@
.openerp2 .ui-tabs-hide {
display: none;
}
+.openerp2 .oe_form .oe_form_field_progressbar.ui-progressbar {
+ height: 22px;
+ font-size: 10px;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+ border: 1px solid #999999;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ background: white;
+ min-width: 90px;
+}
+.openerp2 .oe_form .oe_form_field_progressbar.ui-progressbar span {
+ position: absolute;
+ margin-left: 10px;
+ font-weight: bold;
+}
+.openerp2 .oe_form .oe_form_field_progressbar.ui-progressbar .ui-widget-header {
+ background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
+}
.openerp2 .oe-listview-content {
width: 100%;
}
@@ -1615,6 +1641,42 @@
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
}
+.openerp2 .oe_layout_debugging .oe_form_group {
+ border: 2px dashed red;
+}
+.openerp2 .oe_layout_debugging .oe_form_group_cell {
+ border: 1px solid blue;
+ padding-bottom: 1em;
+}
+.openerp2 .oe_layout_debugging .oe_layout_debug_cell {
+ color: white;
+ background: #669966;
+ font-size: 80%;
+ text-align: center;
+}
+.openerp2 .oe_layout_debugging .oe_layout_debug_cell {
+ display: block;
+}
+.openerp2 .oe_layout_debug_cell {
+ display: none;
+}
+.openerp2 .oe_debug_view_log {
+ font-size: 95%;
+}
+.openerp2 .oe_debug_view_log label {
+ display: block;
+ width: 49%;
+ text-align: right;
+ float: left;
+ font-weight: bold;
+ color: #000099;
+}
+.openerp2 .oe_debug_view_log span {
+ display: block;
+ width: 49%;
+ float: right;
+ color: #333333;
+}
.openerp .oe_form_field_many2one td:first-child {
position: relative;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index f9b0cb49f92..6201312a7f4 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -885,6 +885,7 @@ $colour4: #8a89ba
.oe_searchview_drawer
position: absolute
+ z-index: 1
top: 100%
right: 0
background-color: white
@@ -1073,21 +1074,6 @@ $colour4: #8a89ba
.oe_form_button
width: 100%
white-space: nowrap
- .oe_layout_debugging
- .oe_form_group
- border: 2px dashed red
- .oe_form_group_cell
- border: 1px solid blue
- padding-bottom: 1em
- .oe_layout_debug_cell
- color: white
- background: #696
- font-size: 80%
- text-align: center
- .oe_layout_debug_cell
- display: block
- .oe_layout_debug_cell
- display: none
.oe_form_topbar
border-bottom: 1px solid #cacaca
@include vertical-gradient(#fcfcfc, #dedede)
@@ -1177,6 +1163,30 @@ $colour4: #8a89ba
.oe_form_label_help[for], .oe_form_label[for]
white-space: nowrap
// }}}
+ // FormView.binaryfile {{{
+ /* http://www.quirksmode.org/dom/inputfile.html
+ * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
+ */
+ .oe_form
+ .oe-binary-file-set
+ overflow: hidden
+ position: relative
+ width: 45px
+ height: 30px
+ input.oe-binary-file
+ z-index: 0
+ line-height: 0
+ font-size: 12px
+ position: absolute
+ // Should be adjusted for all browsers
+ top: 1px
+ right: 10px
+ opacity: 0
+ filter: alpha(opacity = 0)
+ -ms-filter: "alpha(opacity=0)"
+ margin: 0
+ padding: 0
+ // }}}
// FormView.separator {{{
.oe_horizontal_separator
font-weight: bold
@@ -1233,6 +1243,30 @@ $colour4: #8a89ba
display: none
// }}}
+ // FormView.progressbar {{{
+ .oe_form
+ .oe_form_field_progressbar.ui-progressbar
+ height: 22px
+ font-size: 10px
+ -moz-box-sizing: border-box
+ -webkit-box-sizing: border-box
+ -ms-box-sizing: border-box
+ box-sizing: border-box
+ border: 1px solid #999
+ -moz-border-radius: 3px
+ -webkit-border-radius: 3px
+ border-radius: 3px
+ background: white
+ min-width: 90px
+
+ span
+ position: absolute
+ margin-left: 10px
+ font-weight: bold
+
+ .ui-widget-header
+ background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x
+ // }}}
// ListView {{{
.oe-listview-content
width: 100%
@@ -1324,6 +1358,39 @@ $colour4: #8a89ba
@include box-shadow(0 1px 2px rgba(0,0,0,0.2))
// }}}
+ // Debugging stuff {{{
+ .oe_layout_debugging
+ .oe_form_group
+ border: 2px dashed red
+ .oe_form_group_cell
+ border: 1px solid blue
+ padding-bottom: 1em
+ .oe_layout_debug_cell
+ color: white
+ background: #696
+ font-size: 80%
+ text-align: center
+ .oe_layout_debug_cell
+ display: block
+ .oe_layout_debug_cell
+ display: none
+
+ .oe_debug_view_log
+ font-size: 95%
+ .oe_debug_view_log label
+ display: block
+ width: 49%
+ text-align: right
+ float: left
+ font-weight: bold
+ color: #009
+ .oe_debug_view_log span
+ display: block
+ width: 49%
+ float: right
+ color: #333
+ // }}}
+
// Transitional overrides for old styles {{{
.openerp
.oe_form_field_many2one
diff --git a/addons/web/static/src/css/base_old.css b/addons/web/static/src/css/base_old.css
index e9a76559179..561b71ead21 100644
--- a/addons/web/static/src/css/base_old.css
+++ b/addons/web/static/src/css/base_old.css
@@ -913,28 +913,6 @@ label.error {
border: 1px solid green !important;
}
-/* http://www.quirksmode.org/dom/inputfile.html
- * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
- */
-.openerp .oe-binary-file-set {
- overflow: hidden;
- position: relative;
-}
-.openerp input.oe-binary-file {
- z-index: 0;
- line-height: 0;
- font-size: 12px;
- position: absolute;
- /* Should be adjusted for all browsers */
- top: 1px;
- right: 10px;
- opacity: 0;
- filter: alpha(opacity = 0);
- -ms-filter: "alpha(opacity=0)";
- margin: 0;
- padding:0;
-}
-
/* Widgets */
.openerp .oe_form_required input, .openerp .oe_form_required select, .openerp .oe_form_required textarea {
background-color: #D2D2FF !important;
@@ -943,31 +921,11 @@ label.error {
background-color: #F66 !important;
border: 1px solid #D00 !important;
}
-.openerp div.oe-progressbar span {
- position: absolute;
- margin-left: 10px;
- margin-top: 5px;
- font-weight: bold;
-}
/* jQuery UI override */
.openerp .ui-widget {
font-size: 1em;
}
-.openerp .oe_form_field_progressbar .ui-progressbar {
- height: 22px;
- font-size: 10px;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- -ms-box-sizing: border-box;
- box-sizing: border-box;
- border: 1px solid #999;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
- background: white;
- min-width: 90px;
-}
.openerp tbody.ui-widget-content {
margin-bottom: 10px;
border-spacing: 4px;
@@ -975,10 +933,6 @@ label.error {
.openerp .ui-widget-header {
background: white none;
}
-/* progress bars */
-.openerp .ui-progressbar .ui-widget-header {
- background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
-}
/* Sidebar */
.openerp .view-manager-main-table {
@@ -1583,24 +1537,6 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after {
color: black;
}
-/* Debug stuff */
-.openerp .oe_debug_view_log {
- font-size: 95%;
-}
-.openerp .oe_debug_view_log label {
- display: block;
- width: 49%;
- text-align: right;
- float: left;
- font-weight: bold;
- color: #009;
-}
-.openerp .oe_debug_view_log span {
- display: block;
- width: 49%;
- float: right;
- color: #333;
-}
/* Internet Explorer Fix */
a img {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 00fa6b75425..38a3b4199b9 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1097,7 +1097,7 @@
<table cellspacing="0" cellpadding="0" border="0">
<tr>
<td>
- <div class="oe-binary-file-set" style="width: 40px; height:22px;">
+ <div class="oe-binary-file-set">
<form class="oe-binary-form" t-att-target="widget.iframe"
method="post" enctype="multipart/form-data" action="/web/binary/upload">
<input type="hidden" name="session_id" value=""/>