Merge lp:~jfb-tempo-consulting/unifield-web/us-7259 into lp:unifield-web

Proposed by jftempo
Status: Merged
Merged at revision: 4988
Proposed branch: lp:~jfb-tempo-consulting/unifield-web/us-7259
Merge into: lp:unifield-web
Diff against target: 23 lines (+1/-2)
2 files modified
addons/openerp/controllers/templates/base.mako (+1/-1)
addons/openerp/static/css/listgrid.css (+0/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-web/us-7259
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+380674@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/controllers/templates/base.mako'
2--- addons/openerp/controllers/templates/base.mako 2020-02-25 13:53:15 +0000
3+++ addons/openerp/controllers/templates/base.mako 2020-03-13 09:53:30 +0000
4@@ -33,7 +33,7 @@
5 <link rel="stylesheet" type="text/css" href="/openerp/static/css/notebook.css?v=16.0rc2"/>
6
7 <link rel="stylesheet" type="text/css" href="/openerp/static/css/pager.css"/>
8- <link rel="stylesheet" type="text/css" href="/openerp/static/css/listgrid.css?v=16.0rc2"/>
9+ <link rel="stylesheet" type="text/css" href="/openerp/static/css/listgrid.css?v=16.1"/>
10 <link rel="stylesheet" type="text/css" href="/openerp/static/css/autocomplete.css"/>
11
12 <!--[if lt IE 9]>
13
14=== modified file 'addons/openerp/static/css/listgrid.css'
15--- addons/openerp/static/css/listgrid.css 2020-02-25 10:55:25 +0000
16+++ addons/openerp/static/css/listgrid.css 2020-03-13 09:53:30 +0000
17@@ -86,7 +86,6 @@
18 font-weight: bold;
19 position: sticky;
20 top: 0;
21- z-index: 1;
22 text-align: center !important;
23 }
24

Subscribers

People subscribed via source and target branches