resolve merge conflicts
This commit is contained in:
ansuz
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,6 +28,11 @@
|
||||
td {
|
||||
padding: @upload_pad_h @upload_pad_v;
|
||||
}
|
||||
.cp-fileupload-table-link {
|
||||
.fa {
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
.cp-fileupload-table-progress {
|
||||
width: 200px;
|
||||
position: relative;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
.font_neuropolitical () {
|
||||
@font-face {
|
||||
font-family: Neuropolitical;
|
||||
src: url(./customize/fonts/neuropolitical.ttf)
|
||||
src: url(/customize/fonts/neuropolitical.ttf)
|
||||
}
|
||||
}
|
||||
.font_open-sans () {
|
||||
|
||||
23
customize.dist/src/less2/include/leftside-menu.less
Normal file
23
customize.dist/src/less2/include/leftside-menu.less
Normal 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
58
customize.dist/src/less2/include/limit-bar.less
Normal 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,23 +1,17 @@
|
||||
@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;
|
||||
&.focus {
|
||||
border-color: #66afe9;
|
||||
outline: 0;
|
||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, 0.6);
|
||||
}
|
||||
background-color: unset;
|
||||
border: none;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
padding: 0 10px;
|
||||
.token {
|
||||
box-sizing: border-box;
|
||||
border-radius: 3px;
|
||||
@@ -25,8 +19,9 @@
|
||||
border: 1px solid #d9d9d9;
|
||||
background-color: #ededed;
|
||||
white-space: nowrap;
|
||||
margin: -1px 5px 5px 0;
|
||||
vertical-align: center;
|
||||
margin: 10px 5px;
|
||||
height: 24px;
|
||||
vertical-align: middle;
|
||||
cursor: default;
|
||||
|
||||
color: #222;
|
||||
@@ -50,17 +45,17 @@
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
padding-left: 4px;
|
||||
vertical-align: center;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.close {
|
||||
font-family: Arial;
|
||||
display: inline-block;
|
||||
line-height: 100%;
|
||||
line-height: 24px;
|
||||
font-size: 1.1em;
|
||||
margin-left: 5px;
|
||||
float: none;
|
||||
height: 100%;
|
||||
vertical-align: center;
|
||||
vertical-align: middle;
|
||||
padding-right: 4px;
|
||||
}
|
||||
&.active {
|
||||
@@ -73,11 +68,10 @@
|
||||
}
|
||||
.token-input {
|
||||
background: none;
|
||||
width: 0%; //60px;
|
||||
min-width: 60px;
|
||||
flex: 1;
|
||||
border: 0;
|
||||
padding: 0;
|
||||
margin-bottom: 6px;
|
||||
margin: 0 !important; // Override alertify
|
||||
box-shadow: none;
|
||||
max-width: 100%;
|
||||
&:focus {
|
||||
@@ -86,9 +80,5 @@
|
||||
box-shadow: none;
|
||||
}
|
||||
}
|
||||
&.disabled {
|
||||
cursor: not-allowed;
|
||||
background-color: #eeeeee;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@import (once) "./colortheme.less";
|
||||
|
||||
.history_main () {
|
||||
body .cp-toolbar-history {
|
||||
.cp-toolbar-history {
|
||||
display: none;
|
||||
text-align: center;
|
||||
* {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -658,6 +650,14 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
p.cp-toolbar-account {
|
||||
&> span {
|
||||
font-weight: bold;
|
||||
span {
|
||||
font-weight: normal;
|
||||
}
|
||||
}
|
||||
}
|
||||
.cp-toolbar-backup {
|
||||
margin: 0;
|
||||
border-radius: 0;
|
||||
|
||||
27
customize.dist/src/less2/include/tools.less
Normal file
27
customize.dist/src/less2/include/tools.less
Normal 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
13
customize.dist/src/less2/include/unselectable.less
Normal 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
3
customize.dist/src/less2/include/variables.less
Normal file
@@ -0,0 +1,3 @@
|
||||
// Elements size
|
||||
@variables_bar-height: 32px;
|
||||
|
||||
@@ -40,7 +40,7 @@ The CSS inside of loading.js is precompiled in order to save 200ish milliseconds
|
||||
}
|
||||
#cp-loading-tip {
|
||||
position: fixed;
|
||||
z-index: 100000; // loading tip
|
||||
z-index: 10000000; // loading tip
|
||||
top: 80%;
|
||||
left: 0;
|
||||
right: 0;
|
||||
|
||||
@@ -22,10 +22,13 @@ html.cp-app-print {
|
||||
.app-print_main();
|
||||
}
|
||||
|
||||
body.cp-app-drive { @import "../../../drive/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"; }
|
||||
body.cp-app-file { @import "../../../file/app-file.less"; }
|
||||
body.cp-app-filepicker { @import "../../../filepicker/app-filepicker.less"; }
|
||||
body.cp-app-contacts { @import "../../../contacts/app-contacts.less"; }
|
||||
//body.cp-app-poll { @import "../../../poll/app-poll.less"; }
|
||||
body.cp-app-whiteboard { @import "../../../whiteboard/app-whiteboard.less"; }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user