From cfe90618e30bbda9b19a76a1add5acae1370d6bc Mon Sep 17 00:00:00 2001 From: ChanMyeong Date: Thu, 27 Sep 2012 09:04:34 +0000 Subject: [PATCH] Issue 2443. CSS bugfix. git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11555 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/admin/tpl/css/admin.css | 15 ++++++++------- modules/admin/tpl/css/admin.min.css | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index 6f1960b77..83e295aea 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -55,12 +55,15 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x button.x_icon-question-sign{cursor:help} .x .x_nav-tabs>li>a{padding-top:6px;padding-bottom:6px} .x .x_table{margin:20px 0;border-top:2px solid #ddd;border-bottom:1px solid #ddd} +.x .x_table:first-child{margin-top:0} .x .x_table>caption{text-align:left;padding:8px 0} .x .x_inline{display:inline-block;*display:inline;*zoom:1} .x label[for], .x .x_form-horizontal .x_control-label{font-weight:bold} .x label.x_inline{margin-right:16px} -.x_modal, +.x .x_input-append .x_add-on, +.x .x_input-prepend .x_add-on{height:16px;line-height:16px} +.x.x_modal, .x_modal-backdrop{display:none} .x.x_modal{padding:0;width:90%;margin:-250px 0 0 -45%;max-width:none} .x .x_control-group{padding-top:8px;margin-bottom:10px;border-top:1px dotted #ddd} @@ -69,8 +72,6 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x .x_control-group input, .x .x_control-group select, .x .x_control-group textarea{margin-bottom:0} -.x select, -.x textarea, .x input[type="text"], .x input[type="password"], .x input[type="datetime"], @@ -88,9 +89,9 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x_uneditable-input{height:16px} .x label, .x input, -.x button, -.x select, -.x textarea{line-height:16px} +.x button{line-height:16px} +.x select{width:auto;margin:0 4px 0 0;padding:0;height:26px;line-height:26px} +.x select[multiple]{height:auto} /* Custom Styles */ .x .section{margin:20px 0 40px 0} .x .section>h1{position:relative} @@ -99,7 +100,6 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x .section>h1>.snToggle.x_icon-chevron-down{background-position:-303px -111px} .x .center{text-align:center} .x .search{margin:20px 0} -.x .search>select{width:auto;margin:0 4px 0 0;padding:0;height:26px;line-height:26px} .x .search>input[type="search"]{height:16px;line-height:16px;width:120px} .x .vr{color:#ccc;font-style:normal} .x .nowr{white-space:nowrap} @@ -284,6 +284,7 @@ to{-o-transform:rotate(360deg)} .x .multilingual>a.x_add-on>i{position:absolute;top:50%;left:50%;margin:-7px 0 0 -7px;z-index:1;opacity:.25;filter:alpha(opacity=25)} .x .multilingual>a.x_add-on:hover>i, .x .multilingual>a.x_add-on.checked>i{opacity:1;filter:alpha(opacity=100)} +.x#multilingual td:first-child>a{display:block} .x .multilingual_item>.en{background:url(../img/flag.en.gif) no-repeat right center} .x .multilingual_item>.ko{background:url(../img/flag.ko.gif) no-repeat right center} .x .multilingual_item>.jp{background:url(../img/flag.jp.gif) no-repeat right center} diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css index ec92c7dec..677eab148 100644 --- a/modules/admin/tpl/css/admin.min.css +++ b/modules/admin/tpl/css/admin.min.css @@ -55,12 +55,15 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x button.x_icon-question-sign{cursor:help} .x .x_nav-tabs>li>a{padding-top:6px;padding-bottom:6px} .x .x_table{margin:20px 0;border-top:2px solid #ddd;border-bottom:1px solid #ddd} +.x .x_table:first-child{margin-top:0} .x .x_table>caption{text-align:left;padding:8px 0} .x .x_inline{display:inline-block;*display:inline;*zoom:1} .x label[for], .x .x_form-horizontal .x_control-label{font-weight:bold} .x label.x_inline{margin-right:16px} -.x_modal, +.x .x_input-append .x_add-on, +.x .x_input-prepend .x_add-on{height:16px;line-height:16px} +.x.x_modal, .x_modal-backdrop{display:none} .x.x_modal{padding:0;width:90%;margin:-250px 0 0 -45%;max-width:none} .x .x_control-group{padding-top:8px;margin-bottom:10px;border-top:1px dotted #ddd} @@ -69,8 +72,6 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x .x_control-group input, .x .x_control-group select, .x .x_control-group textarea{margin-bottom:0} -.x select, -.x textarea, .x input[type="text"], .x input[type="password"], .x input[type="datetime"], @@ -88,9 +89,9 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x_uneditable-input{height:16px} .x label, .x input, -.x button, -.x select, -.x textarea{line-height:16px} +.x button{line-height:16px} +.x select{width:auto;margin:0 4px 0 0;padding:0;height:26px;line-height:26px} +.x select[multiple]{height:auto} /* Custom Styles */ .x .section{margin:20px 0 40px 0} .x .section>h1{position:relative} @@ -99,7 +100,6 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x .section>h1>.snToggle.x_icon-chevron-down{background-position:-303px -111px} .x .center{text-align:center} .x .search{margin:20px 0} -.x .search>select{width:auto;margin:0 4px 0 0;padding:0;height:26px;line-height:26px} .x .search>input[type="search"]{height:16px;line-height:16px;width:120px} .x .vr{color:#ccc;font-style:normal} .x .nowr{white-space:nowrap} @@ -284,6 +284,7 @@ to{-o-transform:rotate(360deg)} .x .multilingual>a.x_add-on>i{position:absolute;top:50%;left:50%;margin:-7px 0 0 -7px;z-index:1;opacity:.25;filter:alpha(opacity=25)} .x .multilingual>a.x_add-on:hover>i, .x .multilingual>a.x_add-on.checked>i{opacity:1;filter:alpha(opacity=100)} +.x#multilingual td:first-child>a{display:block} .x .multilingual_item>.en{background:url(../img/flag.en.gif) no-repeat right center} .x .multilingual_item>.ko{background:url(../img/flag.ko.gif) no-repeat right center} .x .multilingual_item>.jp{background:url(../img/flag.jp.gif) no-repeat right center}