From b0d202455d9d604050768b512ff96d3b65329867 Mon Sep 17 00:00:00 2001 From: Edgar Schnueriger Date: Mon, 17 Jun 2013 18:56:17 +0200 Subject: Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed64f3821cc7d6cbb0bfcf65b25f1b49 --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 765dff6a0..ab0136d21 100644 --- a/less/variables.less +++ b/less/variables.less @@ -128,7 +128,7 @@ @input-color-placeholder: @gray-light; @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); -@input-height-large: (@line-height-computed + (@padding-large-vertical * 2) + 2); +@input-height-large: (@line-height-computed + (@padding-large-vertical * 2) + 8); @input-height-small: (@line-height-computed + (@padding-small-vertical * 2) + 2); -- cgit v1.2.3 From 6a79f53899b0d1e02d41252d0753116b3a121cd0 Mon Sep 17 00:00:00 2001 From: Edgar Schnueriger Date: Tue, 18 Jun 2013 21:43:34 +0200 Subject: Use correct font-size to calculate input-heights --- less/variables.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index ab0136d21..21f283711 100644 --- a/less/variables.less +++ b/less/variables.less @@ -128,8 +128,8 @@ @input-color-placeholder: @gray-light; @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); -@input-height-large: (@line-height-computed + (@padding-large-vertical * 2) + 8); -@input-height-small: (@line-height-computed + (@padding-small-vertical * 2) + 2); +@input-height-large: (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2); +@input-height-small: (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2); // Dropdowns -- cgit v1.2.3 From cd09f3213ba2e07b988708dec6b888f95660b0f9 Mon Sep 17 00:00:00 2001 From: Luis Hdez Date: Thu, 20 Jun 2013 12:50:30 +0200 Subject: Add heading font family variable --- less/variables.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 13ba8885c..4a573a283 100644 --- a/less/variables.less +++ b/less/variables.less @@ -53,6 +53,7 @@ @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px +@headings-font-family: @font-family-sans-serif; @headings-font-weight: 500; @headings-line-height: 1.1; -- cgit v1.2.3 From 1b89a63a48f0bfd6ba024f1cf573c03a42aa5ef2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 15:38:18 -0700 Subject: Use `@font-family-base` for headings font-family variable --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 4a573a283..e71dd03e1 100644 --- a/less/variables.less +++ b/less/variables.less @@ -53,7 +53,7 @@ @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px -@headings-font-family: @font-family-sans-serif; +@headings-font-family: @font-family-base; @headings-font-weight: 500; @headings-line-height: 1.1; -- cgit v1.2.3 From f64fe29003159669404f8f5a7a20551fec263904 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 15:40:37 -0700 Subject: Move Glyphicons into their own repo Removes the icon fonts and associated docs and LESS code from the core repo and into twbs/bootstrap-glyphicons. --- less/variables.less | 5 ----- 1 file changed, 5 deletions(-) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index 13ba8885c..a31aafac6 100644 --- a/less/variables.less +++ b/less/variables.less @@ -165,11 +165,6 @@ @zindex-modal: 1050; -// Glyphicons font path -// ------------------------- -@glyphicons-font-path: "../fonts"; - - // Navbar // ------------------------- -- cgit v1.2.3 From 72183d9a452fa43ac8d994374713c7a585d1744c Mon Sep 17 00:00:00 2001 From: Aristeides Stathopoulos Date: Sat, 22 Jun 2013 18:45:25 +0300 Subject: Update variables.less --- less/variables.less | 1 + 1 file changed, 1 insertion(+) (limited to 'less/variables.less') diff --git a/less/variables.less b/less/variables.less index f91846126..4fd0d492c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -178,6 +178,7 @@ @navbar-height: 50px; @navbar-color: #777; @navbar-bg: #eee; +@navbar-padding: floor(@grid-gutter-width / 2); // ~15px // Navbar links @navbar-link-color: #777; -- cgit v1.2.3