diff options
| author | qsm-odoo <qsm@odoo.com> | 2017-09-05 12:16:28 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2017-09-05 12:16:28 +0200 |
| commit | 41e7a1374fcd0165f4c8f003a0d288966f07e9dd (patch) | |
| tree | e8e57ce677c420ca060560db816d4532bb28e465 /addons/web/static/src/less | |
| parent | 489db80101fba3ca655d103f563db8ec17111902 (diff) | |
| parent | 24ea61163d30f5357e3cd8a6e6d84cf39f89d3fc (diff) | |
[MERGE] web, mail: introduce new chatter/discuss design
Diffstat (limited to 'addons/web/static/src/less')
| -rw-r--r-- | addons/web/static/src/less/bootstrap_overridden.less | 34 | ||||
| -rw-r--r-- | addons/web/static/src/less/navbar.less | 13 |
2 files changed, 45 insertions, 2 deletions
diff --git a/addons/web/static/src/less/bootstrap_overridden.less b/addons/web/static/src/less/bootstrap_overridden.less index 4a677d8da87..1f3f22cac3a 100644 --- a/addons/web/static/src/less/bootstrap_overridden.less +++ b/addons/web/static/src/less/bootstrap_overridden.less @@ -108,9 +108,43 @@ } //== Buttons +// Mixin to define variations for btn-links and muted btn-links +.o-btn-link-variant(@color, @color-active) { + text-transform: none; + .o-hover-text-color(@default-color: @color, @hover-color: @color-active); + + &, &:hover, &:focus, &:active, &.active { + border-color: transparent; + background-color: transparent + } + + &.text-muted, .text-muted { + .o-hover-opacity(); + .o-hover-text-color(@default-color: @text-muted, @hover-color: @color-active); + } +} .btn-icon { .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border); } +.btn-link { + font-weight: @btn-font-weight; + + &.btn-default { + .o-btn-link-variant(@text-color, @headings-color); + } + &.btn-success, &.text-success { + .o-btn-link-variant(@text-color, @brand-success); + } + &.btn-warning, &.text-warning { + .o-btn-link-variant(@text-color, @brand-warning); + } + &.btn-danger, &.text-danger { + .o-btn-link-variant(@text-color, @brand-danger); + } + &.btn-info, &.text-info { + .o-btn-link-variant(@text-color, darken(@brand-info, 20%)); + } +} //== Printing improvements @media print { diff --git a/addons/web/static/src/less/navbar.less b/addons/web/static/src/less/navbar.less index d000ed4f469..5c8f718f98c 100644 --- a/addons/web/static/src/less/navbar.less +++ b/addons/web/static/src/less/navbar.less @@ -122,6 +122,7 @@ .open .dropdown-menu { max-height: 90vh; // the dropdown should not overstep the viewport + min-width: 100%; overflow: auto; margin-top: 0; @@ -134,8 +135,16 @@ .o-menu-indentation(3); } - .oe_topbar_avatar { - height: 15px; + .open .dropdown-toggle { + background-color: @odoo-navbar-inverse-link-hover-bg; + } + .o_user_menu { + margin-left: 6px; + + .oe_topbar_avatar { + height: 17px; + .o-transform(translateY(-2px)); + } } @media (max-width: @screen-xs-max) { |
