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

[FIX] website: css fixes for themes

Browse Source 
bzr revid: chm@openerp.com-20140314164028-em7mrfse2dx9doao
This commit is contained in:
chm@openerp.com
2014-03-14 17:40:28 +01:00
parent 6a14fddc35 79e1813d6e
commit d0e2834c2d
15 changed files with 130 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/css/bootswatch/amelia.fix.css
+27
View File
@@ -0,0 +1,27 @@
#website-top-navbar [data-action="cancel"] {
color: #ad1d28;
}
.oe_product section {
background: rgba(16, 138, 147, 0.75) !important;
}
.oe_product section .text-info {
color: #DFD6F5;
}
ul.wizard li {
background: #debb27 !important;
}
ul.wizard .chevron:before {
border-left: 10px solid #debb27 !important;
}
ul.wizard .text-primary {
color: #ad1d28 !important;
}
ul.wizard .text-success {
color: #ffffff !important;
}
.oe_structure.oe_empty:empty:before, [data-oe-type=html]:empty:before {
color: #79D5DB !important;
}
.input-group-addon .fa {
color: #444;
}
addons/website/static/src/css/bootswatch/cosmo.fix.css
+7
View File
@@ -0,0 +1,7 @@
#website-top-navbar button.btn-primary {
color: #fff;
border: 2px solid #0061c2;
}
#website-top-navbar [data-action="cancel"] {
color: #fff;
}
addons/website/static/src/css/bootswatch/cyborg.fix.css
+30
View File
@@ -0,0 +1,30 @@
.oe_product section {
background: rgba(40, 40, 40, 0.85) !important;
}
.oe_product section .text-info {
color: #BA66E4;
}
ul.wizard li {
background: #222 !important;
}
ul.wizard .chevron:before {
border-left: 10px solid #222 !important;
}
.popover, .modal-content {
border: 1px solid rgba(200,200,200,0.5);
}
.close {
color: #fff;
}
.popover.bottom .arrow:after {
border-bottom-color: #333;
}
.popover.top .arrow:after {
border-top-color: #333;
}
.popover.left .arrow:after {
border-left-color: #333;
}
.popover.right .arrow:after {
border-right-color: #333;
}
addons/website/static/src/css/bootswatch/flatly.fix.css
+3
View File
@@ -0,0 +1,3 @@
#website-top-navbar [data-action="cancel"] {
color: #2c3e50;
}
addons/website/static/src/css/bootswatch/journal.fix.css
+6
View File
@@ -0,0 +1,6 @@
#website-top-navbar button.btn-primary {
border: 2px solid #e4332e;
}
#website-top-navbar [data-action="cancel"] {
color: #fff;
}
addons/website/static/src/css/bootswatch/readable.fix.css
+3
View File
@@ -0,0 +1,3 @@
.oe_product section .text-info {
color: #2A9CBE;
}
addons/website/static/src/css/bootswatch/simplex.fix.css
+3
View File
@@ -0,0 +1,3 @@
#website-top-navbar [data-action="cancel"] {
color: #fff;
}
addons/website/static/src/css/bootswatch/slate.fix.css
+21
View File
@@ -0,0 +1,21 @@
.oe_product section {
background: rgba(40, 40, 45, 0.80) !important;
}
ul.wizard li {
background-image: -webkit-linear-gradient(#8a9196,#7a8288 60%,#788084) !important;
background-image: linear-gradient(#8a9196,#7a8288 60%,#788084 ) !important;
color: #ccc;
}
ul.wizard .chevron:before {
border-left: 10px solid #7C8386 !important;
}
ul.wizard li.text-primary {
color: #fff;
}
.close {
color: #fff;
}
.popover {
-webkit-box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
}
addons/website/static/src/css/bootswatch/spacelab.fix.css
+8
View File
@@ -0,0 +1,8 @@
.carousel .carousel-caption.content,
.carousel .carousel-caption.content h1,
.carousel .carousel-caption.content h2,
.carousel .carousel-caption.content h3,
.carousel .carousel-caption.content h4,
.carousel .carousel-caption.content h5 {
color: #ccc;
}
addons/website/static/src/css/bootswatch/yeti.fix.css
+6
View File
@@ -0,0 +1,6 @@
#website-top-navbar [data-action="cancel"] {
color: #fff;
}
.popover .close {
color: #fff;
}
addons/website/static/src/css/website.css
+1
View File
@@ -120,6 +120,7 @@ header a.navbar-brand img {
.container .container {
padding-left: 0;
padding-right: 0;
width: 100%;
}
/* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
addons/website/static/src/css/website.sass
+1
View File
@@ -89,6 +89,7 @@ header
.container
padding-left: 0
padding-right: 0
width: 100%
/* ----- BOOTSTRAP HACK FOR HEADER NAV BAR ----- */
addons/website/views/themes.xml
+10
View File
@@ -206,6 +206,7 @@
<template id="website.theme_amelia" name="Amelia" inherit_option_id="website.theme">
<xpath expr="//link[@id='bootstrap_css']" position="replace">
<link rel='stylesheet' href='/website/static/src/css/bootswatch/amelia.min.css' t-ignore="true"/>
<link rel='stylesheet' href='/website/static/src/css/bootswatch/amelia.fix.css' t-ignore="true"/>
</xpath>
</template>
@@ -218,48 +219,56 @@
<template id="website.theme_cosmo" name="Cosmo" inherit_option_id="website.theme">
<xpath expr="//link[@id='bootstrap_css']" position="replace">
<link rel='stylesheet' href='/website/static/src/css/bootswatch/cosmo.min.css' t-ignore="true"/>
<link rel='stylesheet' href='/website/static/src/css/bootswatch/cosmo.fix.css' t-ignore="true"/>
</xpath>
</template>
<template id="website.theme_cyborg" name="Cyborg" inherit_option_id="website.theme">
<xpath expr="//link[@id='bootstrap_css']" position="replace">
<link rel='stylesheet' href='/website/static/src/css/bootswatch/cyborg.min.css' t-ignore="true"/>
<link rel='stylesheet' href='/website/static/src/css/bootswatch/cyborg.fix.css' t-ignore="true"/>
</xpath>
</template>
<template id="website.theme_flatly" name="Flatly" inherit_option_id="website.theme">
<xpath expr="//link[@id='bootstrap_css']" position="replace">
<link rel='stylesheet' href='/website/static/src/css/bootswatch/flatly.min.css' t-ignore="true"/>
<link rel='stylesheet' href='/website/static/src/css/bootswatch/flatly.fix.css' t-ignore="true"/>
</xpath>
</template>
<template id="website.theme_journal" name="Journal" inherit_option_id="website.theme">
<xpath expr="//link[@id='bootstrap_css']" position="replace">
<link rel='stylesheet' href='/website/static/src/css/bootswatch/journal.min.css' t-ignore="true"/>
<link rel='stylesheet' href='/website/static/src/css/bootswatch/journal.fix.css' t-ignore="true"/>
</xpath>
</template>
<template id="website.theme_readable" name="Readable" inherit_option_id="website.theme">
<xpath expr="//link[@id='bootstrap_css']" position="replace">
<link rel='stylesheet' href='/website/static/src/css/bootswatch/readable.min.css' t-ignore="true"/>
<link rel='stylesheet' href='/website/static/src/css/bootswatch/readable.fix.css' t-ignore="true"/>
</xpath>
</template>
<template id="website.theme_simplex" name="Simplex" inherit_option_id="website.theme">
<xpath expr="//link[@id='bootstrap_css']" position="replace">
<link rel='stylesheet' href='/website/static/src/css/bootswatch/simplex.min.css' t-ignore="true"/>
<link rel='stylesheet' href='/website/static/src/css/bootswatch/simplex.fix.css' t-ignore="true"/>
</xpath>
</template>
<template id="website.theme_slate" name="Slate" inherit_option_id="website.theme">
<xpath expr="//link[@id='bootstrap_css']" position="replace">
<link rel='stylesheet' href='/website/static/src/css/bootswatch/slate.min.css' t-ignore="true"/>
<link rel='stylesheet' href='/website/static/src/css/bootswatch/slate.fix.css' t-ignore="true"/>
</xpath>
</template>
<template id="website.theme_spacelab" name="Spacelab" inherit_option_id="website.theme">
<xpath expr="//link[@id='bootstrap_css']" position="replace">
<link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.min.css' t-ignore="true"/>
<link rel='stylesheet' href='/website/static/src/css/bootswatch/spacelab.fix.css' t-ignore="true"/>
</xpath>
</template>
@@ -272,6 +281,7 @@
<template id="website.theme_yeti" name="Yeti" inherit_option_id="website.theme">
<xpath expr="//link[@id='bootstrap_css']" position="replace">
<link rel='stylesheet' href='/website/static/src/css/bootswatch/yeti.min.css' t-ignore="true"/>
<link rel='stylesheet' href='/website/static/src/css/bootswatch/yeti.fix.css' t-ignore="true"/>
</xpath>
</template>
addons/website_sale/static/src/css/website_sale.css
+2 -4
View File
@@ -54,10 +54,9 @@
bottom: 0;
overflow: hidden;
padding: 0 15px 24px 0;
max-height: 110px;
min-height: 56px;
border-top: 1px solid rgba(255, 255, 255, 0.2);
background: rgba(100, 100, 100, 0.1);
background: rgba(255, 255, 255, 0.75);
z-index: 5;
}
.oe_product .product_price {
@@ -72,9 +71,8 @@
}
.oe_product .oe_subdescription {
font-size: 0.8em;
max-height: 42px;
overflow: hidden;
margin-bottom: 30px;
margin-bottom: 10px;
}
.oe_mycart .input-group-addon {
addons/website_sale/static/src/css/website_sale.sass
+2 -4
View File
@@ -48,10 +48,9 @@
bottom: 0
overflow: hidden
padding: 0 15px 24px 0
max-height: 110px
min-height: 56px
border-top: 1px solid rgba(255,255,255,0.2)
background: rgba(100, 100, 100, 0.1)
background: rgba(255, 255, 255, 0.75)
z-index: 5
.product_price
padding: 5px 0
@@ -63,9 +62,8 @@
height: 100%
.oe_subdescription
font-size: 0.8em
max-height: 42px
overflow: hidden
margin-bottom: 30px
margin-bottom: 10px
.oe_mycart
.input-group-addon