Create 'admin.bootstrap.css' and recover v2.2.2 code of './common/css/bootstrap.css'.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12563 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2013-01-16 09:29:57 +00:00
parent fca5db8bf8
commit 46e39b32c1
11 changed files with 3262 additions and 1665 deletions

View file

@ -348,7 +348,7 @@ class HTMLDisplayHandler
$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", '', '', 10), true);
$oContext->loadFile(array("./modules/admin/tpl/css/admin.iefix.css", '', 'ie', 10), true);
$oContext->loadFile('./modules/admin/tpl/js/admin.js', true);
$oContext->loadFile(array('./common/css/bootstrap.css', '', '', 1), true);
$oContext->loadFile(array('./modules/admin/tpl/css/admin.bootstrap.css', '', '', 1), true);
$oContext->loadFile(array('./modules/admin/tpl/js/jquery.tmpl.js', '', '', 1), true);
$oContext->loadFile(array('./modules/admin/tpl/js/jquery.jstree.js', '', '', 1), true);
}
@ -358,7 +358,7 @@ class HTMLDisplayHandler
$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", '', '',10), true);
$oContext->loadFile(array("./modules/admin/tpl/css/admin.iefix.min.css", '', 'ie', 10), true);
$oContext->loadFile('./modules/admin/tpl/js/admin.min.js', true);
$oContext->loadFile(array('./common/css/bootstrap.min.css', '', '', 1), true);
$oContext->loadFile(array('./modules/admin/tpl/css/admin.bootstrap.min.css', '', '', 1), true);
$oContext->loadFile(array('./modules/admin/tpl/js/jquery.tmpl.js', '', '', 1), true);
$oContext->loadFile(array('./modules/admin/tpl/js/jquery.jstree.js', '', '', 1), true);
}

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

2644
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

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

View file

@ -203,13 +203,13 @@ body>.x,
/* Image Sprite */
.x a[target="_blank"]:after,
.x>.body>.gnb>ul>li>a>i,
.x .dashboard>div>section>h2:before{background-image:url(../../../../common/img/glyphicons-halflings.png);background-repeat:no-repeat}
.x .dashboard>div>section>h2:before{background-image:url(../img/glyphicons-halflings.png);background-repeat:no-repeat}
.x>.body>.gnb>ul>li.open>a>i,
.x>.body>.gnb>ul>li.active>a>i,
.x_modal-body .tree .jstree-hovered>i,
.x_modal-body .tree .jstree-clicked>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png);background-repeat:no-repeat}
.x_modal-body .tree .jstree-clicked>i{background-image:url(../img/glyphicons-halflings-white.png);background-repeat:no-repeat}
@media all and (max-width:800px){
.x>.body>.gnb>ul>li:first-child>a>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png);background-repeat:no-repeat}
.x>.body>.gnb>ul>li:first-child>a>i{background-image:url(../img/glyphicons-halflings-white.png);background-repeat:no-repeat}
}
/* Layout */
.x>.skipNav{margin:0}

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

File diff suppressed because one or more lines are too long