From 716245f8646f939acc2da74e112f3b622de0137b Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 15 May 2017 16:16:50 +0200 Subject: [PATCH] Make all the buttons look the same --- customize.dist/main.css | 1 + customize.dist/src/less/dropdown.less | 1 + customize.dist/src/less/toolbar.less | 15 ++++++++++++--- customize.dist/src/less/variables.less | 2 +- customize.dist/toolbar.css | 12 ++++++++++-- www/drive/file.css | 9 ++++++++- www/drive/file.less | 12 +++++++++--- www/pad/inner.html | 1 + 8 files changed, 43 insertions(+), 10 deletions(-) diff --git a/customize.dist/main.css b/customize.dist/main.css index d54ec6a98..0f2de7ab9 100644 --- a/customize.dist/main.css +++ b/customize.dist/main.css @@ -413,6 +413,7 @@ font-family: FontAwesome; } .dropdown-bar button .fa-caret-down { + margin-right: 0px; margin-left: 5px; } .dropdown-bar .dropdown-bar-content { diff --git a/customize.dist/src/less/dropdown.less b/customize.dist/src/less/dropdown.less index 79a7edbec..2d93bba8b 100644 --- a/customize.dist/src/less/dropdown.less +++ b/customize.dist/src/less/dropdown.less @@ -18,6 +18,7 @@ button { .fa-caret-down{ + margin-right: 0px; margin-left: 5px; } } diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less index d3aed088c..15ab91911 100644 --- a/customize.dist/src/less/toolbar.less +++ b/customize.dist/src/less/toolbar.less @@ -28,7 +28,10 @@ box-sizing: border-box; padding: 0px 6px; - .fa {font-family: FontAwesome;} + .fa { + font: normal normal normal 14px/1 FontAwesome; + font-family: FontAwesome; + } .unselectable; @@ -42,7 +45,10 @@ } button { - font-size: @toolbar-button-font-size; + font: @toolbar-button-font; + * { + font: @toolbar-button-font; + } &#shareButton, &.buttonSuccess { // Bootstrap 4 colors color: #fff; @@ -84,7 +90,7 @@ // Bootstrap 4 colors (btn-secondary) border: 1px solid transparent; border-radius: .25rem; - color: #292b2c; + color: #000; background-color: #fff; border-color: #ccc; &:hover { @@ -166,6 +172,7 @@ margin: 3px; vertical-align: top; box-sizing: content-box; + text-align: center; span { display: inline-block; width: 4px; @@ -233,6 +240,7 @@ padding-right: 5px; padding-left: 5px; margin: 3px 2px; + box-sizing: border-box; } .dropdown-bar-content { @@ -493,6 +501,7 @@ margin: 8px; line-height: 16px; font-size: 16px; + text-align: center; } .cryptpad-readonly { margin-right: 5px; diff --git a/customize.dist/src/less/variables.less b/customize.dist/src/less/variables.less index 8bf6dc502..43bcb393b 100644 --- a/customize.dist/src/less/variables.less +++ b/customize.dist/src/less/variables.less @@ -72,7 +72,7 @@ @toolbar-gradient-start: #f5f5f5; @toolbar-gradient-end: #DDDDDD; -@toolbar-button-font-size: 12px; +@toolbar-button-font: 12px Ubuntu, Arial, sans-serif; @topbar-back: #fff; @topbar-color: #000; diff --git a/customize.dist/toolbar.css b/customize.dist/toolbar.css index d08954236..3d7e0df0b 100644 --- a/customize.dist/toolbar.css +++ b/customize.dist/toolbar.css @@ -7,6 +7,7 @@ font-family: FontAwesome; } .dropdown-bar button .fa-caret-down { + margin-right: 0px; margin-left: 5px; } .dropdown-bar .dropdown-bar-content { @@ -112,19 +113,23 @@ z-index: 9001; } .cryptpad-toolbar .fa { + font: normal normal normal 14px/1 FontAwesome; font-family: FontAwesome; } .cryptpad-toolbar a { float: right; } .cryptpad-toolbar button { - font-size: 12px; + font: 12px Ubuntu, Arial, sans-serif; border: 1px solid transparent; border-radius: .25rem; - color: #292b2c; + color: #000; background-color: #fff; border-color: #ccc; } +.cryptpad-toolbar button * { + font: 12px Ubuntu, Arial, sans-serif; +} .cryptpad-toolbar button#shareButton, .cryptpad-toolbar button.buttonSuccess { color: #fff; @@ -240,6 +245,7 @@ margin: 3px; vertical-align: top; box-sizing: content-box; + text-align: center; } .cryptpad-toolbar .cryptpad-lag span { display: inline-block; @@ -315,6 +321,7 @@ padding-right: 5px; padding-left: 5px; margin: 3px 2px; + box-sizing: border-box; } .cryptpad-toolbar .dropdown-bar-content { margin-top: -3px; @@ -567,6 +574,7 @@ margin: 8px; line-height: 16px; font-size: 16px; + text-align: center; } .cryptpad-readonly { margin-right: 5px; diff --git a/www/drive/file.css b/www/drive/file.css index 0868dae98..946167d43 100644 --- a/www/drive/file.css +++ b/www/drive/file.css @@ -467,7 +467,14 @@ span.fa-folder-open { } #driveToolbar button { height: 24px; - font-size: 12px; + font: 12px Ubuntu, Arial, sans-serif; +} +#driveToolbar button span { + font: 12px Ubuntu, Arial, sans-serif; +} +#driveToolbar button .fa, +#driveToolbar button.fa { + font-family: FontAwesome; } #driveToolbar button.element { border-radius: 2px; diff --git a/www/drive/file.less b/www/drive/file.less index 138f6eec2..7ea8ecb97 100644 --- a/www/drive/file.less +++ b/www/drive/file.less @@ -1,3 +1,5 @@ +@import "../../customize.dist/src/less/variables.less"; + @tree-bg: #fff; @tree-fg: #000; @tree-lines-col: #888; @@ -23,8 +25,6 @@ @toolbar-path-bg: #fff; @toolbar-path-border: #888; -@button-font-size: 12px; - @size-mobile: 600px; /* PAGE */ @@ -536,7 +536,13 @@ span { button { height: 24px; - font-size: @button-font-size; + font: @toolbar-button-font; + span { + font: @toolbar-button-font; + } + .fa, &.fa { + font-family: FontAwesome; + } &.element { border-radius: 2px; background: @toolbar-button-bg; diff --git a/www/pad/inner.html b/www/pad/inner.html index 9d649f85e..c43af938c 100644 --- a/www/pad/inner.html +++ b/www/pad/inner.html @@ -12,6 +12,7 @@ } #cke_1_top { overflow: visible; + padding: 0 6px; } #cke_1_toolbox { display: inline-block;