Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
This commit is contained in:
commit
64849507b3
8 changed files with 23 additions and 17 deletions
|
@ -4,6 +4,7 @@
|
|||
@import "../less2/include/alertify.less";
|
||||
@import "../less2/include/colortheme.less";
|
||||
@import "../less2/include/modal.less";
|
||||
@import "../less2/include/font.less";
|
||||
@import "./bar.less";
|
||||
@import "./loading.less";
|
||||
@import "./dropdown.less";
|
||||
|
@ -12,6 +13,8 @@
|
|||
|
||||
@toolbar-green: #5cb85c;
|
||||
|
||||
.font_open-sans();
|
||||
|
||||
.alertify_main();
|
||||
|
||||
html.cp, .cp body {
|
||||
|
|
9
customize.dist/src/less2/include/font.less
Normal file
9
customize.dist/src/less2/include/font.less
Normal file
|
@ -0,0 +1,9 @@
|
|||
.font_neuropolitical () {
|
||||
@font-face {
|
||||
font-family: Neuropolitical;
|
||||
src: url(./customize/fonts/neuropolitical.ttf)
|
||||
}
|
||||
}
|
||||
.font_open-sans () {
|
||||
@import (once) '/customize/fonts/open-sans.less';
|
||||
}
|
|
@ -1,8 +1,6 @@
|
|||
@font-face {
|
||||
font-family: Neuropolitical;
|
||||
src: url(./customize/fonts/neuropolitical.ttf)
|
||||
}
|
||||
@import (once) '/customize/fonts/open-sans.less';
|
||||
@import (once) './include/font.less';
|
||||
.font_neuropolitical();
|
||||
.font_open-sans();
|
||||
|
||||
body.cp-page-index { @import "./pages/page-index.less"; }
|
||||
body.cp-page-contact { @import "./pages/page-contact.less"; }
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#register {
|
||||
margin-top: 16px;
|
||||
font-size: 1.25em;
|
||||
width: 30%;
|
||||
min-width: 30%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -84,7 +84,6 @@ body {
|
|||
width: 8px;
|
||||
top: 0;
|
||||
left: 0;
|
||||
z-index: 9999;
|
||||
|
||||
cursor: col-resize;
|
||||
}
|
||||
|
|
|
@ -624,7 +624,7 @@ define([
|
|||
}).appendTo(toolbar.$top);
|
||||
|
||||
// We need to override the "a" tag action here because it is inside the iframe!
|
||||
var inDrive = /^\/drive/;
|
||||
var inDrive = /^\/drive/.test(window.location.pathname);
|
||||
|
||||
var href = inDrive ? '/index.html' : '/drive/';
|
||||
var buttonTitle = inDrive ? Messages.header_homeTitle : Messages.header_logoTitle;
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
@content-bg: #fff;
|
||||
@content-bg-ro: darken(@content-bg, 10%);
|
||||
@content-fg: @tree-fg;
|
||||
@info-box-bg: #ddddff;
|
||||
@info-box-bg: #d2e1f2;
|
||||
@info-box-border: #bbb;
|
||||
@table-header-fg: #555;
|
||||
@table-header-bg: #e8e8e8;
|
||||
|
@ -380,19 +380,16 @@ span {
|
|||
margin-top: 10px;
|
||||
}
|
||||
.info-box {
|
||||
line-height: 40px;
|
||||
padding-left: 10px;
|
||||
margin: 10px auto;
|
||||
line-height: 2em;
|
||||
padding: 0.25em 0.75em;
|
||||
margin: 1em;
|
||||
background: @info-box-bg;
|
||||
border: 1px solid @info-box-border;
|
||||
border-radius: 5px;
|
||||
span {
|
||||
cursor: pointer;
|
||||
margin-left: 10px;
|
||||
float: right;
|
||||
margin-top: 0.5em;
|
||||
}
|
||||
&.noclose {
|
||||
padding-right: 10px;
|
||||
}
|
||||
}
|
||||
li {
|
||||
|
|
|
@ -116,7 +116,7 @@ table#table {
|
|||
|
||||
min-width: 80%;
|
||||
width: 80%;
|
||||
min-height: 5em;
|
||||
min-height: 7em;
|
||||
font-size: 20px;
|
||||
font-weight: bold;
|
||||
border: 1px solid black;
|
||||
|
|
Loading…
Reference in a new issue