aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-05 01:34:14 -0800
committerMark Otto <[email protected]>2012-01-05 01:34:14 -0800
commitfb9401b355366452d310d39f51224999da4daa82 (patch)
treef39799f2247d3993032f381eecf0e7d75784793d /lib
parent553030ca7de8dac3c5180629ff84fa14173513ab (diff)
downloadbootstrap-fb9401b355366452d310d39f51224999da4daa82.tar.xz
bootstrap-fb9401b355366452d310d39f51224999da4daa82.zip
tweaks abound, updated prettify styles, new sidenav component started, sprite icons started
Diffstat (limited to 'lib')
-rw-r--r--lib/bootstrap.less2
-rw-r--r--lib/sidenav.less40
-rw-r--r--lib/sprites.less118
-rw-r--r--lib/tables.less5
-rw-r--r--lib/type.less2
5 files changed, 166 insertions, 1 deletions
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index e05a966ad..8b821825c 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -27,6 +27,7 @@
// Temp catchall for what's missing thus far
@import "patterns.less";
+@import "sprites.less";
@import "dropdowns.less";
@import "tabs-pills.less";
@import "breadcrumbs.less";
@@ -34,6 +35,7 @@
@import "modals.less";
@import "twipsy.less";
@import "popovers.less";
+@import "sidenav.less";
@import "thumbnails.less";
// Responsive
diff --git a/lib/sidenav.less b/lib/sidenav.less
new file mode 100644
index 000000000..afc5ea1dd
--- /dev/null
+++ b/lib/sidenav.less
@@ -0,0 +1,40 @@
+// SIDE NAV
+// --------
+
+
+.side-nav {
+ padding: @baseLineHeight / 2 0;
+}
+.side-nav .nav-label,
+.side-nav .nav-item {
+ display: block;
+ padding: 3px 16px;
+ text-shadow: 0 1px 0 rgba(255,255,255,.5);
+}
+.side-nav .nav-label {
+ font-size: 11px;
+ line-height: @baseLineHeight;
+ color: @grayDark;
+ text-transform: uppercase;
+}
+.side-nav .nav-group {
+ margin: 0 -1px;
+ list-style: none;
+}
+
+.side-nav .nav-item {
+ font-weight: bold;
+}
+.side-nav .nav-item i {
+ vertical-align: -2px;
+}
+.side-nav .nav-item:hover {
+ text-decoration: none;
+}
+.side-nav .active .nav-item {
+ color: #fff;
+ text-shadow: 0 -1px 0 rgba(0,0,0,.3);
+ #gradient > .vertical(#ccc, #aaa);
+ @shadow: inset 0 1px 0 rgba(0,0,0,.05), inset 0 -1px 0 rgba(0,0,0,.05);
+ .box-shadow(@shadow);
+} \ No newline at end of file
diff --git a/lib/sprites.less b/lib/sprites.less
new file mode 100644
index 000000000..8b5bcd5a5
--- /dev/null
+++ b/lib/sprites.less
@@ -0,0 +1,118 @@
+// SPRITES
+// Glyphs and icons for buttons, nav, and more
+// -------------------------------------------
+
+
+// ICONS
+// -----
+
+// As of v2.0.0, the <i> tag is reserved for icons from the Glyphicons set.
+// All icons receive the styles of the <i> tag and are then given a unique
+// class to add width, height, and background-position. Your resulting HTML
+// will look like <i class="inbox"></i>.
+
+i {
+ background-image: url(docs/assets/img/glyphicons-halflings-sprite.png);
+ background-position: 0 0;
+ background-repeat: no-repeat;
+ display: inline-block;
+ vertical-align: text-top;
+ width: 14px;
+ height: 14px;
+}
+
+.glass { background-position: 0 0; }
+.music { background-position: -24px 0; }
+.search { background-position: -48px 0; }
+.envelope { background-position: -72px 0; }
+.heart { background-position: -96px 0; }
+.star { background-position: -120px 0; }
+.star-empty { background-position: -144px 0; }
+.user { background-position: -168px 0; }
+.film { background-position: -192px 0; }
+.th-large { background-position: -216px 0; }
+.th { background-position: -240px 0; }
+.th-lines { background-position: -264px 0; }
+.ok { background-position: -288px 0; }
+.remove { background-position: -312px 0; }
+.zoom-in { background-position: -336px 0; }
+.zoom-out { background-position: -360px 0; }
+.off { background-position: -384px 0; }
+.signal { background-position: -408px 0; }
+.cog { background-position: -432px 0; }
+.trash { background-position: -456px 0; }
+
+.home { background-position: 0 -24px; }
+.file { background-position: -24px -24px; }
+.time { background-position: -48px -24px; }
+.road { background-position: -72px -24px; }
+.download-alt { background-position: -96px -24px; }
+.download { background-position: -120px -24px; }
+.upload { background-position: -144px -24px; }
+.inbox { background-position: -168px -24px; }
+.play-circle { background-position: -192px -24px; }
+.repeat { background-position: -216px -24px; }
+.refresh { background-position: -240px -24px; }
+.calendar { background-position: -264px -24px; }
+.lock { background-position: -288px -24px; }
+.flag { background-position: -312px -24px; }
+.headphones { background-position: -336px -24px; }
+.volume-off { background-position: -360px -24px; }
+.volume-down { background-position: -384px -24px; }
+.volume-up { background-position: -408px -24px; }
+.qrcode { background-position: -432px -24px; }
+.barcode { background-position: -456px -24px; }
+
+.tag { background-position: 0 -48px; }
+.tags { background-position: -24px -48px; }
+.book { background-position: -48px -48px; }
+.bookmark { background-position: -72px -48px; }
+.print { background-position: -96px -48px; }
+.camera { background-position: -120px -48px; }
+.font { background-position: -144px -48px; }
+.bold { background-position: -168px -48px; }
+.italic { background-position: -192px -48px; }
+.text-height { background-position: -216px -48px; }
+.text-width { background-position: -240px -48px; }
+.align-left { background-position: -264px -48px; }
+.align-center { background-position: -288px -48px; }
+.align-right { background-position: -312px -48px; }
+.align-justify { background-position: -336px -48px; }
+.list { background-position: -360px -48px; }
+.indent-left { background-position: -384px -48px; }
+.indent-right { background-position: -408px -48px; }
+.facetime-video { background-position: -432px -48px; }
+.picture { background-position: -456px -48px; }
+
+.pencil { background-position: 0 -72px; }
+.map-marker { background-position: -24px -72px; }
+.adjust { background-position: -48px -72px; }
+.tint { background-position: -72px -72px; }
+.edit { background-position: -96px -72px; }
+.share { background-position: -120px -72px; }
+.check { background-position: -144px -72px; }
+.move { background-position: -168px -72px; }
+.step-backward { background-position: -192px -72px; }
+.fast-backward { background-position: -216px -72px; }
+.backward { background-position: -240px -72px; }
+.play { background-position: -264px -72px; }
+.pause { background-position: -288px -72px; }
+.stop { background-position: -312px -72px; }
+.forward { background-position: -336px -72px; }
+.fast-forward { background-position: -360px -72px; }
+.step-forward { background-position: -384px -72px; }
+.eject { background-position: -408px -72px; }
+.chevron-left { background-position: -432px -72px; }
+.chevron-right { background-position: -456px -72px; }
+
+.arrow-left { background-position: -240px -96px; }
+.arrow-right { background-position: -264px -96px; }
+.arrow-up { background-position: -288px -96px; }
+.arrow-down { background-position: -312px -96px; }
+.share { background-position: -336px -96px; }
+.resize-full { background-position: -360px -96px; }
+.resize-small { background-position: -384px -96px; }
+.plus { background-position: -408px -96px; }
+.minus { background-position: -432px -96px; }
+.asterisk { background-position: -456px -96px; }
+
diff --git a/lib/tables.less b/lib/tables.less
index 164370562..e1c9ed53b 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -52,6 +52,11 @@ td {
td + th {
border-left: 1px solid #ddd;
}
+ // Prevent a double border
+ thead:first-child tr:first-child th,
+ tbody:first-child tr:first-child td {
+ border-top: 0;
+ }
// For first th or td in the first row in the first thead or tbody
thead:first-child tr:first-child th:first-child,
tbody:first-child tr:first-child td:first-child {
diff --git a/lib/type.less b/lib/type.less
index b2ba73b86..cc446a69d 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -74,7 +74,7 @@ h6 {
// Unordered and Ordered lists
ul, ol {
- margin: 0 0 @baseLineHeight / 2 25px;
+ margin: 13px 0 14px 25px;
}
ul ul,
ul ol,