diff --git a/src/public/css/lib/bootstrap-social.scss b/src/public/css/lib/bootstrap-social.scss index 2f2f367..22443ee 100644 --- a/src/public/css/lib/bootstrap-social.scss +++ b/src/public/css/lib/bootstrap-social.scss @@ -1,3 +1,4 @@ +@import "bootstrap/variables"; /* * Social Buttons for Bootstrap * @@ -7,14 +8,14 @@ * https://github.com/lipis/bootstrap-social */ -$bs-height-base: ($line-height-computed + $padding-base-vertical * 2); -$bs-height-lg: (floor($font-size-large * $line-height-base) + $padding-large-vertical * 2); -$bs-height-sm: (floor($font-size-small * 1.5) + $padding-small-vertical * 2); -$bs-height-xs: (floor($font-size-small * 1.2) + $padding-small-vertical + 1); +$bs-height-base: ($line-height-base + $btn-padding-y * 2); +$bs-height-lg: (floor($font-size-lg * $line-height-base) + $btn-padding-y-lg * 2); +$bs-height-sm: (floor($font-size-sm * 1.5) + $btn-padding-y-sm * 2); +$bs-height-xs: (floor($font-size-sm * 1.2) + $btn-padding-y-sm + 1); .btn-social { position: relative; - padding-left: ($bs-height-base + $padding-base-horizontal); + padding-left: ($bs-height-base + $btn-padding-x); text-align: left; white-space: nowrap; overflow: hidden; @@ -25,13 +26,13 @@ $bs-height-xs: (floor($font-size-small * 1.2) + $padding-small-vertical + 1); top: 0; bottom: 0; width: $bs-height-base; - line-height: ($bs-height-base + 2); + line-height: ($bs-height-base + .2); font-size: 1.6em; text-align: center; border-right: 1px solid rgba(0, 0, 0, 0.2); } &.btn-lg { - padding-left: ($bs-height-lg + $padding-large-horizontal); + padding-left: ($bs-height-lg + $btn-padding-x); > :first-child { line-height: $bs-height-lg; width: $bs-height-lg; @@ -39,7 +40,7 @@ $bs-height-xs: (floor($font-size-small * 1.2) + $padding-small-vertical + 1); } } &.btn-sm { - padding-left: ($bs-height-sm + $padding-small-horizontal); + padding-left: ($bs-height-sm + $btn-padding-x); > :first-child { line-height: $bs-height-sm; width: $bs-height-sm; @@ -47,7 +48,7 @@ $bs-height-xs: (floor($font-size-small * 1.2) + $padding-small-vertical + 1); } } &.btn-xs { - padding-left: ($bs-height-xs + $padding-small-horizontal); + padding-left: ($bs-height-xs + $btn-padding-x); > :first-child { line-height: $bs-height-xs; width: $bs-height-xs; @@ -88,7 +89,7 @@ $bs-height-xs: (floor($font-size-small * 1.2) + $padding-small-vertical + 1); @mixin btn-social($color-bg, $color: #fff) { background-color: $color-bg; - @include button-variant($color, $color-bg, rgba(0,0,0,.2)); + @include button-variant($color-bg, rgba(0,0,0,.2)); } diff --git a/src/public/css/lib/bootstrap/_alert.scss b/src/public/css/lib/bootstrap/_alert.scss new file mode 100755 index 0000000..dd43e23 --- /dev/null +++ b/src/public/css/lib/bootstrap/_alert.scss @@ -0,0 +1,51 @@ +// +// Base styles +// + +.alert { + position: relative; + padding: $alert-padding-y $alert-padding-x; + margin-bottom: $alert-margin-bottom; + border: $alert-border-width solid transparent; + @include border-radius($alert-border-radius); +} + +// Headings for larger alerts +.alert-heading { + // Specified to prevent conflicts of changing $headings-color + color: inherit; +} + +// Provide class for links that match alerts +.alert-link { + font-weight: $alert-link-font-weight; +} + + +// Dismissible alerts +// +// Expand the right padding and account for the close button's positioning. + +.alert-dismissible { + padding-right: ($close-font-size + $alert-padding-x * 2); + + // Adjust close link position + .close { + position: absolute; + top: 0; + right: 0; + padding: $alert-padding-y $alert-padding-x; + color: inherit; + } +} + + +// Alternate styles +// +// Generate contextual modifier classes for colorizing the alert. + +@each $color, $value in $theme-colors { + .alert-#{$color} { + @include alert-variant(theme-color-level($color, $alert-bg-level), theme-color-level($color, $alert-border-level), theme-color-level($color, $alert-color-level)); + } +} diff --git a/src/public/css/lib/bootstrap/_alerts.scss b/src/public/css/lib/bootstrap/_alerts.scss deleted file mode 100644 index 7d1e1fd..0000000 --- a/src/public/css/lib/bootstrap/_alerts.scss +++ /dev/null @@ -1,73 +0,0 @@ -// -// Alerts -// -------------------------------------------------- - - -// Base styles -// ------------------------- - -.alert { - padding: $alert-padding; - margin-bottom: $line-height-computed; - border: 1px solid transparent; - border-radius: $alert-border-radius; - - // Headings for larger alerts - h4 { - margin-top: 0; - // Specified for the h4 to prevent conflicts of changing $headings-color - color: inherit; - } - - // Provide class for links that match alerts - .alert-link { - font-weight: $alert-link-font-weight; - } - - // Improve alignment and spacing of inner content - > p, - > ul { - margin-bottom: 0; - } - - > p + p { - margin-top: 5px; - } -} - -// Dismissible alerts -// -// Expand the right padding and account for the close button's positioning. - -.alert-dismissable, // The misspelled .alert-dismissable was deprecated in 3.2.0. -.alert-dismissible { - padding-right: ($alert-padding + 20); - - // Adjust close link position - .close { - position: relative; - top: -2px; - right: -21px; - color: inherit; - } -} - -// Alternate styles -// -// Generate contextual modifier classes for colorizing the alert. - -.alert-success { - @include alert-variant($alert-success-bg, $alert-success-border, $alert-success-text); -} - -.alert-info { - @include alert-variant($alert-info-bg, $alert-info-border, $alert-info-text); -} - -.alert-warning { - @include alert-variant($alert-warning-bg, $alert-warning-border, $alert-warning-text); -} - -.alert-danger { - @include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text); -} diff --git a/src/public/css/lib/bootstrap/_badge.scss b/src/public/css/lib/bootstrap/_badge.scss new file mode 100755 index 0000000..b87a1b0 --- /dev/null +++ b/src/public/css/lib/bootstrap/_badge.scss @@ -0,0 +1,47 @@ +// Base class +// +// Requires one of the contextual, color modifier classes for `color` and +// `background-color`. + +.badge { + display: inline-block; + padding: $badge-padding-y $badge-padding-x; + font-size: $badge-font-size; + font-weight: $badge-font-weight; + line-height: 1; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + @include border-radius($badge-border-radius); + + // Empty badges collapse automatically + &:empty { + display: none; + } +} + +// Quick fix for badges in buttons +.btn .badge { + position: relative; + top: -1px; +} + +// Pill badges +// +// Make them extra rounded with a modifier to replace v3's badges. + +.badge-pill { + padding-right: $badge-pill-padding-x; + padding-left: $badge-pill-padding-x; + @include border-radius($badge-pill-border-radius); +} + +// Colors +// +// Contextual variations (linked badges get darker on :hover). + +@each $color, $value in $theme-colors { + .badge-#{$color} { + @include badge-variant($value); + } +} diff --git a/src/public/css/lib/bootstrap/_badges.scss b/src/public/css/lib/bootstrap/_badges.scss deleted file mode 100644 index 70002e0..0000000 --- a/src/public/css/lib/bootstrap/_badges.scss +++ /dev/null @@ -1,68 +0,0 @@ -// -// Badges -// -------------------------------------------------- - - -// Base class -.badge { - display: inline-block; - min-width: 10px; - padding: 3px 7px; - font-size: $font-size-small; - font-weight: $badge-font-weight; - color: $badge-color; - line-height: $badge-line-height; - vertical-align: middle; - white-space: nowrap; - text-align: center; - background-color: $badge-bg; - border-radius: $badge-border-radius; - - // Empty badges collapse automatically (not available in IE8) - &:empty { - display: none; - } - - // Quick fix for badges in buttons - .btn & { - position: relative; - top: -1px; - } - - .btn-xs &, - .btn-group-xs > .btn & { - top: 0; - padding: 1px 5px; - } - - // [converter] extracted a& to a.badge - - // Account for badges in navs - .list-group-item.active > &, - .nav-pills > .active > a > & { - color: $badge-active-color; - background-color: $badge-active-bg; - } - - .list-group-item > & { - float: right; - } - - .list-group-item > & + & { - margin-right: 5px; - } - - .nav-pills > li > a > & { - margin-left: 3px; - } -} - -// Hover state, but only for links -a.badge { - &:hover, - &:focus { - color: $badge-link-hover-color; - text-decoration: none; - cursor: pointer; - } -} diff --git a/src/public/css/lib/bootstrap/_breadcrumb.scss b/src/public/css/lib/bootstrap/_breadcrumb.scss new file mode 100755 index 0000000..be30950 --- /dev/null +++ b/src/public/css/lib/bootstrap/_breadcrumb.scss @@ -0,0 +1,41 @@ +.breadcrumb { + display: flex; + flex-wrap: wrap; + padding: $breadcrumb-padding-y $breadcrumb-padding-x; + margin-bottom: $breadcrumb-margin-bottom; + list-style: none; + background-color: $breadcrumb-bg; + @include border-radius($breadcrumb-border-radius); +} + +.breadcrumb-item { + // The separator between breadcrumbs (by default, a forward-slash: "/") + + .breadcrumb-item { + padding-left: $breadcrumb-item-padding; + + &::before { + display: inline-block; // Suppress underlining of the separator in modern browsers + padding-right: $breadcrumb-item-padding; + color: $breadcrumb-divider-color; + content: $breadcrumb-divider; + } + } + + // IE9-11 hack to properly handle hyperlink underlines for breadcrumbs built + // without `