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

Make everything 16px and 32px

Browse Source
This commit is contained in:
yflory
2017-07-11 15:34:46 +02:00
parent 16d0527e92
commit 42075e4b5f
5 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -610,7 +610,7 @@ noscript {
color: black; color: black;
text-shadow: 1px 0 2px white, 0 1px 2px white, -1px 0 2px white, 0 -1px 2px white; text-shadow: 1px 0 2px white, 0 1px 2px white, -1px 0 2px white, 0 -1px 2px white;
z-index: 2; z-index: 2;
font-size: 16px; font-size: @main-font-size;
font-weight: bold; font-weight: bold;
} }
} }

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

@@ -1,3 +1,5 @@
@import "/customize/src/less/variables.less";
.fontface(@family, @src, @style: normal, @weight: 400, @fmt: 'truetype'){ .fontface(@family, @src, @style: normal, @weight: 400, @fmt: 'truetype'){
@font-face { @font-face {
font-family: @family; font-family: @family;
@@ -123,8 +125,10 @@
padding: 5px 20px; padding: 5px 20px;
margin: 15px 0; margin: 15px 0;
cursor: pointer; cursor: pointer;
height: @toolbar-line-height;
line-height: @toolbar-line-height - 10px;
.fa { .fa {
width: 20px; width: 25px;
} }
&:hover { &:hover {
background: rgba(0,0,0,0.05); background: rgba(0,0,0,0.05);

34
customize.dist/src/less/toolbar.less
View File

@@ -57,7 +57,7 @@
} }
body .userlist-drawer { body .userlist-drawer {
font: normal normal normal 16px Arial,Helvetica,Tahoma,Verdana,Sans-Serif; font: normal normal normal @main-font-size Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
min-width: 175px; min-width: 175px;
width: 175px; width: 175px;
display: block; display: block;
@@ -96,7 +96,7 @@ body .userlist-drawer {
} }
& > p { & > p {
font: normal normal normal 16px Arial,Helvetica,Tahoma,Verdana,Sans-Serif; font: normal normal normal @main-font-size Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
margin: 0; margin: 0;
padding: 0; padding: 0;
display: block; display: block;
@@ -145,7 +145,7 @@ body {
} }
} }
.cryptpad-spinner, .cryptpad-state { .cryptpad-spinner, .cryptpad-state {
font-size: 16px; font-size: @main-font-size;
color: @color; color: @color;
} }
.cryptpad-limit { .cryptpad-limit {
@@ -472,7 +472,7 @@ body .cryptpad-toolbar {
} }
button, select, .rightside-element { button, select, .rightside-element {
height: 32px; height: @toolbar-line-height;
box-sizing: border-box; box-sizing: border-box;
padding: 3px 10px; padding: 3px 10px;
margin: 0; margin: 0;
@@ -582,7 +582,7 @@ body .cryptpad-toolbar {
flex: auto; flex: auto;
width: 100%; width: 100%;
order: 10; order: 10;
height: 32px; height: @toolbar-line-height;
line-height: initial; line-height: initial;
margin: 0; margin: 0;
.hoverable { .hoverable {
@@ -593,24 +593,24 @@ body .cryptpad-toolbar {
display: inline-block; display: inline-block;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 16px; font-size: @main-font-size;
height: 32px; height: @toolbar-line-height;
box-sizing: border-box; box-sizing: border-box;
line-height: 20px; line-height: 20px;
} }
.pencilIcon, .saveIcon { .pencilIcon, .saveIcon {
box-sizing: border-box; box-sizing: border-box;
height: 32px; height: @toolbar-line-height;
line-height: 16px; line-height: @main-font-size;
display: inline-block; display: inline-block;
.fa { .fa {
font-size: 16px; font-size: @main-font-size;
} }
} }
input { input {
height: 32px; height: @toolbar-line-height;
font-size: 16px; font-size: @main-font-size;
flex: 1; flex: 1;
max-width: none; max-width: none;
} }
@@ -795,7 +795,7 @@ body .cryptpad-toolbar {
vertical-align: top; vertical-align: top;
} }
.cryptpad-upgrade { .cryptpad-upgrade {
height: 32px; height: @toolbar-line-height;
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
} }
@@ -848,7 +848,7 @@ body .cryptpad-toolbar {
} }
} }
.cryptpad-toolbar-leftside { .cryptpad-toolbar-leftside {
height: 32px; height: @toolbar-line-height;
&:empty { &:empty {
height: 0; height: 0;
} }
@@ -883,7 +883,7 @@ body .cryptpad-toolbar {
} }
} }
.cryptpad-toolbar-rightside { .cryptpad-toolbar-rightside {
min-height: 32px; min-height: @toolbar-line-height;
overflow: hidden; overflow: hidden;
&:empty { &:empty {
min-height: 0; min-height: 0;
@@ -903,7 +903,7 @@ body .cryptpad-toolbar {
box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2); box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2);
position: absolute; position: absolute;
right:0px; right:0px;
margin-top: 32px; margin-top: @toolbar-line-height;
min-width: 50px; min-width: 50px;
background: @dropdown-bg; background: @dropdown-bg;
display: flex; display: flex;
@@ -916,7 +916,7 @@ body .cryptpad-toolbar {
&> span { &> span {
box-sizing: border-box; box-sizing: border-box;
min-width: 150px; min-width: 150px;
height: 32px; height: @toolbar-line-height;
border-radius: 0; border-radius: 0;
border: 0; border: 0;
} }

6
customize.dist/src/less/variables.less
View File

@@ -7,6 +7,8 @@
@old-base: #302B28; @old-base: #302B28;
@old-fore: #fafafa; @old-fore: #fafafa;
@main-font-size: 16px;
@cp-green: #46E981; @cp-green: #46E981;
@cp-accent: lighten(@cp-green, 20%); @cp-accent: lighten(@cp-green, 20%);
@@ -73,7 +75,7 @@
// Dropdown // Dropdown
@dropdown-font: 16px -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; @dropdown-font: @main-font-size -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
@dropdown-bg: #f9f9f9; @dropdown-bg: #f9f9f9;
@dropdown-color: black; @dropdown-color: black;
@dropdown-bg-hover: #f1f1f1; @dropdown-bg-hover: #f1f1f1;
@@ -131,3 +133,5 @@
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
} }
@toolbar-line-height: 32px;

36
www/drive/file.less
View File

@@ -37,7 +37,7 @@ html, body {
padding: 0; padding: 0;
margin: 0; margin: 0;
position: relative; position: relative;
font-size: 16px; font-size: @main-font-size;
overflow: auto; overflow: auto;
} }
@@ -93,8 +93,6 @@ div:focus {
} }
.fa { .fa {
/*min-width: 17px;*/
margin-right: 3px;
font-family: FontAwesome; font-family: FontAwesome;
} }
@@ -111,17 +109,13 @@ li {
user-select: none; user-select: none;
} }
.folder, .file {
margin-right: 5px;
}
.contextMenu { .contextMenu {
display: none; display: none;
position: absolute; position: absolute;
z-index: 500; z-index: 500;
li { li {
padding: 0; padding: 0;
font-size: 16px; font-size: @main-font-size;
a { a {
cursor: pointer; cursor: pointer;
} }
@@ -164,7 +158,7 @@ span {
#tree { #tree {
font-size: 16px; font-size: @main-font-size;
//border-right: 1px solid #ccc; //border-right: 1px solid #ccc;
box-sizing: border-box; box-sizing: border-box;
background: @tree-bg; background: @tree-bg;
@@ -207,7 +201,7 @@ span {
.leftsideCategory(); .leftsideCategory();
width: ~"calc(100% + 5px)"; width: ~"calc(100% + 5px)";
margin: 0; margin: 0;
margin-bottom: -5px; margin-bottom: -6px;
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
margin-left: -5px; margin-left: -5px;
@@ -272,7 +266,7 @@ span {
border: 0; border: 0;
border-right: 1px solid lighten(@toolbar-drive-bg, 16%); border-right: 1px solid lighten(@toolbar-drive-bg, 16%);
//border-right: 0; //border-right: 0;
height: 32px; height: @toolbar-line-height;
padding: 0 5px; padding: 0 5px;
padding-left: 45px; padding-left: 45px;
&:focus { &:focus {
@@ -620,7 +614,7 @@ span {
//flex-flow: row; //flex-flow: row;
z-index: 100; z-index: 100;
box-sizing: border-box; box-sizing: border-box;
height: 32px; height: @toolbar-line-height;
padding: 0; padding: 0;
display: flex; display: flex;
flex-flow: row; flex-flow: row;
@@ -649,20 +643,20 @@ span {
margin: 0; margin: 0;
} }
button { button {
height: 32px; height: @toolbar-line-height;
padding: 0 10px; padding: 0 10px;
border: none; border: none;
border-radius: 0; border-radius: 0;
box-sizing: border-box; box-sizing: border-box;
background: transparent; background: transparent;
font-size: 17px; font-size: @main-font-size;
color: @toolbar-drive-color; color: @toolbar-drive-color;
transition: all 0.15s; transition: all 0.15s;
.drawer { .drawer {
display: none; display: none;
} }
.fa, span { .fa, span {
font-size: 17px; font-size: @main-font-size;
} }
&:hover { &:hover {
background: @toolbar-drive-bg; background: @toolbar-drive-bg;
@@ -695,7 +689,7 @@ span {
} }
.buttonTitle { .buttonTitle {
display: inline-flex; display: inline-flex;
height: 32px; height: @toolbar-line-height;
align-items: center; align-items: center;
span:not(.fa) { span:not(.fa) {
line-height: 23px; line-height: 23px;
@@ -727,8 +721,8 @@ span {
.path { .path {
flex: 1; flex: 1;
width: 100%; width: 100%;
height: 32px; height: @toolbar-line-height;
line-height: 32px; line-height: @toolbar-line-height;
cursor: default; cursor: default;
width: auto; width: auto;
overflow: hidden; overflow: hidden;
@@ -738,9 +732,9 @@ span {
text-align: left; text-align: left;
.element { .element {
display: inline-block; display: inline-block;
height: 32px; height: @toolbar-line-height;
line-height: 32px; line-height: @toolbar-line-height;
font-size: 17px; font-size: @main-font-size;
padding: 0 5px; padding: 0 5px;
border: 0; border: 0;
background: darken(@toolbar-drive-bg, 10%); background: darken(@toolbar-drive-bg, 10%);