Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
917 changes: 521 additions & 396 deletions css/binarybootstrap.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions css/binarybootstrap.min.css

Large diffs are not rendered by default.

Empty file modified fonts/glyphicons-halflings-regular.eot
100755 → 100644
Empty file.
Empty file modified fonts/glyphicons-halflings-regular.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified fonts/glyphicons-halflings-regular.ttf
100755 → 100644
Empty file.
Empty file modified fonts/glyphicons-halflings-regular.woff
100755 → 100644
Empty file.
4 changes: 2 additions & 2 deletions js/bootstrap.min.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions less/badges.less
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
&:empty {
display: none;
}

// Quick fix for badges in buttons
.btn & {
position: relative;
top: -1px;
}
}

// Hover state, but only for links
Expand All @@ -34,12 +40,6 @@ a.badge {
}
}

// Quick fix for labels/badges in buttons
.btn .badge {
position: relative;
top: -1px;
}

// Account for counters in navs
a.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
Expand Down
45 changes: 12 additions & 33 deletions less/button-groups.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,6 @@
// Button groups
// --------------------------------------------------

// Button carets
//
// Match the button text color to the arrow/caret for indicating dropdown-ness.

.caret {
.btn-default & {
border-top-color: @btn-default-color;
}
.btn-primary &,
.btn-success &,
.btn-warning &,
.btn-danger &,
.btn-info & {
border-top-color: #fff;
}
}
.dropup {
& .btn-default .caret {
border-bottom-color: @btn-default-color;
}
.btn-primary,
.btn-success,
.btn-warning,
.btn-danger,
.btn-info {
.caret {
border-bottom-color: #fff;
}
}
}

// Make the div behave like a button
.btn-group,
.btn-group-vertical {
Expand Down Expand Up @@ -150,6 +119,11 @@
// Remove the gradient and set the same inset shadow as the :active state
.btn-group.open .dropdown-toggle {
.box-shadow(inset 0 3px 5px rgba(0,0,0,.125));

// Show no shadow for `.btn-link` since it has no other button styles.
&.btn-link {
.box-shadow(none);
}
}


Expand All @@ -173,7 +147,8 @@

.btn-group-vertical {
> .btn,
> .btn-group {
> .btn-group,
> .btn-group > .btn {
display: block;
float: none;
width: 100%;
Expand Down Expand Up @@ -233,11 +208,15 @@
width: 100%;
table-layout: fixed;
border-collapse: separate;
.btn {
> .btn,
> .btn-group {
float: none;
display: table-cell;
width: 1%;
}
> .btn-group .btn {
width: 100%;
}
}


Expand Down
7 changes: 2 additions & 5 deletions less/buttons.less
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// Base styles
// --------------------------------------------------

// Core styles
.btn {
display: inline-block;
margin-bottom: 0; // For input.btn
Expand Down Expand Up @@ -45,7 +44,6 @@
.opacity(.65);
.box-shadow(none);
}

}


Expand Down Expand Up @@ -123,13 +121,12 @@
// line-height: ensure even-numbered height of button next to large input
.button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
}
.btn-sm,
.btn-xs {
.btn-sm {
// line-height: ensure proper height of button next to small input
.button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
}
.btn-xs {
padding: 1px 5px;
.button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small);
}


Expand Down
14 changes: 13 additions & 1 deletion less/carousel.less
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
color: @carousel-control-color;
text-align: center;
text-shadow: @carousel-text-shadow;
// We can't have this transition here because webkit cancels the carousel
// We can't have this transition here because WebKit cancels the carousel
// animation if you trip this while in the middle of another animation.

// Set gradients for backgrounds
Expand All @@ -91,6 +91,7 @@
// Hover/focus state
&:hover,
&:focus {
outline: none;
color: @carousel-control-color;
text-decoration: none;
.opacity(.9);
Expand Down Expand Up @@ -160,6 +161,17 @@
border: 1px solid @carousel-indicator-border-color;
border-radius: 10px;
cursor: pointer;

// IE8-9 hack for event handling
//
// Internet Explorer 8-9 does not support clicks on elements without a set
// `background-color`. We cannot use `filter` since that's not viewed as a
// background color by the browser. Thus, a hack is needed.
//
// For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
// set alpha transparency for the best results possible.
background-color: #000 \9; // IE8
background-color: rgba(0,0,0,0); // IE9
}
.active {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions less/code.less
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
//
// Code (inline and blocK)
// Code (inline and block)
// --------------------------------------------------


// Inline and block code styles
code,
kdb,
kbd,
pre,
samp {
font-family: @font-family-monospace;
Expand Down
11 changes: 3 additions & 8 deletions less/dropdowns.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@
height: 0;
margin-left: 2px;
vertical-align: middle;
border-top: @caret-width-base solid @dropdown-caret-color;
border-top: @caret-width-base solid;
border-right: @caret-width-base solid transparent;
border-left: @caret-width-base solid transparent;
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
// we can just straight up remove this.
border-bottom: 0 dotted;
}

// The dropdown wrapper (div)
Expand Down Expand Up @@ -163,10 +160,8 @@
.navbar-fixed-bottom .dropdown {
// Reverse the caret
.caret {
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
// gets fixed, restore `border-top: 0;`.
border-top: 0 dotted;
border-bottom: 4px solid @dropdown-caret-color;
border-top: 0;
border-bottom: @caret-width-base solid;
content: "";
}
// Different positioning for bottom up menu
Expand Down
25 changes: 17 additions & 8 deletions less/forms.less
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,6 @@ output {
vertical-align: middle;
}

// Placeholder
//
// Placeholder text gets special styles because when browsers invalidate entire
// lines if it doesn't understand a selector/
.form-control {
.placeholder();
}


// Common form controls
//
Expand Down Expand Up @@ -142,6 +134,12 @@ output {
// Customize the `:focus` state to imitate native WebKit styles.
.form-control-focus();

// Placeholder
//
// Placeholder text gets special styles because when browsers invalidate entire
// lines if it doesn't understand a selector/
.placeholder();

// Disabled and read-only inputs
// Note: HTML5 says that controls under a fieldset > legend:first-child won't
// be disabled if the fieldset is disabled. Due to implementation difficulty,
Expand Down Expand Up @@ -311,6 +309,11 @@ input[type="checkbox"],
display: inline-block;
}

// Override `width: 100%;` when not within a `.form-group`
select.form-control {
width: auto;
}

// Remove default margin on radios/checkboxes that were used for stacking, and
// then undo the floating of radios and checkboxes to match (which also avoids
// a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
Expand Down Expand Up @@ -347,6 +350,12 @@ input[type="checkbox"],
margin-bottom: 0;
padding-top: (@padding-base-vertical + 1); // Default padding plus a border
}
// Account for padding we're adding to ensure the alignment and of help text
// and other content below items
.radio,
.checkbox {
min-height: @line-height-computed + (@padding-base-vertical + 1);
}

// Make form groups behave like rows
.form-group {
Expand Down
13 changes: 7 additions & 6 deletions less/glyphicons.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
// Import the fonts
@font-face {
font-family: 'Glyphicons Halflings';
src: url('@{icon-font-path}@{icon-font-name}.eot');
src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'),
url('@{icon-font-path}@{icon-font-name}.woff') format('woff'),
url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'),
url('@{icon-font-path}@{icon-font-name}.svg#glyphicons_halflingsregular') format('svg');
src: ~"url('@{icon-font-path}@{icon-font-name}.eot')";
src: ~"url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype')",
~"url('@{icon-font-path}@{icon-font-name}.woff') format('woff')",
~"url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype')",
~"url('@{icon-font-path}@{icon-font-name}.svg#glyphicons-halflingsregular') format('svg')";
}

// Catchall baseclass
Expand All @@ -27,8 +27,9 @@
font-weight: normal;
line-height: 1;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;

&:empty{
&:empty {
width: 1em;
}
}
Expand Down
38 changes: 12 additions & 26 deletions less/grid.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@
// Set the container width, and override it for fixed navbars in media queries
.container {
.container-fixed();

@media (min-width: @screen-sm) {
width: @container-sm;
}
@media (min-width: @screen-md) {
width: @container-md;
}
@media (min-width: @screen-lg-min) {
width: @container-lg;
}
}

// mobile first defaults
Expand All @@ -18,11 +28,8 @@

// Extra small grid
//
// Grid classes for extra small devices like smartphones. No offset, push, or
// pull classes are present here due to the size of the target.
//
// Note that `.col-xs-12` doesn't get floated on purpose--there's no need since
// it's full-width.
// Columns, offsets, pushes, and pulls for extra small devices like
// smartphones.

.make-grid-columns-float(xs);
.make-grid(@grid-columns, xs, width);
Expand All @@ -35,15 +42,8 @@
//
// Columns, offsets, pushes, and pulls for the small device range, from phones
// to tablets.
//
// Note that `.col-sm-12` doesn't get floated on purpose--there's no need since
// it's full-width.

@media (min-width: @screen-sm-min) {
.container {
width: @container-sm;
}

.make-grid-columns-float(sm);
.make-grid(@grid-columns, sm, width);
.make-grid(@grid-columns, sm, pull);
Expand All @@ -55,15 +55,8 @@
// Medium grid
//
// Columns, offsets, pushes, and pulls for the desktop device range.
//
// Note that `.col-md-12` doesn't get floated on purpose--there's no need since
// it's full-width.

@media (min-width: @screen-md-min) {
.container {
width: @container-md;
}

.make-grid-columns-float(md);
.make-grid(@grid-columns, md, width);
.make-grid(@grid-columns, md, pull);
Expand All @@ -75,15 +68,8 @@
// Large grid
//
// Columns, offsets, pushes, and pulls for the large desktop device range.
//
// Note that `.col-lg-12` doesn't get floated on purpose--there's no need since
// it's full-width.

@media (min-width: @screen-lg-min) {
.container {
width: @container-lg;
}

.make-grid-columns-float(lg);
.make-grid(@grid-columns, lg, width);
.make-grid(@grid-columns, lg, pull);
Expand Down
2 changes: 1 addition & 1 deletion less/input-groups.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table

// Undo padding and float of grid classes
&.col {
&[class*="col-"] {
float: none;
padding-left: 0;
padding-right: 0;
Expand Down
Loading