Skip to content

Commit

Permalink
Bump bootstrap from 4.1.0 to 4.1.1 -- has a few bugfixes and hides th…
Browse files Browse the repository at this point in the history
…e chatty and irrelevant (for us) deprecation warning on client build.
  • Loading branch information
dannon committed May 3, 2018
1 parent 618de01 commit 6a2c678
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 18 deletions.
4 changes: 2 additions & 2 deletions client/package.json
Expand Up @@ -16,7 +16,7 @@
"axios": "^0.17.0",
"backbone": "1.3",
"bibtex-parse-js": "^0.0.24",
"bootstrap": "^4.1.0",
"bootstrap": "^4.1.1",
"bootstrap-tour": "https://github.com/sorich87/bootstrap-tour.git#6a1028fb562f9aa68c451f0901f8cfeb43cad140",
"bootstrap-vue": "^2.0.0-rc.8",
"d3": "3",
Expand Down Expand Up @@ -95,8 +95,8 @@
"karma-polyfill": "^1.0.0",
"karma-qunit": "^1.2.1",
"karma-webpack": "^2.0.6",
"node-sass": "^4.8.3",
"mocha": "^5.0.5",
"node-sass": "^4.8.3",
"phantomjs-polyfill": "0.0.2",
"phantomjs-prebuilt": "^2.1.7",
"prettier": "^1.11.1",
Expand Down
6 changes: 5 additions & 1 deletion client/yarn.lock
Expand Up @@ -1411,10 +1411,14 @@ bootstrap@>=4.0.0-beta:
version "4.0.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0.tgz#ceb03842c145fcc1b9b4e15da2a05656ba68469a"

bootstrap@^4.0.0, bootstrap@^4.1.0:
bootstrap@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.0.tgz#110b05c31a236d56dbc9adcda6dd16f53738a28a"

bootstrap@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.1.tgz#3aec85000fa619085da8d2e4983dfd67cf2114cb"

boxen@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/boxen/-/boxen-0.5.1.tgz#5b73d8840eb7f3c8a155cbf69ed3ed68d4720014"
Expand Down
45 changes: 30 additions & 15 deletions static/style/blue/base.css
@@ -1,6 +1,6 @@
@charset "UTF-8";
/*!
* Bootstrap v4.1.0 (https://getbootstrap.com/)
* Bootstrap v4.1.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 Down Expand Up @@ -51,7 +51,7 @@ html {
@-ms-viewport {
width: device-width; }

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

body {
Expand Down Expand Up @@ -159,7 +159,7 @@ pre,
code,
kbd,
samp {
font-family: monospace, monospace;
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
font-size: 1em; }

pre {
Expand Down Expand Up @@ -414,12 +414,6 @@ mark,
font-size: 90%;
color: #868e96; }

code,
kbd,
pre,
samp {
font-family: Monaco, Menlo, Consolas, "Courier New", monospace; }

code {
font-size: 87.5%;
color: #e83e8c;
Expand Down Expand Up @@ -1504,6 +1498,11 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.custom-select.is-valid ~ .valid-tooltip {
display: block; }

.was-validated .form-control-file:valid ~ .valid-feedback,
.was-validated .form-control-file:valid ~ .valid-tooltip, .form-control-file.is-valid ~ .valid-feedback,
.form-control-file.is-valid ~ .valid-tooltip {
display: block; }

.was-validated .form-check-input:valid ~ .form-check-label, .form-check-input.is-valid ~ .form-check-label {
color: #25cf25; }

Expand Down Expand Up @@ -1581,6 +1580,11 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
.custom-select.is-invalid ~ .invalid-tooltip {
display: block; }

.was-validated .form-control-file:invalid ~ .invalid-feedback,
.was-validated .form-control-file:invalid ~ .invalid-tooltip, .form-control-file.is-invalid ~ .invalid-feedback,
.form-control-file.is-invalid ~ .invalid-tooltip {
display: block; }

.was-validated .form-check-input:invalid ~ .form-check-label, .form-check-input.is-invalid ~ .form-check-label {
color: #ef5f5b; }

Expand Down Expand Up @@ -2642,8 +2646,7 @@ button,
.input-group > .custom-file:not(:last-child) .custom-file-label::after {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
.input-group > .custom-file:not(:first-child) .custom-file-label,
.input-group > .custom-file:not(:first-child) .custom-file-label::after {
.input-group > .custom-file:not(:first-child) .custom-file-label {
border-top-left-radius: 0;
border-bottom-left-radius: 0; }

Expand Down Expand Up @@ -2826,11 +2829,12 @@ button:not(:first-child),
background-color: #e9ecef; }

.custom-control-label {
position: relative;
margin-bottom: 0; }
.custom-control-label::before {
position: absolute;
top: 0.25rem;
left: 0;
left: -1.5rem;
display: block;
width: 1rem;
height: 1rem;
Expand All @@ -2841,7 +2845,7 @@ button:not(:first-child),
.custom-control-label::after {
position: absolute;
top: 0.25rem;
left: 0;
left: -1.5rem;
display: block;
width: 1rem;
height: 1rem;
Expand Down Expand Up @@ -2967,7 +2971,7 @@ button:not(:first-child),
bottom: 0;
z-index: 3;
display: block;
height: calc(calc(1.875rem + 2px) - 1px * 2);
height: 1.875rem;
padding: 0.375rem 0.75rem;
line-height: 1.5;
color: #495057;
Expand Down Expand Up @@ -4563,6 +4567,7 @@ button.close {
margin-right: 3px;
margin-left: 3px;
text-indent: -999px;
cursor: pointer;
background-color: rgba(255, 255, 255, 0.5); }
.carousel-indicators li::before {
position: absolute;
Expand Down Expand Up @@ -6642,7 +6647,17 @@ a.text-dark:hover, a.text-dark:focus {
background-color: #fff !important; }
.table-bordered th,
.table-bordered td {
border: 1px solid #dee2e6 !important; } }
border: 1px solid #dee2e6 !important; }
.table-dark {
color: inherit; }
.table-dark th,
.table-dark td,
.table-dark thead th,
.table-dark tbody + tbody {
border-color: #bfbfbf; }
.table .thead-dark th, .ui-table-striped .thead-dark th {
color: inherit;
border-color: #bfbfbf; } }

/*!
* Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
Expand Down

0 comments on commit 6a2c678

Please sign in to comment.