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

Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin

Browse Source
This commit is contained in:
ansuz 2017-10-09 17:20:23 +02:00
commit 128c9c2f4e
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
customize.dist/pages.js
View File

@ -558,8 +558,7 @@ define([
placeholder: Msg.login_password, placeholder: Msg.login_password,
}), }),
h('div.extra', [ h('div.extra', [
h('button.login.first.btn', Msg.login_login), h('button.login.first.btn', Msg.login_login)
h('button#register.btn.register.cp-login-register', Msg.login_register)
]) ])
]) ])
]), ]),

16
customize.dist/src/less2/pages/page-login.less
View File

@ -54,19 +54,11 @@
} }
.extra { .extra {
margin-top: 1em; margin-top: 1em;
.cp-login-register {
color: @cryptpad_color_blue;
background: #fff;
border: 2px solid @cryptpad_color_blue;
border-radius: 0;
&:hover {
transform: scale(1.05);
}
}
.login { .login {
background: transparent; background: @cryptpad_color_blue;
color: @cryptpad_color_blue; color: #fff;
padding: 0; padding: 10px;
border-radius: 0;
&:hover { &:hover {
transform: scale(1.05); transform: scale(1.05);
} }

2
www/slide/slide.js
View File

@ -83,7 +83,7 @@ define([
var c = Slide.content; var c = Slide.content;
var m = '<span class="cp-app-slide-container"><span class="'+slideClass+'">'+DiffMd.render(c).replace(separatorReg, '</span></span><span class="cp-app-slide-container"><span class="'+slideClass+'">')+'</span></span>'; var m = '<span class="cp-app-slide-container"><span class="'+slideClass+'">'+DiffMd.render(c).replace(separatorReg, '</span></span><span class="cp-app-slide-container"><span class="'+slideClass+'">')+'</span></span>';
DiffMd.apply(m, $content); try { DiffMd.apply(m, $content); } catch (e) { return console.error(e); }
var length = getNumberOfSlides(); var length = getNumberOfSlides();
$modal.find('style.cp-app-slide-style').remove(); $modal.find('style.cp-app-slide-style').remove();