Merge lp:~openerp-dev/openerp-web/trunk-portal_anonymous_fixes-vta into lp:openerp-web

Proposed by Victor Tabuenca (OpenERP)
Status: Merged
Merged at revision: 3621
Proposed branch: lp:~openerp-dev/openerp-web/trunk-portal_anonymous_fixes-vta
Merge into: lp:openerp-web
Diff against target: 111 lines (+54/-4)
3 files modified
addons/web/static/src/css/base.css (+34/-1)
addons/web/static/src/css/base.sass (+20/-2)
addons/web/static/src/js/chrome.js (+0/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-portal_anonymous_fixes-vta
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+140149@code.launchpad.net

Description of the change

Timezone alert on the top right corner not be visible when anonymous

The login button (when anonymous) now has red background, like on the website (see addons https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-portal_anonymous_fixes-vta for changes in template)

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/web/static/src/css/base.css'
2--- addons/web/static/src/css/base.css 2012-12-15 21:41:13 +0000
3+++ addons/web/static/src/css/base.css 2012-12-17 09:58:47 +0000
4@@ -30,7 +30,7 @@
5 text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
6 /* http://www.quirksmode.org/dom/inputfile.html
7 * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
8- */ */
9+ */
10 }
11 .openerp.openerp_webclient_container {
12 height: 100%;
13@@ -998,6 +998,39 @@
14 background-image: -o-linear-gradient(top, #646060, #262626);
15 background-image: linear-gradient(to bottom, #646060, #262626);
16 }
17+.openerp .oe_topbar .oe_topbar_anonymous_login {
18+ background-color: #dc5f59;
19+ color: #eeeeee;
20+ background-color: #fc8787;
21+ background-image: -webkit-gradient(linear, left top, left bottom, from(#fc8787), to(maroon));
22+ background-image: -webkit-linear-gradient(top, #fc8787, maroon);
23+ background-image: -moz-linear-gradient(top, #fc8787, maroon);
24+ background-image: -ms-linear-gradient(top, #fc8787, maroon);
25+ background-image: -o-linear-gradient(top, #fc8787, maroon);
26+ background-image: linear-gradient(to bottom, #fc8787, maroon);
27+}
28+.openerp .oe_topbar .oe_topbar_anonymous_login a {
29+ display: block;
30+ padding: 5px 10px 7px;
31+ line-height: 20px;
32+ height: 20px;
33+ text-decoration: none;
34+ color: white;
35+ background: transparent;
36+ -webkit-transition: all 0.2s ease-out;
37+ -moz-transition: all 0.2s ease-out;
38+ -ms-transition: all 0.2s ease-out;
39+ -o-transition: all 0.2s ease-out;
40+ transition: all 0.2s ease-out;
41+}
42+.openerp .oe_topbar .oe_topbar_anonymous_login a:hover {
43+ background: rgba(0, 0, 0, 0.1);
44+ color: white;
45+ text-shadow: 0px 0px 3px rgba(0, 0, 0, 0.2);
46+ -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
47+ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
48+ box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
49+}
50 .openerp .oe_topbar .oe_topbar_item {
51 display: block;
52 padding: 5px 10px 7px;
53
54=== modified file 'addons/web/static/src/css/base.sass'
55--- addons/web/static/src/css/base.sass 2012-12-15 21:41:13 +0000
56+++ addons/web/static/src/css/base.sass 2012-12-17 09:58:47 +0000
57@@ -827,6 +827,24 @@
58 height: 32px
59 background-color: #414141
60 @include vertical-gradient(#646060, #262626)
61+ .oe_topbar_anonymous_login
62+ background-color: #dc5f59
63+ color: #eeeeee
64+ @include vertical-gradient(#FC8787, #800000)
65+ a
66+ display: block
67+ padding: 5px 10px 7px
68+ line-height: 20px
69+ height: 20px
70+ text-decoration: none
71+ color: white
72+ background: transparent
73+ @include transition(all 0.2s ease-out)
74+ a:hover
75+ background: rgba(0,0,0,0.1)
76+ color: white
77+ text-shadow: 0px 0px 3px rgba(0,0,0,0.2)
78+ @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset)
79 .oe_topbar_item
80 display: block
81 padding: 5px 10px 7px
82@@ -1670,7 +1688,7 @@
83 width: 400px
84 padding-bottom: 0
85 div.oe_chatter
86- box-sizing: border-box
87+ box-sizing: border-box
88 min-width: $sheet-min-width + 2* $sheet-padding
89 max-width: $sheet-max-width + 2* $sheet-padding
90 margin: 0 auto
91@@ -1942,7 +1960,7 @@
92 overflow: hidden
93 width: 24px
94 overflow: hidden
95- background: transparent
96+ background: transparent
97 color: #7C7BAD
98 box-shadow: none
99 border: none
100
101=== modified file 'addons/web/static/src/js/chrome.js'
102--- addons/web/static/src/js/chrome.js 2012-12-15 19:26:59 +0000
103+++ addons/web/static/src/js/chrome.js 2012-12-17 09:58:47 +0000
104@@ -811,7 +811,6 @@
105 });
106 }
107 });
108-
109 },
110 start: function() {
111 this._super.apply(this, arguments);