From 04b9db1bd793b4f128428bdef329c64cfe250f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 19 Sep 2012 11:45:42 +0200 Subject: [PATCH 1/4] [FIX] fixing buttons border css bzr revid: fva@openerp.com-20120919094542-697ow6nd986wws36 --- addons/web/static/src/css/base.css | 3 +-- addons/web/static/src/css/base.sass | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 28bcb85dc44..80663b882a0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -118,7 +118,7 @@ } .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; - border: 1px solid #ababab; + border: 1px solid rgba(0, 0, 0, 0.4); color: #4c4c4c; margin: 0; padding: 3px 12px; @@ -376,7 +376,6 @@ background: #dc5f59; } .openerp button.oe_highlight { - border: 1px solid #795151; background-color: #df3f3f; background-image: -webkit-gradient(linear, left top, left bottom, from(#df3f3f), to(#a21a1a)); background-image: -webkit-linear-gradient(top, #df3f3f, #a21a1a); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 73a7c8d39e8..e06db6d043e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -207,7 +207,7 @@ $sheet-max-width: 860px // Button style {{{ 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 + border: 1px solid rgba(0,0,0,0.4) color: #4c4c4c margin: 0 padding: 3px 12px @@ -378,7 +378,6 @@ $sheet-max-width: 860px color: white background: #DC5F59 button.oe_highlight - border: 1px solid #795151 @include vertical-gradient(#df3f3f, #a21a1a) @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset)) button.oe_highlight:hover From cc733fd0c11151761e5c6b73e6251fd7887ec9d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 19 Sep 2012 14:56:16 +0200 Subject: [PATCH 2/4] [FIX] some css fixes in notes bzr revid: fva@openerp.com-20120919125616-lhmx1cjx58f7m8a8 --- addons/web/static/src/css/base.css | 47 ++++++++++++++++++-- addons/web/static/src/css/base.sass | 33 +++++++++++--- addons/web_kanban/static/src/css/kanban.css | 6 +-- addons/web_kanban/static/src/css/kanban.sass | 4 +- 4 files changed, 76 insertions(+), 14 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 80663b882a0..f6d281425b3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -647,7 +647,7 @@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: #404040; + color: rgba(0, 0, 0, 0.5); font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { @@ -1084,6 +1084,48 @@ .openerp .oe_user_menu .oe_dropdown_menu { right: -1px; } +.openerp .oe_about { + background-color: white; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp .oe_about a { + color: #7c7bad; +} +.openerp .oe_about a:hover { + text-decoration: underline; +} +.openerp .oe_about a:focus { + outline: none; +} +.openerp .oe_about .oe_logo { + margin-left: -6px; +} +.openerp .oe_about .oe_bottom { + position: absolute; + top: 50%; + left: 0; + right: 0; + bottom: 0; + text-shadow: 0 1px 1px #999999; + background-color: #b41616; + background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606)); + background-image: -webkit-linear-gradient(top, #b41616, #600606); + background-image: -moz-linear-gradient(top, #b41616, #600606); + background-image: -ms-linear-gradient(top, #b41616, #600606); + background-image: -o-linear-gradient(top, #b41616, #600606); + background-image: linear-gradient(to bottom, #b41616, #600606); + color: #eeeeee; + padding: 0 16px; + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; + border-radius: 0 0 2px 2px; +} +.openerp .oe_about .oe_bottom a { + color: #eeeeee; +} .openerp .oe_systray > div { float: left; padding: 0 4px 0 4px; @@ -2722,9 +2764,6 @@ .openerp .oe-treeview-table .treeview-tr.oe-treeview-first span, .openerp .oe-treeview-table .treeview-td.oe-treeview-first span { margin-left: 16px; } -.openerp .oe_trad_field.touched { - border: 1px solid green !important; -} .openerp .oe_layout_debugging .oe_form_group { outline: 2px dashed green; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e06db6d043e..85d7a030791 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -553,7 +553,7 @@ $sheet-max-width: 860px position: relative cursor: pointer .oe_dropdown_toggle - color: #404040 + color: rgba(0,0,0,0.5) font-weight: normal .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened display: block @@ -881,6 +881,33 @@ $sheet-max-width: 860px .oe_dropdown_menu right: -1px // }}} + // About openerp {{{ + .oe_about + background-color: white + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=) + @include radius(0 0 2px 2px) + a + color: $link-color + &:hover + text-decoration: underline + &:focus + outline: none + .oe_logo + margin-left: -6px + .oe_bottom + position: absolute + top: 50% + left: 0 + right: 0 + bottom: 0 + text-shadow: 0 1px 1px #999999 + @include vertical-gradient(#b41616, #600606) + color: #eee + padding: 0 16px + @include radius(0 0 2px 2px) + a + color: #eee + // }}} // Systray {{{ .oe_systray > div float: left @@ -2146,10 +2173,6 @@ $sheet-max-width: 860px .treeview-tr.oe-treeview-first span, .treeview-td.oe-treeview-first span margin-left: 16px // }}} - // Translation {{{ - .oe_trad_field.touched - border: 1px solid green !important - // }}} // Debugging stuff {{{ .oe_layout_debugging .oe_form_group diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index c019568fe0e..b53144ada36 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -143,9 +143,9 @@ position: relative; top: -8px; } -.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_toggle { +.openerp .oe_kanban_view .oe_kanban_card, .openerp .oe_kanban_view .oe_dropdown_toggle { cursor: pointer; - display:inline-block; + display: inline-block; } .openerp .oe_kanban_view .oe_kanban_add { float: right; @@ -204,7 +204,7 @@ .openerp .oe_kanban_view .oe_kanban_record { position: relative; display: block; - min-height: 50px; + min-height: 20px; margin: 0; -moz-border-radius: 4px; -webkit-border-radius: 4px; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index a183cad8af0..59e40eb348c 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -156,7 +156,7 @@ top: -8px .oe_kanban_card, .oe_dropdown_toggle cursor: pointer - display:inline-block + display: inline-block .oe_kanban_add float: right @@ -202,7 +202,7 @@ .oe_kanban_record position: relative display: block - min-height: 50px + min-height: 20px margin: 0 @include radius(4px) &:last-child From 04728a30ff8be9923c4fc3709b8757458b423c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 19 Sep 2012 18:21:15 +0200 Subject: [PATCH 3/4] [FIX] some fixes for the notes css bzr revid: fva@openerp.com-20120919162115-2l20lu0r65hyfarb --- addons/web_kanban/static/src/css/kanban.css | 21 ++++++++++++---- addons/web_kanban/static/src/css/kanban.sass | 26 +++++++++++--------- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index b53144ada36..cac006c2a70 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -7,14 +7,14 @@ background: url(/web/static/src/img/form_sheetbg.png); } .openerp .oe_kanban_view .ui-sortable-placeholder { - border: 1px dotted black; + border: 1px solid rgba(0, 0, 0, 0.1); visibility: visible !important; height: 60px !important; } .openerp .oe_kanban_view .ui-sortable-helper { - -moz-box-shadow: 0 1px 20px rgba(0, 0, 0, 0.9); - -webkit-box-shadow: 0 1px 20px rgba(0, 0, 0, 0.9); - -box-shadow: 0 1px 20px rgba(0, 0, 0, 0.9); + -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3); + -box-shadow: 0 1px 10px rgba(0, 0, 0, 0.3); -moz-transform: rotate(3deg); -webkit-transform: rotate(3deg); -o-transform: rotate(3deg); @@ -135,7 +135,8 @@ white-space: nowrap; display: none; position: relative; - top: 5px; + opacity: 0.75; + top: 20px; } .openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle { margin-left: 4px; @@ -515,33 +516,43 @@ } .openerp .oe_kanban_view .oe_kanban_color_0 { background-color: white; + color: #5a5a5a; } .openerp .oe_kanban_view .oe_kanban_color_1 { background-color: #cccccc; + color: #424242; } .openerp .oe_kanban_view .oe_kanban_color_2 { background-color: #ffc7c7; + color: #7a3737; } .openerp .oe_kanban_view .oe_kanban_color_3 { background-color: #fff1c7; + color: #756832; } .openerp .oe_kanban_view .oe_kanban_color_4 { background-color: #e3ffc7; + color: #5d6937; } .openerp .oe_kanban_view .oe_kanban_color_5 { background-color: #c7ffd5; + color: #1a7759; } .openerp .oe_kanban_view .oe_kanban_color_6 { background-color: #c7ffff; + color: #1a5d83; } .openerp .oe_kanban_view .oe_kanban_color_7 { background-color: #c7d5ff; + color: #3b3e75; } .openerp .oe_kanban_view .oe_kanban_color_8 { background-color: #e3c7ff; + color: #4c3668; } .openerp .oe_kanban_view .oe_kanban_color_9 { background-color: #ffc7f1; + color: #6d2c70; } .openerp .oe_form .oe_kanban_view .oe_kanban_column, .openerp .oe_form .oe_kanban_view .oe_kanban_group_header { diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 59e40eb348c..7b10be6c249 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -42,11 +42,11 @@ &.oe_kanban_grouped .oe_kanban_dummy_cell background: url(/web/static/src/img/form_sheetbg.png) .ui-sortable-placeholder - border: 1px dotted black + border: 1px solid rgba(0,0,0,0.1) visibility: visible !important height: 60px !important .ui-sortable-helper - @include box-shadow(0 1px 20px rgba(0, 0, 0, 0.9)) + @include box-shadow(0 1px 10px rgba(0, 0, 0, 0.3)) @include transform(rotate(3deg)) .oe_kanban_left float: left @@ -146,7 +146,8 @@ white-space: nowrap display: none position: relative - top: 5px + opacity: 0.75 + top: 20px // }}} // KanbanQuickCreate {{{ .oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle @@ -433,33 +434,34 @@ // KanbanColors {{{ .oe_kanban_color_0 background-color: #FFFFFF - + color: #5a5a5a .oe_kanban_color_1 background-color: #CCCCCC - + color: #424242 .oe_kanban_color_2 background-color: #FFC7C7 - + color: #7a3737 .oe_kanban_color_3 background-color: #FFF1C7 - + color: #756832 .oe_kanban_color_4 background-color: #E3FFC7 - + color: #5d6937 .oe_kanban_color_5 background-color: #C7FFD5 - + color: #1a7759 .oe_kanban_color_6 background-color: #C7FFFF - + color: #1a5d83 .oe_kanban_color_7 background-color: #C7D5FF - + color: #3b3e75 .oe_kanban_color_8 background-color: #E3C7FF - + color: #4c3668 .oe_kanban_color_9 background-color: #FFC7F1 + color: #6d2c70 .openerp .oe_form .oe_kanban_view .oe_kanban_column, .oe_kanban_group_header From 441bfb5280198e46e1386d521594d925bc7a4e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Thu, 20 Sep 2012 13:49:53 +0200 Subject: [PATCH 4/4] [FIX] css: mouse cursor on links bzr revid: fva@openerp.com-20120920114953-q9uq5fk83uzl5jfw --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f6d281425b3..af353ccba4e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -57,6 +57,7 @@ } .openerp a { text-decoration: none; + cursor: pointer !important; } .openerp table { padding: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 85d7a030791..972e3387883 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -171,6 +171,7 @@ $sheet-max-width: 860px // Tag reset {{{ a text-decoration: none + cursor: pointer !important table padding: 0 border-collapse: collapse