Make all the buttons look the same

This commit is contained in:
yflory 2017-05-15 16:16:50 +02:00
parent 0f37d9def7
commit 716245f864
8 changed files with 43 additions and 10 deletions

View File

@ -413,6 +413,7 @@
font-family: FontAwesome; font-family: FontAwesome;
} }
.dropdown-bar button .fa-caret-down { .dropdown-bar button .fa-caret-down {
margin-right: 0px;
margin-left: 5px; margin-left: 5px;
} }
.dropdown-bar .dropdown-bar-content { .dropdown-bar .dropdown-bar-content {

View File

@ -18,6 +18,7 @@
button { button {
.fa-caret-down{ .fa-caret-down{
margin-right: 0px;
margin-left: 5px; margin-left: 5px;
} }
} }

View File

@ -28,7 +28,10 @@
box-sizing: border-box; box-sizing: border-box;
padding: 0px 6px; padding: 0px 6px;
.fa {font-family: FontAwesome;} .fa {
font: normal normal normal 14px/1 FontAwesome;
font-family: FontAwesome;
}
.unselectable; .unselectable;
@ -42,7 +45,10 @@
} }
button { button {
font-size: @toolbar-button-font-size; font: @toolbar-button-font;
* {
font: @toolbar-button-font;
}
&#shareButton, &.buttonSuccess { &#shareButton, &.buttonSuccess {
// Bootstrap 4 colors // Bootstrap 4 colors
color: #fff; color: #fff;
@ -84,7 +90,7 @@
// Bootstrap 4 colors (btn-secondary) // Bootstrap 4 colors (btn-secondary)
border: 1px solid transparent; border: 1px solid transparent;
border-radius: .25rem; border-radius: .25rem;
color: #292b2c; color: #000;
background-color: #fff; background-color: #fff;
border-color: #ccc; border-color: #ccc;
&:hover { &:hover {
@ -166,6 +172,7 @@
margin: 3px; margin: 3px;
vertical-align: top; vertical-align: top;
box-sizing: content-box; box-sizing: content-box;
text-align: center;
span { span {
display: inline-block; display: inline-block;
width: 4px; width: 4px;
@ -233,6 +240,7 @@
padding-right: 5px; padding-right: 5px;
padding-left: 5px; padding-left: 5px;
margin: 3px 2px; margin: 3px 2px;
box-sizing: border-box;
} }
.dropdown-bar-content { .dropdown-bar-content {
@ -493,6 +501,7 @@
margin: 8px; margin: 8px;
line-height: 16px; line-height: 16px;
font-size: 16px; font-size: 16px;
text-align: center;
} }
.cryptpad-readonly { .cryptpad-readonly {
margin-right: 5px; margin-right: 5px;

View File

@ -72,7 +72,7 @@
@toolbar-gradient-start: #f5f5f5; @toolbar-gradient-start: #f5f5f5;
@toolbar-gradient-end: #DDDDDD; @toolbar-gradient-end: #DDDDDD;
@toolbar-button-font-size: 12px; @toolbar-button-font: 12px Ubuntu, Arial, sans-serif;
@topbar-back: #fff; @topbar-back: #fff;
@topbar-color: #000; @topbar-color: #000;

View File

@ -7,6 +7,7 @@
font-family: FontAwesome; font-family: FontAwesome;
} }
.dropdown-bar button .fa-caret-down { .dropdown-bar button .fa-caret-down {
margin-right: 0px;
margin-left: 5px; margin-left: 5px;
} }
.dropdown-bar .dropdown-bar-content { .dropdown-bar .dropdown-bar-content {
@ -112,19 +113,23 @@
z-index: 9001; z-index: 9001;
} }
.cryptpad-toolbar .fa { .cryptpad-toolbar .fa {
font: normal normal normal 14px/1 FontAwesome;
font-family: FontAwesome; font-family: FontAwesome;
} }
.cryptpad-toolbar a { .cryptpad-toolbar a {
float: right; float: right;
} }
.cryptpad-toolbar button { .cryptpad-toolbar button {
font-size: 12px; font: 12px Ubuntu, Arial, sans-serif;
border: 1px solid transparent; border: 1px solid transparent;
border-radius: .25rem; border-radius: .25rem;
color: #292b2c; color: #000;
background-color: #fff; background-color: #fff;
border-color: #ccc; border-color: #ccc;
} }
.cryptpad-toolbar button * {
font: 12px Ubuntu, Arial, sans-serif;
}
.cryptpad-toolbar button#shareButton, .cryptpad-toolbar button#shareButton,
.cryptpad-toolbar button.buttonSuccess { .cryptpad-toolbar button.buttonSuccess {
color: #fff; color: #fff;
@ -240,6 +245,7 @@
margin: 3px; margin: 3px;
vertical-align: top; vertical-align: top;
box-sizing: content-box; box-sizing: content-box;
text-align: center;
} }
.cryptpad-toolbar .cryptpad-lag span { .cryptpad-toolbar .cryptpad-lag span {
display: inline-block; display: inline-block;
@ -315,6 +321,7 @@
padding-right: 5px; padding-right: 5px;
padding-left: 5px; padding-left: 5px;
margin: 3px 2px; margin: 3px 2px;
box-sizing: border-box;
} }
.cryptpad-toolbar .dropdown-bar-content { .cryptpad-toolbar .dropdown-bar-content {
margin-top: -3px; margin-top: -3px;
@ -567,6 +574,7 @@
margin: 8px; margin: 8px;
line-height: 16px; line-height: 16px;
font-size: 16px; font-size: 16px;
text-align: center;
} }
.cryptpad-readonly { .cryptpad-readonly {
margin-right: 5px; margin-right: 5px;

View File

@ -467,7 +467,14 @@ span.fa-folder-open {
} }
#driveToolbar button { #driveToolbar button {
height: 24px; 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 { #driveToolbar button.element {
border-radius: 2px; border-radius: 2px;

View File

@ -1,3 +1,5 @@
@import "../../customize.dist/src/less/variables.less";
@tree-bg: #fff; @tree-bg: #fff;
@tree-fg: #000; @tree-fg: #000;
@tree-lines-col: #888; @tree-lines-col: #888;
@ -23,8 +25,6 @@
@toolbar-path-bg: #fff; @toolbar-path-bg: #fff;
@toolbar-path-border: #888; @toolbar-path-border: #888;
@button-font-size: 12px;
@size-mobile: 600px; @size-mobile: 600px;
/* PAGE */ /* PAGE */
@ -536,7 +536,13 @@ span {
button { button {
height: 24px; height: 24px;
font-size: @button-font-size; font: @toolbar-button-font;
span {
font: @toolbar-button-font;
}
.fa, &.fa {
font-family: FontAwesome;
}
&.element { &.element {
border-radius: 2px; border-radius: 2px;
background: @toolbar-button-bg; background: @toolbar-button-bg;

View File

@ -12,6 +12,7 @@
} }
#cke_1_top { #cke_1_top {
overflow: visible; overflow: visible;
padding: 0 6px;
} }
#cke_1_toolbox { #cke_1_toolbox {
display: inline-block; display: inline-block;