Skip to content

Commit

Permalink
Merge branch 'release/3.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Thejuse committed Jan 11, 2019
2 parents a925188 + b218840 commit 5767a7c
Show file tree
Hide file tree
Showing 49 changed files with 1,974 additions and 715 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [3.2.1] - 2019-01-11
### Updated
- Bootstrap v. 4.1.3 -> 4.2.1

## [3.2.0] - 2018-12-13
### Changed
- Bootstrap 4.1.3 SCSS-Source
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ You need an Less Compiler like [Prepros](https://prepros.io/) or [CodeKit](https
* Bootstrap & jQuery

## Licence
Copyright (c) 2018 [Julian Seidl](https://www.jseidl.at)
Copyright (c) 2017-2019 [Julian Seidl](https://www.jseidl.at)
Licensed under the [GNU 3.0](LICENCE)
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap Reboot v4.1.3 (https://getbootstrap.com/)
* Bootstrap Reboot v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
Expand All @@ -15,22 +15,16 @@ html {
font-family: sans-serif;
line-height: 1.15;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
-ms-overflow-style: scrollbar;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}

@-ms-viewport {
width: device-width;
}

article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
display: block;
}

body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-size: 1rem;
font-weight: 400;
line-height: 1.5;
Expand Down Expand Up @@ -66,6 +60,7 @@ abbr[data-original-title] {
text-decoration: underline dotted;
cursor: help;
border-bottom: 0;
text-decoration-skip-ink: none;
}

address {
Expand Down Expand Up @@ -101,10 +96,6 @@ blockquote {
margin: 0 0 1rem;
}

dfn {
font-style: italic;
}

b,
strong {
font-weight: bolder;
Expand Down Expand Up @@ -134,7 +125,6 @@ a {
color: #007bff;
text-decoration: none;
background-color: transparent;
-webkit-text-decoration-skip: objects;
}

a:hover {
Expand Down Expand Up @@ -168,7 +158,6 @@ pre {
margin-top: 0;
margin-bottom: 1rem;
overflow: auto;
-ms-overflow-style: scrollbar;
}

figure {
Expand Down Expand Up @@ -237,7 +226,7 @@ select {
}

button,
html [type="button"],
[type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
Expand Down Expand Up @@ -302,7 +291,6 @@ progress {
-webkit-appearance: none;
}

[type="search"]::-webkit-search-cancel-button,
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
Expand Down
Loading

0 comments on commit 5767a7c

Please sign in to comment.