From f72442feb0e6ba4046306a9a776aa99486938c47 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 8 Nov 2012 12:24:07 +0530 Subject: [IMP] Improve code for right click logo resolution. bzr revid: bth@tinyerp.com-20121108065407-zl8zldfsnb9go03e --- addons/web/static/src/css/base.css | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 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 91793947836..0a1d4b410fb 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3023,6 +3023,35 @@ div.ui-widget-overlay { width: 100%; line-height: 20px; } +.resolution { + width: 300px; + background-color: white; + margin-bottom: 15px; + margin-left: 5px; +} +.resolution .res { + display: table; + width:100%; + border:1px solid; +} +.resolution .res > div { + border-bottom: 1px solid; + height: 70px; + clear: both; +} + +.resolution .res div div { + display: inline; +} +.res img { + width: 100px; + height: 40px; + padding-top: 20px; +} +.res span a { + font-size:10px; + padding-left: 5px; +} .resolution table td { valign: middle; } -- cgit v1.2.3 From 4833726717f515b129273fc04bea515e1dbb5d24 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 8 Nov 2012 15:52:42 +0530 Subject: [IMP] Improve css. bzr revid: bth@tinyerp.com-20121108102242-0u95m8s6yexa33vq --- addons/web/static/src/css/base.css | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 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 0a1d4b410fb..9b8dbfa8c3a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3024,7 +3024,7 @@ div.ui-widget-overlay { line-height: 20px; } .resolution { - width: 300px; + width: 350px; background-color: white; margin-bottom: 15px; margin-left: 5px; @@ -3032,7 +3032,18 @@ div.ui-widget-overlay { .resolution .res { display: table; width:100%; - border:1px solid; +} +span.res { + border:1px solid; + padding-top: 10px; + border-bottom: 0px; +} +span.res span { + padding-left: 5px; +} +div.res { + border:1px solid; + border-top: 0px; } .resolution .res > div { border-bottom: 1px solid; @@ -3044,9 +3055,10 @@ div.ui-widget-overlay { display: inline; } .res img { - width: 100px; + width: 150px; height: 40px; padding-top: 20px; + padding-left: 5px; } .res span a { font-size:10px; -- cgit v1.2.3 From ea14b219958be0a3728421d6cb602f62a95f6518 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 9 Nov 2012 11:37:30 +0530 Subject: [IMP] Improve css and structure. bzr revid: bth@tinyerp.com-20121109060730-c7fxdk1rwokw3npe --- addons/web/static/src/css/base.css | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 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 9b8dbfa8c3a..c4d65367fac 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3019,10 +3019,6 @@ div.ui-widget-overlay { border-radius: 3px; } -.resolution table { - width: 100%; - line-height: 20px; -} .resolution { width: 350px; background-color: white; @@ -3033,24 +3029,19 @@ div.ui-widget-overlay { display: table; width:100%; } -span.res { - border:1px solid; - padding-top: 10px; +.res .simtext { border-bottom: 0px; -} -span.res span { - padding-left: 5px; + padding: 5px; + height: auto; } div.res { border:1px solid; - border-top: 0px; } .resolution .res > div { border-bottom: 1px solid; height: 70px; clear: both; } - .resolution .res div div { display: inline; } @@ -3062,10 +3053,7 @@ div.res { } .res span a { font-size:10px; - padding-left: 5px; -} -.resolution table td { - valign: middle; + padding-right: 5px; } @media print { -- cgit v1.2.3 From 14f00d4e898259864cdd74b27012c0cf6bf51a20 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 9 Nov 2012 11:50:14 +0530 Subject: [IMP] Improve css. bzr revid: bth@tinyerp.com-20121109062014-uhbwcf1ztldz14m6 --- addons/web/static/src/css/base.css | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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 c4d65367fac..c4e0c66f223 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3024,24 +3024,25 @@ div.ui-widget-overlay { background-color: white; margin-bottom: 15px; margin-left: 5px; + position: relative; } .resolution .res { display: table; width:100%; } -.res .simtext { - border-bottom: 0px; - padding: 5px; - height: auto; -} div.res { border:1px solid; } -.resolution .res > div { +.resolution .res > div:not(.simtext) { border-bottom: 1px solid; height: 70px; clear: both; } +.res .simtext { + border-bottom: 0px; + padding: 5px; + height: auto; +} .resolution .res div div { display: inline; } -- cgit v1.2.3 From 94935e92a5805a1602ab7b990d2c825196204733 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 9 Nov 2012 12:25:46 +0530 Subject: [IMP] Add css class. bzr revid: bth@tinyerp.com-20121109065546-0k3rmulfy59kyl6g --- addons/web/static/src/css/base.css | 4 ++++ 1 file changed, 4 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 c4e0c66f223..44ac85db98e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3043,6 +3043,10 @@ div.res { padding: 5px; height: auto; } +.simtext span { + font-size: 8px; + color:grey; +} .resolution .res div div { display: inline; } -- cgit v1.2.3 From 0ffd487d182df5f10abf792463f1ad552478e303 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 9 Nov 2012 12:34:34 +0530 Subject: [IMP] Add css class and remove inline style. bzr revid: bth@tinyerp.com-20121109070434-00onkcty4js1lzbk --- addons/web/static/src/css/base.css | 3 +++ 1 file changed, 3 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 44ac85db98e..09cf01f840e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3049,6 +3049,9 @@ div.res { } .resolution .res div div { display: inline; + position: absolute; + padding-top: 30px; + padding-left:10px; } .res img { width: 150px; -- cgit v1.2.3 From 4d24c3fbec90939fab24cf3d5f242b35b6dfb896 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 9 Nov 2012 16:21:20 +0530 Subject: [IMP] Add attribute on div. bzr revid: bth@tinyerp.com-20121109105120-iihflpk9h88uhism --- addons/web/static/src/css/base.css | 1 + 1 file changed, 1 insertion(+) (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 09cf01f840e..82068b15fc7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -3025,6 +3025,7 @@ div.ui-widget-overlay { margin-bottom: 15px; margin-left: 5px; position: relative; + z-index: 10; } .resolution .res { display: table; -- cgit v1.2.3 From d867a08f7cc3c33848611cca164c2eebc83c144b Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Fri, 9 Nov 2012 16:56:28 +0530 Subject: [IMP]Sass changes. bzr revid: bth@tinyerp.com-20121109112628-pikbl2bk9exg5qeb --- addons/web/static/src/css/base.css | 70 ++++++++++++++++++++----------------- addons/web/static/src/css/base.sass | 49 +++++++++++++++++++++++--- 2 files changed, 82 insertions(+), 37 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 82068b15fc7..025efab78a9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -476,13 +476,13 @@ max-height: 180px; } .openerp .oe_view_manager_current a.accessactive { - display:inline-block; - text-decoration:none; + display: inline-block; + text-decoration: none; } -.openerp .oe_view_manager_current .accessactive:first-letter{ - text-decoration:underline; +.openerp .oe_view_manager_current .accessactive:first-letter { + text-decoration: underline; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - font-weight:bold; + font-weight: bold; } .openerp .oe_button.oe_link { border: none; @@ -3020,49 +3020,55 @@ div.ui-widget-overlay { } .resolution { - width: 350px; - background-color: white; - margin-bottom: 15px; - margin-left: 5px; - position: relative; - z-index: 10; + width: 350px; + background-color: white; + margin-bottom: 15px; + margin-left: 5px; + position: relative; + z-index: 10; } .resolution .res { - display: table; - width:100%; + display: table; + width: 100%; } + div.res { - border:1px solid; + border: 1px solid; } + .resolution .res > div:not(.simtext) { - border-bottom: 1px solid; - height: 70px; - clear: both; + border-bottom: 1px solid; + height: 70px; + clear: both; } + .res .simtext { - border-bottom: 0px; - padding: 5px; - height: auto; + border-bottom: 0px; + padding: 5px; + height: auto; } + .simtext span { - font-size: 8px; - color:grey; + font-size: 8px; + color: grey; } + .resolution .res div div { - display: inline; - position: absolute; - padding-top: 30px; - padding-left:10px; + display: inline; + position: absolute; + padding-top: 30px; + padding-left: 10px; } + .res img { - width: 150px; - height: 40px; - padding-top: 20px; - padding-left: 5px; + width: 150px; + height: 40px; + padding-top: 20px; + padding-left: 5px; } .res span a { - font-size:10px; - padding-right: 5px; + font-size: 10px; + padding-right: 5px; } @media print { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a1bb16d6856..0c336d8ee83 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2395,11 +2395,50 @@ div.ui-widget-overlay .ui-corner-all @include radius(3px) -.resolution table - width: 100% - line-height: 20px - td - valign: middle +.resolution + width: 350px + background-color: white + margin-bottom: 15px + margin-left: 5px + position: relative + z-index: 10 + .res + display: table + width: 100% + +div.res + border: 1px solid + +.resolution .res > div:not(.simtext) + border-bottom: 1px solid + height: 70px + clear: both + +.res .simtext + border-bottom: 0px + padding: 5px + height: auto + +.simtext span + font-size: 8px + color: grey + +.resolution .res div div + display: inline + position: absolute + padding-top: 30px + padding-left: 10px + +.res + img + width: 150px + height: 40px + padding-top: 20px + padding-left: 5px + span a + font-size: 10px + padding-right: 5px + @media print .openerp -- cgit v1.2.3