pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] mit style

Browse Source 
bzr revid: al@openerp.com-20120619130220-44vg6uae5po3hdxo
This commit is contained in:
Antony Lesuisse
2012-06-19 15:02:20 +02:00
parent 613803f3c2 7de902b067
commit 18d9ddb042
8 changed files with 128 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/lib/jquery.textext/jquery.textext.js
+6 -6
View File
@@ -4774,7 +4774,8 @@
return node;
};
})(jQuery);
;(function(a){var b=document,c="getElementsByTagName",d=b[c]("head")[0]||b[c]("body")[0],e=b.createElement("style");e.innerHTML=a,d.appendChild(e)})('\n.text-core {\
;
(function(a){var b=document,c="getElementsByTagName",d=b[c]("head")[0]||b[c]("body")[0],e=b.createElement("style");e.innerHTML=a,d.appendChild(e)})('\n.text-core {\
position: relative;\
}\
.text-core .text-wrap {\
@@ -4785,10 +4786,9 @@
-webkit-box-sizing: border-box;\
-moz-box-sizing: border-box;\
box-sizing: border-box;\
-webkit-border-radius: 0px;\
-moz-border-radius: 0px;\
border-radius: 0px;\
border: 1px solid #9daccc;\
-webkit-border-radius: 3px;\
-moz-border-radius: 3px;\
border-radius: 3px;\
outline: none;\
resize: none;\
position: absolute;\
@@ -4927,4 +4927,4 @@
.text-core .text-wrap .text-tags .text-tag .text-button a.text-remove:active {\
background-position: 0 -22px;\
}\
');
');
addons/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.8.16.custom.css
Vendored
+2 -2
View File
@@ -824,7 +824,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
background:whiteSmoke;
border-bottom:1px solid #ddd;
padding-bottom:0px;
color:#00438A;
color:#4c4c4c;
}
@@ -861,7 +861,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
border: 1px solid #ddd;
border-bottom-color: #ffffff;
cursor: default;
color:gray;
color:#4c4c4c;
outline:none;
}
addons/web/static/src/css/base.css
+31 -27
View File
@@ -90,7 +90,8 @@
.openerp li {
list-style-type: none;
}
.openerp input, .openerp textarea {
.openerp input, .openerp textarea, .openerp select {
padding: 4px;
border: 1px solid #cccccc;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
@@ -181,6 +182,9 @@
.openerp .ui-menu .ui-menu-item a.ui-state-active {
background: #f0f0fa;
}
.openerp .ui-tabs {
margin: 0 -16px;
}
.openerp .oe_i {
font-family: "mnmliconsRegular" !important;
font-size: 21px;
@@ -261,6 +265,20 @@
width: 200px;
text-align: center;
}
.openerp .oe_avatar {
float: left;
margin: 0 16px 0 0;
}
.openerp .oe_avatar img {
height: 50px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
border: none;
}
.openerp.oe_tooltip {
font-size: 12px;
}
@@ -724,7 +742,6 @@
border-right: 1px solid #afafb6;
text-shadow: 0 1px 1px white;
padding-bottom: 16px;
line-height: 18px;
}
.openerp a.oe_logo {
width: 220px;
@@ -980,9 +997,9 @@
float: right;
background: #8a89ba;
color: #eeeeee;
font-size: 12px;
font-size: 10px;
border: 1px solid lightgray;
padding: 0px 4px 0px 4px;
padding: 2px 4px;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
margin: 0px;
-moz-border-radius: 4px;
@@ -1244,10 +1261,6 @@
height: 14px;
font-size: 11px;
line-height: 18px;
border: 1px solid #cccccc;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
.openerp .oe_searchview.oe_focused {
border-color: #a6a6fe;
@@ -1388,7 +1401,7 @@
}
.openerp .oe_searchview .oe_searchview_drawer {
position: absolute;
z-index: 1;
z-index: 100;
margin-top: 4px;
top: 100%;
right: -1px;
@@ -1704,9 +1717,9 @@
margin: 0 auto;
}
.openerp .oe_application .oe_form_sheet {
padding: 18px;
background: white;
min-height: 330px;
padding: 16px;
border: 1px solid #afafb6;
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
@@ -1748,11 +1761,14 @@
width: 100%;
}
.openerp .oe_form .oe_form_field_char input,
.openerp .oe_form .oe_form_field_text textarea,
.openerp .oe_form .oe_form_field_url input,
.openerp .oe_form .oe_form_field_text textarea,
.openerp .oe_form .oe_form_field_selection select {
width: inherit;
}
.openerp .oe_form .oe_form_sheet textarea {
width: 500px;
}
.openerp .oe_form .oe_form_field_float input {
width: 100px;
}
@@ -1799,7 +1815,7 @@
padding: 0 2px;
}
.openerp .oe_form .oe_form_field_text textarea {
resize: vertical;
resize: none;
}
.openerp .oe_form .oe_form_field {
width: 100%;
@@ -1838,11 +1854,6 @@
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
padding: 0 2px;
border: 1px solid #999999;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
background: white;
min-width: 70px;
color: #1f1f1f;
@@ -1869,7 +1880,6 @@
.openerp .oe_form .oe_form_field_many2one input,
.openerp .oe_form .oe_form_field_binary input,
.openerp .oe_form .oe_form_field_binary input,
.openerp .oe_form .oe_form_field_email input,
.openerp .oe_form .oe_form_field_url input {
border-right: none;
-webkit-border-top-right-radius: 0px;
@@ -1879,7 +1889,6 @@
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
}
.openerp .oe_form .oe_form_field_email button img,
.openerp .oe_form .oe_form_field_url button img {
vertical-align: top;
}
@@ -1947,11 +1956,9 @@
}
.openerp .oe_form .oe_form_field_with_button > .oe_button {
float: right;
-webkit-border-top-left-radius: 0px;
-webkit-border-bottom-left-radius: 0px;
-moz-border-radius-topleft: 0px;
-moz-border-radius-bottomleft: 0px;
border-top-left-radius: 0px;
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
border-bottom-left-radius: 0px;
height: 22px;
}
@@ -1999,9 +2006,6 @@
width: auto;
vertical-align: top;
}
.openerp .oe_form .oe_form_field_image > img {
min-width: 100px;
}
.openerp .oe_form .oe_form_field_image .oe_form_field_image_controls {
position: absolute;
top: 1px;
addons/web/static/src/css/base.sass
+20 -28
View File
@@ -134,7 +134,8 @@ $colour4: #8a89ba
padding: 0
li
list-style-type: none
input, textarea
input, textarea, select
padding: 4px
border: 1px solid #ccc
@include radius(3px)
img
@@ -193,6 +194,8 @@ $colour4: #8a89ba
width: auto
a.ui-state-active
background: #f0f0fa
.ui-tabs
margin: 0 -16px
// }}}
// Generic classes {{{
.oe_i
@@ -237,7 +240,14 @@ $colour4: #8a89ba
.oe_button_box
width: 200px
text-align: center
//.oe_avatar 
.oe_avatar
float: left
margin: 0 16px 0 0
img
height: 50px
@include radius(3px)
@include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3))
border: none
//.oe_edit_only 
// }}}
// Tooltips {{{
@@ -595,7 +605,6 @@ $colour4: #8a89ba
border-right: 1px solid #afafb6
text-shadow: 0 1px 1px white
padding-bottom: 16px
line-height: 18px
a.oe_logo
width: 220px
display: block
@@ -787,9 +796,9 @@ $colour4: #8a89ba
float: right
background: #8a89ba
color: #eee
font-size: 12px
font-size: 10px
border: 1px solid lightgray
padding: 0px 4px 0px 4px
padding: 2px 4px
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
margin: 0px
@include radius(4px)
@@ -995,8 +1004,6 @@ $colour4: #8a89ba
height: 14px
font-size: 11px
line-height: 18px
border: 1px solid #ccc
@include radius(3px)
&.oe_focused
border-color: $facets-border-selected
@include box-shadow(0 1px 2px $facets-border-selected inset)
@@ -1107,7 +1114,7 @@ $colour4: #8a89ba
.oe_searchview_drawer
position: absolute
z-index: 1
z-index: 100
// detach drawer from field slightly
margin-top: 4px
top: 100%
@@ -1355,9 +1362,9 @@ $colour4: #8a89ba
max-width: 960px
margin: 0 auto
.oe_form_sheet
padding: 18px
background: white
min-height: 330px
padding: 16px
border: 1px solid #afafb6
@include box-shadow(0 0 10px rgba(0,0,0,0.3))
.oe_form
@@ -1392,11 +1399,12 @@ $colour4: #8a89ba
width: 100%
.oe_form_field_char input,
.oe_form_field_text textarea,
.oe_form_field_url input,
.oe_form_field_text textarea,
.oe_form_field_selection select
width: inherit
.oe_form_sheet textarea
width: 500px
.oe_form_field_float input
width: 100px
@@ -1443,8 +1451,6 @@ $colour4: #8a89ba
// }}}
// FormView.fields {{{
.oe_form
.oe_form_field_text textarea
resize: vertical
.oe_form_field
width: 100%
display: inline-block
@@ -1452,7 +1458,6 @@ $colour4: #8a89ba
line-height: 18px
input
margin: 0px
.oe_form_field_integer
width: 180px
.oe_form_field_float
@@ -1461,7 +1466,6 @@ $colour4: #8a89ba
width: 7em
.oe_form_field_datetime
width: 11em
input[type="text"],
input[type="password"],
input[type="file"],
@@ -1474,9 +1478,6 @@ $colour4: #8a89ba
select,
textarea
@include box-sizing(border)
padding: 0 2px
border: 1px solid #999
@include radius(3px)
background: white
min-width: 70px
color: #1f1f1f
@@ -1496,7 +1497,6 @@ $colour4: #8a89ba
.oe_form_field_many2one input,
.oe_form_field_binary input,
.oe_form_field_binary input,
.oe_form_field_email input,
.oe_form_field_url input
border-right: none
-webkit-border-top-right-radius: 0px
@@ -1505,7 +1505,6 @@ $colour4: #8a89ba
-moz-border-radius-bottomright: 0px
border-top-right-radius: 0px
border-bottom-right-radius: 0px
.oe_form_field_email button img,
.oe_form_field_url button img
vertical-align: top
.oe_form_field_date,
@@ -1560,11 +1559,7 @@ $colour4: #8a89ba
width: 100%
> .oe_button
float: right
-webkit-border-top-left-radius: 0px
-webkit-border-bottom-left-radius: 0px
-moz-border-radius-topleft: 0px
-moz-border-radius-bottomleft: 0px
border-top-left-radius: 0px
@include radius(0)
border-bottom-left-radius: 0px
height: 22px
> div
@@ -1581,7 +1576,6 @@ $colour4: #8a89ba
visibility: hidden
.oe_form_group
margin: 5px 0px 5px 0px
// }}}
// FormView.binaryfile {{{
/* http://www.quirksmode.org/dom/inputfile.html
@@ -1608,8 +1602,6 @@ $colour4: #8a89ba
padding: 0
.oe_form
.oe_form_field_image
> img
min-width: 100px
padding: 0
position: relative
display: inline-block
addons/web/static/src/xml/base.xml
+1 -4
View File
@@ -764,7 +764,7 @@
</t>
<t t-name="FormRenderingGroup">
<t t-if="string" t-call="FormRenderingSeparator"/>
<table border="0" cellpadding="0" cellspacing="0" width="100%" t-attf-class="oe_form_group #{classnames}"/>
<table border="0" cellpadding="0" cellspacing="0" t-attf-class="oe_form_group #{classnames}"/>
</t>
<t t-name="FormRenderingNotebook">
<div>
@@ -876,9 +876,6 @@
<span class="oe_form_field oe_form_field_email oe_form_field_with_button">
<a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri"/>
<t t-if="!widget.get('effective_readonly')">
<button class="oe_button" tabindex="-1" type="button" title="Send an e-mail with your default e-mail client">
<img t-att-src='_s + "/web/static/src/img/icons/terp-mail-message-new.png"'/>
</button>
<div>
<input type="text"
t-att-id="widget.id_for_label"
addons/web_graph/static/src/css/graph.css
+55 -14
View File
@@ -1,9 +1,12 @@
.dropdown-menu-icon {
z-index: 5000;
.openerp a.dropdown-menu-icon {
z-index: 10;
position: absolute;
right: 0px;
color: #4c4c4c;
right: 8px;
}
.openerp a.dropdown-menu-icon:hover {
text-decoration: none;
}
.editor-render {
position: relative;
}
@@ -12,24 +15,62 @@
width: 650px;
height: 350px;
}
.graph-dropdown {
padding: 5px;
width: 200px;
border: 1px #333 solid;
.openerp .graph-dropdown {
display: none;
position: absolute;
right: 0px;
background: #fafaf5;
z-index: 100;
top: 40px;
right: 8px;
padding: 8px;
border: 1px solid #afafb6;
background: white;
z-index: 900;
min-width: 160px;
overflow-x: hidden;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
}
.open .graph-dropdown {
.openerp .graph-dropdown h3 {
margin: 8px 4px 4px 0;
color: #8786b7;
font-size: 13px;
}
.openerp .graph-menu > li > a {
position: relative;
display: block;
padding: 2px 4px 2px 20px;
line-height: 14px;
color: #4c4c4c;
text-decoration: none;
}
.openerp .graph-menu > li > a:hover {
text-decoration: none;
background: #f0f0fa;
background: -moz-linear-gradient(#f0f0fa, #eeeef6);
background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
background: -webkit-linear-gradient(#f0f0fa, #eeeef6);
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
}
.openerp .open .graph-dropdown {
display: block;
}
.graph-menu {
padding: 3px;
}
.graph-menu .active {
background: #aaaaff;
.graph-menu .active:before {
content: "W";
font-family: "entypoRegular" !important;
font-size: 24px;
font-weight: 300 !important;
color: #a3a3a3;
position: absolute;
left: 4px;
top: -2px;
}
li {
padding: 2px;
addons/web_graph/static/src/xml/web_graph.xml
+12 -27
View File
@@ -4,45 +4,30 @@
</div>
<a href="#" class="oe_i dropdown-menu-icon" data-toggle="dropdown" title="Graph Options">B</a>
<div class="graph-dropdown">
<div class="menu-section">
Graph Mode:
</div>
<h3 class="menu-section">
Graph Mode
</h3>
<ul class="graph-menu oe_graph_options">
<li><a href="#" data-mode="pie">Pie</a></li>
<li>
<a href="#" data-mode="bar" data-legend="top"
data-stacked="true">Bars</a>
<div class="oe_i graph-menu-options">
<a href="#" data-mode="bar" data-legend="top"
data-stacked="true" title="Stacked Bars">w</a>
<a href="#" data-mode="bar" data-legend="top"
data-stacked="false" title="Multiple Bars">O</a>
</div>
<li><a href="#" data-mode="bar" data-legend="top" data-stacked="true">Bars</a>
</li>
<li><a href="#" data-mode="line">Lines</a></li>
<li><a href="#" data-mode="area" data-legend="top"
data-stacked="true">Areas</a>
<div class="oe_i graph-menu-options">
<a href="#" data-mode="area" data-legend="top"
data-stacked="true" title="Stacked Areas">w</a>
<a href="#" data-mode="area" data-legend="top"
data-stacked="false" title="Multiple Areas">O</a>
</div>
<li><a href="#" data-mode="area" data-legend="top" data-stacked="true">Areas</a>
</li>
<li><a href="#" data-mode="radar" data-legend="inside"
data-orientation="0">Radar</a></li>
</ul>
<div class="menu-section">
Legend:
</div>
<h3 class="menu-section">
Legend
</h3>
<ul class="graph-menu oe_graph_options">
<li><a href="#" data-legend="no">Hide</a></li>
<li><a href="#" data-legend="no">Hidden</a></li>
<li><a href="#" data-legend="inside">Inside</a></li>
<li><a href="#" data-legend="top">Top</a></li>
</ul>
<div class="menu-section">
Actions:
</div>
<h3 class="menu-section">
Actions
</h3>
<ul class="graph-menu">
<li><a href="#" id="graph_switch">Switch Axis</a></li>
<li><a href="#" id="graph_show_data">Show Data</a></li>
addons/web_kanban/static/src/css/kanban.css
+1 -1
View File
@@ -399,7 +399,7 @@
position: absolute;
top: 30px;
right: -140px;
padding: 4px;
padding: 8px;
border: 1px solid #afafb6;
min-width: 160px;
overflow-x: hidden;