infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Smaller palette in whiteboard

pull/1/head
yflory 2020-03-25 16:33:45 +01:00
parent 9aaddea148
commit dcfd9c5a73
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
www/whiteboard/app-whiteboard.less
View File

@ -123,23 +123,28 @@
.middle;
z-index: 100;
background: white;
display: flex;
justify-content: space-between;
display: flex;
flex-shrink: 1;
flex-wrap: wrap;
min-width: 0;
max-width: 300px;
padding: 10px;
span.cp-app-whiteboard-palette-color {
height: 4vw;
width: 4vw;
height: 30px;
width: 30px;
display: block;
margin: 5px;
border: 1px solid black;
border: 1px solid #bbb;
vertical-align: top;
border-radius: 50%;
cursor: pointer;
transition: transform 0.1s;
&:hover {
transform: scale(1.2);
transform: scale(1.1);
}
}
}

6
www/whiteboard/inner.js
View File

@ -511,13 +511,13 @@ define([
}),
h('span#cp-app-whiteboard-opacity-val', '100%')
]),
h('span.cp-app-whiteboard-selected.cp-app-whiteboard-unselectable', [
h('div.cp-app-whiteboard-selected.cp-app-whiteboard-unselectable', [
h('img', {
title: Messages.canvas_currentBrush
})
])
]),
UI.setHTML(h('div#cp-app-whiteboard-colors'), ' '),
]),
UI.setHTML(h('div#cp-app-whiteboard-colors'), ' '),
h('div#cp-app-whiteboard-cursors', {
style: {
display: 'none',