Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/7.0-fix-missing-border-bottom-tabs-in-dialogs-cto into lp:openerp-web/7.0

  1. 7.0-fix-missing-border-bottom-tabs-in-dialogs-cto
  2. Merge into 7.0
Proposed by Samus CTO (OpenERP)
Status: Merged
Merged at revision: 4113
Proposed branch: lp:~openerp-dev/openerp-web/7.0-fix-missing-border-bottom-tabs-in-dialogs-cto
Merge into: lp:openerp-web/7.0
Diff against target: 73 lines (+11/-10)
2 files modified
addons/web/static/src/css/base.css (+8/-8)
addons/web/static/src/css/base.sass (+3/-2)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-fix-missing-border-bottom-tabs-in-dialogs-cto
Reviewer Review Type Date Requested Status
Martin Trigaux (OpenERP) Pending
Review via email: mp+201787@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

Thanks for the patch, LGTM

revno: 4113 [merge]
revision-id: <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/css/base.css'
2--- addons/web/static/src/css/base.css 2014-01-14 11:59:47 +0000
3+++ addons/web/static/src/css/base.css 2014-01-15 14:34:39 +0000
4@@ -1,4 +1,4 @@
5-@charset "utf-8";
6+@charset "UTF-8";
7 @font-face {
8 font-family: "mnmliconsRegular";
9 src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
10@@ -220,6 +220,9 @@
11 padding: 16px;
12 }
13 .openerp.ui-dialog .ui-dialog-titlebar {
14+ border-top: none;
15+ border-left: none;
16+ border-right: none;
17 border-bottom: 1px solid #cacaca;
18 -moz-border-radius: 2px 2px 0 0;
19 -webkit-border-radius: 2px 2px 0 0;
20@@ -236,9 +239,6 @@
21 margin: 0;
22 padding: 0;
23 }
24-.openerp.ui-dialog .ui-widget-header {
25- border: none;
26-}
27 .openerp.ui-dialog .ui-dialog-content {
28 background: white;
29 }
30@@ -623,10 +623,6 @@
31 display: block;
32 color: gray;
33 }
34-.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active {
35- border-bottom: none;
36- padding-bottom: 1px;
37-}
38 .openerp .oe_notebook > li.ui-tabs-active > a {
39 color: #4c4c4c;
40 }
41@@ -652,6 +648,10 @@
42 background-color: #eeeeee;
43 border-color: #eeeeee #eeeeee #dddddd;
44 }
45+.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active {
46+ border-bottom: none;
47+ padding-bottom: 1px;
48+}
49 .openerp .oe_notebook > li.ui-state-active > a, .openerp .oe_notebook > li.ui-state-active > a:hover {
50 background-color: white;
51 border: 1px solid #dddddd;
52
53=== modified file 'addons/web/static/src/css/base.sass'
54--- addons/web/static/src/css/base.sass 2014-01-14 11:59:47 +0000
55+++ addons/web/static/src/css/base.sass 2014-01-15 14:34:39 +0000
56@@ -277,14 +277,15 @@
57 .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
58 padding: 16px
59 .ui-dialog-titlebar
60+ border-top: none
61+ border-left: none
62+ border-right: none
63 border-bottom: 1px solid #cacaca
64 @include radius(2px 2px 0 0)
65 @include vertical-gradient(#FCFCFC, #DEDEDE)
66 .ui-dialog-title
67 margin: 0
68 padding: 0
69- .ui-widget-header
70- border: none
71 .ui-dialog-content
72 background: white
73 .ui-dialog-buttonpane