mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

new buttons, new modal updates around spacing and placeholder content

Browse Source
This commit is contained in:
Mark Otto
2011-06-28 11:56:49 -07:00
parent 80abe21189
commit 9660f6f18d
9 changed files with 147 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/patterns.less
+20 -9
View File
@@ -487,20 +487,16 @@ div.modal {
top: 50%;
left: 50%;
z-index: 2000;
width: 620px;
height: 500px;
margin: -310px 0 0 -250px;
width: 560px;
margin: -280px 0 0 -250px;
background-color: @white;
border: 1px solid rgba(0,0,0,.3);
.border-radius(6px);
.box-shadow(0 2px 6px rgba(0, 0, 0, 0.35))
.box-shadow(0 3px 7px rgba(0,0,0,0.3));
.background-clip(padding);
.modal-header {
border-bottom:1px solid #eee;
border-bottom: 1px solid #eee;
padding: 5px 20px;
h2 {
font-size: 20px;
font-weight: 200;
}
a.close {
position: absolute;
right: 10px;
@@ -510,4 +506,19 @@ div.modal {
font-size: 18px;
}
}
.modal-body {
padding: 20px;
}
.modal-footer {
background-color: #eee;
padding: 14px 20px 15px;
border-top: 1px solid #ddd;
.border-radius(0 0 6px 6px);
.box-shadow(inset 0 1px 0 #fff);
.clearfix();
.btn {
float: right;
margin-left: 10px;
}
}
}
lib/preboot.less
+23 -13
View File
@@ -21,6 +21,7 @@
// Accent Colors
@blue: #08b5fb;
@blueDark: #0069d6;
@green: #46a546;
@red: #9d261d;
@yellow: #ffc40d;
@@ -41,16 +42,16 @@
/* Color Scheme
-------------------------------------------------- */
@baseColor: @blue; // Set a base color
@complement: spin(@baseColor, 180); // Determine a complementary color
@split1: spin(@baseColor, 158); // Split complements
@split2: spin(@baseColor, -158);
@triad1: spin(@baseColor, 135); // Triads colors
@triad2: spin(@baseColor, -135);
@tetra1: spin(@baseColor, 90); // Tetra colors
@tetra2: spin(@baseColor, -90);
@analog1: spin(@baseColor, 22); // Analogs colors
@analog2: spin(@baseColor, -22);
@baseColor: @blue; // Set a base color
@complement: spin(@baseColor, 180); // Determine a complementary color
@split1: spin(@baseColor, 158); // Split complements
@split2: spin(@baseColor, -158);
@triad1: spin(@baseColor, 135); // Triads colors
@triad2: spin(@baseColor, -135);
@tetra1: spin(@baseColor, 90); // Tetra colors
@tetra2: spin(@baseColor, -90);
@analog1: spin(@baseColor, 22); // Analogs colors
@analog2: spin(@baseColor, -22);
/* Mixins
@@ -160,6 +161,13 @@
transition: @transition;
}
// Background clipping
.background-clip(@clip) {
-webkit-background-clip: @clip;
-moz-background-clip: @clip;
background-clip: @clip;
}
// CSS3 Content Columns
.content-columns(@columnCount, @columnGap: 20px) {
-webkit-column-count: @columnCount;
@@ -171,16 +179,18 @@
}
// Buttons
.button(@color: #f5f5f5, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @padding: 9px 15px 10px, @borderRadius: 6px) {
.button(@color: #f5f5f5, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) {
display: inline-block;
#gradient > .vertical(@color,darken(saturate(@color,10),10));
#gradient > .vertical-three-colors(@color, @color, 0.25, darken(@color, 10%));
padding: @padding;
text-shadow: @textShadow;
color: @textColor;
font-size: @fontSize;
line-height: @baseline;
border: 1px solid @borderColor;
border-bottom-color: fadein(@borderColor, 15%);
.border-radius(@borderRadius);
@shadow: inset 0 1px 0 rgba(255,255,255,.2), inset 0 -1px 0 rgba(0,0,0,.2), 0 1px 2px rgba(0,0,0,.25);
@shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.1);
.box-shadow(@shadow);
&:hover {
background-position: 0 -15px;
lib/reset.less
+18 -14
View File
@@ -1,16 +1,20 @@
/*--------------------------------------------------
/*
Global Reset
Props to Eric Meyer (meyerweb.com) for his CSS
reset file. We're using an adapted version here
that cuts out some of the reset HTML elements we
will never need here (i.e., dfn, samp, etc).
Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
*/
-------------------------------------------------- */
html, body { margin: 0; padding: 0; }
h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; font-weight: normal; font-style: normal; font-size: 100%; line-height: 1; font-family: inherit; }
table { border-collapse: collapse; border-spacing: 0; }
ol, ul { list-style: none; }
q:before, q:after, blockquote:before, blockquote:after { content: ""; }
// Eric Meyer reset
html, body { margin: 0; padding: 0; }
h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; font-weight: normal; font-style: normal; font-size: 100%; line-height: 1; font-family: inherit; }
table { border-collapse: collapse; border-spacing: 0; }
ol, ul { list-style: none; }
q:before, q:after, blockquote:before, blockquote:after { content: ""; }
// HTML5
header,
section,
footer,
article,
aside {
display: block;
}
lib/scaffolding.less
+2 -1
View File
@@ -80,7 +80,7 @@ a {
.btn {
.button();
&.primary {
#gradient > .vertical(@blue, darken(@blue, 15));
#gradient > .vertical(@blue, @blueDark);
color: #fff;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
&:hover {
@@ -89,6 +89,7 @@ a {
}
&.large {
font-size: 16px;
line-height: 30px;
.border-radius(6px);
}
&.small {