From 0caab585f557513f936f4664ad1cdbddbfde9add Mon Sep 17 00:00:00 2001 From: Salman Javed Date: Wed, 24 Jul 2013 13:39:16 +0500 Subject: issues fixed for nav-justified on pills on android default browser. --- less/navs.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index 9f671643a..6981010a0 100644 --- a/less/navs.less +++ b/less/navs.less @@ -167,11 +167,12 @@ // ------------------------- .nav-justified { + display: table; width: 100%; > li { float: none; display: table-cell; - width: 1%; + width: auto; > a { text-align: center; } -- cgit v1.2.3 From 7e9532dabe7ae1136c9ee07b33ee5116bcfafac1 Mon Sep 17 00:00:00 2001 From: liuyl Date: Wed, 24 Jul 2013 17:10:27 +0800 Subject: set cursor to not-allowed for disabled elements --- less/dropdowns.less | 2 +- less/navs.less | 2 +- less/pager.less | 2 +- less/pagination.less | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/dropdowns.less b/less/dropdowns.less index 00a84a6cb..938e682f5 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -102,7 +102,7 @@ background-color: transparent; background-image: none; // Remove CSS gradient .reset-filter(); - cursor: default; + cursor: not-allowed; } } diff --git a/less/navs.less b/less/navs.less index 9f671643a..d4d047a3f 100644 --- a/less/navs.less +++ b/less/navs.less @@ -36,7 +36,7 @@ color: @gray-light; text-decoration: none; background-color: transparent; - cursor: default; + cursor: not-allowed; } } diff --git a/less/pager.less b/less/pager.less index 007952da0..a4030c4ab 100644 --- a/less/pager.less +++ b/less/pager.less @@ -48,7 +48,7 @@ > span { color: @gray-light; background-color: @pagination-bg; - cursor: default; + cursor: not-allowed; } } diff --git a/less/pagination.less b/less/pagination.less index 45c53ebce..dcab667b4 100644 --- a/less/pagination.less +++ b/less/pagination.less @@ -53,7 +53,7 @@ > a:focus { color: @gray-light; background-color: @pagination-bg; - cursor: default; + cursor: not-allowed; } } } -- cgit v1.2.3 From 2e6fcefc5ca6aa3301f35b0600d963f82f1eb62a Mon Sep 17 00:00:00 2001 From: syed Date: Wed, 24 Jul 2013 18:43:21 +0500 Subject: Moved modals inline properties to variables.less In this commit I moved modals.less inline properties to variables.less and also added those variables to customize.html. --- less/modals.less | 14 +++++++------- less/variables.less | 10 ++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) (limited to 'less') diff --git a/less/modals.less b/less/modals.less index d79121097..52c1b0df8 100644 --- a/less/modals.less +++ b/less/modals.less @@ -46,10 +46,10 @@ // Actual modal .modal-content { position: relative; - background-color: #fff; - border: 1px solid #999; - border: 1px solid rgba(0,0,0,.2); - border-radius: 6px; + background-color: @modal-content-bg; + border: 1px solid @modal-content-fallback-border-color; //old browsers fallback (ie8 etc) + border: 1px solid @modal-content-border-color; + border-radius: @border-radius-large; .box-shadow(0 3px 9px rgba(0,0,0,.5)); .background-clip(padding-box); // Remove focus outline from opened modal @@ -64,7 +64,7 @@ bottom: 0; left: 0; z-index: (@zindex-modal-background - 10); - background-color: #000; + background-color: @modal-backdrop-bg; // Fade for backdrop &.fade { .opacity(0); } &.fade.in { .opacity(.5); } @@ -74,7 +74,7 @@ // Top section of the modal w/ title and dismiss .modal-header { padding: @modal-title-padding; - border-bottom: 1px solid #e5e5e5; + border-bottom: 1px solid @modal-header-border-color; min-height: (@modal-title-padding + @modal-title-line-height); } // Close icon @@ -100,7 +100,7 @@ margin-top: 15px; padding: (@modal-inner-padding - 1) @modal-inner-padding @modal-inner-padding; text-align: right; // right align buttons - border-top: 1px solid #e5e5e5; + border-top: 1px solid @modal-footer-border-color; .clearfix(); // clear it in case folks use .pull-* classes on buttons // Properly space out buttons diff --git a/less/variables.less b/less/variables.less index bf29d3556..97e608b36 100644 --- a/less/variables.less +++ b/less/variables.less @@ -296,6 +296,16 @@ @modal-title-padding: 15px; @modal-title-line-height: @line-height-base; +@modal-content-bg: #fff; +@modal-content-border-color: rgba(0,0,0,.2); +@modal-content-fallback-border-color: #999; + +@modal-backdrop-bg: #000; + +@modal-header-border-color: #e5e5e5; + +@modal-footer-border-color: #e5e5e5; + // Alerts // ------------------------- @alert-bg: @state-warning-bg; -- cgit v1.2.3 From 3080104642cd952d830e534eddd38ec67fee914b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 24 Jul 2013 16:31:17 -0700 Subject: make footer border color use header border color in modals --- less/variables.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 97e608b36..342eef67c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -301,10 +301,9 @@ @modal-content-fallback-border-color: #999; @modal-backdrop-bg: #000; - @modal-header-border-color: #e5e5e5; +@modal-footer-border-color: @modal-header-border-color; -@modal-footer-border-color: #e5e5e5; // Alerts // ------------------------- -- cgit v1.2.3 From 51de38e5b9f1df43e56166cea979b18108e98350 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 24 Jul 2013 16:52:47 -0700 Subject: make again --- less/navs.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/navs.less b/less/navs.less index 6981010a0..1766f502c 100644 --- a/less/navs.less +++ b/less/navs.less @@ -115,8 +115,8 @@ } // pulling this in mainly for less shorthand &.nav-justified { - .nav-justified; - .nav-tabs-justified; + .nav-justified(); + .nav-tabs-justified(); } } @@ -180,7 +180,7 @@ } // Move borders to anchors instead of bottom of list -.nav-tabs-justified () { +.nav-tabs-justified { border-bottom: 0; > li > a { border-bottom: 1px solid #ddd; -- cgit v1.2.3