Merge pull request #6815 from NuGet/dev

[ReleasePrep][2019.01.14]RI of dev into master
NuGet · Jan 13, 2019 · 7a0ed71 · 7a0ed71
2 parents 3e5a968 + 06e5747
commit 7a0ed71
Show file tree

Hide file tree

Showing 20 changed files with 836 additions and 450 deletions.
diff --git a/src/Bootstrap/dist/css/bootstrap-theme.css b/src/Bootstrap/dist/css/bootstrap-theme.css
diff --git a/src/Bootstrap/dist/js/bootstrap.js b/src/Bootstrap/dist/js/bootstrap.js
@@ -1,6 +1,6 @@
 /*!
  * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2018 Twitter, Inc.
+ * Copyright 2011-2019 Twitter, Inc.
  * Licensed under the MIT license
  */
 

diff --git a/src/Bootstrap/less/theme/base.less b/src/Bootstrap/less/theme/base.less
@@ -1,5 +1,6 @@
 //== Theme Variables
 @panel-footer-color:  @navbar-inverse-color;
+@default-margin-bottom: 24px;
 
 //== Theme Definition
 html, body {
@@ -11,7 +12,7 @@ body {
   display: table;
 
   h1, h2, h3, p {
-    margin-bottom: 24px;
+    margin-bottom: @default-margin-bottom;
   }
 
   h2, h3 {

diff --git a/src/Bootstrap/less/theme/page-upload.less b/src/Bootstrap/less/theme/page-upload.less
@@ -2,4 +2,13 @@
     #browse-for-package-button {
         margin: 0;
     }
+
+    pre.license-file-contents {
+        white-space: pre-wrap;
+        word-break: normal;
+    }
+
+    .custom-license-container {
+        margin-bottom: @default-margin-bottom;
+    }
 }