diff options
Merge pull request #86 from picturepan2/hotfix/fixes
Hotfix/fixes
6 files changed, 34 insertions, 40 deletions
| -rw-r--r-- | src/base.less | 1 | ||||
| -rw-r--r-- | src/layout.less | 3 | ||||
| -rw-r--r-- | src/navbar.less | 13 | ||||
| -rw-r--r-- | src/normalize.less | 45 | ||||
| -rw-r--r-- | src/toasts.less | 2 | ||||
| -rw-r--r-- | src/variables.less | 10 |
diff --git a/src/base.less b/src/base.less index 3b5856c..c5f08eb 100644 --- a/src/base.less +++ b/src/base.less @@ -33,7 +33,6 @@ a { opacity: .75; pointer-events: none; } - // Icons .btn, .toast, diff --git a/src/layout.less b/src/layout.less index 17dcb84..f27c7bb 100644 --- a/src/layout.less +++ b/src/layout.less @@ -34,6 +34,9 @@ padding-right: 0; } } + &.col-multiline { + flex-wrap: wrap; + } } .column { flex: 1; diff --git a/src/navbar.less b/src/navbar.less deleted file mode 100644 index 2fa4eac..0000000 --- a/src/navbar.less +++ /dev/null @@ -1,13 +0,0 @@ -// Navbar -.navbar { - align-items: center; - display: flex; - justify-content: space-between; - padding: 1rem; - - .navbar-brand { - font-size: 2rem; - text-decoration: none; - vertical-align: middle; - } -}
\ No newline at end of file diff --git a/src/normalize.less b/src/normalize.less index 80c11fd..1cef7e9 100644 --- a/src/normalize.less +++ b/src/normalize.less @@ -1,14 +1,16 @@ -/*! normalize.css v4.1.1 | MIT License | github.com/necolas/normalize.css */ +/*! normalize.css v4.2.0 | MIT License | github.com/necolas/normalize.css */ /** * 1. Change the default font family in all browsers (opinionated). - * 2. Prevent adjustments of font size after orientation changes in IE and iOS. + * 2. Correct the line height in all browsers. + * 3. Prevent adjustments of font size after orientation changes in IE and iOS. */ html { font-family: sans-serif; /* 1 */ - -webkit-text-size-adjust: 100%; /* 2 */ - -ms-text-size-adjust: 100%; /* 2 */ + line-height: 1.15; /* 2 */ + -ms-text-size-adjust: 100%; /* 3 */ + -webkit-text-size-adjust: 100%; /* 3 */ } /** @@ -30,19 +32,16 @@ body { article, aside, -details, -/* 1 */ +details, /* 1 */ figcaption, figure, footer, header, -main, -/* 2 */ +main, /* 2 */ menu, nav, section, -summary { - /* 1 */ +summary { /* 1 */ display: block; } @@ -79,8 +78,7 @@ progress { * 1. Add the correct display in IE. */ -template, -/* 1 */ +template, /* 1 */ [hidden] { display: none; } @@ -118,8 +116,8 @@ a:hover { abbr[title] { border-bottom: none; /* 1 */ - text-decoration: underline dotted; /* 2 */ text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ } /** @@ -155,7 +153,7 @@ dfn { h1 { font-size: 2em; - margin: .67em 0; + margin: 0.67em 0; } /** @@ -189,11 +187,11 @@ sup { } sub { - bottom: -.25em; + bottom: -0.25em; } sup { - top: -.5em; + top: -0.5em; } /* Embedded content @@ -281,8 +279,7 @@ optgroup { */ button, -input { - /* 1 */ +input { /* 1 */ overflow: visible; } @@ -292,8 +289,7 @@ input { */ button, -select { - /* 1 */ +select { /* 1 */ text-transform: none; } @@ -304,8 +300,7 @@ select { */ button, -html [type="button"], -/* 1 */ +html [type="button"], /* 1 */ [type="reset"], [type="submit"] { -webkit-appearance: button; /* 2 */ @@ -341,7 +336,7 @@ button:-moz-focusring, fieldset { border: 1px solid #c0c0c0; margin: 0 2px; - padding: .35em .625em .75em; + padding: 0.35em 0.625em 0.75em; } /** @@ -413,7 +408,7 @@ textarea { ::-webkit-input-placeholder { color: inherit; - opacity: .54; + opacity: 0.54; } /** @@ -424,4 +419,4 @@ textarea { ::-webkit-file-upload-button { -webkit-appearance: button; /* 1 */ font: inherit; /* 2 */ -} +}
\ No newline at end of file diff --git a/src/toasts.less b/src/toasts.less index 2ca5487..2384b94 100644 --- a/src/toasts.less +++ b/src/toasts.less @@ -24,7 +24,7 @@ &.toast-success, &.toast-danger { .btn-clear { - color: #fff; + color: @core-light-color; } } } diff --git a/src/variables.less b/src/variables.less index 89e4fc0..24efa9f 100644 --- a/src/variables.less +++ b/src/variables.less @@ -43,6 +43,16 @@ background: @color; border-color: darken(@color, 2%); color: @core-light-color; + + a { + color: @core-light-color; + + &:hover, + &:focus, + &:active { + opacity: .75; + } + } } .label-base() { border-radius: .2rem; |