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

Merge branch 'newdrive' into staging

Browse Source
This commit is contained in:
yflory
2017-09-27 10:28:16 +02:00
parent 767027b237 cdeac00633
commit b4de31c827
38 changed files with 4447 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
customize.dist/src/less/mixins.less
View File

@@ -1,4 +1,5 @@
@import "/customize/src/less/variables.less";
@import (once) "/customize/src/less2/include/tools.less";
.fontface(@family, @src, @style: normal, @weight: 400, @fmt: 'truetype'){
@font-face {
@@ -39,26 +40,6 @@
background: linear-gradient(@start, @end); /* Standard syntax */
}
.placeholderColor (@color) {
&::-webkit-input-placeholder { /* WebKit, Blink, Edge */
color: @color;;
}
&:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
color: @color;
opacity: 1;
}
&::-moz-placeholder { /* Mozilla Firefox 19+ */
color: @color;
opacity: 1;
}
&:-ms-input-placeholder { /* Internet Explorer 10-11 */
color: @color;
}
&::-ms-input-placeholder { /* Microsoft Edge */
color: @color;
}
}
.avatar (@width) {
&.avatar {
overflow: hidden;
@@ -83,7 +64,7 @@
box-sizing: content-box;
}
.default {
.unselectable();
.tools_unselectable();
background: white;
color: black;
font-size: @width/1.2;
@@ -122,7 +103,7 @@
}
.leftsideCategory {
.unselectable();
.tools_unselectable();
padding: 5px 20px;
margin: 15px 0;
cursor: pointer;

9
customize.dist/src/less/sidebar-layout.less
View File

@@ -1,10 +1,11 @@
@import '/customize/src/less/variables.less';
@import '/customize/src/less/mixins.less';
@import (once) "/customize/src/less2/include/colortheme.less";
@leftside-bg: #eee;
@leftside-color: #000;
@rightside-color: #000;
@description-color: #777;
@leftside-bg: @colortheme_sidebar-left-bg;
@leftside-color: @colortheme_sidebar-left-fg;
@rightside-color: @colortheme_sidebar-right-fg;
@description-color: @colortheme_sidebar-description;
@button-width: 400px;

4
customize.dist/src/less2/include/avatar.less
View File

@@ -1,3 +1,5 @@
@import (once) "./tools.less";
.avatar_main (@width) {
&.cp-avatar {
overflow: hidden;
@@ -16,7 +18,7 @@
box-sizing: content-box;
}
.cp-avatar-default {
.unselectable();
.tools_unselectable();
background: white;
color: black;
font-size: @width/1.2;

10
customize.dist/src/less2/include/colortheme.less
View File

@@ -75,6 +75,16 @@
@colortheme_todo-bg: #7bccd1;
@colortheme_todo-color: #000;
// Sidebar layout
@colortheme_sidebar-active: #fff;
@colortheme_sidebar-left-bg: #eee;
@colortheme_sidebar-left-fg: #000;
@colortheme_sidebar-left-branch: #888;
@colortheme_sidebar-right-bg: #fff;
@colortheme_sidebar-right-fg: #000;
@colortheme_sidebar-description: #777;
@cryptpad_color_blue: #4591C4;
@cryptpad_color_grey: #999999;
@cryptpad_header_col: #1E1F1F;

3
customize.dist/src/less2/include/dropdown.less
View File

@@ -1,4 +1,5 @@
@import (once) "./colortheme.less";
@import (once) "./tools.less";
/* The container <div> - needed to position the dropdown content */
.dropdown_main () {
@@ -17,7 +18,7 @@
margin-left: 5px;
}
* {
.unselectable();
.tools_unselectable();
cursor: default;
}
}

23
customize.dist/src/less2/include/leftside-menu.less Normal file
View File

@@ -0,0 +1,23 @@
@import (once) "./unselectable.less";
@import (once) "./variables.less";
@import (once) "./colortheme.less";
.leftside-menu_main() {
}
.leftside-menu-category_main() {
.unselectable_make();
padding: 5px 20px;
margin: 15px 0;
cursor: pointer;
height: @variables_bar-height;
line-height: @variables_bar-height - 10px;
.fa {
width: 25px;
}
&:hover {
background: rgba(0,0,0,0.05);
}
&.cp-leftside-active {
background: @colortheme_sidebar-active;
}
}

58
customize.dist/src/less2/include/limit-bar.less Normal file
View File

@@ -0,0 +1,58 @@
@import (once) "./colortheme.less";
.limit-bar_main () {
.cp-limit-container {
@colortheme_green: #5cb85c;
display: inline-flex;
flex-flow: column-reverse;
width: 100%;
margin-top: 20px;
.cp-limit-bar {
display: inline-block;
max-width: 100%;
margin: 3px;
box-sizing: border-box;
border: 1px solid #999;
background: white;
position: relative;
text-align: center;
vertical-align: middle;
width: ~"calc(100% - 6px)";
height: 25px;
line-height: 25px;
overflow: hidden;
.cp-limit-usage {
height: 100%;
display: inline-block;
background: blue;
position: absolute;
left: 0;
z-index:1; // .usage
&.cp-limit-usage-normal {
background: @colortheme_green;
}
&.cp-limit-usage-warning {
background: orange;
}
&.cp-limit-usage-above {
background: red;
}
}
.cp-limit-usage-text {
position: relative;
color: black;
text-shadow: 1px 0 2px white, 0 1px 2px white, -1px 0 2px white, 0 -1px 2px white;
z-index: 2; // .usageText
font-size: @colortheme_app-font-size;
font-weight: bold;
}
}
.cp-limit-upgrade {
padding: 0;
line-height: 25px;
height: 25px;
margin: 0 3px;
border-radius: 0;
}
}
}

13
customize.dist/src/less2/include/tokenfield.less
View File

@@ -1,15 +1,8 @@
@import (once) "./tools.less";
.tokenfield_main () {
.tokenfield {
.unselectable () {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.unselectable();
.tools_unselectable();
height: auto;
min-height: 34px;
padding-bottom: 0px;

14
customize.dist/src/less2/include/toolbar.less
View File

@@ -5,6 +5,7 @@
@import (once) "./avatar.less";
@import (once) "./toolbar-history.less";
@import (once) "./icon-colors.less";
@import (once) "./tools.less";
.toolbar_main () {
@@ -13,15 +14,6 @@
@toolbar_top-height: 64px;
@toolbar_button-font: @colortheme_app-font;
.unselectable () {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.dropdown_main();
.ckeditor_fix();
.history_main();
@@ -270,7 +262,7 @@
font-family: FontAwesome;
}
.unselectable();
.tools_unselectable();
font: @toolbar_button-font;
width: 100%;
@@ -289,7 +281,7 @@
button {
transition: all 0.15s;
.unselectable();
.tools_unselectable();
&.cp-toolbar-hidden {
display: none;
}

27
customize.dist/src/less2/include/tools.less Normal file
View File

@@ -0,0 +1,27 @@
.tools_placeholder-color (@color) {
&::-webkit-input-placeholder { /* WebKit, Blink, Edge */
color: @color;;
}
&:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
color: @color;
opacity: 1;
}
&::-moz-placeholder { /* Mozilla Firefox 19+ */
color: @color;
opacity: 1;
}
&:-ms-input-placeholder { /* Internet Explorer 10-11 */
color: @color;
}
&::-ms-input-placeholder { /* Microsoft Edge */
color: @color;
}
}
.tools_unselectable () {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
}

13
customize.dist/src/less2/include/unselectable.less Normal file
View File

@@ -0,0 +1,13 @@
.unselectable_make() {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
}
.unselectable_main() {
.cp-unselectable {
.unselectable_make();
}
}

3
customize.dist/src/less2/include/variables.less Normal file
View File

@@ -0,0 +1,3 @@
// Elements size
@variables_bar-height: 32px;

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

@@ -22,6 +22,7 @@ html.cp-app-print {
.app-print_main();
}
body.cp-app-drive { @import "../../../newdrive/app-drive.less"; }
body.cp-app-pad { @import "../../../pad/app-pad.less"; }
body.cp-app-code { @import "../../../code/app-code.less"; }
body.cp-app-slide { @import "../../../slide/app-slide.less"; }