[MERGE] boostrap3 manually merged

bzr revid: al@openerp.com-20131202131943-b01fb56u0qsgcs53
This commit is contained in:
Antony Lesuisse 2013-12-02 14:19:43 +01:00
parent 56bb1b9869
commit d6c6f31231
11 changed files with 10090 additions and 234 deletions

View File

@ -66,6 +66,7 @@ This module provides the core of the OpenERP Web Client.
"static/lib/jquery.tipsy/tipsy.css",
"static/lib/jquery.textext/jquery.textext.css",
"static/lib/fontawesome/css/font-awesome.css",
"static/lib/bootstrap/css/bootstrap.css",
"static/src/css/base.css",
"static/src/css/data_export.css",
"static/lib/cleditor/jquery.cleditor.css",
@ -89,5 +90,4 @@ This module provides the core of the OpenERP Web Client.
"static/test/list-editable.js",
"static/test/mutex.js"
],
'bootstrap': True,
}

View File

@ -0,0 +1,459 @@
/*!
* Bootstrap v3.0.2 by @fat and @mdo
* Copyright 2013 Twitter, Inc.
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
.btn-default,
.btn-primary,
.btn-success,
.btn-info,
.btn-warning,
.btn-danger {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
}
.btn-default:active,
.btn-primary:active,
.btn-success:active,
.btn-info:active,
.btn-warning:active,
.btn-danger:active,
.btn-default.active,
.btn-primary.active,
.btn-success.active,
.btn-info.active,
.btn-warning.active,
.btn-danger.active {
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
}
.btn:active,
.btn.active {
background-image: none;
}
.btn-default {
text-shadow: 0 1px 0 #fff;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#e0e0e0));
background-image: -webkit-linear-gradient(top, #ffffff 0%, #e0e0e0 100%);
background-image: -moz-linear-gradient(top, #ffffff 0%, #e0e0e0 100%);
background-image: linear-gradient(to bottom, #ffffff 0%, #e0e0e0 100%);
background-repeat: repeat-x;
border-color: #dbdbdb;
border-color: #ccc;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.btn-default:hover,
.btn-default:focus {
background-color: #e0e0e0;
background-position: 0 -15px;
}
.btn-default:active,
.btn-default.active {
background-color: #e0e0e0;
border-color: #dbdbdb;
}
.btn-primary {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#2d6ca2));
background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
background-image: -moz-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
background-image: linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%);
background-repeat: repeat-x;
border-color: #2b669a;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.btn-primary:hover,
.btn-primary:focus {
background-color: #2d6ca2;
background-position: 0 -15px;
}
.btn-primary:active,
.btn-primary.active {
background-color: #2d6ca2;
border-color: #2b669a;
}
.btn-success {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#419641));
background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
background-image: -moz-linear-gradient(top, #5cb85c 0%, #419641 100%);
background-image: linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
background-repeat: repeat-x;
border-color: #3e8f3e;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.btn-success:hover,
.btn-success:focus {
background-color: #419641;
background-position: 0 -15px;
}
.btn-success:active,
.btn-success.active {
background-color: #419641;
border-color: #3e8f3e;
}
.btn-warning {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#eb9316));
background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
background-image: -moz-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
background-image: linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
background-repeat: repeat-x;
border-color: #e38d13;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.btn-warning:hover,
.btn-warning:focus {
background-color: #eb9316;
background-position: 0 -15px;
}
.btn-warning:active,
.btn-warning.active {
background-color: #eb9316;
border-color: #e38d13;
}
.btn-danger {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c12e2a));
background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
background-image: -moz-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
background-image: linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
background-repeat: repeat-x;
border-color: #b92c28;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.btn-danger:hover,
.btn-danger:focus {
background-color: #c12e2a;
background-position: 0 -15px;
}
.btn-danger:active,
.btn-danger.active {
background-color: #c12e2a;
border-color: #b92c28;
}
.btn-info {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#2aabd2));
background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
background-image: -moz-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
background-image: linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
background-repeat: repeat-x;
border-color: #28a4c9;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.btn-info:hover,
.btn-info:focus {
background-color: #2aabd2;
background-position: 0 -15px;
}
.btn-info:active,
.btn-info.active {
background-color: #2aabd2;
border-color: #28a4c9;
}
.thumbnail,
.img-thumbnail {
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
}
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
background-color: #e8e8e8;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f5f5f5), to(#e8e8e8));
background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
}
.dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus {
background-color: #357ebd;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
}
.navbar-default {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#f8f8f8));
background-image: -webkit-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
background-image: -moz-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
background-image: linear-gradient(to bottom, #ffffff 0%, #f8f8f8 100%);
background-repeat: repeat-x;
border-radius: 4px;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
}
.navbar-default .navbar-nav > .active > a {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ebebeb), to(#f3f3f3));
background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
background-image: -moz-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
background-image: linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);
-webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.075);
}
.navbar-brand,
.navbar-nav > li > a {
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
}
.navbar-inverse {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#3c3c3c), to(#222222));
background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222222 100%);
background-image: -moz-linear-gradient(top, #3c3c3c 0%, #222222 100%);
background-image: linear-gradient(to bottom, #3c3c3c 0%, #222222 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.navbar-inverse .navbar-nav > .active > a {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#222222), to(#282828));
background-image: -webkit-linear-gradient(top, #222222 0%, #282828 100%);
background-image: -moz-linear-gradient(top, #222222 0%, #282828 100%);
background-image: linear-gradient(to bottom, #222222 0%, #282828 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);
-webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
}
.navbar-inverse .navbar-brand,
.navbar-inverse .navbar-nav > li > a {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
.navbar-static-top,
.navbar-fixed-top,
.navbar-fixed-bottom {
border-radius: 0;
}
.alert {
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.alert-success {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#c8e5bc));
background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
background-image: -moz-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
background-repeat: repeat-x;
border-color: #b2dba1;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
}
.alert-info {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#b9def0));
background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
background-image: -moz-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
background-repeat: repeat-x;
border-color: #9acfea;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
}
.alert-warning {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#f8efc0));
background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
background-image: -moz-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
background-repeat: repeat-x;
border-color: #f5e79e;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
}
.alert-danger {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#e7c3c3));
background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
background-image: -moz-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
background-repeat: repeat-x;
border-color: #dca7a7;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
}
.progress {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ebebeb), to(#f5f5f5));
background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
background-image: -moz-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
}
.progress-bar {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%);
background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
}
.progress-bar-success {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
}
.progress-bar-info {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
}
.progress-bar-warning {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
}
.progress-bar-danger {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
}
.list-group {
border-radius: 4px;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
}
.list-group-item.active,
.list-group-item.active:hover,
.list-group-item.active:focus {
text-shadow: 0 -1px 0 #3071a9;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3278b3));
background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%);
background-image: -moz-linear-gradient(top, #428bca 0%, #3278b3 100%);
background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
background-repeat: repeat-x;
border-color: #3278b3;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
}
.panel {
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}
.panel-default > .panel-heading {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f5f5f5), to(#e8e8e8));
background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
}
.panel-primary > .panel-heading {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
}
.panel-success > .panel-heading {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#d0e9c6));
background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
background-image: -moz-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
}
.panel-info > .panel-heading {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#c4e3f3));
background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
background-image: -moz-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
}
.panel-warning > .panel-heading {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#faf2cc));
background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
background-image: -moz-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
}
.panel-danger > .panel-heading {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#ebcccc));
background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
background-image: -moz-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
}
.well {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#e8e8e8), to(#f5f5f5));
background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
background-image: -moz-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
background-repeat: repeat-x;
border-color: #dcdcdc;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -111,6 +111,8 @@
}
.openerp h4 {
margin: 4px 0;
font-weight: bold;
font-size: inherit;
}
.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
display: inline-block;
@ -199,6 +201,7 @@
}
.openerp.ui-dialog {
display: none;
height: auto !important;
padding: 6px;
background-color: rgba(60, 60, 60, 0.7);
border: 1px solid;
@ -241,6 +244,7 @@
}
.openerp.ui-dialog .ui-dialog-content {
background: white;
width: auto !important;
}
.openerp.ui-dialog .ui-dialog-buttonpane {
border-top: 1px solid #e0e0e0;
@ -529,6 +533,15 @@
.openerp .oe_grey {
color: #aaaaaa;
}
.openerp .oe_error_detail hr {
display: block;
-webkit-margin-before: 0.5em;
-webkit-margin-after: 0.5em;
-webkit-margin-start: auto;
-webkit-margin-end: auto;
border-style: inset;
border-width: 1px;
}
.openerp .oe_tag {
border: 1px solid #afafb6;
font-size: 11px;
@ -680,6 +693,9 @@
.openerp .oe_notebook_page {
padding: 0;
}
.openerp .oe_notebook_page > label:not([for]) {
font-weight: normal !important;
}
.openerp div.ui-tabs {
padding: 3px 0px 3px 0px;
}
@ -976,7 +992,7 @@
}
.openerp .oe_login .oe_login_footer a {
color: #eeeeee;
margin: 0 8px;
margin: 0 6px;
}
.openerp .oe_login .oe_login_footer a:hover {
text-decoration: underline;
@ -1022,19 +1038,7 @@
.openerp .oe_content_full_screen .oe_topbar, .openerp .oe_content_full_screen .oe_leftbar {
display: none;
}
.openerp .oe_topbar {
width: 100%;
height: 32px;
background-color: #414141;
background-color: #454343;
background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
background-image: -webkit-linear-gradient(top, #646060, #262626);
background-image: -moz-linear-gradient(top, #646060, #262626);
background-image: -ms-linear-gradient(top, #646060, #262626);
background-image: -o-linear-gradient(top, #646060, #262626);
background-image: linear-gradient(to bottom, #646060, #262626);
}
.openerp .oe_topbar .oe_topbar_anonymous_login {
.openerp .navbar .oe_topbar_anonymous_login {
background-color: #dc5f59;
color: #eeeeee;
background-color: #be4343;
@ -1045,11 +1049,11 @@
background-image: -o-linear-gradient(top, #fc8787, maroon);
background-image: linear-gradient(to bottom, #fc8787, maroon);
}
.openerp .oe_topbar .oe_topbar_anonymous_login a {
.openerp .navbar .oe_topbar_anonymous_login a {
display: block;
padding: 5px 10px 7px;
line-height: 20px;
height: 20px;
height: 30px;
text-decoration: none;
color: white;
background: transparent;
@ -1059,7 +1063,7 @@
-o-transition: all 0.2s ease-out;
transition: all 0.2s ease-out;
}
.openerp .oe_topbar .oe_topbar_anonymous_login a:hover {
.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);
@ -1067,9 +1071,9 @@
-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 .oe_topbar .oe_topbar_item {
.openerp .navbar .oe_topbar_item {
display: block;
padding: 5px 10px 7px;
padding: 5px 10px 26px;
line-height: 20px;
height: 20px;
text-decoration: none;
@ -1082,7 +1086,7 @@
-o-transition: all 0.2s ease-out;
transition: all 0.2s ease-out;
}
.openerp .oe_topbar .oe_topbar_item:hover {
.openerp .navbar .oe_topbar_item:hover {
background: rgba(0, 0, 0, 0.2);
text-shadow: black 0px 0px 3px;
color: white;
@ -1090,7 +1094,7 @@
-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 .oe_topbar .oe_topbar_avatar {
.openerp .navbar .oe_topbar_avatar {
width: 24px;
height: 24px;
margin: -2px 2px 0 0;
@ -1098,13 +1102,13 @@
-webkit-border-radius: 3px;
border-radius: 3px;
}
.openerp .oe_topbar .oe_topbar_avatar {
.openerp .navbar .oe_topbar_avatar {
vertical-align: top;
}
.openerp .oe_topbar .oe_dropdown_arrow:after {
.openerp .navbar .oe_dropdown_arrow:after {
border-top: 4px solid white;
}
.openerp .oe_topbar .oe_dropdown_menu {
.openerp .navbar .dropdown_menu {
top: 32px;
background: #333333;
background: rgba(37, 37, 37, 0.9);
@ -1119,14 +1123,14 @@
-moz-background-clip: padding-box;
background-clip: padding-box;
}
.openerp .oe_topbar .oe_dropdown_menu li {
.openerp .navbar .dropdown_menu li {
float: none;
padding: 3px 12px;
}
.openerp .oe_topbar .oe_dropdown_menu li a {
.openerp .navbar .dropdown_menu li a {
color: #eeeeee;
}
.openerp .oe_topbar .oe_dropdown_menu li:hover {
.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);
@ -1138,21 +1142,21 @@
-webkit-box-shadow: none;
box-shadow: none;
}
.openerp .oe_topbar .oe_topbar_name {
.openerp .navbar .oe_topbar_name {
max-width: 150px;
overflow: hidden;
display: inline-block;
max-height: 100%;
height: 15px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
.openerp .oe_menu {
.openerp .navbar-nav {
float: left;
padding: 0;
margin: 0;
font-size: 13px;
}
.openerp .oe_menu > li {
.openerp .navbar-nav > li {
list-style-type: none;
padding: 0;
margin: 0;
@ -1160,13 +1164,13 @@
display: block;
color: #eeeeee;
}
.openerp .oe_menu > li > a {
.openerp .navbar-nav > li > a {
display: block;
padding: 5px 10px 7px;
padding: 5px 10px 26px !important;
line-height: 20px;
height: 20px;
text-decoration: none;
color: #eeeeee;
color: #eeeeee !important;
vertical-align: top;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-transition: all 0.2s ease-out;
@ -1175,7 +1179,7 @@
-o-transition: all 0.2s ease-out;
transition: all 0.2s ease-out;
}
.openerp .oe_menu > li > a:hover {
.openerp .navbar-nav > li > a:hover {
background: rgba(0, 0, 0, 0.2);
text-shadow: black 0px 0px 3px;
color: white;
@ -1183,7 +1187,7 @@
-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 .oe_menu > li > .oe_active {
.openerp .navbar-nav > li > .active {
background: rgba(0, 0, 0, 0.3);
text-shadow: black 0px 0px 3px;
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.4) inset;
@ -1214,7 +1218,7 @@
width: 220px;
background: #f0eeee;
border-right: 1px solid #afafb6;
text-shadow: 0 1px 1px white;
text-shadow: none;
padding-bottom: 16px;
}
.openerp a.oe_logo {
@ -1266,37 +1270,9 @@
color: #7c7bad;
}
.openerp .oe_secondary_submenu {
padding: 2px 0 8px 0;
margin: 0;
}
.openerp .oe_secondary_submenu li {
position: relative;
margin: 0;
padding: 1px 0 1px 20px !important;
list-style-type: none;
}
.openerp .oe_secondary_submenu li a {
display: block;
color: #4c4c4c;
padding: 2px 4px 2px 0;
}
.openerp .oe_secondary_submenu li .oe_menu_label {
position: absolute;
top: 1px;
right: 1px;
font-size: 10px;
background: #7c7bad;
color: white;
padding: 2px 4px;
margin: 1px 6px 0 0;
border: 1px solid lightgrey;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
margin-bottom: 10px !important;
line-height: 1.1em;
margin-top: 3px;
}
.openerp .oe_secondary_submenu .oe_menu_text {
white-space: nowrap;
@ -1304,15 +1280,9 @@
display: inline-block;
text-overflow: ellipsis;
max-width: 85%;
margin-top: 1px;
}
.openerp .oe_secondary_submenu .oe_menu_counter {
float: right;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
margin: 1px;
padding: 1px 4px;
border: none;
}
.openerp .oe_secondary_submenu .oe_menu_counter:hover {
.openerp .oe_secondary_submenu .badge:hover {
cursor: pointer;
-webkit-transform: scale(1.1);
-moz-transform: scale(1.1);
@ -1320,33 +1290,6 @@
-o-transform: scale(1.1);
transform: scale(1.1);
}
.openerp .oe_secondary_submenu .oe_active {
border-top: 1px solid lightgrey;
border-bottom: 1px solid #dedede;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
background: #7c7bad;
}
.openerp .oe_secondary_submenu .oe_active a {
color: white;
}
.openerp .oe_secondary_submenu .oe_active .oe_menu_label {
background: #eeeeee;
color: #7c7bad;
text-shadow: 0 1px 1px white;
-moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
}
.openerp .oe_secondary_submenu .oe_active .oe_menu_counter {
background: #eeeeee;
color: #7c7bad;
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2);
}
.openerp .oe_secondary_submenu .oe_menu_toggler:before {
width: 0;
height: 0;
@ -1371,9 +1314,6 @@
border-right: 4px solid transparent;
border-top: 4px solid #4c4c4c;
}
.openerp .oe_secondary_submenu .oe_secondary_submenu {
margin-left: -20px;
}
.openerp .oe_secondary_submenu .oe_secondary_submenu li {
margin-left: 20px;
}
@ -1440,6 +1380,7 @@
.openerp .oe_application .oe_breadcrumb_title > * {
display: inline-block;
overflow: hidden;
font-weight: bold;
}
.openerp .oe_view_manager {
display: table;
@ -1482,6 +1423,7 @@
font-size: 18px;
margin: 0;
float: left;
line-height: 30px;
}
.openerp .oe_view_manager table.oe_view_manager_header h2 a {
color: #7c7bad;
@ -1652,9 +1594,12 @@
.openerp .oe_view_manager_inline > .oe_view_manager_header, .openerp .oe_view_manager_inlineview > .oe_view_manager_header {
display: none;
}
.openerp .oe_popup_form > .oe_formview > .oe_form_pager {
.openerp .oe_popup_form .oe_formview .oe_form_pager {
display: none !important;
}
.openerp .oe_popup_form table label {
font-weight: normal;
}
.openerp .oe_popup_list_pager {
float: right;
}
@ -1680,6 +1625,16 @@
font-size: 12px;
line-height: 18px;
}
.openerp .oe_searchview input:not([type]), .openerp .oe_searchview input[type="text"], .openerp .oe_searchview input[type="number"] {
width: 156px;
height: 22px;
}
.openerp .oe_searchview input[type="checkbox"] {
margin: 3px 3px 3px 4px;
}
.openerp .oe_searchview select {
margin: 2px 4px 2px 0;
}
.openerp .oe_searchview.oe_focused {
border-color: #a6a6fe;
-moz-box-shadow: 0 1px 2px #a6a6fe inset;
@ -1904,6 +1859,7 @@
box-sizing: border-box;
display: table-cell;
width: 50%;
padding-left: 2px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section ul {
margin: 0 8px 8px;
@ -1939,7 +1895,7 @@
line-height: 18px;
}
.openerp .oe_searchview .oe_searchview_drawer form button {
margin: 0 0 8px 0;
margin: 0 0 8px -3px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom {
padding: 0 8px 8px 8px;
@ -1967,6 +1923,9 @@
top: 0;
right: 5px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom label {
font-weight: normal;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_dashboard form {
display: none;
margin-top: 2px;
@ -1994,6 +1953,7 @@
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li:first-child .searchview_extended_prop_or {
visibility: hidden;
margin-left: -14px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced .searchview_extended_prop_or {
opacity: 0.5;
@ -2185,6 +2145,12 @@
background: url(/web/static/src/img/form_sheetbg.png);
border-bottom: 1px solid #dddddd;
}
.openerp .oe_application .oe_form_sheetbg .oe_subtotal_footer label {
font-weight: bold;
}
.openerp .oe_application .oe_form_sheetbg table label {
font-weight: normal;
}
.openerp .oe_application .oe_form_sheet {
border: 1px solid #c8c8d3;
-moz-box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
@ -2273,7 +2239,7 @@
padding: 2px 11px 2px 0px !important;
}
.openerp .oe_form .oe_subtotal_footer label.oe_form_label_help {
font-weight: normal;
font-weight: normal !important;
}
.openerp .oe_form .oe_form_box_info {
background: #ffee99;
@ -2305,7 +2271,8 @@
.openerp .oe_form td.oe_form_group_cell_label label {
line-height: 18px;
display: block;
min-width: 140px;
min-width: 150px;
font-weight: bold !important;
}
.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
padding: 2px 0 2px 8px;
@ -2318,13 +2285,12 @@
padding-left: 20px;
}
.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
font-weight: bold;
white-space: nowrap;
padding-right: 8px;
}
.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
font-size: 80%;
color: darkgreen;
color: darkGreen;
vertical-align: top;
position: relative;
top: -4px;
@ -2402,6 +2368,18 @@
height: inherit !important;
font-size: inherit;
}
.openerp .oe_form .oe_title h1, .openerp .oe_form h1 {
font-weight: bold;
font-size: 2em;
}
.openerp .oe_form h2 {
font-size: 1.5em;
}
.openerp .oe_form label {
font-weight: bold;
margin-bottom: 0px;
display: inline;
}
.openerp .oe_form .oe_form_field {
width: 100%;
display: inline-block;
@ -2539,6 +2517,9 @@
margin: 0;
padding: 0;
}
.openerp .oe_form .oe_form_field_binary {
display: inline-block;
}
.openerp .oe_form .oe_form_field_image {
padding: 0;
position: relative;
@ -2570,13 +2551,14 @@
display: inline-block;
clear: both;
width: 100%;
margin-bottom: -15px;
}
.openerp .oe_fileupload .oe_add {
float: left;
position: relative;
width: 100%;
left: 2px;
top: 7px;
margin: 9px 0;
overflow: hidden;
}
.openerp .oe_fileupload .oe_add button {
@ -2588,9 +2570,6 @@
}
.openerp .oe_fileupload .oe_add button.oe_attach {
width: 24px;
overflow: hidden;
width: 24px;
overflow: hidden;
background: transparent;
color: #7c7bad;
box-shadow: none;
@ -2639,6 +2618,9 @@
.openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(even) {
background: #f4f5fa;
}
.openerp .oe_form_field_many2one {
display: inline-block;
}
.openerp .oe_form_field_many2one td:first-child {
position: relative;
}
@ -2701,9 +2683,13 @@
padding-left: 24px;
margin: 0;
position: relative;
line-height: normal;
font-size: 100%;
font-weight: normal;
}
.openerp ul.oe_form_status li > .arrow, .openerp ul.oe_form_status_clickable li > .arrow {
width: 17px;
height: 30px;
display: inline-block;
vertical-align: top;
overflow: hidden;
@ -3201,9 +3187,6 @@
.openerp .oe_form_field_many2one .oe_m2o_cm_button {
line-height: 18px;
}
.openerp .oe_secondary_submenu {
line-height: 14px;
}
.openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off {
top: 0px;
}
@ -3451,6 +3434,151 @@ div.ui-widget-overlay {
overflow: hidden !important;
}
}
.nav li > a {
padding: 3px 4px 2px 18px;
color: #4c4c4c;
}
.nav nav-pills.nav-stacked > li > ul {
padding-left: 16px;
}
.nav-pills > li.active > a, a.list-group-item.active > a {
background-color: #7c7bad;
color: white;
border-radius: 0;
}
.nav-pills > li.active a:hover, .nav-pills > li.active a:focus, a.list-group-item.active a:hover, a.list-group-item.active a:focus {
background-color: #7c7bad;
}
.nav-pills > li.active .badge, a.list-group-item.active .badge {
background-color: white;
color: #7c7bad;
text-shadow: none;
}
.badge {
font-weight: normal;
font-size: 11px;
background-color: #7c7bad;
}
button, body {
line-height: normal;
}
h1, h2 {
font-weight: bold;
}
h3 {
font-size: 1.17em;
font-weight: bold;
}
p {
display: block;
-webkit-margin-before: 1em;
-webkit-margin-after: 1em;
-webkit-margin-start: 0px;
-webkit-margin-end: 0px;
}
pre {
background-color: white;
border: none;
padding: 10px 0 3px 0;
}
.jqstooltip {
height: auto !important;
width: auto !important;
}
h5 {
font-weight: bold;
font-size: smaller;
}
.oe_form .oe_subtype label, .oe_subtype label {
font-weight: normal;
}
.oe_msg_subtype_check {
margin: 3px 3px 0 !important;
}
.oe_view_manager_new .oe_form_nosheet {
margin-top: 8px;
}
.oe_view_manager_new .oe_form_nosheet .oe_form_label {
font-weight: normal;
}
.navbar {
min-height: 32px;
margin-bottom: 0px;
border: none;
z-index: 1;
background-color: #414141;
background-color: #454343;
background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
background-image: -webkit-linear-gradient(top, #646060, #262626);
background-image: -moz-linear-gradient(top, #646060, #262626);
background-image: -ms-linear-gradient(top, #646060, #262626);
background-image: -o-linear-gradient(top, #646060, #262626);
background-image: linear-gradient(to bottom, #646060, #262626);
}
.navbar-default .navbar-nav li a:hover, .navbar-default .navbar-nav li a:focus {
background: rgba(0, 0, 0, 0.3);
}
.navbar-default .navbar-nav .open > a, .navbar-default .navbar-nav a:hover, .navbar-default .navbar-nav a:focus {
background: rgba(0, 0, 0, 0.3) !important;
}
.navbar-default .navbar-nav .dropdown > a .caret {
border-top-color: #777777 !important;
border-bottom-color: #777777 !important;
}
.navbar-nav li a {
padding: 4px 32px 4px 12px;
}
.dropdown-menu {
font-size: 13px;
padding: 4px 0;
background: #333333 !important;
background: rgba(37, 37, 37, 0.9) !important;
border-color: #999999;
border-color: rgba(0, 0, 0, 0.2);
background-color: #414141;
text-shadow: none;
background-color: #454343;
background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
background-image: -webkit-linear-gradient(top, #646060, #262626);
background-image: -moz-linear-gradient(top, #646060, #262626);
background-image: -ms-linear-gradient(top, #646060, #262626);
background-image: -o-linear-gradient(top, #646060, #262626);
background-image: linear-gradient(to bottom, #646060, #262626);
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
.dropdown-menu li a, .dropdown-menu li a:hover, .dropdown-menu li a:focus {
color: #eeeeee;
}
.ui-icon {
width: 18px;
height: 18px;
}
input[type="radio"], input[type="checkbox"] {
margin-right: 4px;
margin-left: 4px;
}
.blockUI.blockOverlay {
background-color: black;
opacity: 0.6;

View File

@ -204,6 +204,8 @@ $sheet-padding: 16px
vertical-align: middle
h4
margin: 4px 0
font-weight: bold
font-size: inherit
// }}}
// Button style {{{
a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
@ -263,6 +265,7 @@ $sheet-padding: 16px
// Modal box
&.ui-dialog
display: none
height: auto !important
padding: 6px
//overflow: hidden
background-color: rgba(60,60,60,0.7)
@ -287,6 +290,7 @@ $sheet-padding: 16px
border: none
.ui-dialog-content
background: white
width: auto !important
.ui-dialog-buttonpane
border-top: 1px solid #e0e0e0
background: #f5f7f9
@ -467,7 +471,16 @@ $sheet-padding: 16px
max-width: 650px
.oe_grey
color: #aaa
// Added for generic error message and customize bootstrap3 <pre>,<hr>
.oe_error_detail
hr
display: block
-webkit-margin-before: 0.5em
-webkit-margin-after: 0.5em
-webkit-margin-start: auto
-webkit-margin-end: auto
border-style: inset
border-width: 1px
// }}}
// Tags (for many2many tags, among others) {{{
@ -589,6 +602,10 @@ $sheet-padding: 16px
cursor: default
.oe_notebook_page
padding: 0
//Customize label weight according bootstrap3
> label:not([for])
font-weight: normal !important
// End of customize
div.ui-tabs
padding: 3px 0px 3px 0px
.ui-tabs-hide
@ -811,7 +828,7 @@ $sheet-padding: 16px
text-align: center
a
color: #eee
margin: 0 8px
margin: 0 6px
&:hover
text-decoration: underline
span
@ -854,11 +871,7 @@ $sheet-padding: 16px
// }}}
// Top Menu {{{
.oe_topbar
width: 100%
height: 32px
background-color: #414141
@include vertical-gradient(#646060, #262626)
.navbar
.oe_topbar_anonymous_login
background-color: #dc5f59
color: #eeeeee
@ -867,7 +880,7 @@ $sheet-padding: 16px
display: block
padding: 5px 10px 7px
line-height: 20px
height: 20px
height: 30px
text-decoration: none
color: white
background: transparent
@ -879,7 +892,7 @@ $sheet-padding: 16px
@include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset)
.oe_topbar_item
display: block
padding: 5px 10px 7px
padding: 5px 10px 26px
line-height: 20px
height: 20px
text-decoration: none
@ -902,7 +915,7 @@ $sheet-padding: 16px
vertical-align: top
.oe_dropdown_arrow:after
border-top: 4px solid white
.oe_dropdown_menu
.dropdown_menu
top: 32px
background: #333
background: rgba(37,37,37,0.9)
@ -922,17 +935,17 @@ $sheet-padding: 16px
@include box-shadow(none)
.oe_topbar_name
max-width: 150px
overflow: hidden
display: inline-block
max-height: 100%
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
.oe_menu
.navbar-nav
float: left
padding: 0
margin: 0
@ -946,11 +959,11 @@ $sheet-padding: 16px
color: #eeeeee
> a
display: block
padding: 5px 10px 7px
padding: 5px 10px 26px !important
line-height: 20px
height: 20px
text-decoration: none
color: #eee
color: #eee !important
vertical-align: top
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
@include transition(all 0.2s ease-out)
@ -959,7 +972,7 @@ $sheet-padding: 16px
text-shadow: black 0px 0px 3px
color: white
@include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset)
> .oe_active
> .active
background: rgba(0,0,0,0.30)
text-shadow: black 0px 0px 3px
@include box-shadow(0 1px 2px rgba(0,0,0,0.4) inset)
@ -987,7 +1000,7 @@ $sheet-padding: 16px
width: 220px
background: #f0eeee
border-right: 1px solid $tag-border
text-shadow: 0 1px 1px white
text-shadow: none
padding-bottom: 16px
a.oe_logo
position: relative
@ -1030,62 +1043,20 @@ $sheet-padding: 16px
margin-left: 8px
color: $link-color
.oe_secondary_submenu
padding: 2px 0 8px 0
margin: 0
li
position: relative
margin: 0
padding: 1px 0 1px 20px !important
list-style-type: none
a
display: block
color: #4c4c4c
padding: 2px 4px 2px 0
.oe_menu_label
position: absolute
top: 1px
right: 1px
font-size: 10px
background: $link-color
color: white
padding: 2px 4px
margin: 1px 6px 0 0
border: 1px solid lightGray
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
@include radius(4px)
@include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2))
margin-bottom: 10px !important
line-height: 1.1em
margin-top: 3px
.oe_menu_text
white-space: nowrap
overflow: hidden
display: inline-block
text-overflow: ellipsis
max-width: 85%
.oe_menu_counter
float: right
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
margin: 1px
padding: 1px 4px
border: none
margin-top: 1px
.badge
&:hover
cursor: pointer
@include transform(scale(1.1))
.oe_active
border-top: 1px solid lightGray
border-bottom: 1px solid #dedede
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
@include box-shadow((inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2)))
background: $link-color
a
color: white
.oe_menu_label
background: #eee
color: $link-color
text-shadow: 0 1px 1px white
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.2))
.oe_menu_counter
background: #eee
color: $link-color
@include box-shadow(inset 0 1px 2px rgba(0, 0, 0, 0.2))
.oe_menu_toggler:before
width: 0
height: 0
@ -1107,11 +1078,8 @@ $sheet-padding: 16px
border-left: 4px solid transparent
border-right: 4px solid transparent
border-top: 4px solid #4c4c4c
.oe_secondary_submenu
margin-left: -20px
.oe_secondary_submenu li
margin-left: 20px
// }}}
// About openerp {{{
.oe_about
@ -1157,6 +1125,7 @@ $sheet-padding: 16px
.oe_breadcrumb_title > *
display: inline-block
overflow: hidden
font-weight: bold
// }}}
// ViewManager common {{{
.oe_view_manager
@ -1195,6 +1164,7 @@ $sheet-padding: 16px
font-size: 18px
margin: 0
float: left
line-height: 30px
a
color: $link-color
.oe_dropdown_menu
@ -1323,8 +1293,13 @@ $sheet-padding: 16px
display: none
// }}}
// FormPopup {{{
.oe_popup_form > .oe_formview > .oe_form_pager
display: none !important
.oe_popup_form
.oe_formview .oe_form_pager
display: none !important
// Customize label weight for popup wizard appear from another wizard according bootstrap3
table label
font-weight: normal
// End of customize
.oe_popup_list_pager
float: right
// }}}
@ -1345,6 +1320,15 @@ $sheet-padding: 16px
height: 14px
font-size: 12px
line-height: 18px
//Customize searchview input, select
input:not([type]), input[type="text"], input[type="number"]
width: 156px
height: 22px
input[type="checkbox"]
margin: 3px 3px 3px 4px
select
margin: 2px 4px 2px 0
//End of customize
&.oe_focused
border-color: $tag-border-selected
@include box-shadow(0 1px 2px $tag-border-selected inset)
@ -1509,6 +1493,7 @@ $sheet-padding: 16px
@include box-sizing(border)
display: table-cell
width: 50%
padding-left: 2px // Managed padding-left according bootstrap3
ul
margin: 0 8px 8px
padding: 0
@ -1538,7 +1523,7 @@ $sheet-padding: 16px
margin: 4px 0
line-height: 18px
button
margin: 0 0 8px 0
margin: 0 0 8px -3px // Managed margin-left according bootstrap3
.oe_searchview_custom
padding: 0 8px 8px 8px
div
@ -1558,6 +1543,10 @@ $sheet-padding: 16px
position: absolute
top: 0
right: 5px
//Customize for searchview label
label
font-weight: normal
//End of Customize
.oe_searchview_dashboard
form
display: none
@ -1583,9 +1572,10 @@ $sheet-padding: 16px
white-space: nowrap
&:first-child .searchview_extended_prop_or
visibility: hidden
margin-left: -14px
.searchview_extended_prop_or
opacity: 0.5
margin-left: -14px
margin-left: -14px //Customize 'or' in searchview
.oe_opened
h4:before
content: ""
@ -1732,6 +1722,12 @@ $sheet-padding: 16px
.oe_form_sheetbg
background: url(/web/static/src/img/form_sheetbg.png)
border-bottom: 1px solid #ddd
// Customize font weight according bootstrap3
.oe_subtotal_footer label
font-weight: bold
table label
font-weight: normal
// End of customize
.oe_form_sheet
border: 1px solid #c8c8d3 //$tag-border
@include box-shadow(0 4px 20px rgba(0,0,0,0.15))
@ -1799,7 +1795,7 @@ $sheet-padding: 16px
font-weight: bold !important
padding: 2px 11px 2px 0px !important
label.oe_form_label_help
font-weight: normal
font-weight: normal !important
.oe_form_box_info
background: #fe9
border-bottom: 1px solid #cb6
@ -1826,7 +1822,8 @@ $sheet-padding: 16px
label
line-height: 18px
display: block
min-width: 140px
min-width: 150px
font-weight: bold !important
td.oe_form_group_cell + .oe_form_group_cell
padding: 2px 0 2px 8px
.oe_form_group
@ -1838,7 +1835,6 @@ $sheet-padding: 16px
// FormView.label {{{
.oe_form
.oe_form_label_help[for], .oe_form_label[for]
font-weight: bold
white-space: nowrap
padding-right: 8px
span
@ -1907,6 +1903,17 @@ $sheet-padding: 16px
input
height: inherit !important
font-size: inherit
// Customize for formview
.oe_title h1, h1
font-weight: bold
font-size: 2em
h2
font-size: 1.5em
label
font-weight: bold
margin-bottom: 0px
display: inline
// End of customize
.oe_form_field
width: 100%
display: inline-block
@ -2022,6 +2029,8 @@ $sheet-padding: 16px
margin: 0
padding: 0
.oe_form
.oe_form_field_binary
display: inline-block
.oe_form_field_image
padding: 0
position: relative
@ -2045,12 +2054,13 @@ $sheet-padding: 16px
display: inline-block
clear: both
width: 100%
margin-bottom: -15px
.oe_add
float: left
position: relative
width: 100%
left: +2px
top: +7px
margin: 9px 0 /* Customize margin according bootstrap3 */
overflow: hidden
button
display: inline
@ -2060,9 +2070,6 @@ $sheet-padding: 16px
vertical-align: middle
button.oe_attach
width: 24px
overflow: hidden
width: 24px
overflow: hidden
background: transparent
color: #7C7BAD
box-shadow: none
@ -2104,6 +2111,7 @@ $sheet-padding: 16px
// }}}
// FormView.many2one {{{
.oe_form_field_many2one
display: inline-block
td:first-child
position: relative
span.oe_m2o_drop_down_button
@ -2152,8 +2160,14 @@ $sheet-padding: 16px
padding-left: 24px
margin: 0
position: relative
// Customize for statusbar label
line-height: normal
font-size: 100%
font-weight: normal
// End of customize
> .arrow
width: 17px
height: 30px
display: inline-block
vertical-align: top
overflow: hidden
@ -2522,8 +2536,6 @@ $sheet-padding: 16px
top: -1px
.oe_form_field_many2one .oe_m2o_cm_button
line-height: 18px
.oe_secondary_submenu
line-height: 14px
.oe_webclient
.oe_star_on, .oe_star_off
top: 0px
@ -2728,6 +2740,121 @@ div.ui-widget-overlay
overflow: hidden !important
// }}}
// Customize bootstrap3 for leftbar
.nav
li > a
padding: 3px 4px 2px 18px
color: #4c4c4c
nav-pills.nav-stacked > li > ul
padding-left: 16px
.nav-pills > li.active,a.list-group-item.active
> a
background-color: #7c7bad
color: white
border-radius: 0
a:hover,a:focus
background-color: #7c7bad
.badge
background-color: white
color: #7c7bad
text-shadow: none
.badge
font-weight: normal
font-size: 11px
background-color: #7c7bad
// End of customize
// Customize for global tags
button, body
line-height: normal
h1,h2
font-weight: bold
h3
font-size: 1.17em
font-weight: bold
p
display: block
-webkit-margin-before: 1em
-webkit-margin-after: 1em
-webkit-margin-start: 0px
-webkit-margin-end: 0px
pre
background-color: #FFFFFF
border: none
padding: 10px 0 3px 0
// End of customize
// Customize for kanban tooltip
.jqstooltip
height: auto !important
width: auto !important
// End of kanban tooltip
// Customize for chatter
h5
font-weight: bold
font-size: smaller
.oe_form .oe_subtype label, .oe_subtype label
font-weight: normal
.oe_msg_subtype_check
margin: 3px 3px 0 !important
// End of customize
// Minimized unused white space and label weight for wizard popup
.oe_view_manager_new .oe_form_nosheet
margin-top: 8px
.oe_form_label
font-weight: normal
// End of customize
// navbar hack {{{
.navbar
min-height: 32px
margin-bottom: 0px
border: none
z-index: 1
background-color: #414141
@include vertical-gradient(#646060, #262626)
.navbar-default
.navbar-nav
li
a:hover,a:focus
background: rgba(0, 0, 0, 0.3)
.open > a,a:hover,a:focus
background: rgba(0, 0, 0, 0.3) !important
.dropdown > a .caret
border-top-color: #777 !important
border-bottom-color: #777 !important
.navbar-nav
li
a
padding: 4px 32px 4px 12px
.dropdown-menu
font-size: 13px
padding: 4px 0
background: #333333 !important
background: rgba(37, 37, 37, 0.9) !important
border-color: #999999
border-color: rgba(0, 0, 0, 0.2)
background-color: #414141
text-shadow: none
@include vertical-gradient(#646060, #262626)
@include radius(3px)
li
a,a:hover,a:focus
color: #eeeeee
// End hack }}}
// Hack for ui icon {{{
.ui-icon
width: 18px
height: 18px
// End hack}}}
input[type="radio"], input[type="checkbox"]
margin-right: 4px
margin-left: 4px
.blockUI.blockOverlay
background-color: black
opacity: 0.6000000238418579

View File

@ -1,6 +1,11 @@
.openerp .oe_export {
width: 100%;
}
/* Customize according bootstrap3 */
.openerp .oe_export label {
font-weight: normal;
}
/* End of customize */
.openerp .oe_export_row tr{
background-color: #FFFFFF;
font-size: 0.8em;

View File

@ -442,10 +442,10 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
self.$el.html(QWeb.render("DatabaseManager", { widget : self }));
$('.oe_user_menu_placeholder').append(QWeb.render("DatabaseManager.user_menu",{ widget : self }));
$('.oe_secondary_menus_container').append(QWeb.render("DatabaseManager.menu",{ widget : self }));
$('ul.oe_secondary_submenu > li:first').addClass('oe_active');
$('ul.oe_secondary_submenu > li:first').addClass('active');
$('ul.oe_secondary_submenu > li').bind('click', function (event) {
var menuitem = $(this);
menuitem.addClass('oe_active').siblings().removeClass('oe_active');
menuitem.addClass('active').siblings().removeClass('active');
var form_id =menuitem.find('a').attr('href');
$(form_id).show().siblings().hide();
event.preventDefault();
@ -969,7 +969,7 @@ instance.web.Menu = instance.web.Widget.extend({
this.needaction_data = data;
_.each(this.needaction_data, function (item, menu_id) {
var $item = self.$secondary_menus.find('a[data-menu="' + menu_id + '"]');
$item.find('.oe_menu_counter').remove();
$item.find('.badge').remove();
if (item.needaction_counter && item.needaction_counter > 0) {
$item.append(QWeb.render("Menu.needaction_counter", { widget : item }));
}
@ -982,8 +982,8 @@ instance.web.Menu = instance.web.Widget.extend({
reflow: function() {
var self = this;
this.$el.height('auto').show();
var $more_container = this.$('.oe_menu_more_container').hide();
var $more = this.$('.oe_menu_more');
var $more_container = this.$('#menu_more_container').hide();
var $more = this.$('#menu_more');
$more.children('li').insertBefore($more_container);
var $toplevel_items = this.$el.children('li').not($more_container).hide();
$toplevel_items.each(function() {
@ -1026,8 +1026,8 @@ instance.web.Menu = instance.web.Widget.extend({
}
// Activate current main menu
this.$el.find('.oe_active').removeClass('oe_active');
$main_menu.addClass('oe_active');
this.$el.find('.active').removeClass('active');
$main_menu.addClass('active');
// Show current sub menu
this.$secondary_menus.find('.oe_secondary_menu').hide();
@ -1037,13 +1037,13 @@ instance.web.Menu = instance.web.Widget.extend({
this.$secondary_menus.parent('.oe_leftbar').toggle(!!$sub_menu.children().length);
// Activate current menu item and show parents
this.$secondary_menus.find('.oe_active').removeClass('oe_active');
this.$secondary_menus.find('.active').removeClass('active');
if ($main_menu !== $clicked_menu) {
$clicked_menu.parents().show();
if ($clicked_menu.is('.oe_menu_toggler')) {
$clicked_menu.toggleClass('oe_menu_opened').siblings('.oe_secondary_submenu:first').toggle();
} else {
$clicked_menu.parent().addClass('oe_active');
$clicked_menu.parent().addClass('active');
}
}
},
@ -1129,7 +1129,7 @@ instance.web.Menu = instance.web.Widget.extend({
},
on_menu_click: function(ev) {
ev.preventDefault();
var needaction = $(ev.target).is('div.oe_menu_counter');
var needaction = $(ev.target).is('div#menu_counter');
this.menu_click($(ev.currentTarget).data('menu'), needaction);
},
});
@ -1143,7 +1143,7 @@ instance.web.UserMenu = instance.web.Widget.extend({
start: function() {
var self = this;
this._super.apply(this, arguments);
this.$el.on('click', '.oe_dropdown_menu li a[data-menu]', function(ev) {
this.$el.on('click', '.dropdown-menu li a[data-menu]', function(ev) {
ev.preventDefault();
var f = self['on_menu_' + $(this).data('menu')];
if (f) {
@ -1304,7 +1304,7 @@ instance.web.Client = instance.web.Widget.extend({
self.action_manager.appendTo(self.$('.oe_application'));
},
toggle_bars: function(value) {
this.$('tr:has(td.oe_topbar),.oe_leftbar').toggle(value);
this.$('tr:has(td.navbar),.oe_leftbar').toggle(value);
},
has_uncommitted_changes: function() {
return false;

View File

@ -320,7 +320,7 @@
</t>
<t t-name="DatabaseManager.menu">
<div class="oe_secondary_menu_section">Database Management</div>
<ul class="oe_secondary_submenu">
<ul class="oe_secondary_submenu nav nav-pills nav-stacked">
<li><a href="#db_create">Create</a></li>
<li><a href="#db_duplicate">Duplicate</a></li>
<li><a href="#db_drop">Drop</a></li>
@ -362,15 +362,13 @@
</t>
<t t-name="Menu">
<ul class="oe_menu" t-if="widget.data">
<ul class="nav navbar-nav navbar-left" t-if="widget.data">
<li t-foreach="widget.data.data.children" t-as="menu">
<t t-call="Menu.link"/>
</li>
<li class="oe_menu_more_container" style="display: none;">
<span class="oe_topbar_item oe_menu_more_link oe_dropdown_toggle oe_dropdown_arrow">
More
<ul class="oe_menu_more oe_dropdown_menu"/>
</span>
<li id="menu_more_container" class="dropdown" style="display: none;">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a>
<ul id="menu_more" class="dropdown-menu"></ul>
</li>
</ul>
</t>
@ -389,7 +387,7 @@
</div>
</t>
<t t-name="Menu.secondary.submenu">
<ul t-if="menu.children.length" class="oe_secondary_submenu">
<ul t-if="menu.children.length" class="oe_secondary_submenu nav nav-pills nav-stacked">
<li t-foreach="menu.children" t-as="menu">
<t t-call="Menu.link"/>
<!--<span class="oe_menu_label">8</span>-->
@ -410,24 +408,28 @@
</t>
<t t-name="Menu.needaction_counter">
<div class="oe_tag oe_tag_dark oe_menu_counter">
<div id="menu_counter" class="badge pull-right">
<t t-if="widget.needaction_counter &gt; 99"> 99+ </t>
<t t-if="widget.needaction_counter &lt;= 99"> <t t-esc="widget.needaction_counter"/> </t>
</div>
</t>
<t t-name="UserMenu">
<span class="oe_user_menu oe_topbar_item oe_dropdown_toggle oe_dropdown_arrow">
<img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/>
<span class="oe_topbar_name"/>
<ul class="oe_dropdown_menu">
<li><a href="#" data-menu="settings">Preferences</a></li>
<li><a href="#" data-menu="account">My OpenERP.com account</a></li>
<li><a href="#" data-menu="about">About OpenERP</a></li>
<li><a href="#" data-menu="help">Help</a></li>
<li><a href="#" data-menu="logout">Log out</a></li>
</ul>
</span>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/>
<span class="oe_topbar_name"/> <b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="#" data-menu="settings">Preferences</a></li>
<li><a href="#" data-menu="account">My OpenERP.com account</a></li>
<li><a href="#" data-menu="about">About OpenERP</a></li>
<li><a href="#" data-menu="help">Help</a></li>
<li><a href="#" data-menu="logout">Log out</a></li>
</ul>
</li>
</ul>
</t>
<t t-name="UserMenu.about">
@ -450,7 +452,7 @@
<div class="openerp openerp_webclient_container">
<table class="oe_webclient">
<tr>
<td colspan="2" class="oe_topbar">
<td colspan="2" class="navbar navbar-default navbar-static-top" role="navigation">
<div class="oe_menu_placeholder"/>
<div class="oe_user_menu_placeholder"/>
<div class="oe_systray"/>

View File

@ -24,3 +24,24 @@
.openerp .oe_calendar.oe_cal_month .dhx_cal_data table tr td:last-child div.dhx_month_body {
padding-right: 5px;
}
.dhx_cal_tab {
height: 18px;
}
.dhx_cal_tab.active {
height: 20px;
}
.dhx_cal_today_button {
height: 20px;
}
.dhx_cal_event .dhx_body {
width: auto !important;
height: 28px !important;
}
.dhx_scale_hour {
height: 42px !important;
}

View File

@ -31,5 +31,19 @@
table tr td:last-child div.dhx_month_body
padding-right: 5px
// Hack for calender {{{
.dhx_cal_tab
height: 18px
.dhx_cal_tab.active
height: 20px
.dhx_cal_today_button
height: 20px
.dhx_cal_event .dhx_body
width: auto !important
height: 28px !important
.dhx_scale_hour
height: 42px !important
// End hack }}}
// au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
// vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: