Skip to content
This repository was archived by the owner on Oct 13, 2025. It is now read-only.

Clarkt/bootstrap v4 release upgrade #198

Merged
acn-dgopa merged 48 commits into from
Apr 6, 2018
Merged

Clarkt/bootstrap v4 release upgrade #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
0a1f279
initial setup of bootstrap beta3 so scss and js compile
clarkt Jan 10, 2018
9a47972
changed id for input-field
clarkt Jan 11, 2018
11e6500
removed thilde from version in some dependencies
clarkt Jan 11, 2018
8891228
updated all display properties for pages with different breakpoints
clarkt Jan 15, 2018
3239f4a
updated bootstrap to release version, using the bundled bootstrap.js …
clarkt Jan 23, 2018
f2f2532
fixed template for popover, as class for content had changed, making …
clarkt Jan 23, 2018
b857b67
added pointer events to buttons for closing modal.
clarkt Jan 23, 2018
a940709
merged master into branch
clarkt Jan 23, 2018
76b13ca
changed d-block to d-inline for icons
clarkt Jan 23, 2018
beafa31
merge conflicts
mrosvik Feb 5, 2018
2092239
fixed checkboxes with new html and css
mrosvik Feb 6, 2018
9b47d66
fixed radiobuttons with new html and css
mrosvik Feb 7, 2018
bbf0bf6
merge with master
mrosvik Feb 7, 2018
1626b3a
changed d-md-block to d-md-inline to make footer look correct
mrosvik Feb 7, 2018
2c05599
Moved data-parent from header to content to make accordion work corre…
mrosvik Feb 8, 2018
5d87d0f
merge
mrosvik Feb 8, 2018
4bad33c
changed d-md-block to d-md-inline to make footer on altinnett look co…
mrosvik Feb 8, 2018
f45fc6c
Merge branch 'master' of https://github.com/Altinn/DesignSystem into …
mrosvik Feb 8, 2018
1cf7f99
css fix for input focus and language arrow
mrosvik Feb 12, 2018
767770e
Merge branch 'master' of https://github.com/Altinn/DesignSystem into …
mrosvik Feb 12, 2018
8420556
grid fix, popover padding, badge color
mrosvik Feb 13, 2018
e7cf166
Merge branch 'master' of https://github.com/Altinn/DesignSystem into …
mrosvik Feb 13, 2018
eac26eb
fix for breadcrumb truncate lines
mrosvik Feb 13, 2018
bfe0110
Merge branch 'master' of https://github.com/Altinn/DesignSystem into …
mrosvik Feb 13, 2018
6fd6d8d
fix for a-js-feedbackToggle
mrosvik Feb 13, 2018
2475d35
merge
mrosvik Feb 13, 2018
afb2908
had to add important to display none on hr to overwrite bootstrap cla…
mrosvik Feb 14, 2018
222ed87
merge
mrosvik Feb 14, 2018
56a5f6e
new html structure for nav tabs that looks like radio buttons
mrosvik Feb 14, 2018
181a03a
1o5 spacer was turning one space into 18 instead of 12
mrosvik Feb 14, 2018
acaf910
fixes to make aktorvalg look correct
mrosvik Feb 15, 2018
ed829ca
fixes for innboks, profil and klientdelegering
mrosvik Feb 15, 2018
e2575af
removed tether stuff, fixed some popovers
clarkt Feb 16, 2018
0283da4
changed to inline for labels so they are not block elements
clarkt Feb 19, 2018
76f72c2
replaced old input classes with new ones
mrosvik Feb 20, 2018
ae742d8
new arhived-checkbox for patternlab header that works with bootstrap 4
mrosvik Feb 20, 2018
9027f8e
merge with master
mrosvik Feb 20, 2018
3faaa2f
css from styleguidekit fix for checkbox arhived components
mrosvik Feb 20, 2018
ba6e37e
removed d-inline for checkbox archived components
mrosvik Feb 20, 2018
b98641f
Merge branch 'clarkt/bootstrap-beta3-upgrade' of https://github.com/A…
clarkt Feb 21, 2018
f8cd302
had to add important to some style to override inline styles from popper
clarkt Feb 22, 2018
316471d
styled arrow for new popovers
mrosvik Feb 22, 2018
94422ca
Merge branch 'clarkt/bootstrap-beta3-upgrade' of https://github.com/A…
mrosvik Feb 22, 2018
65b9f18
styled arrow for popovers left and right
mrosvik Feb 22, 2018
862dafc
updated package-lock.json
clarkt Mar 20, 2018
50dee4f
merged master and updated changes into branch
clarkt Mar 20, 2018
808aaf3
changed classname so it targets correct element
clarkt Mar 21, 2018
cb042c0
fixed label for bootstrap version, isrequired for checkboxes, and cha…
clarkt Apr 5, 2018
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
2 changes: 1 addition & 1 deletion .csscomb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,4 @@
],
[ "$include media-breakpoint-up" ]
]
}
}
24 changes: 8 additions & 16 deletions config/gulp/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
{
"filename": "portal.vendor.js",
"files": [
"node_modules/tether/dist/js/tether.js",
"node_modules/bootstrap/dist/js/bootstrap.js",
"node_modules/bootstrap/dist/js/bootstrap.bundle.js",
"node_modules/anchor-js/anchor.js",
"node_modules/mark.js/dist/jquery.mark.js",
"node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js",
Expand Down Expand Up @@ -80,8 +79,7 @@
{
"filename": "infoportal.vendor.js",
"files": [
"node_modules/tether/dist/js/tether.js",
"node_modules/bootstrap/dist/js/bootstrap.js",
"node_modules/bootstrap/dist/js/bootstrap.bundle.js",
"node_modules/anchor-js/anchor.js",
"node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js",
"node_modules/jquery-validation/dist/jquery.validate.js",
Expand Down Expand Up @@ -145,8 +143,7 @@
{
"filename": "infoportal-frontpage.vendor.js",
"files": [
"node_modules/tether/dist/js/tether.js",
"node_modules/bootstrap/dist/js/bootstrap.js",
"node_modules/bootstrap/dist/js/bootstrap.bundle.js",
"node_modules/jquery-validation/dist/jquery.validate.js",
"node_modules/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js",
"node_modules/jquery-ui/ui/data.js",
Expand Down Expand Up @@ -218,8 +215,7 @@
{
"filename": "altinnett.vendor.js",
"files": [
"node_modules/tether/dist/js/tether.js",
"node_modules/bootstrap/dist/js/bootstrap.js",
"node_modules/bootstrap/dist/js/bootstrap.bundle.js",
"node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js",
"node_modules/truncate.js/dist/truncate.js"
]
Expand Down Expand Up @@ -256,8 +252,7 @@
{
"filename": "brreg.vendor.js",
"files": [
"node_modules/tether/dist/js/tether.js",
"node_modules/bootstrap/dist/js/bootstrap.js"
"node_modules/bootstrap/dist/js/bootstrap.bundle.js"
]
}
]
Expand All @@ -271,8 +266,7 @@
{
"filename": "altinnPrototyping.vendor.js",
"files": [
"node_modules/tether/dist/js/tether.js",
"node_modules/bootstrap/dist/js/bootstrap.js",
"node_modules/bootstrap/dist/js/bootstrap.bundle.js",
"node_modules/anchor-js/anchor.js",
"node_modules/clipboard/dist/clipboard.js",
"node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js",
Expand Down Expand Up @@ -378,8 +372,7 @@
{
"filename": "altinnettPrototyping.vendor.js",
"files": [
"node_modules/tether/dist/js/tether.js",
"node_modules/bootstrap/dist/js/bootstrap.js",
"node_modules/bootstrap/dist/js/bootstrap.bundle.js",
"node_modules/truncate.js/dist/truncate.js",
"node_modules/mark.js/dist/jquery.mark.js",
"node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js"
Expand Down Expand Up @@ -419,8 +412,7 @@
{
"filename": "brregPrototyping.vendor.js",
"files": [
"node_modules/tether/dist/js/tether.js",
"node_modules/bootstrap/dist/js/bootstrap.js",
"node_modules/bootstrap/dist/js/bootstrap.bundle.js",
"node_modules/truncate.js/dist/truncate.js"
]
},
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ gulp.task('pl-copy:distribution-fonts', function(done) {
gulp.src('./source/fortAwesome/kit-altinn-no-ed31cded.zip')
.pipe(decompress({strip: 0}))
.pipe(gulp.dest('./dist/fonts/icons/ai/'));

gulp.src('./source/fortAwesome/kit-altinn-reg-no-df832575.zip')
.pipe(decompress({strip: 0}))
.pipe(gulp.dest('./dist/fonts/icons/reg/'));
Expand Down
Loading