From: Jeremy Kersten Date: Fri, 5 Sep 2014 13:18:07 +0000 (+0200) Subject: [IMP] base: Odoo-ification and bootstrapification from the "About Us" popup X-Git-Tag: 8.0.0~145 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=70dc7c819b1b48bee005ea2fa5e3fc43e86d737e;p=odoo%2Fodoo.git [IMP] base: Odoo-ification and bootstrapification from the "About Us" popup --- diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 913573a..edd6651 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "UTF-8"; +@charset "utf-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -975,42 +975,82 @@ .openerp .oe_secondary_submenu .oe_secondary_submenu li { margin-left: 20px; } -.openerp .oe_about { - background-color: white; - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); - -moz-border-radius: 0 0 2px 2px; - -webkit-border-radius: 0 0 2px 2px; - border-radius: 0 0 2px 2px; +.openerp .oe_about .label { + background-color: #a24689; } .openerp .oe_about a { - color: #7c7bad; + color: #a24689; } -.openerp .oe_about a:hover { - text-decoration: underline; +.openerp .oe_about .user-details { + position: relative; + padding: 0; + margin-bottom: 275px; } -.openerp .oe_about a:focus { - outline: none; +.openerp .oe_about .user-details .user-image { + width: 100%; + text-align: center; } -.openerp .oe_about .oe_logo { - margin-left: -6px; -} -.openerp .oe_about .oe_bottom { - text-shadow: 0 1px 1px #999999; - background-color: #8a0e0e; - background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606)); - background-image: -webkit-linear-gradient(top, #b41616, #600606); - background-image: -moz-linear-gradient(top, #b41616, #600606); - background-image: -ms-linear-gradient(top, #b41616, #600606); - background-image: -o-linear-gradient(top, #b41616, #600606); - background-image: linear-gradient(to bottom, #b41616, #600606); - color: #eeeeee; - padding: 0 16px; - -moz-border-radius: 0 0 2px 2px; - -webkit-border-radius: 0 0 2px 2px; - border-radius: 0 0 2px 2px; +.openerp .oe_about .user-details .user-info-block { + width: 100%; + position: absolute; + top: 55px; + padding-top: 35px; } -.openerp .oe_about .oe_bottom a { - color: #eeeeee; +.openerp .oe_about .user-details .user-info-block .user-heading { + text-align: center; + margin: 10px 0 0; +} +.openerp .oe_about .user-details .user-info-block .navigation { + float: left; + width: auto; + padding: 0; + margin-left: 25%; + list-style: none; + border: 1px solid #a24689; +} +.openerp .oe_about .user-details .user-info-block .navigation li { + float: left; +} +.openerp .oe_about .user-details .user-info-block .navigation li a { + padding: 20px 30px; + float: left; +} +.openerp .oe_about .user-details .user-info-block .navigation li.active a { + background: #a24689; + color: white; +} +.openerp .oe_about .user-details .user-info-block .user-body { + text-align: center; +} +.openerp .oe_about .user-details .user-info-block .user-body .tab-content > div { + float: left; + width: 100%; +} +.openerp .oe_about a.oe_activate_debug_mode { + color: white !important; + font-size: 100%; +} +.openerp .oe_about #social i { + margin: 10px; +} +.openerp .oe_about #social i:hover { + -webkit-transform: scale(1.3); + -moz-transform: scale(1.3); + -ms-transform: scale(1.3); + -o-transform: scale(1.3); + transform: scale(1.3); +} +.openerp .oe_about #social .social-fb:hover { + color: #3b5998; +} +.openerp .oe_about #social .social-tw:hover { + color: #4099ff; +} +.openerp .oe_about #social .social-gp:hover { + color: #d34836; +} +.openerp .oe_about #social .social-lk:hover { + color: #007bb6; } .openerp a.oe_form_uri:hover { text-decoration: underline; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2977c77..955039e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -846,26 +846,64 @@ $sheet-padding: 16px margin-left: 20px // }}} // About openerp {{{ + $link-color-odoo: #a24689 .oe_about - background-color: white - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=) - @include radius(0 0 2px 2px) + .label + background-color: $link-color-odoo a - color: $link-color - &:hover - text-decoration: underline - &:focus - outline: none - .oe_logo - margin-left: -6px - .oe_bottom - text-shadow: 0 1px 1px #999999 - @include vertical-gradient(#b41616, #600606) - color: #eee - padding: 0 16px - @include radius(0 0 2px 2px) - a - color: #eee + color: $link-color-odoo + + .user-details + position: relative + padding: 0 + margin-bottom: 275px + .user-image + width: 100% + text-align: center + .user-info-block + width: 100% + position: absolute + top: 55px + padding-top: 35px + .user-heading + text-align: center + margin: 10px 0 0 + .navigation + float: left + width: auto + padding: 0 + margin-left: 25% + list-style: none + border: 1px solid $link-color-odoo + li + float: left + a + padding: 20px 30px + float: left + &.active a + background: $link-color-odoo + color: #fff + .user-body + text-align: center + .tab-content > div + float: left + width: 100% + a.oe_activate_debug_mode + color: white !important + font-size: 100% + #social + i + margin: 10px + &:hover + @include transform(scale(1.3)) + .social-fb:hover + color: #3B5998 + .social-tw:hover + color: #4099FF + .social-gp:hover + color: #d34836 + .social-lk:hover + color: #007bb6 // }}} // ActionManager {{{ a.oe_form_uri:hover diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index d54e4fb..c5e0f74 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -366,16 +366,79 @@
- Activate the developer mode - -

Version

+ Activate the developer mode -
-

Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.
- Odoo is a trademark of the OpenERP SA Company.

-

Licenced under the terms of GNU Affero General Public License

-

For more information visit Odoo.com

-
+ + +
+
+
+
+ Odoo (Formerly OpenERP) +
+ +
+
+