Skip to content

Commit

Permalink
Merge pull request #188 from sebgroup/develop
Browse files Browse the repository at this point in the history 
cut release
  • Loading branch information
@hjalmers
hjalmers authored Jan 3, 2020
2 parents 9f6864a + e622742 commit b6c684a
Show file tree
Hide file tree
Showing 82 changed files with 2,466 additions and 1,282 deletions.
2,382 changes: 1,576 additions & 806 deletions package-lock.json
View file

Large diffs are not rendered by default.

50 changes: 25 additions & 25 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build --base-href https://sebgroup.github.io/bootstrap/ && copyfiles -f src/404.html dist/bootstrap",
"build": "ng build --source-map false --base-href https://sebgroup.github.io/bootstrap/ && copyfiles -f src/404.html dist/bootstrap",
"prebuild": "rimraf dist/bootstrap && replace __TRAVIS_BUILD_NUMBER__ $TRAVIS_BUILD_NUMBER src/environments/environment.ts && replace __TRAVIS_BUILD_NUMBER__ $TRAVIS_BUILD_NUMBER src/environments/environment.prod.ts",
"build-dev": "ng build --base-href https://sebgroup.github.io/bootstrap/dev/ --output-path dist/bootstrap/dev && copyfiles -f src/dev/404.html dist/bootstrap/dev",
"build-dev": "ng build --source-map false --base-href https://sebgroup.github.io/bootstrap/dev/ --output-path dist/bootstrap/dev && copyfiles -f src/dev/404.html dist/bootstrap/dev",
"prebuild-dev": "rimraf dist/bootstrap/dev",
"build-lib": "npm run copy-scss && npm run copy-fonts && npm run compile-css && copyfiles -f CHANGELOG.md LICENSE.md README.md scss/package.json dist/lib",
"build-sdl": "rimraf dist/bootstrap/sdl && copyfiles -u 2 src/**/*.md dist/bootstrap/sdl/ && gulp build-sdl && copyfiles -f scss/targetindex.json dist/lib/package.json dist/bootstrap/sdl/ && renamer --find \"package\" --replace \"version\" dist/bootstrap/sdl/*.json && copyfiles -f dist/lib/css/bootstrap-all* dist/bootstrap/",
Expand Down Expand Up @@ -59,48 +59,48 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^8.2.13",
"@angular/common": "^8.2.13",
"@angular/compiler": "^8.2.13",
"@angular/core": "^8.2.13",
"@angular/forms": "^8.2.13",
"@angular/platform-browser": "^8.2.13",
"@angular/platform-browser-dynamic": "^8.2.13",
"@angular/router": "^8.2.13",
"@angular/animations": "^8.2.14",
"@angular/common": "^8.2.14",
"@angular/compiler": "^8.2.14",
"@angular/core": "^8.2.14",
"@angular/forms": "^8.2.14",
"@angular/platform-browser": "^8.2.14",
"@angular/platform-browser-dynamic": "^8.2.14",
"@angular/router": "^8.2.14",
"@fortawesome/angular-fontawesome": "^0.1.1",
"@fortawesome/fontawesome-svg-core": "^1.2.25",
"@fortawesome/pro-light-svg-icons": "^5.11.2",
"@fortawesome/fontawesome-svg-core": "^1.2.26",
"@fortawesome/pro-light-svg-icons": "^5.12.0",
"@sebgroup/fonts": "^1.0.0",
"@sebgroup/ng-bootstrap": "^1.0.1",
"@sebgroup/ngx-toastr": "^1.0.0",
"angular-exemplify": "^3.1.3",
"core-js": "^2.6.10",
"rxjs": "^6.5.3",
"core-js": "^2.6.11",
"rxjs": "^6.5.4",
"scrollingelement": "^1.5.2",
"swe-validation": "^1.0.1",
"tslib": "^1.9.0",
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.803.18",
"@angular/cli": "^8.3.18",
"@angular/compiler-cli": "^8.2.13",
"@angular/language-service": "^8.2.13",
"@angular-devkit/build-angular": "^0.803.21",
"@angular/cli": "^8.3.21",
"@angular/compiler-cli": "^8.2.14",
"@angular/language-service": "^8.2.14",
"@commitlint/cli": "^7.5.2",
"@commitlint/config-conventional": "^7.5.0",
"@fortawesome/fontawesome-pro": "^5.11.2",
"@fortawesome/fontawesome-pro": "^5.12.0",
"@types/jasmine": "^2.8.16",
"@types/jasminewd2": "^2.0.8",
"@types/node": "^8.10.59",
"autoprefixer": "^9.7.1",
"autoprefixer": "^9.7.3",
"babel-core": "^6.26.3",
"babel-preset-env": "^1.7.0",
"babel-register": "^6.26.0",
"backstopjs": "^3.8.8",
"body-scroll-lock": "^2.6.4",
"bootstrap": "^4.3.1",
"bootstrap": "^4.4.1",
"clean-css-cli": "^4.2.1",
"codelyzer": "^5.0.1",
"codelyzer": "^5.2.1",
"commitizen": "^2.10.1",
"copyfiles": "^2.1.0",
"cz-conventional-changelog": "^2.1.0",
Expand All @@ -116,7 +116,7 @@
"jasmine-spec-reporter": "~4.2.1",
"karma": "~3.0.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "^2.1.0",
"karma-coverage-istanbul-reporter": "^2.1.1",
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"mobile-detect": "^1.4.4",
Expand All @@ -128,9 +128,9 @@
"protractor": "^5.4.2",
"raw-loader": "^0.5.1",
"renamer": "^1.1.4",
"replace": "^1.1.1",
"replace": "^1.1.3",
"rimraf": "^2.7.1",
"semantic-release": "^15.13.30",
"semantic-release": "^15.14.0",
"start-server-and-test": "^1.10.6",
"travis-deploy-once": "^5.0.11",
"ts-node": "~7.0.0",
Expand Down
4 changes: 4 additions & 0 deletions scss/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ $input-btn-padding-x-lg: 1rem !default;

$btn-font-weight: $font-weight-medium !default;
$btn-disabled-opacity: 1 !default;
$btn-white-space: nowrap !default; // Set to `nowrap` to prevent text wrapping
$btn-disabled-color: $gray-500 !default; // SEB specific

$btn-box-shadow: 0 0 0 0 !default;
Expand Down Expand Up @@ -437,6 +438,7 @@ $pagination-border-color: $input-border-color !default;

// Cards
$card-box-shadow: 0 1px 2px 0 rgba($black, .05) !default; // SEB specific
$card-columns-margin: $spacer !default;

// Tooltips
$tooltip-bg: $gray-900 !default;
Expand Down Expand Up @@ -504,6 +506,8 @@ $list-group-action-active-color: $white !default;
$list-group-active-bg: $dark !default;
$list-group-disabled-color: $gray-500 !default;
$list-group-disabled-bg: $gray-200 !default;
$list-group-border-color: $gray-300 !default;



// Image thumbnails
Expand Down
2 changes: 1 addition & 1 deletion scss/bootstrap-core/_badge.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@include transition($badge-transition);

@at-root a#{&} {
@include hover-focus {
@include hover-focus() {
text-decoration: none;
}
}
Expand Down
3 changes: 2 additions & 1 deletion scss/bootstrap-core/_breadcrumb.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
flex-wrap: wrap;
padding: $breadcrumb-padding-y $breadcrumb-padding-x;
margin-bottom: $breadcrumb-margin-bottom;
@include font-size($breadcrumb-font-size);
list-style: none;
background-color: $breadcrumb-bg;
@include border-radius($breadcrumb-border-radius);
Expand All @@ -17,7 +18,7 @@
display: inline-block; // Suppress underlining of the separator in modern browsers
padding-right: $breadcrumb-item-padding;
color: $breadcrumb-divider-color;
content: $breadcrumb-divider;
content: escape-svg($breadcrumb-divider);
}
}

Expand Down
2 changes: 1 addition & 1 deletion scss/bootstrap-core/_button-group.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

// Bring the hover, focused, and "active" buttons to the front to overlay
// the borders properly
@include hover {
@include hover() {
z-index: 1;
}
&:focus,
Expand Down
6 changes: 4 additions & 2 deletions scss/bootstrap-core/_buttons.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@
font-weight: $btn-font-weight;
color: $body-color;
text-align: center;
white-space: $btn-white-space;
vertical-align: middle;
cursor: if($enable-pointer-cursor-for-buttons, pointer, null);
user-select: none;
background-color: transparent;
border: $btn-border-width solid transparent;
@include button-size($btn-padding-y, $btn-padding-x, $btn-font-size, $btn-line-height, $btn-border-radius);
@include transition($btn-transition);

@include hover {
@include hover() {
color: $body-color;
text-decoration: none;
}
Expand Down Expand Up @@ -79,7 +81,7 @@ fieldset:disabled a.btn {
color: $link-color;
text-decoration: $link-decoration;

@include hover {
@include hover() {
color: $link-hover-color;
text-decoration: $link-hover-decoration;
}
Expand Down
45 changes: 17 additions & 28 deletions scss/bootstrap-core/_card.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
display: flex;
flex-direction: column;
min-width: 0; // See https://github.com/twbs/bootstrap/pull/22740#issuecomment-305868106
height: $card-height;
word-wrap: break-word;
background-color: $card-bg;
background-clip: border-box;
Expand Down Expand Up @@ -35,6 +36,9 @@
// Enable `flex-grow: 1` for decks and groups so that card blocks take up
// as much space as possible, ensuring footers are aligned to the bottom.
flex: 1 1 auto;
// Workaround for the image size bug in IE
// See: https://github.com/twbs/bootstrap/pull/28855
min-height: 1px;
padding: $card-spacer-x;
color: $card-color;
}
Expand All @@ -53,7 +57,7 @@
}

.card-link {
@include hover {
@include hover() {
text-decoration: none;
}

Expand Down Expand Up @@ -121,43 +125,40 @@
padding: $card-img-overlay-padding;
}

.card-img {
.card-img,
.card-img-top,
.card-img-bottom {
flex-shrink: 0; // For IE: https://github.com/twbs/bootstrap/issues/29396
width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch
@include border-radius($card-inner-border-radius);
}

// Card image caps
.card-img,
.card-img-top {
width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch
@include border-top-radius($card-inner-border-radius);
}

.card-img,
.card-img-bottom {
width: 100%; // Required because we use flexbox and this inherently applies align-self: stretch
@include border-bottom-radius($card-inner-border-radius);
}


// Card deck

.card-deck {
display: flex;
flex-direction: column;

.card {
margin-bottom: $card-deck-margin;
}

@include media-breakpoint-up(sm) {
display: flex;
flex-flow: row wrap;
margin-right: -$card-deck-margin;
margin-left: -$card-deck-margin;

.card {
display: flex;
// Flexbugs #4: https://github.com/philipwalton/flexbugs#flexbug-4
flex: 1 0 0%;
flex-direction: column;
margin-right: $card-deck-margin;
margin-bottom: 0; // Override the default
margin-left: $card-deck-margin;
Expand All @@ -171,16 +172,14 @@
//

.card-group {
display: flex;
flex-direction: column;

// The child selector allows nested `.card` within `.card-group`
// to display properly.
> .card {
margin-bottom: $card-group-margin;
}

@include media-breakpoint-up(sm) {
display: flex;
flex-flow: row wrap;
// The child selector allows nested `.card` within `.card-group`
// to display properly.
Expand Down Expand Up @@ -262,27 +261,17 @@
> .card {
overflow: hidden;

&:not(:first-of-type) {
.card-header:first-child {
@include border-radius(0);
}

&:not(:last-of-type) {
border-bottom: 0;
@include border-radius(0);
}
}

&:first-of-type {
&:not(:last-of-type) {
border-bottom: 0;
@include border-bottom-radius(0);
}

&:last-of-type {
&:not(:first-of-type) {
@include border-top-radius(0);
}

.card-header {
> .card-header {
@include border-radius(0);
margin-bottom: -$card-border-width;
}
}
Expand Down
12 changes: 6 additions & 6 deletions scss/bootstrap-core/_carousel.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
.active.carousel-item-right {
z-index: 0;
opacity: 0;
@include transition(0s $carousel-transition-duration opacity);
@include transition(opacity 0s $carousel-transition-duration);
}
}

Expand All @@ -101,7 +101,7 @@
@include transition($carousel-control-transition);

// Hover/focus state
@include hover-focus {
@include hover-focus() {
color: $carousel-control-color;
text-decoration: none;
outline: 0;
Expand All @@ -111,13 +111,13 @@
.carousel-control-prev {
left: 0;
@if $enable-gradients {
background: linear-gradient(90deg, rgba($black, .25), rgba($black, .001));
background-image: linear-gradient(90deg, rgba($black, .25), rgba($black, .001));
}
}
.carousel-control-next {
right: 0;
@if $enable-gradients {
background: linear-gradient(270deg, rgba($black, .25), rgba($black, .001));
background-image: linear-gradient(270deg, rgba($black, .25), rgba($black, .001));
}
}

Expand All @@ -130,10 +130,10 @@
background: no-repeat 50% / 100% 100%;
}
.carousel-control-prev-icon {
background-image: $carousel-control-prev-icon-bg;
background-image: escape-svg($carousel-control-prev-icon-bg);
}
.carousel-control-next-icon {
background-image: $carousel-control-next-icon-bg;
background-image: escape-svg($carousel-control-next-icon-bg);
}


Expand Down
4 changes: 2 additions & 2 deletions scss/bootstrap-core/_close.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
opacity: .5;

// Override <a>'s hover style
@include hover {
@include hover() {
color: $close-color;
text-decoration: none;
}

&:not(:disabled):not(.disabled) {
@include hover-focus {
@include hover-focus() {
opacity: .75;
}
}
Expand Down
2 changes: 1 addition & 1 deletion scss/bootstrap-core/_code.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
code {
@include font-size($code-font-size);
color: $code-color;
word-break: break-word;
word-wrap: break-word;

// Streamline the style when inside anchors to avoid broken underline and more
a > & {
Expand Down
Loading

0 comments on commit b6c684a

Please sign in to comment.