Bootstrap update. 2.1.1 -> 2.2.2

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12448 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-12-21 06:17:01 +00:00
parent eb4ca0c317
commit 8a8b2f5400
4 changed files with 683 additions and 384 deletions

View file

@ -1,5 +1,5 @@
/*! /*!
* Bootstrap Responsive v2.1.1 * Bootstrap Responsive v2.2.2
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
@ -8,6 +8,10 @@
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
*/ */
@-ms-viewport {
width: device-width;
}
.x_clearfix { .x_clearfix {
*zoom: 1; *zoom: 1;
} }
@ -215,6 +219,9 @@
.x_row-fluid [class*="x_span"]:first-child { .x_row-fluid [class*="x_span"]:first-child {
margin-left: 0; margin-left: 0;
} }
.x_row-fluid .x_controls-row [class*="x_span"] + [class*="x_span"] {
margin-left: 2.564102564102564%;
}
.x_row-fluid .x_span12 { .x_row-fluid .x_span12 {
width: 100%; width: 100%;
*width: 99.94680851063829%; *width: 99.94680851063829%;
@ -562,6 +569,9 @@
.x_row-fluid [class*="x_span"]:first-child { .x_row-fluid [class*="x_span"]:first-child {
margin-left: 0; margin-left: 0;
} }
.x_row-fluid .x_controls-row [class*="x_span"] + [class*="x_span"] {
margin-left: 2.7624309392265194%;
}
.x_row-fluid .x_span12 { .x_row-fluid .x_span12 {
width: 100%; width: 100%;
*width: 99.94680851063829%; *width: 99.94680851063829%;
@ -814,6 +824,7 @@
margin-left: 0; margin-left: 0;
} }
[class*="x_span"], [class*="x_span"],
.uneditable-input[class*="span"],
.x_row-fluid [class*="x_span"] { .x_row-fluid [class*="x_span"] {
display: block; display: block;
float: none; float: none;
@ -830,6 +841,9 @@
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.x_row-fluid [class*="x_offset"]:first-child {
margin-left: 0;
}
.x_input-large, .x_input-large,
.x_input-xlarge, .x_input-xlarge,
.x_input-xxlarge, .x_input-xxlarge,
@ -862,8 +876,11 @@
width: auto; width: auto;
margin: 0; margin: 0;
} }
.x_modal.x_fade {
top: -100px;
}
.x_modal.x_fade.x_in { .x_modal.x_fade.x_in {
top: auto; top: 20px;
} }
} }
@ -895,6 +912,16 @@
padding-right: 10px; padding-right: 10px;
padding-left: 10px; padding-left: 10px;
} }
.x_media .x_pull-left,
.x_media .x_pull-right {
display: block;
float: none;
margin-bottom: 10px;
}
.x_media-object {
margin-right: 0;
margin-left: 0;
}
.x_modal { .x_modal {
top: 10px; top: 10px;
right: 10px; right: 10px;
@ -979,6 +1006,10 @@
.x_nav-collapse .x_dropdown-menu a:hover { .x_nav-collapse .x_dropdown-menu a:hover {
background-color: #f2f2f2; background-color: #f2f2f2;
} }
.x_navbar-inverse .x_nav-collapse .x_nav > li > a,
.x_navbar-inverse .x_nav-collapse .x_dropdown-menu a {
color: #999999;
}
.x_navbar-inverse .x_nav-collapse .x_nav > li > a:hover, .x_navbar-inverse .x_nav-collapse .x_nav > li > a:hover,
.x_navbar-inverse .x_nav-collapse .x_dropdown-menu a:hover { .x_navbar-inverse .x_nav-collapse .x_dropdown-menu a:hover {
background-color: #111111; background-color: #111111;
@ -991,7 +1022,7 @@
position: static; position: static;
top: auto; top: auto;
left: auto; left: auto;
display: block; display: none;
float: none; float: none;
max-width: none; max-width: none;
padding: 0; padding: 0;
@ -1005,6 +1036,9 @@
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
} }
.x_nav-collapse .x_open > .x_dropdown-menu {
display: block;
}
.x_nav-collapse .x_dropdown-menu:before, .x_nav-collapse .x_dropdown-menu:before,
.x_nav-collapse .x_dropdown-menu:after { .x_nav-collapse .x_dropdown-menu:after {
display: none; display: none;

File diff suppressed because one or more lines are too long

1018
common/css/bootstrap.css vendored

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long