rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve conflicts

Browse source
This commit is contained in:
Mark Otto 2011-08-21 20:33:54 -07:00
commit 34a19915f4
8 changed files with 179 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

50
lib/patterns.less
View file

@ -16,8 +16,14 @@
right: 0;
z-index: 10000;
overflow: visible;
@shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
.box-shadow(@shadow);
// gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
.fill {
background:#222;
#gradient > .vertical(#333, #222);
@shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
.box-shadow(@shadow);
}
// Links get text shadow
a {
@ -35,15 +41,18 @@
}
// Website name
h3 a {
float: left;
display: block;
padding: 8px 20px 12px;
margin-left: -20px; // negative indent to left-align the text down the page
color: @white;
font-size: 20px;
font-weight: 200;
line-height: 1;
h3 {
position:relative;
a {
float: left;
display: block;
padding: 8px 20px 12px;
margin-left: -20px; // negative indent to left-align the text down the page
color: @white;
font-size: 20px;
font-weight: 200;
line-height: 1;
}
}
// Search Form
@ -53,7 +62,7 @@
position: relative;
.opacity(100);
input {
background-color: @grayLight;
background-color: #444;
background-color: rgba(255,255,255,.3);
#font > .sans-serif(13px, normal, 1);
width: 220px;
@ -75,7 +84,7 @@
}
// Hover states
&:hover {
background-color: #444;
background-color: @grayLight;
background-color: rgba(255,255,255,.5);
color: #fff;
}
@ -153,7 +162,7 @@
&.open {
a.menu,
a:hover {
background-color: #333;
background-color: #444;
background-color: rgba(255,255,255,.1);
color: #fff;
}
@ -217,6 +226,7 @@
&.divider {
height: 1px;
overflow: hidden;
background: #222;
background: rgba(0,0,0,.2);
border-bottom: 1px solid rgba(255,255,255,.1);
margin: 5px 0;
@ -278,6 +288,10 @@
// One-liner alert bars
.alert-message {
// TODO: Ask cloudhead how to do this fancy filter elegantly. Less eval is returning strings with quotes ;_;
#gradient > .vertical(transparent, rgba(0,0,0,0.15));
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";
filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";
background-color: @grayLighter;
margin-bottom: @baseline;
padding: 8px 15px;
@ -329,11 +343,13 @@
padding: 14px;
color: @grayDark;
color: rgba(0,0,0,.8);
*color: @grayDark; /* IE 6-7 */
text-shadow: 0 1px 0 rgba(255,255,255,.25);
.border-radius(6px);
p {
color: @grayDark;
color: rgba(0,0,0,.8);
*color: @grayDark; /* IE 6-7 */
margin-right: 30px;
margin-bottom: 0;
}
@ -442,6 +458,7 @@
margin: 0;
border: 1px solid #ddd;
border: 1px solid rgba(0,0,0,.15);
border-right: 0\9; /* IE8 and below don't support last child. TODO: clean this up; */
.border-radius(3px);
.box-shadow(0 1px 2px rgba(0,0,0,.05);
li {
@ -450,8 +467,9 @@
float: left;
padding: 0 14px;
line-height: (@baseline * 2) - 2;
border-right: 1px solid #ddd;
border-right: 1px solid rgba(0,0,0,.15);
border-right: 1px solid;
border-right-color: #ddd;
border-right-color: rgba(0,0,0,.15);
text-decoration: none;
}
a:hover,

5
lib/preboot.less
View file

@ -189,8 +189,9 @@
color: @textColor;
font-size: @fontSize;
line-height: @baseline;
border: 1px solid @borderColor;
border-bottom-color: fadein(@borderColor, 15%);
border: 1px solid;
border-color: #ccc #ccc #bbb;
border-color: borderColor borderColor fadein(@borderColor, 15%);
.border-radius(@borderRadius);
@shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);

10
lib/scaffolding.less
View file

@ -101,6 +101,8 @@ a {
#gradient > .vertical(@blue, @blueDark);
color: #fff;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
border-color: @blueDark @blueDark darken(@blueDark, 15%);
border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
&:hover {
color: #fff;
}
@ -115,12 +117,18 @@ a {
padding-left: 9px;
font-size: 11px;
}
&:disabled,
&.disabled {
background-image: none;
.opacity(65);
cursor: default;
}
// this can't be included with the .disabled def because IE8 and below will drop it ;_;
&:disabled {
background-image: none;
.opacity(65);
cursor: default;
}
&:active {
@shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);