web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
ansuz 2017-08-11 14:26:34 +02:00
commit 64849507b3
8 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
customize.dist/src/less/cryptpad.less
View File

@ -4,6 +4,7 @@
@import "../less2/include/alertify.less"; @import "../less2/include/alertify.less";
@import "../less2/include/colortheme.less"; @import "../less2/include/colortheme.less";
@import "../less2/include/modal.less"; @import "../less2/include/modal.less";
@import "../less2/include/font.less";
@import "./bar.less"; @import "./bar.less";
@import "./loading.less"; @import "./loading.less";
@import "./dropdown.less"; @import "./dropdown.less";
@ -12,6 +13,8 @@
@toolbar-green: #5cb85c; @toolbar-green: #5cb85c;
.font_open-sans();
.alertify_main(); .alertify_main();
html.cp, .cp body { html.cp, .cp body {

9
customize.dist/src/less2/include/font.less Normal file
View 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';
}

8
customize.dist/src/less2/main.less
View File

@ -1,8 +1,6 @@
@font-face { @import (once) './include/font.less';
font-family: Neuropolitical; .font_neuropolitical();
src: url(./customize/fonts/neuropolitical.ttf) .font_open-sans();
}
@import (once) '/customize/fonts/open-sans.less';
body.cp-page-index { @import "./pages/page-index.less"; } body.cp-page-index { @import "./pages/page-index.less"; }
body.cp-page-contact { @import "./pages/page-contact.less"; } body.cp-page-contact { @import "./pages/page-contact.less"; }

2
customize.dist/src/less2/pages/page-register.less
View File

@ -19,7 +19,7 @@
#register { #register {
margin-top: 16px; margin-top: 16px;
font-size: 1.25em; font-size: 1.25em;
width: 30%; min-width: 30%;
} }
} }
} }

1
www/code/code.less
View File

@ -84,7 +84,6 @@ body {
width: 8px; width: 8px;
top: 0; top: 0;
left: 0; left: 0;
z-index: 9999;
cursor: col-resize; cursor: col-resize;
} }

2
www/common/toolbar2.js
View File

@ -624,7 +624,7 @@ define([
}).appendTo(toolbar.$top); }).appendTo(toolbar.$top);
// We need to override the "a" tag action here because it is inside the iframe! // 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 href = inDrive ? '/index.html' : '/drive/';
var buttonTitle = inDrive ? Messages.header_homeTitle : Messages.header_logoTitle; var buttonTitle = inDrive ? Messages.header_homeTitle : Messages.header_logoTitle;

13
www/drive/file.less
View File

@ -11,7 +11,7 @@
@content-bg: #fff; @content-bg: #fff;
@content-bg-ro: darken(@content-bg, 10%); @content-bg-ro: darken(@content-bg, 10%);
@content-fg: @tree-fg; @content-fg: @tree-fg;
@info-box-bg: #ddddff; @info-box-bg: #d2e1f2;
@info-box-border: #bbb; @info-box-border: #bbb;
@table-header-fg: #555; @table-header-fg: #555;
@table-header-bg: #e8e8e8; @table-header-bg: #e8e8e8;
@ -380,19 +380,16 @@ span {
margin-top: 10px; margin-top: 10px;
} }
.info-box { .info-box {
line-height: 40px; line-height: 2em;
padding-left: 10px; padding: 0.25em 0.75em;
margin: 10px auto; margin: 1em;
background: @info-box-bg; background: @info-box-bg;
border: 1px solid @info-box-border;
border-radius: 5px;
span { span {
cursor: pointer; cursor: pointer;
margin-left: 10px;
float: right; float: right;
margin-top: 0.5em;
} }
&.noclose { &.noclose {
padding-right: 10px;
} }
} }
li { li {

2
www/poll/poll.less
View File

@ -116,7 +116,7 @@ table#table {
min-width: 80%; min-width: 80%;
width: 80%; width: 80%;
min-height: 5em; min-height: 7em;
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
border: 1px solid black; border: 1px solid black;