From e95ca69113bf3b37c82c3e2cab7e6636592c9508 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 10 Apr 2014 12:06:31 +0200 Subject: [REF]add bootstrap modal window based, cleaned, refactored from trunk-ui-to-boostrap-modal branch bzr revid: csn@openerp.com-20140410100631-5v6a71oi5wyunbda --- addons/web/static/src/css/base.sass | 127 ++++++------------------------------ 1 file changed, 19 insertions(+), 108 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 ca77310b0d9..335e04f2424 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -218,7 +218,7 @@ $sheet-padding: 16px font-size: inherit // }}} // Button style {{{ - a.button:link, a.button:visited, button, .oe_button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button + a.button:link, a.button:visited, button, .oe_button, input[type='submit'] display: inline-block border: 1px solid rgba(0,0,0,0.4) color: #4c4c4c @@ -233,18 +233,18 @@ $sheet-padding: 16px -webkit-font-smoothing: antialiased outline: none - a.button:hover, button:hover,.oe_button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover + a.button:hover, button:hover,.oe_button:hover, input[type='submit']:hover @include vertical-gradient(#f6f6f6, #e3e3e3) cursor: pointer background-position: 0 - a.button:focus, button:focus, .oe_button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus + a.button:focus, button:focus, .oe_button:focus, input[type='submit']: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, .oe_button:active, .oe_button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active + a.button:active, a.button.active, button:active, .oe_button:active, .oe_button.active, input[type='submit']:active, input[type='submit'].active @include vertical-gradient(#e3e3e3, #f6f6f6) @include box-shadow(none) @@ -272,105 +272,6 @@ $sheet-padding: 16px .ui-tabs position: static - // Modal box - &.ui-dialog - display: none - height: auto !important - padding: 6px - //overflow: hidden - background-color: rgba(60,60,60,0.7) - border: 1px solid - border-color: #888 #555 #444 - //overflow: hidden - @include radius(8px) - @include box-shadow(0 1px 12px rgba(0, 0, 0, 0.6)) - @include background-clip() - .ui-dialog-content - padding: 0 - .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-dialog-content - background: white - width: auto !important - .ui-dialog-buttonpane - border-top: 1px solid #e0e0e0 - background: #f5f7f9 - margin: 0 - @include radius(0 0 2px 2px) - button - margin: 0 4px 0 0 - .ui-dialog-buttonset - float: left - .ui-button - margin-right: 4px - .ui-dialog-titlebar-close - padding: 0 - .ui-icon-closethick - display: none - &:before - content: "×" - font-size: 18px - font-weight: bold - line-height: 16px - color: black - text-shadow: 0 1px 0 white - padding: 0 - cursor: pointer - background: transparent - border: 0 - &:hover - color: black - text-decoration: none - .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 - - &.ui-dialog.oe_act_window - .ui-dialog-content - padding: 0px - - .modal-backdrop - position: fixed - top: 0 - right: 0 - bottom: 0 - left: 0 - z-index: 1040 - background-color: black - @include opacity(.3) - // }}} // Generic classes {{{ .oe_i @@ -1031,10 +932,8 @@ $sheet-padding: 16px 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 @@ -2765,9 +2664,6 @@ body.oe_single_form > .arrow span background-color: #729fcf !important - // jquery ui for ie - .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8') // }}} // @media print {{{ @@ -2812,6 +2708,21 @@ body.oe_single_form height: 18px // End hack}}} +// Customized modal according bootstrap3 +.modal + .modal-header + button.close + border: none + background: none + padding: 1px + height: 18px + font-size: 20px + .modal-footer + text-align: left + &.oe_act_window + .modal-body + padding: 0 + input[type="radio"], input[type="checkbox"] margin-right: 4px margin-left: 4px -- cgit v1.2.3 From 964e94f8a800661020af8082c719b19c4cdddd86 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 10 Apr 2014 14:11:22 +0200 Subject: [FIX]forgot to open a dialog bzr revid: csn@openerp.com-20140410121122-y0a8l1hzd01af8bn --- addons/web/static/src/css/base.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 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 335e04f2424..fbf86cca678 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2719,8 +2719,8 @@ body.oe_single_form font-size: 20px .modal-footer text-align: left - &.oe_act_window - .modal-body + .oe_act_window + &.modal-body padding: 0 input[type="radio"], input[type="checkbox"] -- cgit v1.2.3 From 049539809d4d1e4d37eac4b59d08d10c39c731f7 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 10 Apr 2014 17:19:40 +0200 Subject: [FIX]modal strict to bootstrap: no resize and only use 3 size, large-medium-small instead of changing width of modal bzr revid: csn@openerp.com-20140410151940-w0m1ljjqgo0eysgp --- addons/web/static/src/css/base.sass | 3 --- 1 file changed, 3 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 fbf86cca678..f70fee5583f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -931,9 +931,6 @@ $sheet-padding: 16px .oe_logo margin-left: -6px .oe_bottom - position: absolute - left: 0 - right: 0 text-shadow: 0 1px 1px #999999 @include vertical-gradient(#b41616, #600606) color: #eee -- cgit v1.2.3 From c8607c8b818b4554c01294f5c05bc5d20f226f82 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 11 Apr 2014 14:27:53 +0200 Subject: [FIX]few cosmetic of code bzr revid: csn@openerp.com-20140411122753-qzxb29uwkw89mrxs --- addons/web/static/src/css/base.sass | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 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 f70fee5583f..882d0489c04 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2707,18 +2707,16 @@ body.oe_single_form // Customized modal according bootstrap3 .modal - .modal-header - button.close - border: none - background: none - padding: 1px - height: 18px - font-size: 20px + .modal-header button.close + border: none + background: none + padding: 1px + height: 18px + font-size: 20px .modal-footer text-align: left - .oe_act_window - &.modal-body - padding: 0 + .oe_act_window.modal-body + padding: 0 input[type="radio"], input[type="checkbox"] margin-right: 4px -- cgit v1.2.3