diff options
| author | ged-odoo <ged@odoo.com> | 2014-06-12 16:27:11 +0200 |
|---|---|---|
| committer | ged-odoo <ged@odoo.com> | 2014-06-12 16:27:11 +0200 |
| commit | 74168c4e9d1527cfdd62aae5e37ca3bfd4f584c3 (patch) | |
| tree | 6f11de511ecebc37aa539be6eb99ee8e7085e7ab /addons/web/static/src/css/base.sass | |
| parent | 64b78b34d6427a4756dd652b21ab24c291a0110e (diff) | |
| parent | c73736694e7f99cbd5052de278c88c9efd160add (diff) | |
Merge pull request #272 from odoo-dev/master-inline-searchview-ged
[MERGP] Inline Searchview
This task split the searchview in two parts: SearchView and SearchViewDrawer. The drawer is displayed inside the main view and the searchview stays in place. It also changes the scrolling behavior of the web client: the main view area can scroll without affecting the UI (so the various menus stays in place)
Because of this, other large changes have been made:
the drawer has been redesigned,
the Custom Filter widget has been split in two (Custom Report and SaveCurrentFilter),
the main view is now scrollable, so the UI stays in place and only the view can change
The text 'Group By...' has been changed into 'Group By' (most addons had to be modified)
bootstrap classes are used when it makes sense (for example, badge)
the left menu is also scrollable (separately from the main view)
It is likely that some stupid bugs have been introduced. Please don't hurt me.
Diffstat (limited to 'addons/web/static/src/css/base.sass')
| -rw-r--r-- | addons/web/static/src/css/base.sass | 441 |
1 files changed, 232 insertions, 209 deletions
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4d952cc47bb..093ebf6cb0b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -844,40 +844,53 @@ $sheet-padding: 16px background: #f0eeee border-right: 1px solid $tag-border text-shadow: none - padding-bottom: 16px - a.oe_logo - position: relative - width: 220px - display: block - text-align: center - img - margin: 14px 0 - border: 0 - .oe_logo_edit - margin: 14px 0 - position: absolute - top: 1px - padding: 4px - width: 100% - display: none - text-align: center - color: #eee - background: rgba(37,37,37,0.9) - @include box-sizing(border) - &:hover .oe_logo_edit_admin - display: block - .oe_footer - position: fixed - bottom: 0 - padding: 4px 0 - background: #f0eeee - width: 220px - text-align: center - a - font-weight: bold - color: black - span - color: #a24689 + > div + height: 100% + display: table + width: 220px + position: relative + a.oe_logo + display: table-row + text-align: center + img + margin: 14px 0 + border: 0 + .oe_logo_edit + margin: 14px 0 + position: absolute + top: 1px + padding: 4px + width: 100% + display: none + text-align: center + color: #eee + background: rgba(37,37,37,0.9) + @include box-sizing(border) + &:hover .oe_logo_edit_admin + display: block + > div + display: table-row + height: 100% + > div + position: relative + height: 100% + > div.oe_secondary_menus_container + position: absolute + position: static\9 + top: 0 + bottom: 0 + left: 0 + right: 0 + overflow-x: hidden + overflow-y: auto + .oe_footer + background: #f0eeee + text-align: center + a + font-weight: bold + color: black + span + color: #a24689 // }}} // Webclient.leftbar items {{{ @@ -955,7 +968,25 @@ $sheet-padding: 16px a color: $link-color > div + position: relative height: 100% + > .oe_view_manager + > .oe_view_manager_wrapper + display: table-row + height: 100% + > div + position: relative + height: 100% + > .oe_view_manager_body + position: absolute + position: static\9 + top: 0 + bottom: 0 + left: 0 + right: 0 + overflow: auto + + .oe_breadcrumb_item:not(:last-child) max-width: 7em white-space: nowrap @@ -970,10 +1001,8 @@ $sheet-padding: 16px display: table height: inherit width: 100% - .oe_view_manager_body - height: inherit .oe_view_manager_view_kanban:not(:empty) - height: inherit + height: 100% &[data-view-type=kanban] .oe_view_manager_body display: table-row @@ -1150,7 +1179,7 @@ $sheet-padding: 16px float: right padding: 1px 0 line-height: 18px - width: 400px + min-width: 400px border: 1px solid #ababab background: white @include radius(13px) @@ -1277,188 +1306,180 @@ $sheet-padding: 16px background: #8786b7 text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) @include radius(2px) - &.oe_searchview_open_drawer - .oe_searchview_drawer - display: block - .oe_searchview_drawer - cursor: default - position: absolute - z-index: 2 - // detach drawer from field slightly - margin-top: 4px - top: 100% - right: -1px - background-color: white - min-width: 100% - display: none - border: 1px solid $tag-border - text-align: left - @include radius(4px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - > div - border-top: 1px solid #ccc - margin: 0 - padding: 8px - > div:first-child - border-top: none - margin: 0 - h3 - margin: 8px 4px 4px 0px - color: $section-title-color - font-size: 13px - h4, h4 * - margin: 0 0 0 2px - cursor: pointer - font-weight: normal + .oe_searchview_drawer_container + overflow: auto + .oe_searchview_drawer + display: none + width: 100% + cursor: default + display: none + overflow: hidden + border-bottom: 1px solid $tag-border + text-align: left + padding: 8px 0 + .badge + font-size: 12px + line-height: 12px + > div:first-child + border: none + padding-left: 0 + li:hover:not(.badge) + background-color: $hover-background + .col-md-5 + padding-left: 0 + dl + margin-bottom: 0 + dt + color: $section-title-color + font-size: 13px + line-height: 24px + dd + line-height: 24px + font-size: 13px + padding-top: 3px + h4, h4 * + margin: 0 0 0 2px + padding-left: 20px + cursor: pointer + font-weight: normal + display: inline-block + &:hover + background-color: $hover-background + h4:before + content: "▸ " + color: #a3a3a3 + button + margin: 4px 0 + .button + border: none + background: transparent + padding: 0 2px + @include box-shadow(none) + @include radius(0) + .oe_searchview_section + ul + margin: 0 8px + padding: 0 + list-style: none + display: inline + li display: inline-block - &:hover - background-color: $hover-background - h4:before - content: "▸ " - color: #a3a3a3 - button + cursor: pointer + position: relative + margin-right: 8px + > span + display: inline-block + max-width: 250px + text-overflow: ellipsis + vertical-align: bottom + overflow: hidden + form + margin-left: 12px + p margin: 4px 0 - .button - border: none - background: transparent - padding: 0 2px - @include box-shadow(none) - @include radius(0) - .oe_searchview_section - display: table - width: 100% - > div - @include box-sizing(border) - display: table-cell - width: 50% - padding-left: 2px // Managed padding-left according bootstrap3 - ul - margin: 0 8px 8px - padding: 0 - list-style: none - li - list-style: none - padding: 2px 4px 2px 20px - line-height: 14px - color: inherit - cursor: pointer - position: relative - &.oe_selected:before - content: "W" - font-family: "entypoRegular" !important - font-size: 24px - font-weight: 300 !important - color: #a3a3a3 - position: absolute - left: 4px - top: -2px - // after oe_selected so background color is not overridden - &:hover - background-color: $hover-background + line-height: 18px + button + margin: 0 0 8px -3px // Managed margin-left according bootstrap3 + .oe_searchview_savefilter form - margin-left: 12px - p - margin: 4px 0 - line-height: 18px + display: none + .oe_searchview_custom + display: none + li + cursor: pointer + position: relative + line-height: 14px + margin-right: 0 button - margin: 0 0 8px -3px // Managed margin-left according bootstrap3 - .oe_searchview_custom - padding: 0 8px 8px 8px - div - padding: 0 - h4 - margin: 0 - form - display: none - li - cursor: pointer - position: relative - line-height: 14px - padding: 2px 4px 2px 20px - &:hover - background-color: $hover-background - button - position: absolute - top: 0 - right: 5px - //Customize for searchview label - label - font-weight: normal - //End of Customize - .oe_searchview_dashboard - form - display: none - margin-top: 2px - - .oe_searchview_advanced - form - display: none - margin-top: 8px - button.oe_add_condition:before - content: "Z" - font-family: "entypoRegular" !important - font-size: 24px - font-weight: 300 !important - margin-right: 4px - ul - list-style: none - padding: 0 - li - position: relative - list-style: none - margin: 0 - white-space: nowrap - &:first-child .searchview_extended_prop_or - visibility: hidden - margin-left: -14px - .searchview_extended_prop_or - opacity: 0.5 - margin-left: -14px //Customize 'or' in searchview - .oe_opened - h4:before - content: "▾ " - position: relative - top: -1px - form - display: block + position: absolute + top: 0 + right: 5px + a + margin-left: 10px + position: inherit + visibility: hidden + display: inline-block + span:hover:not(.badge) + background-color: $hover-background + li:hover a + visibility: visible + //Customize for searchview label + label + font-weight: normal + //End of Customize + .oe_searchview_dashboard + form + display: none + margin-top: 2px - // delete buttons - .oe_searchview_custom_delete, .searchview_extended_delete_prop - display: inline-block - width: 12px - height: 12px - line-height: 12px - padding: 1px - color: #8786b7 - line-height: 8px - text-align: center - font-weight: bold - text-shadow: 0 1px 1px white - &:hover - text-decoration: none - color: white - background: #8786b7 - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) - @include radius(2px) - .oe_searchview_custom_delete + .oe_searchview_advanced + overflow: auto + form display: none - position: absolute - bottom: 1px - right: 4px - .oe_searchview_custom_private, .oe_searchview_custom_public - &:hover - .oe_searchview_custom_delete - display: inline-block - .oe_searchview_custom_public:after - content: "," + margin-top: 8px + button.oe_add_condition:before + content: "Z" font-family: "entypoRegular" !important - font-size: 22px + font-size: 24px font-weight: 300 !important - margin: 0 0 0 4px + margin-right: 4px + ul + list-style: none padding: 0 + li + position: relative + list-style: none + margin: 0 + white-space: nowrap + &:first-child .searchview_extended_prop_or + visibility: hidden + margin-left: -14px + .searchview_extended_prop_or + opacity: 0.5 + margin-left: -14px //Customize 'or' in searchview + .oe_opened + h4:before + content: "▾ " + position: relative + top: -1px + form + display: block - + // delete buttons + .oe_searchview_custom_delete, .searchview_extended_delete_prop + display: inline-block + width: 12px + height: 12px + line-height: 12px + padding: 1px + color: #8786b7 + line-height: 8px + text-align: center + font-weight: bold + text-shadow: 0 1px 1px white + &:hover + text-decoration: none + color: white + background: #8786b7 + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) + @include radius(2px) + .oe_searchview_custom_delete + display: none + position: absolute + bottom: 1px + right: 4px + .oe_searchview_custom_private, .oe_searchview_custom_public + &:hover + .oe_searchview_custom_delete + display: inline-block + .oe_searchview_custom_public:after + content: "," + font-family: "entypoRegular" !important + font-size: 22px + font-weight: 300 !important + margin: 0 0 0 4px + padding: 0 // }}} // Views Common {{{ .oe_view_nocontent @@ -2779,5 +2800,7 @@ input[type="radio"], input[type="checkbox"] opacity: 0.6000000238418579 +body + overflow: auto // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: |
