Merge branch 'bar' into staging

customize.dist/loading.js

@@ -13,7 +13,8 @@ define([], function () {
   right: 0px;
   background: linear-gradient(to right, #326599 0%, #326599 50%, #4591c4 50%, #4591c4 100%);
   color: #fafafa;
-  font-size: 1.5em;
+  font-size: 1.3em;
+  line-height: 120%;
   opacity: 1;
   display: flex;
   flex-flow: column;
@@ -77,13 +78,11 @@ define([], function () {
     background: #FFF;
     padding: 20px;
     width: 100%;
-    color: #000;
-    text-align: center;
+    color: #3F4141;
+    text-align: left;
     display: none;
 }
-#cp-loading-password-prompt {
-    font-size: 18px;
-}
+
 #cp-loading-password-prompt .cp-password-error {
     color: white;
     background: #9e0000;
@@ -94,24 +93,49 @@ define([], function () {
     text-align: left;
     margin-bottom: 15px;
 }
+p.cp-password-info{
+    text-align: left;
+}
 #cp-loading-password-prompt .cp-password-form {
     display: flex;
-    justify-content: space-around;
     flex-wrap: wrap;
 }
-#cp-loading-password-prompt .cp-password-form button,
-#cp-loading-password-prompt .cp-password-form .cp-password-input {
+#cp-loading-password-prompt .cp-password-form button{
     background-color: #4591c4;
     color: white;
     border: 1px solid #4591c4;
 }
+
+.cp-password-input{
+    font-size:16px;
+    border: 1px solid #4591c4;
+    background-color: white;
+    border-radius 0;
+}
+
+.cp-password-form button{
+    padding: 8px 12px;
+    font-weight: bold;
+    text-transform: uppercase;
+}
+
+#cp-loading-password-prompt .cp-password-form{
+    width: 100%;
+}
+
 #cp-loading-password-prompt .cp-password-form .cp-password-container {
     flex-shrink: 1;
     min-width: 0;
 }
+
+#cp-loading-password-prompt .cp-password-form .cp-password-container .cp-password-reveal{
+    color: #4591c4;
+    padding: 0px 24px;
+}
+
 #cp-loading-password-prompt .cp-password-form input {
     flex: 1;
-    padding: 0 5px;
+    padding: 12px;
     min-width: 0;
     text-overflow: ellipsis;
 }
@@ -119,7 +143,7 @@ define([], function () {
     background-color: #326599;
 }
 #cp-loading-password-prompt ::placeholder {
-    color: #d9d9d9;
+    color: #999999;
     opacity: 1;
 }
 #cp-loading-password-prompt :-ms-input-placeholder {
@@ -154,7 +178,7 @@ define([], function () {
   background: #222;
   color: #fafafa;
   text-align: center;
-  font-size: 1.5em;
+  font-size: 1.3em;
   opacity: 0.7;
   font-family: 'Open Sans', 'Helvetica Neue', sans-serif;
   padding: 15px;
@@ -201,6 +225,19 @@ define([], function () {
     animation-timing-function: cubic-bezier(.6,0.15,0.4,0.85);
 }
 
+button.primary{
+    border: 1px solid #4591c4;
+    padding: 8px 12px;
+    text-transform: uppercase;
+    background-color: #4591c4;
+    color: white;
+    font-weight: bold;
+}
+
+button.primary:hover{
+    background-color: rgb(52, 118, 162);
+}
+
 */}).toString().slice(14, -3);
     var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; });
     var elem = document.createElement('div');

customize.dist/src/less2/include/modals-ui-elements.less

@@ -14,6 +14,9 @@
         .radio-group {
             display: flex;
             flex-direction: row;
+            &:not(:last-child){
+                margin-bottom: 8px;
+            }
             .cp-radio {
                 margin-right: 30px;
             }

customize.dist/src/less2/include/toolbar.less

@@ -97,6 +97,12 @@
 
     .ckeditor_fix();
 
+    .cp-burn-after-reading {
+        text-align: center;
+        font-size: @colortheme_app-font-size !important;
+        margin: 0 !important;
+    }
+
     .cp-markdown-toolbar {
         height: @toolbar_line-height;
         background-color: @toolbar-bg-color-l20;