From 7bb4f6da82750fc4b90cc602adf4294ab8215f96 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 24 Dec 2013 12:22:01 +0100 Subject: [FIX]web: status bar alignment, sometimes wrong on google chrome bzr revid: dle@openerp.com-20131224112201-0zlxa6fevvj3501h --- addons/web/static/src/css/base.css | 3 ++- addons/web/static/src/css/base.sass | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index fabb8503b34..0c77ca037c7 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"); @@ -2180,6 +2180,7 @@ } .openerp .oe_form header .oe_button { margin: 3px 2px 1px; + float: left; } .openerp .oe_form header .oe_button:first-child { margin-left: 6px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c54cd2920c0..4ddd2ca8704 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1719,6 +1719,7 @@ $sheet-padding: 16px float: right .oe_button margin: 3px 2px 1px + float: left &:first-child margin-left: 6px // }}} -- cgit v1.2.3 From 5ba8c98feeb2a80a5ccaec5d416cb9a315375beb Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Fri, 3 Jan 2014 10:44:15 +0100 Subject: [REVERT] rev 4098, revid:dle@openerp.com-20131224112201-0zlxa6fevvj3501h. Partialy break the design (buttons and status bar not displayed sometimes) bzr revid: dle@openerp.com-20140103094415-vi99tbbeitzr7r2b --- addons/web/static/src/css/base.css | 3 +-- addons/web/static/src/css/base.sass | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0c77ca037c7..fabb8503b34 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"); @@ -2180,7 +2180,6 @@ } .openerp .oe_form header .oe_button { margin: 3px 2px 1px; - float: left; } .openerp .oe_form header .oe_button:first-child { margin-left: 6px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4ddd2ca8704..c54cd2920c0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1719,7 +1719,6 @@ $sheet-padding: 16px float: right .oe_button margin: 3px 2px 1px - float: left &:first-child margin-left: 6px // }}} -- cgit v1.2.3 From 7960f9fc59235fe37adbc346f81e9f605cc65d5b Mon Sep 17 00:00:00 2001 From: Xavier ALT Date: Tue, 14 Jan 2014 12:59:47 +0100 Subject: [FIX] web: list view: fix wrong css for fields.reference in editable tree view bzr revid: xal@openerp.com-20140114115947-gkh09tb2vxsjyksk --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 5 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index fabb8503b34..f1c99512118 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2850,6 +2850,9 @@ .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master { width: 100% !important; } +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_reference { + display: table; +} .openerp .oe_list_group_name { white-space: nowrap; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c54cd2920c0..28947b3b467 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2243,6 +2243,8 @@ $sheet-padding: 16px &.oe_form_field_datetime,&.oe_form_field_date input.oe_datepicker_master width: 100% !important + &.oe_form_field_reference + display: table .oe_list_group_name white-space: nowrap // }}} -- cgit v1.2.3 From f00e6711f5205ee7ddcc77d32e063e43e2194d1e Mon Sep 17 00:00:00 2001 From: Cecile Tonglet Date: Wed, 15 Jan 2014 15:26:08 +0100 Subject: [FIX] Fix the missing border-bottom of the notebook in dialogs bzr revid: cto@openerp.com-20140115142608-rjemiq5lq8ju8zc0 --- addons/web/static/src/css/base.css | 16 ++++++++-------- addons/web/static/src/css/base.sass | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index f1c99512118..efe220bf02b 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"); @@ -220,6 +220,9 @@ padding: 16px; } .openerp.ui-dialog .ui-dialog-titlebar { + border-top: none; + border-left: none; + border-right: none; border-bottom: 1px solid #cacaca; -moz-border-radius: 2px 2px 0 0; -webkit-border-radius: 2px 2px 0 0; @@ -236,9 +239,6 @@ margin: 0; padding: 0; } -.openerp.ui-dialog .ui-widget-header { - border: none; -} .openerp.ui-dialog .ui-dialog-content { background: white; } @@ -623,10 +623,6 @@ display: block; color: gray; } -.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active { - border-bottom: none; - padding-bottom: 1px; -} .openerp .oe_notebook > li.ui-tabs-active > a { color: #4c4c4c; } @@ -652,6 +648,10 @@ background-color: #eeeeee; border-color: #eeeeee #eeeeee #dddddd; } +.openerp .ui-tabs .oe_notebook.ui-tabs-nav li.ui-tabs-active { + border-bottom: none; + padding-bottom: 1px; +} .openerp .oe_notebook > li.ui-state-active > a, .openerp .oe_notebook > li.ui-state-active > a:hover { background-color: white; border: 1px solid #dddddd; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 28947b3b467..cc6c044f804 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -277,14 +277,15 @@ $sheet-padding: 16px .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane padding: 16px .ui-dialog-titlebar + border-top: none + border-left: none + border-right: none border-bottom: 1px solid #cacaca @include radius(2px 2px 0 0) @include vertical-gradient(#FCFCFC, #DEDEDE) .ui-dialog-title margin: 0 padding: 0 - .ui-widget-header - border: none .ui-dialog-content background: white .ui-dialog-buttonpane -- cgit v1.2.3 From 153df3aeacfce1a184bf3930376435bd691d19a3 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 16 Jan 2014 17:54:39 +0100 Subject: [IMP] Moved web client stuff under .openerp bzr revid: fme@openerp.com-20140116165439-wvltptsqr69lv9ee --- addons/web/static/src/css/base.css | 251 +++++++++++++++++------------------- addons/web/static/src/css/base.sass | 204 ++++++++++++++--------------- 2 files changed, 217 insertions(+), 238 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index da2c93f6555..ae3ce185f73 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3189,6 +3189,123 @@ float: right; color: #333333; } +.openerp .navbar { + min-height: 32px; + margin-bottom: 0px; + border: none; + z-index: 1; + background-color: #414141; + background-color: #454343; + background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); + background-image: -webkit-linear-gradient(top, #646060, #262626); + background-image: -moz-linear-gradient(top, #646060, #262626); + background-image: -ms-linear-gradient(top, #646060, #262626); + background-image: -o-linear-gradient(top, #646060, #262626); + background-image: linear-gradient(to bottom, #646060, #262626); +} +.openerp .navbar-default .navbar-nav li a:hover, .openerp .navbar-default .navbar-nav li a:focus { + background: rgba(0, 0, 0, 0.3); +} +.openerp .navbar-default .navbar-nav .open > a, .openerp .navbar-default .navbar-nav a:hover, .openerp .navbar-default .navbar-nav a:focus { + background: rgba(0, 0, 0, 0.3) !important; +} +.openerp .navbar-default .navbar-nav .dropdown > a .caret { + border-top-color: #777777 !important; + border-bottom-color: #777777 !important; +} +.openerp .navbar-nav li a { + padding: 4px 32px 4px 12px; +} +.openerp .oe_navbar .dropdown-menu { + font-size: 13px; + padding: 4px 0; + background: #333333 !important; + background: rgba(37, 37, 37, 0.9) !important; + border-color: #999999; + border-color: rgba(0, 0, 0, 0.2); + background-color: #414141; + text-shadow: none; + background-color: #454343; + background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); + background-image: -webkit-linear-gradient(top, #646060, #262626); + background-image: -moz-linear-gradient(top, #646060, #262626); + background-image: -ms-linear-gradient(top, #646060, #262626); + background-image: -o-linear-gradient(top, #646060, #262626); + background-image: linear-gradient(to bottom, #646060, #262626); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} +.openerp .oe_navbar .dropdown-menu li a, .openerp .oe_navbar .dropdown-menu li a:hover, .openerp .oe_navbar .dropdown-menu li a:focus { + color: #eeeeee; +} +.openerp .oe_view_manager_new .oe_form_nosheet { + margin-top: 8px; +} +.openerp .oe_view_manager_new .oe_form_nosheet .oe_form_label { + font-weight: normal; +} +.openerp .nav li > a { + padding: 3px 4px 2px 18px; + color: #4c4c4c; +} +.openerp .nav nav-pills.nav-stacked > li > ul { + padding-left: 16px; +} +.openerp .nav-pills > li.active > a, .openerp a.list-group-item.active > a { + background-color: #7c7bad; + color: white; + border-radius: 0; +} +.openerp .nav-pills > li.active a:hover, .openerp .nav-pills > li.active a:focus, .openerp a.list-group-item.active a:hover, .openerp a.list-group-item.active a:focus { + background-color: #7c7bad; +} +.openerp .nav-pills > li.active .badge, .openerp a.list-group-item.active .badge { + background-color: white; + color: #7c7bad; + text-shadow: none; +} +.openerp .badge { + font-weight: normal; + font-size: 11px; + background-color: #7c7bad; +} +.openerp button, .openerp body { + line-height: normal; +} +.openerp h1, .openerp h2 { + font-weight: bold; +} +.openerp h3 { + font-size: 1.17em; + font-weight: bold; +} +.openerp p { + display: block; + -webkit-margin-before: 1em; + -webkit-margin-after: 1em; + -webkit-margin-start: 0px; + -webkit-margin-end: 0px; +} +.openerp pre { + background-color: white; + border: none; + padding: 10px 0 3px 0; +} +.openerp .jqstooltip { + height: auto !important; + width: auto !important; +} +.openerp h5 { + font-weight: bold; + font-size: smaller; +} +.openerp .oe_form .oe_subtype label, .openerp .oe_subtype label { + font-weight: normal; +} +.openerp .oe_msg_subtype_check { + margin: 3px 3px 0 !important; +} @-moz-document url-prefix() { .openerp .oe_searchview .oe_searchview_search { @@ -3444,140 +3561,6 @@ div.ui-widget-overlay { overflow: hidden !important; } } -.nav li > a { - padding: 3px 4px 2px 18px; - color: #4c4c4c; -} -.nav nav-pills.nav-stacked > li > ul { - padding-left: 16px; -} - -.nav-pills > li.active > a, a.list-group-item.active > a { - background-color: #7c7bad; - color: white; - border-radius: 0; -} -.nav-pills > li.active a:hover, .nav-pills > li.active a:focus, a.list-group-item.active a:hover, a.list-group-item.active a:focus { - background-color: #7c7bad; -} -.nav-pills > li.active .badge, a.list-group-item.active .badge { - background-color: white; - color: #7c7bad; - text-shadow: none; -} - -.badge { - font-weight: normal; - font-size: 11px; - background-color: #7c7bad; -} - -button, body { - line-height: normal; -} - -h1, h2 { - font-weight: bold; -} - -h3 { - font-size: 1.17em; - font-weight: bold; -} - -p { - display: block; - -webkit-margin-before: 1em; - -webkit-margin-after: 1em; - -webkit-margin-start: 0px; - -webkit-margin-end: 0px; -} - -pre { - background-color: white; - border: none; - padding: 10px 0 3px 0; -} - -.jqstooltip { - height: auto !important; - width: auto !important; -} - -h5 { - font-weight: bold; - font-size: smaller; -} - -.oe_form .oe_subtype label, .oe_subtype label { - font-weight: normal; -} - -.oe_msg_subtype_check { - margin: 3px 3px 0 !important; -} - -.oe_view_manager_new .oe_form_nosheet { - margin-top: 8px; -} -.oe_view_manager_new .oe_form_nosheet .oe_form_label { - font-weight: normal; -} - -.navbar { - min-height: 32px; - margin-bottom: 0px; - border: none; - z-index: 1; - background-color: #414141; - background-color: #454343; - background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); - background-image: -webkit-linear-gradient(top, #646060, #262626); - background-image: -moz-linear-gradient(top, #646060, #262626); - background-image: -ms-linear-gradient(top, #646060, #262626); - background-image: -o-linear-gradient(top, #646060, #262626); - background-image: linear-gradient(to bottom, #646060, #262626); -} - -.navbar-default .navbar-nav li a:hover, .navbar-default .navbar-nav li a:focus { - background: rgba(0, 0, 0, 0.3); -} -.navbar-default .navbar-nav .open > a, .navbar-default .navbar-nav a:hover, .navbar-default .navbar-nav a:focus { - background: rgba(0, 0, 0, 0.3) !important; -} -.navbar-default .navbar-nav .dropdown > a .caret { - border-top-color: #777777 !important; - border-bottom-color: #777777 !important; -} - -.navbar-nav li a { - padding: 4px 32px 4px 12px; -} - -.oe_navbar .dropdown-menu { - font-size: 13px; - padding: 4px 0; - background: #333333 !important; - background: rgba(37, 37, 37, 0.9) !important; - border-color: #999999; - border-color: rgba(0, 0, 0, 0.2); - background-color: #414141; - text-shadow: none; - background-color: #454343; - background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); - background-image: -webkit-linear-gradient(top, #646060, #262626); - background-image: -moz-linear-gradient(top, #646060, #262626); - background-image: -ms-linear-gradient(top, #646060, #262626); - background-image: -o-linear-gradient(top, #646060, #262626); - background-image: linear-gradient(to bottom, #646060, #262626); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; -} -.oe_navbar .dropdown-menu li a, .oe_navbar .dropdown-menu li a:hover, .oe_navbar .dropdown-menu li a:focus { - color: #eeeeee; -} - .ui-icon { width: 18px; height: 18px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 76907656a08..4ed3a10870f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2537,6 +2537,106 @@ $sheet-padding: 16px float: right color: #333 // }}} + // Bootstrap HACKS {{{ + .navbar + min-height: 32px + margin-bottom: 0px + border: none + z-index: 1 + background-color: #414141 + @include vertical-gradient(#646060, #262626) + .navbar-default + .navbar-nav + li + a:hover,a:focus + background: rgba(0, 0, 0, 0.3) + .open > a,a:hover,a:focus + background: rgba(0, 0, 0, 0.3) !important + .dropdown > a .caret + border-top-color: #777 !important + border-bottom-color: #777 !important + .navbar-nav + li + a + padding: 4px 32px 4px 12px + .oe_navbar .dropdown-menu + font-size: 13px + padding: 4px 0 + background: #333333 !important + background: rgba(37, 37, 37, 0.9) !important + border-color: #999999 + border-color: rgba(0, 0, 0, 0.2) + background-color: #414141 + text-shadow: none + @include vertical-gradient(#646060, #262626) + @include radius(3px) + li + a,a:hover,a:focus + color: #eeeeee + + // Minimized unused white space and label weight for wizard popup + .oe_view_manager_new .oe_form_nosheet + margin-top: 8px + .oe_form_label + font-weight: normal + + // Customize bootstrap3 for leftbar + .nav + li > a + padding: 3px 4px 2px 18px + color: #4c4c4c + nav-pills.nav-stacked > li > ul + padding-left: 16px + .nav-pills > li.active,a.list-group-item.active + > a + background-color: #7c7bad + color: white + border-radius: 0 + a:hover,a:focus + background-color: #7c7bad + .badge + background-color: white + color: #7c7bad + text-shadow: none + .badge + font-weight: normal + font-size: 11px + background-color: #7c7bad + + // Customize for global tags + button, body + line-height: normal + h1,h2 + font-weight: bold + h3 + font-size: 1.17em + font-weight: bold + p + display: block + -webkit-margin-before: 1em + -webkit-margin-after: 1em + -webkit-margin-start: 0px + -webkit-margin-end: 0px + pre + background-color: #FFFFFF + border: none + padding: 10px 0 3px 0 + + // Customize for kanban tooltip + .jqstooltip + height: auto !important + width: auto !important + + // Customize for chatter + h5 + font-weight: bold + font-size: smaller + .oe_form .oe_subtype label, .oe_subtype label + font-weight: normal + .oe_msg_subtype_check + margin: 3px 3px 0 !important + // }}} + @-moz-document url-prefix() .openerp .oe_searchview .oe_searchview_search @@ -2747,110 +2847,6 @@ div.ui-widget-overlay overflow: hidden !important // }}} -// Customize bootstrap3 for leftbar -.nav - li > a - padding: 3px 4px 2px 18px - color: #4c4c4c - nav-pills.nav-stacked > li > ul - padding-left: 16px -.nav-pills > li.active,a.list-group-item.active - > a - background-color: #7c7bad - color: white - border-radius: 0 - a:hover,a:focus - background-color: #7c7bad - .badge - background-color: white - color: #7c7bad - text-shadow: none -.badge - font-weight: normal - font-size: 11px - background-color: #7c7bad -// End of customize - -// Customize for global tags -button, body - line-height: normal -h1,h2 - font-weight: bold -h3 - font-size: 1.17em - font-weight: bold -p - display: block - -webkit-margin-before: 1em - -webkit-margin-after: 1em - -webkit-margin-start: 0px - -webkit-margin-end: 0px -pre - background-color: #FFFFFF - border: none - padding: 10px 0 3px 0 -// End of customize - -// Customize for kanban tooltip -.jqstooltip - height: auto !important - width: auto !important -// End of kanban tooltip - -// Customize for chatter -h5 - font-weight: bold - font-size: smaller -.oe_form .oe_subtype label, .oe_subtype label - font-weight: normal -.oe_msg_subtype_check - margin: 3px 3px 0 !important -// End of customize - -// Minimized unused white space and label weight for wizard popup -.oe_view_manager_new .oe_form_nosheet - margin-top: 8px - .oe_form_label - font-weight: normal -// End of customize - -// navbar hack {{{ -.navbar - min-height: 32px - margin-bottom: 0px - border: none - z-index: 1 - background-color: #414141 - @include vertical-gradient(#646060, #262626) -.navbar-default - .navbar-nav - li - a:hover,a:focus - background: rgba(0, 0, 0, 0.3) - .open > a,a:hover,a:focus - background: rgba(0, 0, 0, 0.3) !important - .dropdown > a .caret - border-top-color: #777 !important - border-bottom-color: #777 !important -.navbar-nav - li - a - padding: 4px 32px 4px 12px -.oe_navbar .dropdown-menu - font-size: 13px - padding: 4px 0 - background: #333333 !important - background: rgba(37, 37, 37, 0.9) !important - border-color: #999999 - border-color: rgba(0, 0, 0, 0.2) - background-color: #414141 - text-shadow: none - @include vertical-gradient(#646060, #262626) - @include radius(3px) - li - a,a:hover,a:focus - color: #eeeeee -// End hack }}} // Hack for ui icon {{{ .ui-icon -- cgit v1.2.3