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

Use the same font-size for all the toolbar buttons

Browse Source
This commit is contained in:
yflory
2017-05-15 14:46:17 +02:00
parent 8172f117a7
commit 48496416e7
5 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@
} }
button { button {
font-size: @toolbar-button-font-size;
&#shareButton, &.buttonSuccess { &#shareButton, &.buttonSuccess {
// Bootstrap 4 colors // Bootstrap 4 colors
color: #fff; color: #fff;

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

@@ -72,6 +72,7 @@
@toolbar-gradient-start: #f5f5f5; @toolbar-gradient-start: #f5f5f5;
@toolbar-gradient-end: #DDDDDD; @toolbar-gradient-end: #DDDDDD;
@toolbar-button-font-size: 14px;
@topbar-back: #fff; @topbar-back: #fff;
@topbar-color: #000; @topbar-color: #000;

1
customize.dist/toolbar.css
View File

@@ -118,6 +118,7 @@
float: right; float: right;
} }
.cryptpad-toolbar button { .cryptpad-toolbar button {
font-size: 14px;
border: 1px solid transparent; border: 1px solid transparent;
border-radius: .25rem; border-radius: .25rem;
color: #292b2c; color: #292b2c;

16
www/drive/file.css
View File

@@ -450,7 +450,7 @@ span.fa-folder-open {
#driveToolbar { #driveToolbar {
background: #ddd; background: #ddd;
color: #555; color: #555;
height: 40px; height: 30px;
display: flex; display: flex;
flex-flow: row; flex-flow: row;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
@@ -458,6 +458,7 @@ span.fa-folder-open {
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
z-index: 100; z-index: 100;
box-sizing: content-box; box-sizing: content-box;
padding: 0 6px;
/* The container <div> - needed to position the dropdown content */ /* The container <div> - needed to position the dropdown content */
} }
#driveToolbar .newPadContainer { #driveToolbar .newPadContainer {
@@ -465,24 +466,25 @@ span.fa-folder-open {
height: 100%; height: 100%;
} }
#driveToolbar button { #driveToolbar button {
height: 26px; height: 24px;
font-size: 14px;
} }
#driveToolbar button.element { #driveToolbar button.element {
border-radius: 2px; border-radius: 2px;
background: #888; background: #888;
color: #eee; color: #eee;
font-size: 16px; font-size: 14px;
border: none; border: 1px solid #888;
font-weight: bold; font-weight: bold;
} }
#driveToolbar button.element:hover { #driveToolbar button.element:hover {
box-shadow: 0px 0px 2px #000; background: #777;
} }
#driveToolbar button.new { #driveToolbar button.new {
padding: 0 5px; padding: 0 5px;
} }
#driveToolbar .dropdown-bar { #driveToolbar .dropdown-bar {
margin: 5px 5px; margin: 2px 2px;
line-height: 1em; line-height: 1em;
position: relative; position: relative;
display: inline-block; display: inline-block;
@@ -516,7 +518,7 @@ span.fa-folder-open {
#driveToolbar .path { #driveToolbar .path {
display: inline-block; display: inline-block;
height: 100%; height: 100%;
line-height: 40px; line-height: 30px;
cursor: default; cursor: default;
width: auto; width: auto;
overflow: hidden; overflow: hidden;

20
www/drive/file.less
View File

@@ -17,10 +17,14 @@
@toolbar-fg: #555; @toolbar-fg: #555;
@toolbar-border-col: #ccc; @toolbar-border-col: #ccc;
@toolbar-button-bg: #888; @toolbar-button-bg: #888;
@toolbar-button-border: #888;
@toolbar-button-bg-hover: #777;
@toolbar-button-fg: #eee; @toolbar-button-fg: #eee;
@toolbar-path-bg: #fff; @toolbar-path-bg: #fff;
@toolbar-path-border: #888; @toolbar-path-border: #888;
@button-font-size: 14px;
@size-mobile: 600px; @size-mobile: 600px;
/* PAGE */ /* PAGE */
@@ -515,7 +519,7 @@ span {
#driveToolbar { #driveToolbar {
background: @toolbar-bg; background: @toolbar-bg;
color: @toolbar-fg; color: @toolbar-fg;
height: 40px; height: 30px;
display: flex; display: flex;
flex-flow: row; flex-flow: row;
border-top: 1px solid @toolbar-border-col; border-top: 1px solid @toolbar-border-col;
@@ -523,6 +527,7 @@ span {
box-shadow: 0 2px 4px rgba(0,0,0,0.2); box-shadow: 0 2px 4px rgba(0,0,0,0.2);
z-index: 100; z-index: 100;
box-sizing: content-box; box-sizing: content-box;
padding: 0 6px;
.newPadContainer { .newPadContainer {
display: inline-block; display: inline-block;
@@ -530,16 +535,17 @@ span {
} }
button { button {
height: 26px; height: 24px;
font-size: @button-font-size;
&.element { &.element {
border-radius: 2px; border-radius: 2px;
background: @toolbar-button-bg; background: @toolbar-button-bg;
color: @toolbar-button-fg; color: @toolbar-button-fg;
font-size: 16px; font-size: 14px;
border: none; border: 1px solid @toolbar-button-border;
font-weight: bold; font-weight: bold;
&:hover { &:hover {
box-shadow: 0px 0px 2px #000; background: @toolbar-button-bg-hover;
} }
} }
&.new { &.new {
@@ -548,7 +554,7 @@ span {
} }
/* The container <div> - needed to position the dropdown content */ /* The container <div> - needed to position the dropdown content */
.dropdown-bar { .dropdown-bar {
margin: 5px 5px; margin: 2px 2px;
line-height: 1em; line-height: 1em;
position: relative; position: relative;
display: inline-block; display: inline-block;
@@ -583,7 +589,7 @@ span {
.path { .path {
display: inline-block; display: inline-block;
height: 100%; height: 100%;
line-height: 40px; line-height: 30px;
cursor: default; cursor: default;
width: auto; width: auto;
overflow: hidden; overflow: hidden;