Skip to content
Snippets Groups Projects
Verified Commit be2ee183 authored by Björn Ludwig's avatar Björn Ludwig
Browse files

Enlarge font-size-base

parent c81ed81e
Branches
No related tags found
No related merge requests found
Showing
with 67 additions and 67 deletions
......@@ -250,12 +250,12 @@
.dropdown {
display: inline-block;
font-size: @font-size-large;
width: @font-size-large * 2.5;
font-size: @accessibility-font-size-large;
width: @accessibility-font-size-large * 2.5;
> a {
color: @headings-color;
padding: @font-size-large;
padding: @accessibility-font-size-large;
}
}
......
......@@ -8,7 +8,7 @@
display: inline-block;
min-width: 10px;
padding: 3px 7px;
font-size: @font-size-small;
font-size: @accessibility-font-size-small;
font-weight: @badge-font-weight;
color: @badge-color;
line-height: @badge-line-height;
......
......@@ -17,7 +17,7 @@
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid transparent;
white-space: nowrap;
.button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @btn-border-radius-base);
.button-size(@padding-base-vertical; @padding-base-horizontal; @accessibility-font-size-base; @line-height-base; @btn-border-radius-base);
.user-select(none);
&,
......@@ -132,14 +132,14 @@
.btn-lg {
// line-height: ensure even-numbered height of button next to large input
.button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @btn-border-radius-large);
.button-size(@padding-large-vertical; @padding-large-horizontal; @accessibility-font-size-large; @line-height-large; @btn-border-radius-large);
}
.btn-sm {
// line-height: ensure proper height of button next to small input
.button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small);
.button-size(@padding-small-vertical; @padding-small-horizontal; @accessibility-font-size-small; @line-height-small; @btn-border-radius-small);
}
.btn-xs {
.button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small);
.button-size(@padding-xs-vertical; @padding-xs-horizontal; @accessibility-font-size-small; @line-height-small; @btn-border-radius-small);
}
......
......@@ -5,7 +5,7 @@
.close {
float: right;
font-size: (@font-size-base * 1.5);
font-size: (@accessibility-font-size-base * 1.5);
font-weight: @close-font-weight;
line-height: 1;
color: @close-color;
......
......@@ -42,7 +42,7 @@ pre {
display: block;
padding: ((@line-height-computed - 1) / 2);
margin: 0 0 (@line-height-computed / 2);
font-size: (@font-size-base - 1); // 14px to 13px
font-size: (@accessibility-font-size-base - 1); // 14px to 13px
line-height: @line-height-base;
word-break: break-all;
word-wrap: break-word;
......
......@@ -39,7 +39,7 @@
padding: 5px 0;
margin: 2px 0 0; // override default ul
list-style: none;
font-size: @font-size-base;
font-size: @accessibility-font-size-base;
text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
background-color: @dropdown-bg;
border: 1px solid @dropdown-fallback-border; // IE8 fallback
......@@ -153,7 +153,7 @@
.dropdown-header {
display: block;
padding: 3px 20px;
font-size: @font-size-small;
font-size: @accessibility-font-size-small;
line-height: @line-height-base;
color: @dropdown-header-color;
white-space: nowrap; // as with > li > a
......
......@@ -22,7 +22,7 @@ legend {
width: 100%;
padding: 0;
margin-bottom: @line-height-computed;
font-size: (@font-size-base * 1.5);
font-size: (@accessibility-font-size-base * 1.5);
line-height: inherit;
color: @legend-color;
border: 0;
......@@ -83,7 +83,7 @@ input[type="checkbox"]:focus {
output {
display: block;
padding-top: (@padding-base-vertical + 1);
font-size: @font-size-base;
font-size: @accessibility-font-size-base;
line-height: @line-height-base;
color: @input-color;
}
......@@ -116,7 +116,7 @@ output {
width: 100%;
height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
padding: @padding-base-vertical @padding-base-horizontal;
font-size: @font-size-base;
font-size: @accessibility-font-size-base;
line-height: @line-height-base;
color: @input-color;
background-color: @input-bg;
......@@ -308,7 +308,7 @@ input[type="checkbox"] {
padding-bottom: (@padding-base-vertical + 1);
// Remove default margin from `p`
margin-bottom: 0;
min-height: (@line-height-computed + @font-size-base);
min-height: (@line-height-computed + @accessibility-font-size-base);
&.input-lg,
&.input-sm {
......@@ -327,13 +327,13 @@ input[type="checkbox"] {
// issue documented in https://github.com/twbs/bootstrap/issues/15074.
.input-sm {
.input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small);
.input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @accessibility-font-size-small; @line-height-small; @input-border-radius-small);
}
.form-group-sm {
.form-control {
height: @input-height-small;
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
font-size: @accessibility-font-size-small;
line-height: @line-height-small;
border-radius: @input-border-radius-small;
}
......@@ -347,21 +347,21 @@ input[type="checkbox"] {
}
.form-control-static {
height: @input-height-small;
min-height: (@line-height-computed + @font-size-small);
min-height: (@line-height-computed + @accessibility-font-size-small);
padding: (@padding-small-vertical + 1) @padding-small-horizontal;
font-size: @font-size-small;
font-size: @accessibility-font-size-small;
line-height: @line-height-small;
}
}
.input-lg {
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @accessibility-font-size-large; @line-height-large; @input-border-radius-large);
}
.form-group-lg {
.form-control {
height: @input-height-large;
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
font-size: @accessibility-font-size-large;
line-height: @line-height-large;
border-radius: @input-border-radius-large;
}
......@@ -375,9 +375,9 @@ input[type="checkbox"] {
}
.form-control-static {
height: @input-height-large;
min-height: (@line-height-computed + @font-size-large);
min-height: (@line-height-computed + @accessibility-font-size-large);
padding: (@padding-large-vertical + 1) @padding-large-horizontal;
font-size: @font-size-large;
font-size: @accessibility-font-size-large;
line-height: @line-height-large;
}
}
......@@ -598,7 +598,7 @@ input[type="checkbox"] {
@media (min-width: @screen-sm-min) {
.control-label {
padding-top: (@padding-large-vertical + 1);
font-size: @font-size-large;
font-size: @accessibility-font-size-large;
}
}
}
......@@ -606,7 +606,7 @@ input[type="checkbox"] {
@media (min-width: @screen-sm-min) {
.control-label {
padding-top: (@padding-small-vertical + 1);
font-size: @font-size-small;
font-size: @accessibility-font-size-small;
}
}
}
......
......@@ -76,7 +76,7 @@
// -------------------------
.input-group-addon {
padding: @padding-base-vertical @padding-base-horizontal;
font-size: @font-size-base;
font-size: @accessibility-font-size-base;
font-weight: normal;
line-height: 1;
color: @input-color;
......@@ -88,12 +88,12 @@
// Sizing
&.input-sm {
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
font-size: @accessibility-font-size-small;
border-radius: @input-border-radius-small;
}
&.input-lg {
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
font-size: @accessibility-font-size-large;
border-radius: @input-border-radius-large;
}
......
......@@ -163,7 +163,7 @@
.navbar-brand {
float: left;
padding: @navbar-padding-vertical @navbar-padding-horizontal;
font-size: @font-size-large;
font-size: @accessibility-font-size-large;
line-height: @line-height-computed;
height: @navbar-height;
......
......@@ -80,10 +80,10 @@
// Large
.pagination-lg {
.pagination-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
.pagination-size(@padding-large-vertical; @padding-large-horizontal; @accessibility-font-size-large; @line-height-large; @border-radius-large);
}
// Small
.pagination-sm {
.pagination-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
.pagination-size(@padding-small-vertical; @padding-small-horizontal; @accessibility-font-size-small; @line-height-small; @border-radius-small);
}
......@@ -33,7 +33,7 @@
.panel-title {
margin-top: 0;
margin-bottom: 0;
font-size: ceil((@font-size-base * 1.125));
font-size: ceil((@accessibility-font-size-base * 1.125));
color: inherit;
> a,
......
......@@ -14,7 +14,7 @@
// Our parent element can be arbitrary since popovers are by default inserted as a sibling of their target element.
// So reset our font and text properties to avoid inheriting weird values.
.reset-text();
font-size: @font-size-base;
font-size: @accessibility-font-size-base;
background-color: @popover-bg;
background-clip: padding-box;
......@@ -33,7 +33,7 @@
.popover-title {
margin: 0; // reset heading margin
padding: 8px 14px;
font-size: @font-size-base;
font-size: @accessibility-font-size-base;
background-color: @popover-title-bg;
border-bottom: 1px solid darken(@popover-title-bg, 5%);
border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0;
......
......@@ -37,7 +37,7 @@
float: left;
width: 0%;
height: 100%;
font-size: @font-size-small;
font-size: @accessibility-font-size-small;
line-height: @line-height-computed;
color: @progress-bar-color;
text-align: center;
......
......@@ -26,7 +26,7 @@ html {
body {
font-family: @font-family-base;
font-size: @font-size-base;
font-size: @accessibility-font-size-base;
line-height: @line-height-base;
color: @accessibility-text-color;
background-color: @accessibility-body-bg;
......
......@@ -11,7 +11,7 @@
// Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
// So reset our font and text properties to avoid inheriting weird values.
.reset-text();
font-size: @font-size-small;
font-size: @accessibility-font-size-small;
.opacity(0);
......
......@@ -44,12 +44,12 @@ h6, .h6 {
}
}
h1, .h1 { font-size: @font-size-h1; }
h2, .h2 { font-size: @font-size-h2; }
h3, .h3 { font-size: @font-size-h3; }
h4, .h4 { font-size: @font-size-h4; }
h5, .h5 { font-size: @font-size-h5; }
h6, .h6 { font-size: @font-size-h6; }
h1, .h1 { font-size: @accessibility-font-size-h1; }
h2, .h2 { font-size: @accessibility-font-size-h2; }
h3, .h3 { font-size: @accessibility-font-size-h3; }
h4, .h4 { font-size: @accessibility-font-size-h4; }
h5, .h5 { font-size: @accessibility-font-size-h5; }
h6, .h6 { font-size: @accessibility-font-size-h6; }
// Body text
......@@ -61,12 +61,12 @@ p {
.lead {
margin-bottom: @line-height-computed;
font-size: floor((@font-size-base * 1.15));
font-size: floor((@accessibility-font-size-base * 1.15));
font-weight: 300;
line-height: 1.4;
@media (min-width: @screen-sm-min) {
font-size: (@font-size-base * 1.5);
font-size: (@accessibility-font-size-base * 1.5);
}
}
......@@ -77,7 +77,7 @@ p {
// Ex: (12px small font / 14px base font) * 100% = about 85%
small,
.small {
font-size: floor((100% * @font-size-small / @font-size-base));
font-size: floor((100% * @accessibility-font-size-small / @accessibility-font-size-base));
}
mark,
......
......@@ -48,21 +48,21 @@
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
@font-size-base: 14px;
@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
@accessibility-font-size-base: 20px;
@accessibility-font-size-large: ceil((@accessibility-font-size-base * 1.25)); // ~18px
@accessibility-font-size-small: ceil((@accessibility-font-size-base * 0.85)); // ~12px
@font-size-h1: floor((@font-size-base * 2.6)); // ~36px
@font-size-h2: floor((@font-size-base * 2.15)); // ~30px
@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px
@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px
@font-size-h5: @font-size-base;
@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
@accessibility-font-size-h1: floor((@accessibility-font-size-base * 2.6)); // ~36px
@accessibility-font-size-h2: floor((@accessibility-font-size-base * 2.15)); // ~30px
@accessibility-font-size-h3: ceil((@accessibility-font-size-base * 1.7)); // ~24px
@accessibility-font-size-h4: ceil((@accessibility-font-size-base * 1.25)); // ~18px
@accessibility-font-size-h5: @accessibility-font-size-base;
@accessibility-font-size-h6: ceil((@accessibility-font-size-base * 0.85)); // ~12px
//** Unit-less `line-height` for use in components like buttons.
@line-height-base: 1.428571429; // 20/14
//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
@line-height-computed: floor((@accessibility-font-size-base * @line-height-base)); // ~20px
//** By default, this inherits from the `<body>`.
@headings-font-family: inherit;
......@@ -208,9 +208,9 @@
//** Default `.form-control` height
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
//** Large `.form-control` height
@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
@input-height-large: (ceil(@accessibility-font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
//** Small `.form-control` height
@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
@input-height-small: (floor(@accessibility-font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
//** `.form-group` margin
@form-group-margin-bottom: 15px;
......@@ -488,8 +488,8 @@
@jumbotron-color: inherit;
@jumbotron-bg: @gray-lighter;
@jumbotron-heading-color: inherit;
@jumbotron-font-size: ceil((@font-size-base * 1.5));
@jumbotron-heading-font-size: ceil((@font-size-base * 4.5));
@jumbotron-font-size: ceil((@accessibility-font-size-base * 1.5));
@jumbotron-heading-font-size: ceil((@accessibility-font-size-base * 4.5));
//== Form states and alerts
......@@ -856,7 +856,7 @@
//** Blockquote small color
@blockquote-small-color: @gray-light;
//** Blockquote font size
@blockquote-font-size: (@font-size-base * 1.25);
@blockquote-font-size: (@accessibility-font-size-base * 1.25);
//** Blockquote border color
@blockquote-border-color: @gray-lighter;
//** Page header border color
......
......@@ -8,7 +8,7 @@
@xwiki-drawer-brand-link-hover-color: @navbar-default-link-hover-color;
@xwiki-drawer-brand-user-color: @navbar-default-color;
@xwiki-drawer-menu-item-padding: @navbar-padding-vertical 0 @navbar-padding-vertical @navbar-padding-horizontal;
@xwiki-drawer-menu-item-size: @font-size-base;
@xwiki-drawer-menu-item-size: @accessibility-font-size-base;
@xwiki-drawer-menu-item-color: @accessibility-text-color;
@xwiki-drawer-menu-item-bg: @xwiki-drawer-bg;
@xwiki-drawer-menu-item-icon-padding: @navbar-padding-horizontal;
......
......@@ -53,7 +53,7 @@ select[size="0"], select[size="1"] {
}
dl {
dt {
margin-top: floor(@font-size-base * 1.4);
margin-top: floor(@accessibility-font-size-base * 1.4);
position: relative;
&:first-of-type {
margin-top: 0;
......
......@@ -4,9 +4,9 @@
.edit_section {
display: block;
height: @font-size-h1;
line-height: @font-size-h1;
margin: -@font-size-h1 0 0;
height: @accessibility-font-size-h1;
line-height: @accessibility-font-size-h1;
margin: -@accessibility-font-size-h1 0 0;
overflow: hidden;
position: relative;
visibility:hidden;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment