mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-13 09:04:14 +02:00
Code Issues Releases Wiki Activity

adding border variable for dropdowns, making dropdown carets use dropdown vars

Browse Source
This commit is contained in:
Mark Otto
2012-03-12 09:57:10 -07:00
parent 40fddffeec
commit e12c66aabe
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

2
docs/download.html
View File

@@ -339,6 +339,8 @@
<h3>Dropdowns</h3> <h3>Dropdowns</h3>
<label>@dropdownBackground</label> <label>@dropdownBackground</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="@white">
<label>@dropdownBorder</label>
<input type="text" class="span3" placeholder="rgba(0,0,0,.2)">
<label>@dropdownLinkColor</label> <label>@dropdownLinkColor</label>
<input type="text" class="span3" placeholder="@grayDark"> <input type="text" class="span3" placeholder="@grayDark">
<label>@dropdownLinkColorHover</label> <label>@dropdownLinkColorHover</label>

2
docs/templates/pages/download.mustache vendored
View File

@@ -263,6 +263,8 @@
<h3>{{_i}}Dropdowns{{/i}}</h3> <h3>{{_i}}Dropdowns{{/i}}</h3>
<label>@dropdownBackground</label> <label>@dropdownBackground</label>
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="@white">
<label>@dropdownBorder</label>
<input type="text" class="span3" placeholder="rgba(0,0,0,.2)">
<label>@dropdownLinkColor</label> <label>@dropdownLinkColor</label>
<input type="text" class="span3" placeholder="@grayDark"> <input type="text" class="span3" placeholder="@grayDark">
<label>@dropdownLinkColorHover</label> <label>@dropdownLinkColorHover</label>

8
less/navbar.less
View File

@@ -270,7 +270,7 @@
border-left: 7px solid transparent; border-left: 7px solid transparent;
border-right: 7px solid transparent; border-right: 7px solid transparent;
border-bottom: 7px solid #ccc; border-bottom: 7px solid #ccc;
border-bottom-color: rgba(0,0,0,.2); border-bottom-color: @dropdownBorder;
position: absolute; position: absolute;
top: -7px; top: -7px;
left: 9px; left: 9px;
@@ -280,7 +280,7 @@
display: inline-block; display: inline-block;
border-left: 6px solid transparent; border-left: 6px solid transparent;
border-right: 6px solid transparent; border-right: 6px solid transparent;
border-bottom: 6px solid @white; border-bottom: 6px solid @dropdownBackground;
position: absolute; position: absolute;
top: -6px; top: -6px;
left: 10px; left: 10px;
@@ -290,13 +290,13 @@
.navbar-fixed-bottom .dropdown-menu { .navbar-fixed-bottom .dropdown-menu {
&:before { &:before {
border-top: 7px solid #ccc; border-top: 7px solid #ccc;
border-top-color: rgba(0, 0, 0, 0.2); border-top-color: @dropdownBorder;
border-bottom: 0; border-bottom: 0;
bottom: -7px; bottom: -7px;
top: auto; top: auto;
} }
&:after { &:after {
border-top: 6px solid #ffffff; border-top: 6px solid @dropdownBackground;
border-bottom: 0; border-bottom: 0;
bottom: -6px; bottom: -6px;
top: auto; top: auto;

1
less/variables.less
View File

@@ -98,6 +98,7 @@
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
@dropdownBackground: @white; @dropdownBackground: @white;
@dropdownBorder: rgba(0,0,0,.2);
@dropdownLinkColor: @grayDark; @dropdownLinkColor: @grayDark;
@dropdownLinkColorHover: @white; @dropdownLinkColorHover: @white;
@dropdownLinkBackgroundHover: @linkColor; @dropdownLinkBackgroundHover: @linkColor;