odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]menu bar: clean up css and few cosmetics

This commit is contained in:
Cedric Snauwaert 2014-07-07 11:48:31 +02:00
parent cbe2dbb672
commit 94d65557fc
4 changed files with 65 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_attendance/static/src/css/attendance.css
View File

@ -1,3 +1,3 @@
.oe_systray #oe_attendance_sign_in_out_icon {
font-color: white;
color: white;
}

1
addons/im_chat/static/src/css/im_chat.css
View File

@ -14,7 +14,6 @@
/* button */
.oe_systray #oe_topbar_imbutton_icon {
color: white;
margin-right: 10px;
}
.oe_topbar_item.oe_topbar_imbutton .oe_e {
position: relative;

180
addons/web/static/src/css/base.css
View File

@ -8,7 +8,6 @@
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: "EntypoRegular";
src: url("/web/static/src/font/entypo-webfont.eot") format("eot");
@ -19,7 +18,6 @@
font-weight: normal;
font-style: normal;
}
#oe_main_menu_navbar {
min-height: 34px;
z-index: 1001;
@ -39,6 +37,39 @@
margin-bottom: 0px;
}
.oe_systray {
margin-right: 0px !important;
}
.oe_notification {
z-index: 1600;
}
.oe_webclient_timezone_notification a {
color: white;
text-decoration: underline;
}
.oe_webclient_timezone_notification p {
margin-top: 1em;
}
.oe_webclient_timezone_notification dt {
font-weight: bold;
}
.oe_timezone_systray span {
margin-top: 1px;
background-color: #f6cf3b;
}
.navbar .oe_topbar_name {
max-width: 150px;
display: inline-block;
height: 15px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
.openerp {
padding: 0;
margin: 0;
@ -800,23 +831,6 @@
border-bottom-right-radius: 8px;
border-bottom-left-radius: 8px;
}
.openerp .oe_notification {
z-index: 1500;
}
.openerp .oe_webclient_timezone_notification a {
color: white;
text-decoration: underline;
}
.openerp .oe_webclient_timezone_notification p {
margin-top: 1em;
}
.openerp .oe_webclient_timezone_notification dt {
font-weight: bold;
}
.openerp .oe_timezone_systray span {
margin-top: 1px;
background-color: #f6cf3b;
}
.openerp .oe_dialog_warning {
width: 100%;
}
@ -847,133 +861,6 @@
.openerp .oe_content_full_screen .oe_topbar, .openerp .oe_content_full_screen .oe_leftbar {
display: none;
}
.openerp .navbar .oe_topbar_anonymous_login {
background-color: #dc5f59;
color: #eeeeee;
background-color: #be4343;
background-image: -webkit-gradient(linear, left top, left bottom, from(#fc8787), to(maroon));
background-image: -webkit-linear-gradient(top, #fc8787, maroon);
background-image: -moz-linear-gradient(top, #fc8787, maroon);
background-image: -ms-linear-gradient(top, #fc8787, maroon);
background-image: -o-linear-gradient(top, #fc8787, maroon);
background-image: linear-gradient(to bottom, #fc8787, #800000);
}
.openerp .navbar .oe_topbar_anonymous_login a {
display: block;
padding: 5px 10px 7px;
line-height: 20px;
height: 30px;
text-decoration: none;
color: white;
background: transparent;
-webkit-transition: all 0.2s ease-out;
-moz-transition: all 0.2s ease-out;
-ms-transition: all 0.2s ease-out;
-o-transition: all 0.2s ease-out;
transition: all 0.2s ease-out;
}
.openerp .navbar .oe_topbar_anonymous_login a:hover {
background: rgba(0, 0, 0, 0.1);
color: white;
text-shadow: 0px 0px 3px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
}
.openerp .navbar .oe_topbar_item {
display: block;
padding: 5px 10px 26px;
line-height: 20px;
height: 20px;
text-decoration: none;
color: #eeeeee;
vertical-align: top;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-transition: all 0.2s ease-out;
-moz-transition: all 0.2s ease-out;
-ms-transition: all 0.2s ease-out;
-o-transition: all 0.2s ease-out;
transition: all 0.2s ease-out;
}
.openerp .navbar .oe_topbar_item:hover {
background: rgba(0, 0, 0, 0.2);
text-shadow: black 0px 0px 3px;
color: white;
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
}
.openerp .navbar .oe_topbar_avatar {
width: 24px;
height: 24px;
margin: -2px 2px 0 0;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
.openerp .navbar .oe_topbar_avatar {
vertical-align: top;
}
.openerp .navbar .oe_dropdown_arrow:after {
border-top: 4px solid white;
}
.openerp .navbar .dropdown_menu {
top: 32px;
background: #333333;
background: rgba(37, 37, 37, 0.9);
border-color: #999999;
border-color: rgba(0, 0, 0, 0.2);
border-style: solid;
border-width: 0 2px 1px;
-moz-border-radius: 0 0 6px 6px;
-webkit-border-radius: 0 0 6px 6px;
border-radius: 0 0 6px 6px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding-box;
background-clip: padding-box;
}
.openerp .navbar .dropdown_menu li {
float: none;
padding: 3px 12px;
}
.openerp .navbar .dropdown_menu li a {
color: #eeeeee;
}
.openerp .navbar .dropdown_menu li:hover {
background-color: #212121;
background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919));
background-image: -webkit-linear-gradient(top, #292929, #191919);
background-image: -moz-linear-gradient(top, #292929, #191919);
background-image: -ms-linear-gradient(top, #292929, #191919);
background-image: -o-linear-gradient(top, #292929, #191919);
background-image: linear-gradient(to bottom, #292929, #191919);
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
}
.openerp .navbar .oe_topbar_name {
max-width: 150px;
display: inline-block;
height: 15px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
.openerp .nav li a {
padding: 6px 8px 4px 8px;
}
.openerp .oe_user_menu {
float: right;
padding: 0;
margin: 0;
}
.openerp .oe_user_menu li {
list-style-type: none;
float: left;
}
.openerp .oe_user_menu .oe_dropdown_menu {
right: -1px;
}
.openerp .oe_leftbar {
display: none;
width: 220px;
@ -3114,7 +3001,6 @@
top: 0px;
}
}
.kitten-mode-activated {
background-size: cover;
background-attachment: fixed;

137
addons/web/static/src/css/base.sass
View File

@ -158,6 +158,37 @@ $sheet-padding: 16px
#oe_main_menu_navbar.navbar
margin-bottom: 0px
.oe_systray
margin-right: 0px !important
// Notifications {{{
.oe_notification
z-index: 1600
.oe_webclient_timezone_notification
a
color: white
text-decoration: underline
p
margin-top: 1em
dt
font-weight: bold
.oe_timezone_systray
span
margin-top: 1px
background-color: #f6cf3b
// }}}
// Top Menu {{{
.navbar
.oe_topbar_name
max-width: 150px
display: inline-block
height: 15px // Customize to manage caret when topbar_name is over sized.
text-overflow: ellipsis
white-space: nowrap
overflow: hidden // Customize to bring ellipsis when topbar_name is over sized.
// }}}
.openerp
// Global style {{{
padding: 0
@ -690,23 +721,6 @@ $sheet-padding: 16px
border-bottom-right-radius: 8px
border-bottom-left-radius: 8px
// }}}
// Notifications {{{
.oe_notification
z-index: 1500
.oe_webclient_timezone_notification
a
color: white
text-decoration: underline
p
margin-top: 1em
dt
font-weight: bold
.oe_timezone_systray
span
margin-top: 1px
background-color: #f6cf3b
// }}}
// CrashManager {{{
.oe_dialog_warning
width: 100%
@ -738,95 +752,6 @@ $sheet-padding: 16px
.oe_topbar, .oe_leftbar
display: none
// }}}
// Top Menu {{{
.navbar
.oe_topbar_anonymous_login
background-color: #dc5f59
color: #eeeeee
@include vertical-gradient(#FC8787, #800000)
a
display: block
padding: 5px 10px 7px
line-height: 20px
height: 30px
text-decoration: none
color: white
background: transparent
@include transition(all 0.2s ease-out)
a:hover
background: rgba(0,0,0,0.1)
color: white
text-shadow: 0px 0px 3px rgba(0,0,0,0.2)
@include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset)
.oe_topbar_item
display: block
padding: 5px 10px 26px
line-height: 20px
height: 20px
text-decoration: none
color: #eee
vertical-align: top
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
@include transition(all 0.2s ease-out)
&:hover
background: rgba(0,0,0,0.2)
text-shadow: black 0px 0px 3px
color: white
@include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset)
.oe_topbar_avatar
width: 24px
height: 24px
margin: -2px 2px 0 0
@include radius(3px)
.oe_topbar_avatar
vertical-align: top
.oe_dropdown_arrow:after
border-top: 4px solid white
.dropdown_menu
top: 32px
background: #333
background: rgba(37,37,37,0.9)
border-color: #999
border-color: rgba(0, 0, 0, 0.2)
border-style: solid
border-width: 0 2px 1px
@include radius(0 0 6px 6px)
@include background-clip()
li
float: none
padding: 3px 12px
a
color: #eee
&:hover
@include vertical-gradient(#292929, #191919)
@include box-shadow(none)
.oe_topbar_name
max-width: 150px
display: inline-block
height: 15px // Customize to manage caret when topbar_name is over sized.
text-overflow: ellipsis
white-space: nowrap
overflow: hidden // Customize to bring ellipsis when topbar_name is over sized.
// oe menu is the list of the buttons on the left side of the bar.
// So why aren't the buttons oe_topbar_items ? This sad state of affairs
// is a leftover from an uncomplete refactoring when the left and top menu
// were merged. You are welcome to refactor and clean this up
.nav li a
padding: 6px 8px 4px 8px
.oe_user_menu
float: right
padding: 0
margin: 0
li
list-style-type: none
float: left
.oe_dropdown_menu
right: -1px
// }}}
// Webclient.leftbar {{{
.oe_leftbar
display: none