diff --git a/assets/css/foundation.css b/assets/css/foundation.css index 7fc0d0f..036a36f 100644 --- a/assets/css/foundation.css +++ b/assets/css/foundation.css @@ -125,19 +125,20 @@ a { outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -a:not([href]) { +a:not([href]):not([tabindex]) { color: inherit; text-decoration: none; } - a:not([href]):focus, - a:not([href]):hover { + a:not([href]):not([tabindex]):focus, + a:not([href]):not([tabindex]):hover { color: inherit; text-decoration: none; } - a:not([href]):focus { + a:not([href]):not([tabindex]):focus { outline: none; } pre { margin-top: 0; - margin-bottom: 1rem; } + margin-bottom: 1rem; + overflow: auto; } figure { margin: 0 0 1rem; } @@ -160,6 +161,7 @@ textarea { touch-action: manipulation; } table { + border-collapse: collapse; background-color: transparent; } caption { @@ -188,6 +190,16 @@ textarea { line-height: inherit; border-radius: 0; } +input[type="radio"]:disabled, +input[type="checkbox"]:disabled { + cursor: not-allowed; } + +input[type="date"], +input[type="time"], +input[type="datetime-local"], +input[type="month"] { + -webkit-appearance: listbox; } + textarea { resize: vertical; } @@ -1801,7 +1813,7 @@ fieldset[disabled] a.btn { width: 100%; } .btn-block + .btn-block { - margin-top: 5px; } + margin-top: 0.5rem; } input[type="submit"].btn-block, input[type="reset"].btn-block, @@ -1828,7 +1840,6 @@ input[type="button"].btn-block { transition-property: height; } .bg-inverse { - color: #eceeef; background-color: #373a3c; } .bg-faded { @@ -1879,6 +1890,15 @@ a.bg-danger:hover { display: table; clear: both; } +.d-block { + display: block !important; } + +.d-inline-block { + display: inline-block !important; } + +.d-inline { + display: inline !important; } + .pull-xs-left { float: left !important; } @@ -1939,6 +1959,9 @@ a.bg-danger:hover { overflow: visible; clip: auto; } +.w-100 { + width: 100% !important; } + .m-x-auto { margin-right: auto !important; margin-left: auto !important; } diff --git a/assets/css/foundation.css.map b/assets/css/foundation.css.map index 1bdd643..d98f325 100644 Binary files a/assets/css/foundation.css.map and b/assets/css/foundation.css.map differ diff --git a/assets/css/main.css.map b/assets/css/main.css.map index c5fd5e5..b9cd477 100644 Binary files a/assets/css/main.css.map and b/assets/css/main.css.map differ diff --git a/assets/css/templates/photo.css.map b/assets/css/templates/photo.css.map index 43817c6..a3f69e0 100644 Binary files a/assets/css/templates/photo.css.map and b/assets/css/templates/photo.css.map differ diff --git a/assets/css/templates/project.css.map b/assets/css/templates/project.css.map index dab1794..a4283a1 100644 Binary files a/assets/css/templates/project.css.map and b/assets/css/templates/project.css.map differ diff --git a/assets/css/templates/projects.css b/assets/css/templates/projects.css index 68f4891..24637ad 100644 --- a/assets/css/templates/projects.css +++ b/assets/css/templates/projects.css @@ -47,7 +47,7 @@ margin-bottom: 0.75rem; background-color: #fff; border-radius: 0.25rem; - box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.125); } + border: 1px solid rgba(0, 0, 0, 0.125); } .card-block { padding: 1.25rem; } @@ -73,8 +73,8 @@ margin-left: 1.25rem; } .card > .list-group:first-child .list-group-item:first-child { - border-top-left-radius: 0.25rem; - border-top-right-radius: 0.25rem; } + border-top-right-radius: 0.25rem; + border-top-left-radius: 0.25rem; } .card > .list-group:last-child .list-group-item:last-child { border-bottom-right-radius: 0.25rem; @@ -83,7 +83,7 @@ .card-header { padding: 0.75rem 1.25rem; background-color: #f5f5f5; - box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.125); } + border-bottom: 1px solid rgba(0, 0, 0, 0.125); } .card-header::after { content: ""; display: table; @@ -94,7 +94,7 @@ .card-footer { padding: 0.75rem 1.25rem; background-color: #f5f5f5; - box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.125); } + border-top: 1px solid rgba(0, 0, 0, 0.125); } .card-footer::after { content: ""; display: table; @@ -107,8 +107,6 @@ margin-bottom: -0.75rem; margin-left: -0.625rem; border-bottom: 0; } - .card-header-tabs .nav-item { - margin-bottom: 0; } .card-header-pills { margin-right: -0.625rem; @@ -117,22 +115,37 @@ .card-primary { background-color: #0275d8; border-color: #0275d8; } + .card-primary .card-header, + .card-primary .card-footer { + background-color: transparent; } .card-success { background-color: #5cb85c; border-color: #5cb85c; } + .card-success .card-header, + .card-success .card-footer { + background-color: transparent; } .card-info { background-color: #5bc0de; border-color: #5bc0de; } + .card-info .card-header, + .card-info .card-footer { + background-color: transparent; } .card-warning { background-color: #f0ad4e; border-color: #f0ad4e; } + .card-warning .card-header, + .card-warning .card-footer { + background-color: transparent; } .card-danger { background-color: #d9534f; border-color: #d9534f; } + .card-danger .card-header, + .card-danger .card-footer { + background-color: transparent; } .card-outline-primary { background-color: transparent; @@ -160,7 +173,7 @@ .card-inverse .card-header, .card-inverse .card-footer { - border-bottom: 1px solid rgba(255, 255, 255, 0.2); } + border-color: rgba(255, 255, 255, 0.2); } .card-inverse .card-header, .card-inverse .card-footer, @@ -170,7 +183,8 @@ .card-inverse .card-link, .card-inverse .card-text, -.card-inverse .card-blockquote > footer { +.card-inverse .card-subtitle, +.card-inverse .card-blockquote .blockquote-footer { color: rgba(255, 255, 255, 0.65); } .card-inverse .card-link:focus, @@ -194,19 +208,23 @@ padding: 1.25rem; } .card-img-top { - border-radius: 0.25rem 0.25rem 0 0; } + border-top-right-radius: 0.25rem; + border-top-left-radius: 0.25rem; } .card-img-bottom { - border-radius: 0 0 0.25rem 0.25rem; } + border-bottom-right-radius: 0.25rem; + border-bottom-left-radius: 0.25rem; } @media (min-width: 544px) { .card-deck { display: table; + width: 100%; + margin-bottom: 0.75rem; table-layout: fixed; border-spacing: 1.25rem 0; } .card-deck .card { display: table-cell; - width: 1%; + margin-bottom: 0; vertical-align: top; } .card-deck-wrapper { margin-right: -1.25rem; diff --git a/assets/css/templates/projects.css.map b/assets/css/templates/projects.css.map index d78523e..e748c05 100644 Binary files a/assets/css/templates/projects.css.map and b/assets/css/templates/projects.css.map differ diff --git a/assets/css/templates/webdesign.css.map b/assets/css/templates/webdesign.css.map index ffd34be..71d6483 100644 Binary files a/assets/css/templates/webdesign.css.map and b/assets/css/templates/webdesign.css.map differ diff --git a/assets/scss/templates/home.scss b/assets/scss/templates/home.scss index f494e11..71cefa4 100644 --- a/assets/scss/templates/home.scss +++ b/assets/scss/templates/home.scss @@ -9,16 +9,16 @@ main { text-align: center; margin-top: 17%; margin-bottom: 20%; - + div.logo { font-family: 'Boon', "Verdana", "Arial", sans-serif; font-size: 24.5px; line-height: 1.2em; font-weight: 100; - + width: 11em; // more than needed, because of fallback fonts margin: 0 auto; - + span { color: $color_accent; font-weight: 400; @@ -26,18 +26,18 @@ main { padding-left: 0.1em; padding-right: 0.56em; } - &.surname { + &.surname { letter-spacing: -0.036em; } } - + } - + p { margin-top: 0.5em; font-size: 14px; letter-spacing: -0.02em; } - + } } diff --git a/assets/scss/templates/projects.scss b/assets/scss/templates/projects.scss index 940e556..300d2a4 100644 --- a/assets/scss/templates/projects.scss +++ b/assets/scss/templates/projects.scss @@ -26,7 +26,7 @@ main.projects { color: $color_font; text-decoration: none; } - + &.card-link { &:active, &:hover { text-decoration: underline; diff --git a/assets/scss/templates/webdesign.scss b/assets/scss/templates/webdesign.scss index d1d2ede..db0dd7e 100644 --- a/assets/scss/templates/webdesign.scss +++ b/assets/scss/templates/webdesign.scss @@ -21,7 +21,7 @@ main.webdesign { } .featurette { - + h2 { font-family: inherit; margin-top: 10px; diff --git a/assets/vendors/bootstrap b/assets/vendors/bootstrap index 1a6d0cc..4354e87 160000 --- a/assets/vendors/bootstrap +++ b/assets/vendors/bootstrap @@ -1 +1 @@ -Subproject commit 1a6d0cc446259cf86d73bf7437f2ca3b095f6781 +Subproject commit 4354e874840393418e13409e1c534c1b5bf55809