From 5f2fe0169be2b0cb5bde166aa3db750dcc74bcb9 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 26 Jul 2012 18:11:06 +0200 Subject: Rationalization of tag css classes bzr revid: mit@openerp.com-20120726161106-5a9uu0wjuwausmgh --- addons/web/static/src/css/base.sass | 53 ++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 25 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c9e00c65a8a..dd4f9baee66 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2,8 +2,10 @@ // Variables {{{ $section-title-color: #8786b7 -$facets-border: #afafb6 -$facets-border-selected: #a6a6fe +$tag-bg-light: #f0f0fa +$tag-bg-dark: #8786b7 +$tag-border: #afafb6 +$tag-border-selected: #a6a6fe $hover-background: #f0f0fa $colour4: #8a89ba $sheet-max-width: 860px @@ -427,15 +429,17 @@ $sheet-max-width: 860px // }}} // Tags (for many2many tags, among others) {{{ .oe_tag - border-radius: 2px - @include box-sizing(border) - border: 1px solid #9DACCC - background: #E2E6F0 - color: black !important - padding: 0px 3px 0px 3px + border: 1px solid $tag-border + font-size: 11px + padding: 2px 4px margin: 0 2px 2px 0 - height: 16px - // font: 11px "lucida grande", tahoma, verdana, arial, sans-serif + @include radius(3px) + background: $tag-bg-light + color: #4C4C4C + .oe_tag_dark + background: $tag-bg-dark + color: #eee + .oe_tags .text-wrap width: 100% !important @@ -906,14 +910,9 @@ $sheet-max-width: 860px @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2)) .oe_menu_counter float: right - background: #8a89ba - color: #eee - font-size: 10px - border: 1px solid lightgray - padding: 2px 4px text-shadow: 0 1px 1px rgba(0,0,0,0.2) margin: 0px - @include radius(4px) + padding: 1px 4px .oe_active background: $colour4 border-top: 1px solid lightGray @@ -1125,8 +1124,8 @@ $sheet-max-width: 860px font-size: 12px line-height: 18px &.oe_focused - border-color: $facets-border-selected - @include box-shadow(0 1px 2px $facets-border-selected inset) + border-color: $tag-border-selected + @include box-shadow(0 1px 2px $tag-border-selected inset) .oe_searchview_clear cursor: pointer position: absolute @@ -1177,7 +1176,7 @@ $sheet-max-width: 860px vertical-align: top display: inline-block line-height: 17px - .oe_searchview_input, .oe_searchview_facet + .oe_searchview_facet height: 18px margin: 1px 0 font-size: 11px @@ -1185,17 +1184,20 @@ $sheet-max-width: 860px outline: none .oe_searchview_input padding: 0 0 0 6px + font-size: 12px + height: 16px + margin-top: 3px + &:focus + outline: none .oe_searchview_facet position: relative cursor: pointer - border: 1px solid $facets-border - @include radius(3px) - background: #8786b7 + padding: 0 -webkit-font-smoothing: auto // spacing for opera, FF &:focus - border-color: $facets-border-selected - @include box-shadow(0 0 3px 1px $facets-border-selected) + border-color: $tag-border-selected + @include box-shadow(0 0 3px 1px $tag-border-selected) .oe_facet_values background: #f0f0fa @include radius(0 3px 3px 0) @@ -1208,8 +1210,9 @@ $sheet-max-width: 860px .oe_facet_category.oe_i font-size: 16px .oe_facet_value - border-left: 1px solid $facets-border + border-left: 1px solid $tag-border text-shadow: 0 1px 1px white + color: #4C4C4C &:last-child padding-right: 16px .oe_facet_remove -- cgit v1.2.3 From 84488630075d41930a8d2a715eebb62e69471b2f Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 30 Jul 2012 17:47:50 +0200 Subject: Restyling of jquery-ui buttons in dialog box + various style fixes bzr revid: mit@openerp.com-20120730154750-x40vpq9y9f492zvn --- addons/web/static/src/css/base.sass | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index dd4f9baee66..2a2d816241f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -184,7 +184,7 @@ $sheet-max-width: 860px margin: 4px 0 // }}} // Button style {{{ - a.button:link, a.button:visited, button, input[type='submit'] + a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button display: inline-block border: 1px solid #ababab color: #404040 @@ -199,16 +199,18 @@ $sheet-max-width: 860px -webkit-font-smoothing: antialiased outline: none - a.button:hover, button:hover, input[type='submit']:hover + a.button:hover, button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover @include vertical-gradient(#f6f6f6, #e3e3e3) cursor: pointer + background-position: 0 - a.button:focus, button:focus, input[type='submit']:focus + a.button:focus, button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus border: 1px solid #80bfff + background-position: 0 @include vertical-gradient(#f6f6f6, #e3e3e3) @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset)) - a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active + a.button:active, a.button.active, button:active, button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active @include vertical-gradient(#e3e3e3, #f6f6f6) @include box-shadow(none) @@ -231,9 +233,7 @@ $sheet-max-width: 860px width: auto a.ui-state-active background: #f0f0fa - div.ui-widget-overlay - background: black - @include opacity(0.3) + // Modal box &.ui-dialog display: none @@ -270,6 +270,8 @@ $sheet-max-width: 860px margin: 0 .ui-dialog-buttonset float: left + .ui-button + margin-right: 4px .ui-dialog-titlebar-close padding: 0 .ui-icon-closethick @@ -296,6 +298,8 @@ $sheet-max-width: 860px color: #8A89BA &:hover text-decoration: underline + &:focus + outline: none .oe_logo margin-left: -6px .oe_bottom @@ -1993,6 +1997,10 @@ $sheet-max-width: 860px // }}} +// The jQuery-ui overlay is outside the .openerp div, please don't add indentation !!! +div.ui-widget-overlay + background: black + @include opacity(0.3) // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: -- cgit v1.2.3 From 3364a85ba5904ed4bdd8fe9c61574e794c0ce9a7 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 1 Aug 2012 16:28:05 +0200 Subject: fixed padding in kanban tags and searchview tags bzr revid: mit@openerp.com-20120801142805-5drbpx6t3ks7p86s --- addons/web/static/src/css/base.sass | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2a2d816241f..8723d9d6f2e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1227,6 +1227,7 @@ $sheet-max-width: 860px line-height: 8px width: 12px height: 12px + padding-top: 1px text-align: center font-weight: bold cursor: pointer -- cgit v1.2.3 From ad585bf761e99e8037d2ff50ddc303ad0d4a8086 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 3 Aug 2012 17:37:58 +0200 Subject: Restyling of 'edit avatar' button bzr revid: mit@openerp.com-20120803153758-03jg3xuwyrh2e198 --- addons/web/static/src/css/base.sass | 43 ++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 24 deletions(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0eb4472164f..a2b4231b130 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -7,7 +7,7 @@ $tag-bg-dark: #8786b7 $tag-border: #afafb6 $tag-border-selected: #a6a6fe $hover-background: #f0f0fa -$colour4: #8a89ba +$link-color: #8a89ba $sheet-max-width: 860px // }}} // Mixins {{{ @@ -226,6 +226,8 @@ $sheet-max-width: 860px .ui-widget font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif font-size: 13px + .ui-widget-content a + color: $link-color .ui-menu .ui-menu-item margin: 0 8px 0 0 @@ -295,7 +297,7 @@ $sheet-max-width: 860px background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=) @include radius(0 0 2px 2px) a - color: #8A89BA + color: $link-color &:hover text-decoration: underline &:focus @@ -397,7 +399,6 @@ $sheet-max-width: 860px button margin: 4px .oe_avatar - margin: 0 6px 15px 0 > img height: 90px max-width: 100px @@ -412,7 +413,7 @@ $sheet-max-width: 860px display: none span @include reset() - color: #8A89BA + color: $link-color font-weight: bold &:hover text-decoration: underline @@ -886,7 +887,7 @@ $sheet-max-width: 860px .oe_secondary_menu_section font-weight: bold margin-left: 8px - color: $colour4 + color: $link-color .oe_secondary_submenu padding: 2px 0 8px 0 margin: 0 @@ -904,7 +905,7 @@ $sheet-max-width: 860px top: 1px right: 1px font-size: 10px - background: $colour4 + background: $link-color color: white padding: 2px 4px margin: 1px 6px 0 0 @@ -918,7 +919,7 @@ $sheet-max-width: 860px margin: 0px padding: 1px 4px .oe_active - background: $colour4 + background: $link-color border-top: 1px solid lightGray border-bottom: 1px solid lightGray text-shadow: 0 1px 1px rgba(0,0,0,0.2) @@ -927,12 +928,12 @@ $sheet-max-width: 860px color: white .oe_menu_label background: #eee - color: $colour4 + 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: #8a89ba + color: $link-color .oe_menu_toggler:before width: 0 height: 0 @@ -959,7 +960,7 @@ $sheet-max-width: 860px .oe_application width: 100% a - color: $colour4 + color: $link-color &:hover text-decoration: underline > div @@ -993,7 +994,7 @@ $sheet-max-width: 860px margin: 0 float: left a - color: $colour4 + color: $link-color .oe_button_group display: inline-block border: 1px solid #ababab @@ -1706,19 +1707,14 @@ $sheet-max-width: 860px * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image */ .oe_hidden_input_file - overflow: hidden - position: relative - display: inline-block - width: 45px - height: 30px input.oe_form_binary_file z-index: 0 line-height: 0 font-size: 12px position: absolute - // Should be adjusted for all browsers top: 1px - right: 10px + left: 0 + right: 0 opacity: 0 filter: alpha(opacity = 0) -ms-filter: "alpha(opacity=0)" @@ -1733,15 +1729,14 @@ $sheet-max-width: 860px vertical-align: top .oe_form_field_image_controls position: absolute - white-space: nowrap top: 1px - padding: 3px 0 0 0 - margin: 0 1px + padding: 4px + width: 100% display: none - width: 99% text-align: center - background: url(/web/static/src/img/form_sheetbg.png) - border-bottom: 1px dotted black + color: #eee + background: rgba(37,37,37,0.9) + @include radius(3px 3px 0 0) @include box-sizing(border) &:hover .oe_form_field_image_controls display: block -- cgit v1.2.3 From 2043809be494efb256a6a8d0147a49a614b099c8 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 9 Aug 2012 15:46:12 +0200 Subject: Restyling of the dashboard bzr revid: mit@openerp.com-20120809134612-lt4l62nzezlfbkgq --- addons/web/static/src/css/base.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/css/base.sass') diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a2b4231b130..ddee25c3105 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1450,7 +1450,7 @@ $sheet-max-width: 860px .oe_form .oe_form_field_date width: auto .oe_form_nosheet - margin: 20px + margin: 8px .oe_form_nosheet > header margin-top: -20px margin-left: -20px -- cgit v1.2.3