Antoine(OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-font-size-ahu into lp:openerp-web.
Requested reviews:
Fabien Meghazi (OpenERP) (fme)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-font-size-ahu/+merge/83152
Changes in the font size in view list, form and non editable form. Also some
small changes in kanban view and in search view buttons
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-font-size-ahu/+merge/83152
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-font-size-ahu.
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2011-11-23 10:05:42 +0000
+++ addons/web/static/src/css/base.css 2011-11-23 12:50:36 +0000
@@ -1,4 +1,3 @@
-/* TODO: separate openerp web client page css from openerp views css */
body.openerp {
padding: 0;
margin: 0;
@@ -6,10 +5,12 @@
min-width: 1000px;
overflow-y: scroll;
font-size: 80%;
+ font-family: Ubuntu, Helvetica, sans-serif;
}
body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp option, .openerp button, .openerp .ui-widget {
font-family: Ubuntu, Helvetica, sans-serif;
+ font-size:85%;
}
.oe_box {
@@ -29,6 +30,17 @@
.openerp .oe-listview .oe-number {
text-align: right !important;
}
+.oe-listview-header-columns {
+ background: #444; /* Old browsers */
+ background: -moz-linear-gradient(top, #ffffff 0%, #d1d1d1 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#d1d1d1)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #ffffff 0%,#d1d1d1 100%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #ffffff 0%,#d1d1d1 100%); /* Opera11.10+ */
+ background: -ms-linear-gradient(top, #ffffff 0%,#d1d1d1 100%); /* IE10+ */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#d1d1d1',GradientType=0 ); /* IE6-9 */
+ background: linear-gradient(top, #ffffff 0%,#d1d1d1 100%); /* W3C */
+}
+
.openerp .oe_hide {
display: none !important;
}
@@ -261,7 +273,7 @@
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#BD5E54', endColorstr='#90322A',GradientType=0 ); /* IE6-9 */
background: linear-gradient(top, #bd5e54 0%,#90322a 60%); /* W3C */
- border: 1px solid #6E2A24;
+ border: 1px solid #5E1A14;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
@@ -272,7 +284,7 @@
text-transform: uppercase;
line-height: 20px;
font-weight: bold;
- font-size: 85%;
+ font-size: 75%;
white-space: nowrap;
}
@@ -431,6 +443,8 @@
margin: 0;
padding: 4px 10px;
text-shadow: 0 1px 0 #111111;
+ font-weight:600;
+ line-height:14px;
}
.openerp .header_title small {
color: #ccc;
@@ -498,6 +512,10 @@
font-weight: bold;
}
+.openerp .logout {
+ font-size:80%;
+}
+
/* Footer */
.openerp div.oe_footer {
background: none repeat scroll 0 0 #CCCCCC;
@@ -530,7 +548,7 @@
}
.openerp h2.oe_view_title {
- font-size: 175%;
+ font-size: 110%;
font-weight: normal;
margin: 2px 0;
color: #252424;
@@ -541,12 +559,15 @@
.openerp .oe_vm_switch {
float: right;
}
+.openerp .oe-view-manager-header .oe_view_title {
+ font-size:150%;
+}
/* SearchView */
.openerp .filter_label, .openerp .filter_icon {
- border: 1px solid #666;
border-left-width: 0;
background: #F0F0F0;
+ border: 1px solid #999;
background: -moz-linear-gradient(top, #F0F0F0 0%, #C0C0C0 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F0F0F0), color-stop(100%,#C0C0C0));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F0F0F0', endColorstr='#C0C0C0',GradientType=0 );
@@ -558,13 +579,13 @@
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F0F0F0', endColorstr='#A1A7CE',GradientType=0 );
}
.openerp .filter_label:active, .openerp .filter_icon:active {
- background: #AAAAAA;
+ background: #aaa;
background: -moz-linear-gradient(top, #999999 0%, #EEEEEE 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#999999), color-stop(100%,#EEEEEE));
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#999999', endColorstr='#EEEEEE',GradientType=0 );
}
.openerp .filter_label.enabled, .openerp .filter_icon.enabled {
- background: #AAAAAA;
+ background: #aaa;
}
.openerp .filter_icon {
height: 22px;
@@ -588,13 +609,17 @@
white-space: nowrap;
}
.openerp .filter_label_group button:first-child {
- border-left: 1px solid #666;
-webkit-border-top-left-radius: 7px;
-webkit-border-bottom-left-radius: 7px;
-moz-border-radius-topleft: 7px;
-moz-border-radius-bottomleft: 7px;
border-top-left-radius: 7px;
border-bottom-left-radius: 7px;
+ /*border-left:0px;*/
+ border-right:none;
+}
+.openerp .filter_label_group button {
+ border-right:none;
}
.openerp .filter_label_group button:last-child {
-webkit-border-top-right-radius: 7px;
@@ -603,6 +628,20 @@
-moz-border-radius-bottomright: 7px;
border-top-right-radius: 7px;
border-bottom-right-radius: 7px;
+ border-right:1px solid #999;
+}
+.openerp .filter_label_group button.filter_icon img {
+ padding:1px 8px 0px 8px;
+}
+.openerp .filter_label_group button.filter_icon:first-child {
+ border-left:solid 1px #999;
+ margin-left:-7px;
+ -webkit-border-top-left-radius: 0px;
+ -webkit-border-bottom-left-radius: 0px;
+ -moz-border-radius-topleft: 0px;
+ -moz-border-radius-bottomleft: 0px;
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
}
.openerp .searchview_group_string {
@@ -631,6 +670,10 @@
.openerp .searchview_group_content {
padding-left: 10px;
}
+.openerp .searchview_group_content .oe_label, .openerp .searchview_group_content .oe_label_help {
+ font-weight:bold;
+ color:#4c4c4c;
+}
.openerp .searchview_extended_group {
padding: 3px;
@@ -715,10 +758,16 @@
text-align: left;
padding: 1px 2px;
}
-.openerp .oe-listview th.oe-record-selector,
-.openerp .oe-listview td.oe-button,
-.openerp .oe-listview td.oe-record-delete {
- padding: 0 1px;
+
+.openerp .oe-record-delete button{
+ border:none;
+ height:12px;
+ width:12px;
+ background-image:url("/web/static/src/img/iconset-b-remove.gif");
+ background-repeat:no-repeat;
+ background-position:center center;
+ background-color:transparent;
+ cursor:pointer;
}
/* Could use :not selectors if they were supported by MSIE8... */
@@ -738,15 +787,28 @@
}
.openerp .oe-listview th.oe-sortable {
cursor: pointer;
+ font-size:75%;
+ text-transform:uppercase;
+ padding:0px;
+ margin:0px;
+ padding-left:3px;
+ color:#333;
}
.openerp .oe-listview th.oe-sortable .ui-icon {
- height: 1em;
- display: inline;
+ height: 60%;
+ margin: -6px 0px 0px 0px;
display: inline-block;
+ vertical-align:middle;
}
+
.openerp .oe-listview .oe-field-cell {
cursor: pointer;
+ margin-top: 0px;
+ margin-bottom: 0px;
+ padding-top: 3px;
+ padding-bottom: 3px;
+ font-size:80%;
}
.openerp .oe-listview .oe-field-cell progress {
width: 100%;
@@ -778,6 +840,8 @@
}
.openerp .oe-list-pager .oe-pager-state {
cursor: pointer;
+ font-size:90%;
+ color:#555;
}
.openerp .oe-listview .oe-group-name {
@@ -794,6 +858,8 @@
.openerp .oe-listview .oe-list-footer {
text-align: center;
white-space: nowrap;
+ color:#444;
+ font-size:85%;
}
.openerp .oe-listview .oe-list-footer span {
margin: 0 1em;
@@ -854,7 +920,9 @@
border-radius: 0;
-moz-border-radius: 0;
-webkit-border-radius: 0;
- line-height: 0.5em;
+ line-height: 0.8em;
+ font-size:0.85em;
+ color:#555;
}
.openerp .oe_form_notebook ul.ui-tabs-nav li {
font-weight: bold;
@@ -866,8 +934,32 @@
.openerp .oe_form_notebook .ui-tabs-selected {
background: #f9f9f9;
}
+/* Unedit Form */
+.openerp .field_char, .openerp .field_date, .openerp .field_float, .openerp .field_selection, .openerp .oe_form_field_many2one a {
+ vertical-align:middle;
+ padding-top:3px;
+ font-size:90%;
+ color:#222;
+}
+.openerp .oe_form_field_many2one a {
+ color:#9A0404;
+ line-height:12px;
+}
+
+
/* Form */
+.openerp .oe_form_frame_cell input[type="checkbox"] {
+ margin-top:5px;
+ vertical-align:center;
+}
+.openerp table.oe_frame td {
+ color: #4c4c4c;
+}
+.openerp td.oe_form_frame_cell {
+ padding: 2px;
+ position: relative;
+}
.openerp .oe_frame.oe_forms {
clear: both;
}
@@ -900,14 +992,24 @@
}
.openerp .oe_form_pager, .openerp .oe_list_pager {
float: right;
+ font-size:80%;
+ color:gray;
+ font-weight:bold;
}
.openerp label.oe_label_help, .openerp label.oe_label {
display: block;
+ color:#4c4c4c;
+ font-size:80%;
+ font-weight:700;
+/* letter-spacing:1px;*/
}
.openerp label.oe_label_help {
cursor: help;
}
+.openerp .oe_form_frame_cell .oe_label, .openerp .oe_form_frame_cell .oe_label_help {
+ font-weight:500;
+}
.openerp #tiptip_content {
font-size: 12px;
}
@@ -926,7 +1028,7 @@
}
.openerp .oe_forms label.oe_label, .openerp .oe_forms label.oe_label_help {
- margin: 3px 0 0 10px;
+ margin: 3px 0 0 3px;
}
.openerp label.oe_label_help span {
font-size: 80%;
@@ -1055,10 +1157,14 @@
border: 0 solid #666;
}
.openerp .separator.horizontal {
- font-weight: bold;
+ font-weight: bold;
border-bottom-width: 1px;
margin: 3px 4px 3px 1px;
height: 15px;
+ font-size:90%;
+}
+.openerp .separator.horizontal:empty {
+ height: 5px;
}
.openerp .oe_form_frame_cell.oe_form_separator_vertical {
border-left: 1px solid #666;
@@ -1095,6 +1201,17 @@
background: white;
min-width: 90px;
}
+.openerp tbody.ui-widget-content {
+ margin-bottom:10px;
+ border-spacing:4px;
+ /*border:1px solid red;
+ background-color:red;
+ color:red;*/
+}
+.openerp .ui-widget-header {
+ background-image:none;
+ background-color:white;
+}
/* Sidebar */
.openerp .view-manager-main-table {
@@ -1110,6 +1227,7 @@
.openerp .view-manager-main-content {
width: 100%;
+ padding:0px 7px;
}
.openerp .oe-view-manager-header {
overflow: auto;
@@ -1434,6 +1552,7 @@
.oe-shortcut-toggle {
height: 20px;
padding: 0;
+ margin-top:4px;
width: 24px;
cursor: pointer;
display: block;
=== modified file 'addons/web/static/src/css/data_import.css'
--- addons/web/static/src/css/data_import.css 2011-10-24 14:27:44 +0000
+++ addons/web/static/src/css/data_import.css 2011-11-23 12:50:36 +0000
@@ -27,7 +27,7 @@
.openerp .oe-import fieldset.oe-closed table {
display: none;
}
-.openerp .separator.horizontal {
+.openerp .oe-import .separator.horizontal {
font-weight: bold;
border-bottom-width: 1px;
margin: 6px 4px 6px 1px;
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml 2011-11-23 10:05:42 +0000
+++ addons/web/static/src/xml/base.xml 2011-11-23 12:50:36 +0000
@@ -642,7 +642,7 @@
</td>
</t>
<td t-if="options.deletable" class='oe-record-delete' width="1">
- <button type="button" name="delete">♻</button>
+ <button type="button" name="delete"></button>
</td>
</tr>
<t t-name="ListView.row.form">
=== modified file 'addons/web_kanban/static/src/css/kanban.css'
--- addons/web_kanban/static/src/css/kanban.css 2011-11-08 16:58:17 +0000
+++ addons/web_kanban/static/src/css/kanban.css 2011-11-23 12:50:36 +0000
@@ -1,3 +1,4 @@
+
.openerp .oe_kanban_view .ui-sortable-placeholder {
border: 1px dotted black;
visibility: visible !important;
@@ -18,9 +19,10 @@
}
.openerp .oe_kanban_group_title {
- color: #000000;
- font-size: 130%;
+ font-size: 100%;
font-weight: bold;
+ padding-left:2px;
+ color: #666666;
}
.openerp .oe_kanban_group_title_undefined {
color: #666666;
@@ -45,10 +47,10 @@
.openerp .oe_kanban_fold_icon {
cursor: pointer;
float: left;
- padding: 2px 2px 0 0;
+ padding: 4px 2px 0 2px;
width: 16px;
height: 16px;
- background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat;
+ background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat center center;
}
.openerp .oe_kanban_group_folded .oe_kanban_fold_icon {
background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat;
@@ -64,6 +66,7 @@
}
.openerp ul.oe_kanban_aggregates span {
text-decoration: underline;
+ font-size:90%;
}
.openerp .oe_kanban_action_button {
@@ -90,14 +93,18 @@
padding: 0 4px 0 4px;
}
.openerp .oe_kanban_title2 {
- font-size: 110%;
+ font-size: 100%;
font-weight: bold;
+ color:#3A3A3A;
padding: 0 4px 0 4px;
}
.openerp .oe_kanban_title3 {
- font-size: 100%;
+ font-size: 95%;
font-weight: normal;
padding: 0 4px 0 4px;
+ line-height:16px;
+}
+.openerp .oe_kanban_title3 img{
}
.openerp .oe_kanban_small {
font-size: 80%;
@@ -105,6 +112,7 @@
}
.openerp .oe_kanban_table {
width: 100%;
+ font-size:95%;
border: none;
border-collapse: collapse;
margin: 0;
@@ -116,7 +124,13 @@
}
.openerp .oe_kanban_box_content {
padding: 4px;
-}
+ font-size:90%;
+}
+.openerp .oe_kanban_box_content div:last-child {
+ padding-top:4px;
+ color:#555;
+}
+
.openerp .oe_kanban_buttons_set {
border-top: 1px dotted;
white-space: nowrap;
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
