php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-16 06:17:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yiisoft/yii2

Browse Source
This commit is contained in:
Qiang Xue
2013-05-20 10:16:05 -04:00
parent 1b7b200c1e 0084fa9b18
commit 712ba7d972
1 changed files with 2635 additions and 2623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
yii/requirements/views/web/css.php
View File

@@ -1,6 +1,6 @@
<style type="text/css"> <style type="text/css">
/*! /*!
* Bootstrap v2.3.1 * Bootstrap v2.3.2
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
@@ -1836,7 +1836,7 @@ input.search-query {
border-radius: 15px; border-radius: 15px;
} }
/* Allow for input prepend/append in search forms */ /* Allow for input prepend/append in search forms */
.form-search .input-append .search-query, .form-search .input-append .search-query,
.form-search .input-prepend .search-query { .form-search .input-prepend .search-query {
@@ -2283,11 +2283,12 @@ table th[class*="span"],
*margin-right: .3em; *margin-right: .3em;
line-height: 14px; line-height: 14px;
vertical-align: text-top; vertical-align: text-top;
background-image: url("../img/glyphicons-halflings.png");
background-position: 14px 14px; background-position: 14px 14px;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
/* White icons with optional class, or on hover/focus/active states of certain elements */ /* White icons with optional class, or on hover/focus/active states of certain elements */
.icon-white, .icon-white,
.nav-pills > .active > a > [class^="icon-"], .nav-pills > .active > a > [class^="icon-"],
@@ -2305,7 +2306,9 @@ table th[class*="span"],
.dropdown-submenu:hover > a > [class^="icon-"], .dropdown-submenu:hover > a > [class^="icon-"],
.dropdown-submenu:focus > a > [class^="icon-"], .dropdown-submenu:focus > a > [class^="icon-"],
.dropdown-submenu:hover > a > [class*=" icon-"], .dropdown-submenu:hover > a > [class*=" icon-"],
.dropdown-submenu:focus > a > [class*=" icon-"] {} .dropdown-submenu:focus > a > [class*=" icon-"] {
background-image: url("../img/glyphicons-halflings-white.png");
}
.icon-glass { .icon-glass {
background-position: 0 0; background-position: 0 0;
@@ -3007,6 +3010,15 @@ table th[class*="span"],
display: block; display: block;
} }
.dropdown-backdrop {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 990;
}
.pull-right > .dropdown-menu { .pull-right > .dropdown-menu {
right: 0; right: 0;
left: auto; left: auto;
@@ -4171,7 +4183,7 @@ input[type="submit"].btn.btn-mini {
border-bottom-color: #005580; border-bottom-color: #005580;
} }
/* move down carets for tabs */ /* move down carets for tabs */
.nav-tabs .dropdown-toggle .caret { .nav-tabs .dropdown-toggle .caret {
margin-top: 8px; margin-top: 8px;