From 86f04a8726eb4a9e838a3a2fe3a0953b45a2fe28 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 17 Aug 2012 16:22:29 +0200 Subject: [PATCH] darker link color and padding fix bzr revid: mit@openerp.com-20120817142229-v8pvwnysx8vpqyl0 --- addons/web/static/src/css/base.css | 32 ++++++++++++++--------------- addons/web/static/src/css/base.sass | 9 ++++---- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index b9eb6fed93b..ab74e92ac69 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"); @@ -79,7 +79,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -234,7 +234,7 @@ font-size: 13px; } .openerp .ui-widget-content a { - color: #8a89ba; + color: #7c7bad; } .openerp .ui-menu .ui-menu-item { margin: 0 8px 0 0; @@ -336,7 +336,7 @@ border-radius: 0 0 2px 2px; } .openerp.ui-dialog .oe_about a { - color: #8a89ba; + color: #7c7bad; } .openerp.ui-dialog .oe_about a:hover { text-decoration: underline; @@ -547,7 +547,7 @@ -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; - color: #8a89ba; + color: #7c7bad; font-weight: bold; } .openerp .oe_button.oe_link span:hover { @@ -578,7 +578,7 @@ color: #4c4c4c; } .openerp .oe_tag_dark { - background: #8786b7; + background: #7c7bad; color: #eeeeee; } .openerp .oe_tags.oe_inline { @@ -1180,7 +1180,7 @@ .openerp .oe_secondary_menu_section { font-weight: bold; margin-left: 8px; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu { padding: 2px 0 8px 0; @@ -1202,7 +1202,7 @@ top: 1px; right: 1px; font-size: 10px; - background: #8a89ba; + background: #7c7bad; color: white; padding: 2px 4px; margin: 1px 6px 0 0; @@ -1222,7 +1222,7 @@ padding: 1px 4px; } .openerp .oe_secondary_submenu .oe_active { - background: #8a89ba; + background: #7c7bad; border-top: 1px solid lightGray; border-bottom: 1px solid lightGray; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); @@ -1235,7 +1235,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_label { background: #eeeeee; - color: #8a89ba; + 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); @@ -1243,7 +1243,7 @@ } .openerp .oe_secondary_submenu .oe_active .oe_menu_counter { background: #eeeeee; - color: #8a89ba; + color: #7c7bad; } .openerp .oe_secondary_submenu .oe_menu_toggler:before { width: 0; @@ -1273,7 +1273,7 @@ width: 100%; } .openerp .oe_application a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_application a:hover { text-decoration: underline; @@ -1314,7 +1314,7 @@ float: left; } .openerp .oe_view_manager table.oe_view_manager_header h2 a { - color: #8a89ba; + color: #7c7bad; } .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group { display: inline-block; @@ -1673,7 +1673,7 @@ } .openerp .oe_searchview .oe_searchview_drawer h3 { margin: 8px 4px 4px 12px; - color: #8786b7; + color: #7c7bad; font-size: 13px; } .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * { @@ -1931,6 +1931,7 @@ } .openerp .oe_form_nosheet > header { margin: -16px -16px 0 -16px; + padding: 8px; } .openerp .oe_form header { position: relative; @@ -1942,7 +1943,6 @@ background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); - padding: 8px; } .openerp .oe_form header ul { display: inline-block; @@ -2074,7 +2074,7 @@ background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } .openerp ul.oe_form_steps_clickable li .label { - color: #8a89ba; + color: #7c7bad; } .openerp ul.oe_form_steps_clickable li.oe_active:hover { background-color: #4c85c2; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index befb68b42db..6472f7aaacd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2,13 +2,13 @@ // Variables {{{ $facets-border: #afafb6 -$section-title-color: #8786b7 +$section-title-color: #7C7BAD $tag-bg-light: #f0f0fa -$tag-bg-dark: #8786b7 +$tag-bg-dark: #7C7BAD $tag-border: #afafb6 $tag-border-selected: #a6a6fe $hover-background: #f0f0fa -$link-color: #8a89ba +$link-color: #7C7BAD $sheet-max-width: 860px // }}} // Mixins {{{ @@ -1504,6 +1504,7 @@ $sheet-max-width: 860px margin: 16px > header margin: -16px -16px 0 -16px + padding: 8px // }}} // FormView.custom tags and classes {{{ .oe_form @@ -1511,8 +1512,6 @@ $sheet-max-width: 860px position: relative border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) - padding: 8px - //line-height: 30px ul display: inline-block float: right