Make everything 16px and 32px

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

View File

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

View File

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

View File

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

View File

@@ -7,6 +7,8 @@
@old-base: #302B28;
@old-fore: #fafafa;
@main-font-size: 16px;
@cp-green: #46E981;
@cp-accent: lighten(@cp-green, 20%);
@@ -73,7 +75,7 @@
// 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-color: black;
@dropdown-bg-hover: #f1f1f1;
@@ -131,3 +133,5 @@
-ms-user-select: none;
user-select: none;
}
@toolbar-line-height: 32px;