Minor update. /common/css/bootstrap.css bugfix.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11233 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-09-15 00:49:58 +00:00
parent d035d2e38f
commit c201f5c6b6
2 changed files with 48 additions and 47 deletions

View file

@ -214,7 +214,7 @@ a:hover {
clear: both; clear: both;
} }
[class*="span"] { [class*="x_span"] {
float: left; float: left;
min-height: 1px; min-height: 1px;
margin-left: 20px; margin-left: 20px;
@ -339,7 +339,7 @@ a:hover {
clear: both; clear: both;
} }
.x_row-fluid [class*="span"] { .x_row-fluid [class*="x_span"] {
display: block; display: block;
float: left; float: left;
width: 100%; width: 100%;
@ -351,7 +351,7 @@ a:hover {
box-sizing: border-box; box-sizing: border-box;
} }
.x_row-fluid [class*="span"]:first-child { .x_row-fluid [class*="x_span"]:first-child {
margin-left: 0; margin-left: 0;
} }
@ -535,13 +535,13 @@ a:hover {
*margin-left: 8.404255319148938%; *margin-left: 8.404255319148938%;
} }
[class*="span"].x_hide, [class*="x_span"].x_hide,
.x_row-fluid [class*="span"].x_hide { .x_row-fluid [class*="x_span"].x_hide {
display: none; display: none;
} }
[class*="span"].x_pull-right, [class*="x_span"].x_pull-right,
.x_row-fluid [class*="span"].x_pull-right { .x_row-fluid [class*="x_span"].x_pull-right {
float: right; float: right;
} }
@ -1180,28 +1180,28 @@ textarea::-webkit-input-placeholder {
width: 530px; width: 530px;
} }
input[class*="span"], input[class*="x_span"],
select[class*="span"], select[class*="x_span"],
textarea[class*="span"], textarea[class*="x_span"],
.x_uneditable-input[class*="span"], .x_uneditable-input[class*="x_span"],
.x_row-fluid input[class*="span"], .x_row-fluid input[class*="x_span"],
.x_row-fluid select[class*="span"], .x_row-fluid select[class*="x_span"],
.x_row-fluid textarea[class*="span"], .x_row-fluid textarea[class*="x_span"],
.x_row-fluid .x_uneditable-input[class*="span"] { .x_row-fluid .x_uneditable-input[class*="x_span"] {
float: none; float: none;
margin-left: 0; margin-left: 0;
} }
.x_input-append input[class*="span"], .x_input-append input[class*="x_span"],
.x_input-append .x_uneditable-input[class*="span"], .x_input-append .x_uneditable-input[class*="x_span"],
.x_input-prepend input[class*="span"], .x_input-prepend input[class*="x_span"],
.x_input-prepend .x_uneditable-input[class*="span"], .x_input-prepend .x_uneditable-input[class*="x_span"],
.x_row-fluid input[class*="span"], .x_row-fluid input[class*="x_span"],
.x_row-fluid select[class*="span"], .x_row-fluid select[class*="x_span"],
.x_row-fluid textarea[class*="span"], .x_row-fluid textarea[class*="x_span"],
.x_row-fluid .x_uneditable-input[class*="span"], .x_row-fluid .x_uneditable-input[class*="x_span"],
.x_row-fluid .x_input-prepend [class*="span"], .x_row-fluid .x_input-prepend [class*="x_span"],
.x_row-fluid .x_input-append [class*="span"] { .x_row-fluid .x_input-append [class*="x_span"] {
display: inline-block; display: inline-block;
} }
@ -1211,7 +1211,7 @@ textarea,
margin-left: 0; margin-left: 0;
} }
.x_controls-row [class*="span"] + [class*="span"] { .x_controls-row [class*="x_span"] + [class*="x_span"] {
margin-left: 20px; margin-left: 20px;
} }
@ -1302,7 +1302,7 @@ textarea.x_span1,
clear: both; clear: both;
} }
.x_controls-row [class*="span"] { .x_controls-row [class*="x_span"] {
float: left; float: left;
} }
@ -1957,8 +1957,8 @@ table {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
table [class*=span], table [class*=x_span],
.x_row-fluid table [class*=span] { .x_row-fluid table [class*=x_span] {
display: table-cell; display: table-cell;
float: none; float: none;
margin-left: 0; margin-left: 0;
@ -2140,8 +2140,8 @@ table [class*=span],
background-color: #c4e3f3; background-color: #c4e3f3;
} }
[class^="icon-"], [class^="x_icon-"],
[class*=" icon-"] { [class*=" x_icon-"] {
display: inline-block; display: inline-block;
width: 14px; width: 14px;
height: 14px; height: 14px;
@ -2157,18 +2157,18 @@ table [class*=span],
/* White icons with optional class, or on hover/active states of certain elements */ /* White icons with optional class, or on hover/active states of certain elements */
.x_icon-white, .x_icon-white,
.x_nav-tabs > .x_active > a > [class^="icon-"], .x_nav-tabs > .x_active > a > [class^="x_icon-"],
.x_nav-tabs > .x_active > a > [class*=" icon-"], .x_nav-tabs > .x_active > a > [class*=" x_icon-"],
.x_nav-pills > .x_active > a > [class^="icon-"], .x_nav-pills > .x_active > a > [class^="x_icon-"],
.x_nav-pills > .x_active > a > [class*=" icon-"], .x_nav-pills > .x_active > a > [class*=" x_icon-"],
.x_nav-list > .x_active > a > [class^="icon-"], .x_nav-list > .x_active > a > [class^="x_icon-"],
.x_nav-list > .x_active > a > [class*=" icon-"], .x_nav-list > .x_active > a > [class*=" x_icon-"],
.x_navbar-inverse .x_nav > .x_active > a > [class^="icon-"], .x_navbar-inverse .x_nav > .x_active > a > [class^="x_icon-"],
.x_navbar-inverse .x_nav > .x_active > a > [class*=" icon-"], .x_navbar-inverse .x_nav > .x_active > a > [class*=" x_icon-"],
.x_dropdown-menu > li > a:hover > [class^="icon-"], .x_dropdown-menu > li > a:hover > [class^="x_icon-"],
.x_dropdown-menu > li > a:hover > [class*=" icon-"], .x_dropdown-menu > li > a:hover > [class*=" x_icon-"],
.x_dropdown-menu > .x_active > a > [class^="icon-"], .x_dropdown-menu > .x_active > a > [class^="x_icon-"],
.x_dropdown-menu > .x_active > a > [class*=" icon-"] { .x_dropdown-menu > .x_active > a > [class*=" x_icon-"] {
background-image: url("../img/glyphicons-halflings-white.x_png"); background-image: url("../img/glyphicons-halflings-white.x_png");
} }
@ -3129,7 +3129,7 @@ button.x_close {
border-radius: 5px; border-radius: 5px;
} }
.x_btn-large [class^="icon-"] { .x_btn-large [class^="x_icon-"] {
margin-top: 2px; margin-top: 2px;
} }
@ -3139,7 +3139,7 @@ button.x_close {
line-height: 18px; line-height: 18px;
} }
.x_btn-small [class^="icon-"] { .x_btn-small [class^="x_icon-"] {
margin-top: 0; margin-top: 0;
} }
@ -3807,7 +3807,7 @@ input[type="submit"].x_btn.x_btn-mini {
background-color: #0088cc; background-color: #0088cc;
} }
.x_nav-list [class^="icon-"] { .x_nav-list [class^="x_icon-"] {
margin-right: 2px; margin-right: 2px;
} }

File diff suppressed because one or more lines are too long