From 1e0453f825cb7d6e14807b121210a594f242bc35 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 00:36:51 -0700 Subject: Restore glyphicons --- less/bootstrap.less | 1 + less/glphyicons.less | 0 less/glyphicons.less | 189 +++++++++++++++++++++++++++++++++++++++++++++++++++ less/variables.less | 6 ++ 4 files changed, 196 insertions(+) create mode 100644 less/glphyicons.less create mode 100644 less/glyphicons.less (limited to 'less') diff --git a/less/bootstrap.less b/less/bootstrap.less index 635e0256c..1344b462f 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -27,6 +27,7 @@ // Components @import "component-animations.less"; +@import "glyphicons.less"; @import "dropdowns.less"; @import "button-groups.less"; @import "input-groups.less"; diff --git a/less/glphyicons.less b/less/glphyicons.less new file mode 100644 index 000000000..e69de29bb diff --git a/less/glyphicons.less b/less/glyphicons.less new file mode 100644 index 000000000..dc9086f58 --- /dev/null +++ b/less/glyphicons.less @@ -0,0 +1,189 @@ +// +// Glyphicons for Bootstrap +// +// Since icons are fonts, they can be placed anywhere text is placed and are +// thus automatically sized to match the surrounding child. To use, create an +// inline element with the appropriate classes, like so: +// +// Star + +// Import the fonts +@font-face { + font-family: 'Glyphicons Halflings'; + src: url('@{icon-font-path}@{icon-font-name}.eot'); + src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'), + url('@{icon-font-path}@{icon-font-name}.woff') format('woff'), + url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'), + url('@{icon-font-path}@{icon-font-name}.svg#glyphicons_halflingsregular') format('svg'); +} + +// Catchall baseclass +.glyphicon { + font-family: 'Glyphicons Halflings'; + font-style: normal; + font-weight: normal; + line-height: 1; + -webkit-font-smoothing: antialiased; +} + +// Individual icons +.glyphicon-glass { &:before { content: "\e001"; } } +.glyphicon-music { &:before { content: "\e002"; } } +.glyphicon-search { &:before { content: "\e003"; } } +.glyphicon-envelope { &:before { content: "\2709"; } } +.glyphicon-heart { &:before { content: "\e005"; } } +.glyphicon-star { &:before { content: "\e006"; } } +.glyphicon-star-empty { &:before { content: "\e007"; } } +.glyphicon-user { &:before { content: "\e008"; } } +.glyphicon-film { &:before { content: "\e009"; } } +.glyphicon-th-large { &:before { content: "\e010"; } } +.glyphicon-th { &:before { content: "\e011"; } } +.glyphicon-th-list { &:before { content: "\e012"; } } +.glyphicon-ok { &:before { content: "\e013"; } } +.glyphicon-remove { &:before { content: "\e014"; } } +.glyphicon-zoom-in { &:before { content: "\e015"; } } +.glyphicon-zoom-out { &:before { content: "\e016"; } } +.glyphicon-off { &:before { content: "\e017"; } } +.glyphicon-signal { &:before { content: "\e018"; } } +.glyphicon-cog { &:before { content: "\e019"; } } +.glyphicon-trash { &:before { content: "\e020"; } } +.glyphicon-home { &:before { content: "\e021"; } } +.glyphicon-file { &:before { content: "\e022"; } } +.glyphicon-time { &:before { content: "\e023"; } } +.glyphicon-road { &:before { content: "\e024"; } } +.glyphicon-download-alt { &:before { content: "\e025"; } } +.glyphicon-download { &:before { content: "\e026"; } } +.glyphicon-upload { &:before { content: "\e027"; } } +.glyphicon-inbox { &:before { content: "\e028"; } } +.glyphicon-play-circle { &:before { content: "\e029"; } } +.glyphicon-repeat { &:before { content: "\e030"; } } +.glyphicon-refresh { &:before { content: "\e031"; } } +.glyphicon-list-alt { &:before { content: "\e032"; } } +.glyphicon-lock { &:before { content: "\e033"; } } +.glyphicon-flag { &:before { content: "\e034"; } } +.glyphicon-headphones { &:before { content: "\e035"; } } +.glyphicon-volume-off { &:before { content: "\e036"; } } +.glyphicon-volume-down { &:before { content: "\e037"; } } +.glyphicon-volume-up { &:before { content: "\e038"; } } +.glyphicon-qrcode { &:before { content: "\e039"; } } +.glyphicon-barcode { &:before { content: "\e040"; } } +.glyphicon-tag { &:before { content: "\e041"; } } +.glyphicon-tags { &:before { content: "\e042"; } } +.glyphicon-book { &:before { content: "\e043"; } } +.glyphicon-bookmark { &:before { content: "\e044"; } } +.glyphicon-print { &:before { content: "\e045"; } } +.glyphicon-camera { &:before { content: "\e046"; } } +.glyphicon-font { &:before { content: "\e047"; } } +.glyphicon-bold { &:before { content: "\e048"; } } +.glyphicon-italic { &:before { content: "\e049"; } } +.glyphicon-text-height { &:before { content: "\e050"; } } +.glyphicon-text-width { &:before { content: "\e051"; } } +.glyphicon-align-left { &:before { content: "\e052"; } } +.glyphicon-align-center { &:before { content: "\e053"; } } +.glyphicon-align-right { &:before { content: "\e054"; } } +.glyphicon-align-justify { &:before { content: "\e055"; } } +.glyphicon-list { &:before { content: "\e056"; } } +.glyphicon-indent-left { &:before { content: "\e057"; } } +.glyphicon-indent-right { &:before { content: "\e058"; } } +.glyphicon-facetime-video { &:before { content: "\e059"; } } +.glyphicon-picture { &:before { content: "\e060"; } } +.glyphicon-pencil { &:before { content: "\270f"; } } +.glyphicon-map-marker { &:before { content: "\e062"; } } +.glyphicon-adjust { &:before { content: "\e063"; } } +.glyphicon-tint { &:before { content: "\e064"; } } +.glyphicon-edit { &:before { content: "\e065"; } } +.glyphicon-share { &:before { content: "\e066"; } } +.glyphicon-check { &:before { content: "\e067"; } } +.glyphicon-move { &:before { content: "\e068"; } } +.glyphicon-step-backward { &:before { content: "\e069"; } } +.glyphicon-fast-backward { &:before { content: "\e070"; } } +.glyphicon-backward { &:before { content: "\e071"; } } +.glyphicon-play { &:before { content: "\e072"; } } +.glyphicon-pause { &:before { content: "\e073"; } } +.glyphicon-stop { &:before { content: "\e074"; } } +.glyphicon-forward { &:before { content: "\e075"; } } +.glyphicon-fast-forward { &:before { content: "\e076"; } } +.glyphicon-step-forward { &:before { content: "\e077"; } } +.glyphicon-eject { &:before { content: "\e078"; } } +.glyphicon-chevron-left { &:before { content: "\e079"; } } +.glyphicon-chevron-right { &:before { content: "\e080"; } } +.glyphicon-plus-sign { &:before { content: "\e081"; } } +.glyphicon-minus-sign { &:before { content: "\e082"; } } +.glyphicon-remove-sign { &:before { content: "\e083"; } } +.glyphicon-ok-sign { &:before { content: "\e084"; } } +.glyphicon-question-sign { &:before { content: "\e085"; } } +.glyphicon-info-sign { &:before { content: "\e086"; } } +.glyphicon-screenshot { &:before { content: "\e087"; } } +.glyphicon-remove-circle { &:before { content: "\e088"; } } +.glyphicon-ok-circle { &:before { content: "\e089"; } } +.glyphicon-ban-circle { &:before { content: "\e090"; } } +.glyphicon-arrow-left { &:before { content: "\e091"; } } +.glyphicon-arrow-right { &:before { content: "\e092"; } } +.glyphicon-arrow-up { &:before { content: "\e093"; } } +.glyphicon-arrow-down { &:before { content: "\e094"; } } +.glyphicon-share-alt { &:before { content: "\e095"; } } +.glyphicon-resize-full { &:before { content: "\e096"; } } +.glyphicon-resize-small { &:before { content: "\e097"; } } +.glyphicon-plus { &:before { content: "\002b"; } } +.glyphicon-minus { &:before { content: "\2212"; } } +.glyphicon-asterisk { &:before { content: "\002a"; } } +.glyphicon-exclamation-sign { &:before { content: "\e101"; } } +.glyphicon-gift { &:before { content: "\e102"; } } +.glyphicon-leaf { &:before { content: "\e103"; } } +.glyphicon-fire { &:before { content: "\e104"; } } +.glyphicon-eye-open { &:before { content: "\e105"; } } +.glyphicon-eye-close { &:before { content: "\e106"; } } +.glyphicon-warning-sign { &:before { content: "\e107"; } } +.glyphicon-plane { &:before { content: "\e108"; } } +.glyphicon-calendar { &:before { content: "\e109"; } } +.glyphicon-random { &:before { content: "\e110"; } } +.glyphicon-comment { &:before { content: "\e111"; } } +.glyphicon-magnet { &:before { content: "\e112"; } } +.glyphicon-chevron-up { &:before { content: "\e113"; } } +.glyphicon-chevron-down { &:before { content: "\e114"; } } +.glyphicon-retweet { &:before { content: "\e115"; } } +.glyphicon-shopping-cart { &:before { content: "\e116"; } } +.glyphicon-folder-close { &:before { content: "\e117"; } } +.glyphicon-folder-open { &:before { content: "\e118"; } } +.glyphicon-resize-vertical { &:before { content: "\e119"; } } +.glyphicon-resize-horizontal { &:before { content: "\e120"; } } +.glyphicon-hdd { &:before { content: "\e121"; } } +.glyphicon-bullhorn { &:before { content: "\e122"; } } +.glyphicon-bell { &:before { content: "\e123"; } } +.glyphicon-certificate { &:before { content: "\e124"; } } +.glyphicon-thumbs-up { &:before { content: "\e125"; } } +.glyphicon-thumbs-down { &:before { content: "\e126"; } } +.glyphicon-hand-right { &:before { content: "\e127"; } } +.glyphicon-hand-left { &:before { content: "\e128"; } } +.glyphicon-hand-up { &:before { content: "\e129"; } } +.glyphicon-hand-down { &:before { content: "\e130"; } } +.glyphicon-circle-arrow-right { &:before { content: "\e131"; } } +.glyphicon-circle-arrow-left { &:before { content: "\e132"; } } +.glyphicon-circle-arrow-up { &:before { content: "\e133"; } } +.glyphicon-circle-arrow-down { &:before { content: "\e134"; } } +.glyphicon-globe { &:before { content: "\e135"; } } +.glyphicon-wrench { &:before { content: "\e136"; } } +.glyphicon-tasks { &:before { content: "\e137"; } } +.glyphicon-filter { &:before { content: "\e138"; } } +.glyphicon-briefcase { &:before { content: "\e139"; } } +.glyphicon-fullscreen { &:before { content: "\e140"; } } +.glyphicon-dashboard { &:before { content: "\e141"; } } +.glyphicon-paperclip { &:before { content: "\e142"; } } +.glyphicon-heart-empty { &:before { content: "\e143"; } } +.glyphicon-link { &:before { content: "\e144"; } } +.glyphicon-phone { &:before { content: "\e145"; } } +.glyphicon-pushpin { &:before { content: "\e146"; } } +.glyphicon-euro { &:before { content: "\20ac"; } } +.glyphicon-usd { &:before { content: "\e148"; } } +.glyphicon-gbp { &:before { content: "\e149"; } } +.glyphicon-sort { &:before { content: "\e150"; } } +.glyphicon-sort-by-alphabet { &:before { content: "\e151"; } } +.glyphicon-sort-by-alphabet-alt { &:before { content: "\e152"; } } +.glyphicon-sort-by-order { &:before { content: "\e153"; } } +.glyphicon-sort-by-order-alt { &:before { content: "\e154"; } } +.glyphicon-sort-by-attributes { &:before { content: "\e155"; } } +.glyphicon-sort-by-attributes-alt { &:before { content: "\e156"; } } +.glyphicon-unchecked { &:before { content: "\e157"; } } +.glyphicon-expand { &:before { content: "\e158"; } } +.glyphicon-collapse { &:before { content: "\e159"; } } +.glyphicon-collapse-top { &:before { content: "\e160"; } } diff --git a/less/variables.less b/less/variables.less index a46ad4fb6..c1020ebbe 100644 --- a/less/variables.less +++ b/less/variables.less @@ -55,6 +55,12 @@ @headings-font-weight: 500; @headings-line-height: 1.1; +// Iconography +// ------------------------- + +@icon-font-path: "../fonts/"; +@icon-font-name: "glyphiconshalflings-regular"; + // Components // ------------------------- -- cgit v1.2.3 From f2e35bf7027e8274e28e46b41efb93f4c03184eb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 01:23:45 -0700 Subject: docs layout and alignment refinement --- less/glyphicons.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'less') diff --git a/less/glyphicons.less b/less/glyphicons.less index dc9086f58..3c4ef5921 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -19,6 +19,9 @@ // Catchall baseclass .glyphicon { + position: relative; + top: 2px; + display: inline-block; font-family: 'Glyphicons Halflings'; font-style: normal; font-weight: normal; -- cgit v1.2.3 From e13ca6d38494e69ed1faeddbb12b469a778ade06 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 01:46:26 -0700 Subject: Upgrade to latest glyphicons --- less/glyphicons.less | 43 ++++++++++++++++++++++++++++++++++++++++++- less/variables.less | 2 +- 2 files changed, 43 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/glyphicons.less b/less/glyphicons.less index 3c4ef5921..1f89bd4c0 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -14,7 +14,7 @@ src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'), url('@{icon-font-path}@{icon-font-name}.woff') format('woff'), url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'), - url('@{icon-font-path}@{icon-font-name}.svg#glyphicons_halflingsregular') format('svg'); + url('@{icon-font-path}@{icon-font-name}.svg#glyphicons-halflingsregular') format('svg'); } // Catchall baseclass @@ -190,3 +190,44 @@ .glyphicon-expand { &:before { content: "\e158"; } } .glyphicon-collapse { &:before { content: "\e159"; } } .glyphicon-collapse-top { &:before { content: "\e160"; } } + +.glyphicon-log-in { &:before{ content: "\e161"; } } +.glyphicon-flash { &:before{ content: "\e162"; } } +.glyphicon-log-out { &:before{ content: "\e163"; } } +.glyphicon-new-window { &:before{ content: "\e164"; } } +.glyphicon-record { &:before{ content: "\e165"; } } +.glyphicon-save { &:before{ content: "\e166"; } } +.glyphicon-open { &:before{ content: "\e167"; } } +.glyphicon-saved { &:before{ content: "\e168"; } } +.glyphicon-import { &:before{ content: "\e169"; } } +.glyphicon-export { &:before{ content: "\e170"; } } +.glyphicon-send { &:before{ content: "\e171"; } } +.glyphicon-floppy-disk { &:before{ content: "\e172"; } } +.glyphicon-floppy-saved { &:before{ content: "\e173"; } } +.glyphicon-floppy-remove { &:before{ content: "\e174"; } } +.glyphicon-floppy-save { &:before{ content: "\e175"; } } +.glyphicon-floppy-open { &:before{ content: "\e176"; } } +.glyphicon-credit-card { &:before{ content: "\e177"; } } +.glyphicon-transfer { &:before{ content: "\e178"; } } +.glyphicon-cutlery { &:before{ content: "\e179"; } } +.glyphicon-header { &:before{ content: "\e180"; } } +.glyphicon-compressed { &:before{ content: "\e181"; } } +.glyphicon-earphone { &:before{ content: "\e182"; } } +.glyphicon-phone-alt { &:before{ content: "\e183"; } } +.glyphicon-tower { &:before{ content: "\e184"; } } +.glyphicon-stats { &:before{ content: "\e185"; } } +.glyphicon-sd-video { &:before{ content: "\e186"; } } +.glyphicon-hd-video { &:before{ content: "\e187"; } } +.glyphicon-subtitles { &:before{ content: "\e188"; } } +.glyphicon-sound-stereo { &:before{ content: "\e189"; } } +.glyphicon-sound-dolby { &:before{ content: "\e190"; } } +.glyphicon-sound-5-1 { &:before{ content: "\e191"; } } +.glyphicon-sound-6-1 { &:before{ content: "\e192"; } } +.glyphicon-sound-7-1 { &:before{ content: "\e193"; } } +.glyphicon-copyright-mark { &:before{ content: "\e194"; } } +.glyphicon-registration-mark { &:before{ content: "\e195"; } } +.glyphicon-cloud { &:before{ content: "\2601"; } } +.glyphicon-cloud-download { &:before{ content: "\e197"; } } +.glyphicon-cloud-upload { &:before{ content: "\e198"; } } +.glyphicon-tree-conifer { &:before{ content: "\e199"; } } +.glyphicon-tree-deciduous { &:before{ content: "\e200"; } } diff --git a/less/variables.less b/less/variables.less index c1020ebbe..38600a681 100644 --- a/less/variables.less +++ b/less/variables.less @@ -59,7 +59,7 @@ // ------------------------- @icon-font-path: "../fonts/"; -@icon-font-name: "glyphiconshalflings-regular"; +@icon-font-name: "glyphicons-halflings-regular"; // Components -- cgit v1.2.3 From ce410dc36ea50f152f617df6fbd29c3ac4d3a9eb Mon Sep 17 00:00:00 2001 From: liuyl Date: Sun, 18 Aug 2013 20:13:48 +0800 Subject: fixed caret --- less/button-groups.less | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index e4a78cd4e..b137aba6d 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -160,10 +160,12 @@ // Carets in other button sizes .btn-lg .caret { border-width: @caret-width-large; + border-bottom-width: 0; } // Upside down carets for .dropup .dropup .btn-lg .caret { - border-bottom-width: @caret-width-large; + border-width: @caret-width-large; + border-top-width: 0; } -- cgit v1.2.3 From 4246f6a01f6d025962beb8dcc9a035d6e17e5d20 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 09:58:21 -0700 Subject: fixes #9769: use navbar border radius var in theme --- less/theme.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/theme.less b/less/theme.less index 52e2d239a..f7e503644 100644 --- a/less/theme.less +++ b/less/theme.less @@ -94,7 +94,7 @@ // Basic navbar .navbar { #gradient > .vertical(@start-color: lighten(@navbar-bg, 10%); @end-color: @navbar-bg;); - border-radius: @border-radius-base; + border-radius: @navbar-border-radius; @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); .box-shadow(@shadow); -- cgit v1.2.3 From 73a1a4133c484d0791efff87bc41eac3e2853e42 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 10:08:18 -0700 Subject: combine and simplify caret border widths --- less/button-groups.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index b137aba6d..45f2fd0a9 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -159,13 +159,12 @@ } // Carets in other button sizes .btn-lg .caret { - border-width: @caret-width-large; + border-width: @caret-width-large @caret-width-large 0; border-bottom-width: 0; } // Upside down carets for .dropup .dropup .btn-lg .caret { - border-width: @caret-width-large; - border-top-width: 0; + border-width: 0 @caret-width-large @caret-width-large; } -- cgit v1.2.3 From 2488f2ae68628b9ec5fb54965605ab81164149d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Pag=C3=A9?= Date: Sun, 18 Aug 2013 19:23:42 +0200 Subject: Update mixins.less --- less/mixins.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/mixins.less b/less/mixins.less index c4d1de5ff..633d02455 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -286,7 +286,7 @@ // Reset filters for IE // -// When you need to remove a gradient background, don't forget to use this to reset +// When you need to remove a gradient background, do not forget to use this to reset // the IE filter for IE9 and below. .reset-filter() { filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)")); -- cgit v1.2.3 From 3c1d951d2948f418ab83a592634a1aa52e34c09b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 11:00:04 -0700 Subject: fixes #9787: remove derp file --- less/glphyicons.less | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 less/glphyicons.less (limited to 'less') diff --git a/less/glphyicons.less b/less/glphyicons.less deleted file mode 100644 index e69de29bb..000000000 -- cgit v1.2.3 From ef4590dfb461036c915d8fbc5b6fbf3ad7ba9c86 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 11:08:20 -0700 Subject: fixes #9786: enable tables in panels --- less/panels.less | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index 9d1b21389..e39fa3adf 100644 --- a/less/panels.less +++ b/less/panels.less @@ -18,12 +18,16 @@ .clearfix(); } + // List groups in panels // // By default, space out list group content from panel headings to account for // any kind of custom content between the two. .panel { + > .table { + margin-bottom: 0; + } > .list-group { margin-bottom: 0; @@ -48,6 +52,22 @@ } } + +// Tables in panels +// +// Place a non-bordered `.table` within a panel (not within a `.panel-body`) and +// watch it go full width. + +.panel { + > .table { + margin-bottom: 0; + } + > .panel-body + .table { + border-top: 1px solid @table-border-color; + } +} + + // Optional heading .panel-heading { padding: 10px 15px; -- cgit v1.2.3 From 26067d3d7d4e16f2b46b5bde59566f5db3c4f2d7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 11:11:31 -0700 Subject: fixes #9768: unbold buttons --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/variables.less b/less/variables.less index 38600a681..3ba25f768 100644 --- a/less/variables.less +++ b/less/variables.less @@ -104,7 +104,7 @@ // Buttons // ------------------------- -@btn-font-weight: bold; +@btn-font-weight: normal; @btn-default-color: #333; @btn-default-bg: #fff; -- cgit v1.2.3 From 9b66e6b0f4e642609e8b7ba2b8590d2c31fe0469 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 11:17:28 -0700 Subject: fixes #9790: nullify right padding in container-ed navbars when last element in collapse is a right aligned navbar nav --- less/navbar.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index ce598d0d2..0554f5fbf 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -77,6 +77,10 @@ &.in { overflow-y: visible; } + + .navbar-nav.navbar-right:last-child { + margin-right: -@navbar-padding-horizontal; + } } } -- cgit v1.2.3 From abca00870f862d024a943b2c563bd42ff3f8418f Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Sun, 18 Aug 2013 23:05:56 +0200 Subject: Add a .navbar-default class for default colors * Extract color styles from .navbar { } and put them into .navbar-default { } * Change variable names * Change the docs accordingly (i.e., add the .navbar-default class to all default navbars) * Change customizer accordingly --- less/navbar.less | 233 +++++++++++++++++++++++++++++++--------------------- less/variables.less | 32 ++++---- 2 files changed, 154 insertions(+), 111 deletions(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 0554f5fbf..454e9c1ce 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -12,8 +12,7 @@ position: relative; min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode) margin-bottom: @navbar-margin-bottom; - background-color: @navbar-bg; - border: 1px solid @navbar-border; + border: 1px solid transparent; // Prevent floats from breaking the navbar .clearfix(); @@ -53,7 +52,7 @@ overflow-x: visible; padding-right: @navbar-padding-horizontal; padding-left: @navbar-padding-horizontal; - border-top: 1px solid darken(@navbar-bg, 7%); + border-top: 1px solid transparent; box-shadow: inset 0 1px 0 rgba(255,255,255,.1); .clearfix(); -webkit-overflow-scrolling: touch; @@ -145,12 +144,9 @@ padding: @navbar-padding-vertical @navbar-padding-horizontal; font-size: @font-size-large; line-height: @line-height-computed; - color: @navbar-brand-color; &:hover, &:focus { - color: @navbar-brand-hover-color; text-decoration: none; - background-color: @navbar-brand-hover-bg; } @media (min-width: @grid-float-breakpoint) { @@ -173,20 +169,14 @@ padding: 9px 10px; .navbar-vertical-align(34px); background-color: transparent; - border: 1px solid @navbar-toggle-border-color; + border: 1px solid transparent; border-radius: @border-radius-base; - &:hover, - &:focus { - background-color: @navbar-toggle-hover-bg; - } - // Bars .icon-bar { display: block; width: 22px; height: 2px; - background-color: @navbar-toggle-icon-bar-bg; border-radius: 1px; } .icon-bar + .icon-bar { @@ -210,29 +200,7 @@ > li > a { padding-top: 10px; padding-bottom: 10px; - color: @navbar-link-color; line-height: @line-height-computed; - &:hover, - &:focus { - color: @navbar-link-hover-color; - background-color: @navbar-link-hover-bg; - } - } - > .active > a { - &, - &:hover, - &:focus { - color: @navbar-link-active-color; - background-color: @navbar-link-active-bg; - } - } - > .disabled > a { - &, - &:hover, - &:focus { - color: @navbar-link-disabled-color; - background-color: @navbar-link-disabled-bg; - } } @media (max-width: @screen-xs-max) { @@ -250,31 +218,12 @@ padding: 5px 15px 5px 25px; } > li > a { - color: @navbar-link-color; line-height: @line-height-computed; &:hover, &:focus { - color: @navbar-link-hover-color; - background-color: @navbar-link-hover-bg; background-image: none; } } - > .active > a { - &, - &:hover, - &:focus { - color: @navbar-link-active-color; - background-color: @navbar-link-active-bg; - } - } - > .disabled > a { - &, - &:hover, - &:focus { - color: @navbar-link-disabled-color; - background-color: @navbar-link-disabled-bg; - } - } } } @@ -321,8 +270,8 @@ margin-left: -@navbar-padding-horizontal; margin-right: -@navbar-padding-horizontal; padding: 10px @navbar-padding-horizontal; - border-top: 1px solid darken(@navbar-bg, 7%); - border-bottom: 1px solid darken(@navbar-bg, 7%); + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); .box-shadow(@shadow); @@ -363,34 +312,6 @@ .border-bottom-radius(0); } -// Dropdown menu items and carets -.navbar-nav { - // Caret should match text color on hover - > .dropdown > a:hover .caret, - > .dropdown > a:focus .caret { - border-top-color: @navbar-link-hover-color; - border-bottom-color: @navbar-link-hover-color; - } - - // Remove background color from open dropdown - > .open > a { - &, - &:hover, - &:focus { - background-color: @navbar-link-active-bg; - color: @navbar-link-active-color; - .caret { - border-top-color: @navbar-link-active-color; - border-bottom-color: @navbar-link-active-color; - } - } - } - > .dropdown > a .caret { - border-top-color: @navbar-link-color; - border-bottom-color: @navbar-link-color; - } -} - // Right aligned menus need alt position .navbar-nav.pull-right > li > .dropdown-menu, .navbar-nav > li > .dropdown-menu.pull-right { @@ -414,7 +335,6 @@ .navbar-text { float: left; - color: @navbar-color; .navbar-vertical-align(@line-height-computed); @media (min-width: @grid-float-breakpoint) { @@ -423,22 +343,145 @@ } } +// Alternate navbars +// -------------------------------------------------- -// Links in navbars -// -// Add a class to ensure links outside the navbar nav are colored correctly. +// Default navbar +.navbar-default { + background-color: @navbar-bg; + border-color: @navbar-border; + + .navbar-brand { + color: @navbar-brand-color; + &:hover, + &:focus { + color: @navbar-brand-hover-color; + background-color: @navbar-brand-hover-bg; + } + } -// Default navbar variables -.navbar-link { - color: @navbar-link-color; - &:hover { - color: @navbar-link-hover-color; + .navbar-text { + color: @navbar-color; + } + + .navbar-nav { + > li > a { + color: @navbar-link-color; + + &:hover, + &:focus { + color: @navbar-link-hover-color; + background-color: @navbar-link-hover-bg; + } + } + > .active > a { + &, + &:hover, + &:focus { + color: @navbar-link-active-color; + background-color: @navbar-link-active-bg; + } + } + > .disabled > a { + &, + &:hover, + &:focus { + color: @navbar-link-disabled-color; + background-color: @navbar-link-disabled-bg; + } + } } -} + .navbar-toggle { + border-color: @navbar-toggle-border-color; + &:hover, + &:focus { + background-color: @navbar-toggle-hover-bg; + } + .icon-bar { + background-color: @navbar-toggle-icon-bar-bg; + } + } + + .navbar-collapse, + .navbar-form { + border-color: darken(@navbar-bg, 7%); + } + + // Dropdown menu items and carets + .navbar-nav { + // Caret should match text color on hover + > .dropdown > a:hover .caret, + > .dropdown > a:focus .caret { + border-top-color: @navbar-link-hover-color; + border-bottom-color: @navbar-link-hover-color; + } + + // Remove background color from open dropdown + > .open > a { + &, + &:hover, + &:focus { + background-color: @navbar-link-active-bg; + color: @navbar-link-active-color; + .caret { + border-top-color: @navbar-link-active-color; + border-bottom-color: @navbar-link-active-color; + } + } + } + > .dropdown > a .caret { + border-top-color: @navbar-link-color; + border-bottom-color: @navbar-link-color; + } + + + @media (max-width: @screen-xs-max) { + // Dropdowns get custom display when collapsed + .open .dropdown-menu { + > li > a { + color: @navbar-link-color; + &:hover, + &:focus { + color: @navbar-link-hover-color; + background-color: @navbar-link-hover-bg; + } + } + > .active > a { + &, + &:hover, + &:focus { + color: @navbar-link-active-color; + background-color: @navbar-link-active-bg; + } + } + > .disabled > a { + &, + &:hover, + &:focus { + color: @navbar-link-disabled-color; + background-color: @navbar-link-disabled-bg; + } + } + } + } + } + + + // Links in navbars + // + // Add a class to ensure links outside the navbar nav are colored correctly. + + .navbar-link { + color: @navbar-link-color; + &:hover { + color: @navbar-link-hover-color; + } + } + +} // Inverse navbar -// -------------------------------------------------- .navbar-inverse { background-color: @navbar-inverse-bg; diff --git a/less/variables.less b/less/variables.less index 3ba25f768..da0786637 100644 --- a/less/variables.less +++ b/less/variables.less @@ -237,31 +237,31 @@ // Basics of a navbar @navbar-height: 50px; @navbar-margin-bottom: @line-height-computed; -@navbar-color: #777; -@navbar-bg: #f8f8f8; -@navbar-border: darken(@navbar-bg, 6.5%); +@navbar-default-color: #777; +@navbar-default-bg: #f8f8f8; +@navbar-default-border: darken(@navbar-bg, 6.5%); @navbar-border-radius: @border-radius-base; @navbar-padding-horizontal: floor(@grid-gutter-width / 2); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); // Navbar links -@navbar-link-color: #777; -@navbar-link-hover-color: #333; -@navbar-link-hover-bg: transparent; -@navbar-link-active-color: #555; -@navbar-link-active-bg: darken(@navbar-bg, 6.5%); -@navbar-link-disabled-color: #ccc; -@navbar-link-disabled-bg: transparent; +@navbar-default-link-color: #777; +@navbar-default-link-hover-color: #333; +@navbar-default-link-hover-bg: transparent; +@navbar-default-link-active-color: #555; +@navbar-default-link-active-bg: darken(@navbar-bg, 6.5%); +@navbar-default-link-disabled-color: #ccc; +@navbar-default-link-disabled-bg: transparent; // Navbar brand label -@navbar-brand-color: @navbar-link-color; -@navbar-brand-hover-color: darken(@navbar-link-color, 10%); -@navbar-brand-hover-bg: transparent; +@navbar-default-brand-color: @navbar-link-color; +@navbar-default-brand-hover-color: darken(@navbar-link-color, 10%); +@navbar-default-brand-hover-bg: transparent; // Navbar toggle -@navbar-toggle-hover-bg: #ddd; -@navbar-toggle-icon-bar-bg: #ccc; -@navbar-toggle-border-color: #ddd; +@navbar-default-toggle-hover-bg: #ddd; +@navbar-default-toggle-icon-bar-bg: #ccc; +@navbar-default-toggle-border-color: #ddd; // Inverted navbar -- cgit v1.2.3 From 743fc9ac7e7d0b82a5443855631122c1e0a7e0bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sun, 18 Aug 2013 23:28:55 +0200 Subject: Nesting for link styles --- less/scaffolding.less | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'less') diff --git a/less/scaffolding.less b/less/scaffolding.less index 3a6ed3d99..7f6d3bf3a 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -54,14 +54,16 @@ textarea { a { color: @link-color; text-decoration: none; -} -a:hover, -a:focus { - color: @link-hover-color; - text-decoration: underline; -} -a:focus { - .tab-focus(); + + &:hover, + &:focus { + color: @link-hover-color; + text-decoration: underline; + } + + &:focus { + .tab-focus(); + } } -- cgit v1.2.3 From 546b2cc614ed57f1068eb455b592d6966d49d2d3 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Sun, 18 Aug 2013 23:30:40 +0200 Subject: Fix some forgotten things for navbar-default New variable names were missing here and there. --- less/navbar.less | 68 ++++++++++++++++++++++++++--------------------------- less/theme.less | 4 ++-- less/variables.less | 8 +++---- 3 files changed, 40 insertions(+), 40 deletions(-) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 454e9c1ce..754b018ad 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -348,64 +348,64 @@ // Default navbar .navbar-default { - background-color: @navbar-bg; - border-color: @navbar-border; + background-color: @navbar-default-bg; + border-color: @navbar-default-border; .navbar-brand { - color: @navbar-brand-color; + color: @navbar-default-brand-color; &:hover, &:focus { - color: @navbar-brand-hover-color; - background-color: @navbar-brand-hover-bg; + color: @navbar-default-brand-hover-color; + background-color: @navbar-default-brand-hover-bg; } } .navbar-text { - color: @navbar-color; + color: @navbar-default-color; } .navbar-nav { > li > a { - color: @navbar-link-color; + color: @navbar-default-link-color; &:hover, &:focus { - color: @navbar-link-hover-color; - background-color: @navbar-link-hover-bg; + color: @navbar-default-link-hover-color; + background-color: @navbar-default-link-hover-bg; } } > .active > a { &, &:hover, &:focus { - color: @navbar-link-active-color; - background-color: @navbar-link-active-bg; + color: @navbar-default-link-active-color; + background-color: @navbar-default-link-active-bg; } } > .disabled > a { &, &:hover, &:focus { - color: @navbar-link-disabled-color; - background-color: @navbar-link-disabled-bg; + color: @navbar-default-link-disabled-color; + background-color: @navbar-default-link-disabled-bg; } } } .navbar-toggle { - border-color: @navbar-toggle-border-color; + border-color: @navbar-default-toggle-border-color; &:hover, &:focus { - background-color: @navbar-toggle-hover-bg; + background-color: @navbar-default-toggle-hover-bg; } .icon-bar { - background-color: @navbar-toggle-icon-bar-bg; + background-color: @navbar-default-toggle-icon-bar-bg; } } .navbar-collapse, .navbar-form { - border-color: darken(@navbar-bg, 7%); + border-color: darken(@navbar-default-bg, 7%); } // Dropdown menu items and carets @@ -413,8 +413,8 @@ // Caret should match text color on hover > .dropdown > a:hover .caret, > .dropdown > a:focus .caret { - border-top-color: @navbar-link-hover-color; - border-bottom-color: @navbar-link-hover-color; + border-top-color: @navbar-default-link-hover-color; + border-bottom-color: @navbar-default-link-hover-color; } // Remove background color from open dropdown @@ -422,17 +422,17 @@ &, &:hover, &:focus { - background-color: @navbar-link-active-bg; - color: @navbar-link-active-color; + background-color: @navbar-default-link-active-bg; + color: @navbar-default-link-active-color; .caret { - border-top-color: @navbar-link-active-color; - border-bottom-color: @navbar-link-active-color; + border-top-color: @navbar-default-link-active-color; + border-bottom-color: @navbar-default-link-active-color; } } } > .dropdown > a .caret { - border-top-color: @navbar-link-color; - border-bottom-color: @navbar-link-color; + border-top-color: @navbar-default-link-color; + border-bottom-color: @navbar-default-link-color; } @@ -440,27 +440,27 @@ // Dropdowns get custom display when collapsed .open .dropdown-menu { > li > a { - color: @navbar-link-color; + color: @navbar-default-link-color; &:hover, &:focus { - color: @navbar-link-hover-color; - background-color: @navbar-link-hover-bg; + color: @navbar-default-link-hover-color; + background-color: @navbar-default-link-hover-bg; } } > .active > a { &, &:hover, &:focus { - color: @navbar-link-active-color; - background-color: @navbar-link-active-bg; + color: @navbar-default-link-active-color; + background-color: @navbar-default-link-active-bg; } } > .disabled > a { &, &:hover, &:focus { - color: @navbar-link-disabled-color; - background-color: @navbar-link-disabled-bg; + color: @navbar-default-link-disabled-color; + background-color: @navbar-default-link-disabled-bg; } } } @@ -473,9 +473,9 @@ // Add a class to ensure links outside the navbar nav are colored correctly. .navbar-link { - color: @navbar-link-color; + color: @navbar-default-link-color; &:hover { - color: @navbar-link-hover-color; + color: @navbar-default-link-hover-color; } } diff --git a/less/theme.less b/less/theme.less index f7e503644..d2f98f2fb 100644 --- a/less/theme.less +++ b/less/theme.less @@ -93,13 +93,13 @@ // Basic navbar .navbar { - #gradient > .vertical(@start-color: lighten(@navbar-bg, 10%); @end-color: @navbar-bg;); + #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg;); border-radius: @navbar-border-radius; @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); .box-shadow(@shadow); .navbar-nav > .active > a { - background-color: @navbar-bg; + background-color: @navbar-default-bg; } } .navbar-brand, diff --git a/less/variables.less b/less/variables.less index da0786637..53aad251b 100644 --- a/less/variables.less +++ b/less/variables.less @@ -239,7 +239,7 @@ @navbar-margin-bottom: @line-height-computed; @navbar-default-color: #777; @navbar-default-bg: #f8f8f8; -@navbar-default-border: darken(@navbar-bg, 6.5%); +@navbar-default-border: darken(@navbar-default-bg, 6.5%); @navbar-border-radius: @border-radius-base; @navbar-padding-horizontal: floor(@grid-gutter-width / 2); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); @@ -249,13 +249,13 @@ @navbar-default-link-hover-color: #333; @navbar-default-link-hover-bg: transparent; @navbar-default-link-active-color: #555; -@navbar-default-link-active-bg: darken(@navbar-bg, 6.5%); +@navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%); @navbar-default-link-disabled-color: #ccc; @navbar-default-link-disabled-bg: transparent; // Navbar brand label -@navbar-default-brand-color: @navbar-link-color; -@navbar-default-brand-hover-color: darken(@navbar-link-color, 10%); +@navbar-default-brand-color: @navbar-default-link-color; +@navbar-default-brand-hover-color: darken(@navbar-default-link-color, 10%); @navbar-default-brand-hover-bg: transparent; // Navbar toggle -- cgit v1.2.3 From fa3959a1e10da848867be73ac1d18d209367a9b0 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 18 Aug 2013 15:05:42 -0700 Subject: rm redundant ampersands from button-groups LESS --- less/button-groups.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/button-groups.less b/less/button-groups.less index 45f2fd0a9..43ada11d9 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -22,11 +22,11 @@ & .btn-default .caret { border-bottom-color: @btn-default-color; } - & .btn-primary, - & .btn-success, - & .btn-warning, - & .btn-danger, - & .btn-info { + .btn-primary, + .btn-success, + .btn-warning, + .btn-danger, + .btn-info { .caret { border-bottom-color: #fff; } -- cgit v1.2.3 From 9b61b7a72219888ff662186dbe552150497715f9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 15:10:28 -0700 Subject: fixes #9803: label and input alignment in horizontal forms --- less/forms.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index c59cdd4d7..798b07c17 100644 --- a/less/forms.less +++ b/less/forms.less @@ -329,7 +329,7 @@ input[type="checkbox"], .form-horizontal .control-label, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline { - padding-top: @padding-base-vertical; + padding-top: (@padding-base-vertical + 1); // Default padding plus a border } .form-horizontal { -- cgit v1.2.3 From 7b0d93f79ea252f57cd6e132b1447a63efcdf095 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 18 Aug 2013 15:15:33 -0700 Subject: regenerate Glyphicons LESS from their website; fixes some wrong codepoint numbers --- less/glyphicons.less | 401 +++++++++++++++++++++++++-------------------------- 1 file changed, 200 insertions(+), 201 deletions(-) (limited to 'less') diff --git a/less/glyphicons.less b/less/glyphicons.less index 1f89bd4c0..1c6cf2fd7 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -30,204 +30,203 @@ } // Individual icons -.glyphicon-glass { &:before { content: "\e001"; } } -.glyphicon-music { &:before { content: "\e002"; } } -.glyphicon-search { &:before { content: "\e003"; } } -.glyphicon-envelope { &:before { content: "\2709"; } } -.glyphicon-heart { &:before { content: "\e005"; } } -.glyphicon-star { &:before { content: "\e006"; } } -.glyphicon-star-empty { &:before { content: "\e007"; } } -.glyphicon-user { &:before { content: "\e008"; } } -.glyphicon-film { &:before { content: "\e009"; } } -.glyphicon-th-large { &:before { content: "\e010"; } } -.glyphicon-th { &:before { content: "\e011"; } } -.glyphicon-th-list { &:before { content: "\e012"; } } -.glyphicon-ok { &:before { content: "\e013"; } } -.glyphicon-remove { &:before { content: "\e014"; } } -.glyphicon-zoom-in { &:before { content: "\e015"; } } -.glyphicon-zoom-out { &:before { content: "\e016"; } } -.glyphicon-off { &:before { content: "\e017"; } } -.glyphicon-signal { &:before { content: "\e018"; } } -.glyphicon-cog { &:before { content: "\e019"; } } -.glyphicon-trash { &:before { content: "\e020"; } } -.glyphicon-home { &:before { content: "\e021"; } } -.glyphicon-file { &:before { content: "\e022"; } } -.glyphicon-time { &:before { content: "\e023"; } } -.glyphicon-road { &:before { content: "\e024"; } } -.glyphicon-download-alt { &:before { content: "\e025"; } } -.glyphicon-download { &:before { content: "\e026"; } } -.glyphicon-upload { &:before { content: "\e027"; } } -.glyphicon-inbox { &:before { content: "\e028"; } } -.glyphicon-play-circle { &:before { content: "\e029"; } } -.glyphicon-repeat { &:before { content: "\e030"; } } -.glyphicon-refresh { &:before { content: "\e031"; } } -.glyphicon-list-alt { &:before { content: "\e032"; } } -.glyphicon-lock { &:before { content: "\e033"; } } -.glyphicon-flag { &:before { content: "\e034"; } } -.glyphicon-headphones { &:before { content: "\e035"; } } -.glyphicon-volume-off { &:before { content: "\e036"; } } -.glyphicon-volume-down { &:before { content: "\e037"; } } -.glyphicon-volume-up { &:before { content: "\e038"; } } -.glyphicon-qrcode { &:before { content: "\e039"; } } -.glyphicon-barcode { &:before { content: "\e040"; } } -.glyphicon-tag { &:before { content: "\e041"; } } -.glyphicon-tags { &:before { content: "\e042"; } } -.glyphicon-book { &:before { content: "\e043"; } } -.glyphicon-bookmark { &:before { content: "\e044"; } } -.glyphicon-print { &:before { content: "\e045"; } } -.glyphicon-camera { &:before { content: "\e046"; } } -.glyphicon-font { &:before { content: "\e047"; } } -.glyphicon-bold { &:before { content: "\e048"; } } -.glyphicon-italic { &:before { content: "\e049"; } } -.glyphicon-text-height { &:before { content: "\e050"; } } -.glyphicon-text-width { &:before { content: "\e051"; } } -.glyphicon-align-left { &:before { content: "\e052"; } } -.glyphicon-align-center { &:before { content: "\e053"; } } -.glyphicon-align-right { &:before { content: "\e054"; } } -.glyphicon-align-justify { &:before { content: "\e055"; } } -.glyphicon-list { &:before { content: "\e056"; } } -.glyphicon-indent-left { &:before { content: "\e057"; } } -.glyphicon-indent-right { &:before { content: "\e058"; } } -.glyphicon-facetime-video { &:before { content: "\e059"; } } -.glyphicon-picture { &:before { content: "\e060"; } } -.glyphicon-pencil { &:before { content: "\270f"; } } -.glyphicon-map-marker { &:before { content: "\e062"; } } -.glyphicon-adjust { &:before { content: "\e063"; } } -.glyphicon-tint { &:before { content: "\e064"; } } -.glyphicon-edit { &:before { content: "\e065"; } } -.glyphicon-share { &:before { content: "\e066"; } } -.glyphicon-check { &:before { content: "\e067"; } } -.glyphicon-move { &:before { content: "\e068"; } } -.glyphicon-step-backward { &:before { content: "\e069"; } } -.glyphicon-fast-backward { &:before { content: "\e070"; } } -.glyphicon-backward { &:before { content: "\e071"; } } -.glyphicon-play { &:before { content: "\e072"; } } -.glyphicon-pause { &:before { content: "\e073"; } } -.glyphicon-stop { &:before { content: "\e074"; } } -.glyphicon-forward { &:before { content: "\e075"; } } -.glyphicon-fast-forward { &:before { content: "\e076"; } } -.glyphicon-step-forward { &:before { content: "\e077"; } } -.glyphicon-eject { &:before { content: "\e078"; } } -.glyphicon-chevron-left { &:before { content: "\e079"; } } -.glyphicon-chevron-right { &:before { content: "\e080"; } } -.glyphicon-plus-sign { &:before { content: "\e081"; } } -.glyphicon-minus-sign { &:before { content: "\e082"; } } -.glyphicon-remove-sign { &:before { content: "\e083"; } } -.glyphicon-ok-sign { &:before { content: "\e084"; } } -.glyphicon-question-sign { &:before { content: "\e085"; } } -.glyphicon-info-sign { &:before { content: "\e086"; } } -.glyphicon-screenshot { &:before { content: "\e087"; } } -.glyphicon-remove-circle { &:before { content: "\e088"; } } -.glyphicon-ok-circle { &:before { content: "\e089"; } } -.glyphicon-ban-circle { &:before { content: "\e090"; } } -.glyphicon-arrow-left { &:before { content: "\e091"; } } -.glyphicon-arrow-right { &:before { content: "\e092"; } } -.glyphicon-arrow-up { &:before { content: "\e093"; } } -.glyphicon-arrow-down { &:before { content: "\e094"; } } -.glyphicon-share-alt { &:before { content: "\e095"; } } -.glyphicon-resize-full { &:before { content: "\e096"; } } -.glyphicon-resize-small { &:before { content: "\e097"; } } -.glyphicon-plus { &:before { content: "\002b"; } } -.glyphicon-minus { &:before { content: "\2212"; } } -.glyphicon-asterisk { &:before { content: "\002a"; } } -.glyphicon-exclamation-sign { &:before { content: "\e101"; } } -.glyphicon-gift { &:before { content: "\e102"; } } -.glyphicon-leaf { &:before { content: "\e103"; } } -.glyphicon-fire { &:before { content: "\e104"; } } -.glyphicon-eye-open { &:before { content: "\e105"; } } -.glyphicon-eye-close { &:before { content: "\e106"; } } -.glyphicon-warning-sign { &:before { content: "\e107"; } } -.glyphicon-plane { &:before { content: "\e108"; } } -.glyphicon-calendar { &:before { content: "\e109"; } } -.glyphicon-random { &:before { content: "\e110"; } } -.glyphicon-comment { &:before { content: "\e111"; } } -.glyphicon-magnet { &:before { content: "\e112"; } } -.glyphicon-chevron-up { &:before { content: "\e113"; } } -.glyphicon-chevron-down { &:before { content: "\e114"; } } -.glyphicon-retweet { &:before { content: "\e115"; } } -.glyphicon-shopping-cart { &:before { content: "\e116"; } } -.glyphicon-folder-close { &:before { content: "\e117"; } } -.glyphicon-folder-open { &:before { content: "\e118"; } } -.glyphicon-resize-vertical { &:before { content: "\e119"; } } -.glyphicon-resize-horizontal { &:before { content: "\e120"; } } -.glyphicon-hdd { &:before { content: "\e121"; } } -.glyphicon-bullhorn { &:before { content: "\e122"; } } -.glyphicon-bell { &:before { content: "\e123"; } } -.glyphicon-certificate { &:before { content: "\e124"; } } -.glyphicon-thumbs-up { &:before { content: "\e125"; } } -.glyphicon-thumbs-down { &:before { content: "\e126"; } } -.glyphicon-hand-right { &:before { content: "\e127"; } } -.glyphicon-hand-left { &:before { content: "\e128"; } } -.glyphicon-hand-up { &:before { content: "\e129"; } } -.glyphicon-hand-down { &:before { content: "\e130"; } } -.glyphicon-circle-arrow-right { &:before { content: "\e131"; } } -.glyphicon-circle-arrow-left { &:before { content: "\e132"; } } -.glyphicon-circle-arrow-up { &:before { content: "\e133"; } } -.glyphicon-circle-arrow-down { &:before { content: "\e134"; } } -.glyphicon-globe { &:before { content: "\e135"; } } -.glyphicon-wrench { &:before { content: "\e136"; } } -.glyphicon-tasks { &:before { content: "\e137"; } } -.glyphicon-filter { &:before { content: "\e138"; } } -.glyphicon-briefcase { &:before { content: "\e139"; } } -.glyphicon-fullscreen { &:before { content: "\e140"; } } -.glyphicon-dashboard { &:before { content: "\e141"; } } -.glyphicon-paperclip { &:before { content: "\e142"; } } -.glyphicon-heart-empty { &:before { content: "\e143"; } } -.glyphicon-link { &:before { content: "\e144"; } } -.glyphicon-phone { &:before { content: "\e145"; } } -.glyphicon-pushpin { &:before { content: "\e146"; } } -.glyphicon-euro { &:before { content: "\20ac"; } } -.glyphicon-usd { &:before { content: "\e148"; } } -.glyphicon-gbp { &:before { content: "\e149"; } } -.glyphicon-sort { &:before { content: "\e150"; } } -.glyphicon-sort-by-alphabet { &:before { content: "\e151"; } } -.glyphicon-sort-by-alphabet-alt { &:before { content: "\e152"; } } -.glyphicon-sort-by-order { &:before { content: "\e153"; } } -.glyphicon-sort-by-order-alt { &:before { content: "\e154"; } } -.glyphicon-sort-by-attributes { &:before { content: "\e155"; } } -.glyphicon-sort-by-attributes-alt { &:before { content: "\e156"; } } -.glyphicon-unchecked { &:before { content: "\e157"; } } -.glyphicon-expand { &:before { content: "\e158"; } } -.glyphicon-collapse { &:before { content: "\e159"; } } -.glyphicon-collapse-top { &:before { content: "\e160"; } } - -.glyphicon-log-in { &:before{ content: "\e161"; } } -.glyphicon-flash { &:before{ content: "\e162"; } } -.glyphicon-log-out { &:before{ content: "\e163"; } } -.glyphicon-new-window { &:before{ content: "\e164"; } } -.glyphicon-record { &:before{ content: "\e165"; } } -.glyphicon-save { &:before{ content: "\e166"; } } -.glyphicon-open { &:before{ content: "\e167"; } } -.glyphicon-saved { &:before{ content: "\e168"; } } -.glyphicon-import { &:before{ content: "\e169"; } } -.glyphicon-export { &:before{ content: "\e170"; } } -.glyphicon-send { &:before{ content: "\e171"; } } -.glyphicon-floppy-disk { &:before{ content: "\e172"; } } -.glyphicon-floppy-saved { &:before{ content: "\e173"; } } -.glyphicon-floppy-remove { &:before{ content: "\e174"; } } -.glyphicon-floppy-save { &:before{ content: "\e175"; } } -.glyphicon-floppy-open { &:before{ content: "\e176"; } } -.glyphicon-credit-card { &:before{ content: "\e177"; } } -.glyphicon-transfer { &:before{ content: "\e178"; } } -.glyphicon-cutlery { &:before{ content: "\e179"; } } -.glyphicon-header { &:before{ content: "\e180"; } } -.glyphicon-compressed { &:before{ content: "\e181"; } } -.glyphicon-earphone { &:before{ content: "\e182"; } } -.glyphicon-phone-alt { &:before{ content: "\e183"; } } -.glyphicon-tower { &:before{ content: "\e184"; } } -.glyphicon-stats { &:before{ content: "\e185"; } } -.glyphicon-sd-video { &:before{ content: "\e186"; } } -.glyphicon-hd-video { &:before{ content: "\e187"; } } -.glyphicon-subtitles { &:before{ content: "\e188"; } } -.glyphicon-sound-stereo { &:before{ content: "\e189"; } } -.glyphicon-sound-dolby { &:before{ content: "\e190"; } } -.glyphicon-sound-5-1 { &:before{ content: "\e191"; } } -.glyphicon-sound-6-1 { &:before{ content: "\e192"; } } -.glyphicon-sound-7-1 { &:before{ content: "\e193"; } } -.glyphicon-copyright-mark { &:before{ content: "\e194"; } } -.glyphicon-registration-mark { &:before{ content: "\e195"; } } -.glyphicon-cloud { &:before{ content: "\2601"; } } -.glyphicon-cloud-download { &:before{ content: "\e197"; } } -.glyphicon-cloud-upload { &:before{ content: "\e198"; } } -.glyphicon-tree-conifer { &:before{ content: "\e199"; } } -.glyphicon-tree-deciduous { &:before{ content: "\e200"; } } +.glyphicon-asterisk { &:before { content: "\2a"; } } +.glyphicon-plus { &:before { content: "\2b"; } } +.glyphicon-euro { &:before { content: "\20ac"; } } +.glyphicon-minus { &:before { content: "\2212"; } } +.glyphicon-cloud { &:before { content: "\2601"; } } +.glyphicon-envelope { &:before { content: "\2709"; } } +.glyphicon-pencil { &:before { content: "\270f"; } } +.glyphicon-glass { &:before { content: "\e001"; } } +.glyphicon-music { &:before { content: "\e002"; } } +.glyphicon-search { &:before { content: "\e003"; } } +.glyphicon-heart { &:before { content: "\e005"; } } +.glyphicon-star { &:before { content: "\e006"; } } +.glyphicon-star-empty { &:before { content: "\e007"; } } +.glyphicon-user { &:before { content: "\e008"; } } +.glyphicon-film { &:before { content: "\e009"; } } +.glyphicon-th-large { &:before { content: "\e010"; } } +.glyphicon-th { &:before { content: "\e011"; } } +.glyphicon-th-list { &:before { content: "\e012"; } } +.glyphicon-ok { &:before { content: "\e013"; } } +.glyphicon-remove { &:before { content: "\e014"; } } +.glyphicon-zoom-in { &:before { content: "\e015"; } } +.glyphicon-zoom-out { &:before { content: "\e016"; } } +.glyphicon-off { &:before { content: "\e017"; } } +.glyphicon-signal { &:before { content: "\e018"; } } +.glyphicon-cog { &:before { content: "\e019"; } } +.glyphicon-trash { &:before { content: "\e020"; } } +.glyphicon-home { &:before { content: "\e021"; } } +.glyphicon-file { &:before { content: "\e022"; } } +.glyphicon-time { &:before { content: "\e023"; } } +.glyphicon-road { &:before { content: "\e024"; } } +.glyphicon-download-alt { &:before { content: "\e025"; } } +.glyphicon-download { &:before { content: "\e026"; } } +.glyphicon-upload { &:before { content: "\e027"; } } +.glyphicon-inbox { &:before { content: "\e028"; } } +.glyphicon-play-circle { &:before { content: "\e029"; } } +.glyphicon-repeat { &:before { content: "\e030"; } } +.glyphicon-refresh { &:before { content: "\e031"; } } +.glyphicon-list-alt { &:before { content: "\e032"; } } +.glyphicon-flag { &:before { content: "\e034"; } } +.glyphicon-headphones { &:before { content: "\e035"; } } +.glyphicon-volume-off { &:before { content: "\e036"; } } +.glyphicon-volume-down { &:before { content: "\e037"; } } +.glyphicon-volume-up { &:before { content: "\e038"; } } +.glyphicon-qrcode { &:before { content: "\e039"; } } +.glyphicon-barcode { &:before { content: "\e040"; } } +.glyphicon-tag { &:before { content: "\e041"; } } +.glyphicon-tags { &:before { content: "\e042"; } } +.glyphicon-book { &:before { content: "\e043"; } } +.glyphicon-print { &:before { content: "\e045"; } } +.glyphicon-font { &:before { content: "\e047"; } } +.glyphicon-bold { &:before { content: "\e048"; } } +.glyphicon-italic { &:before { content: "\e049"; } } +.glyphicon-text-height { &:before { content: "\e050"; } } +.glyphicon-text-width { &:before { content: "\e051"; } } +.glyphicon-align-left { &:before { content: "\e052"; } } +.glyphicon-align-center { &:before { content: "\e053"; } } +.glyphicon-align-right { &:before { content: "\e054"; } } +.glyphicon-align-justify { &:before { content: "\e055"; } } +.glyphicon-list { &:before { content: "\e056"; } } +.glyphicon-indent-left { &:before { content: "\e057"; } } +.glyphicon-indent-right { &:before { content: "\e058"; } } +.glyphicon-facetime-video { &:before { content: "\e059"; } } +.glyphicon-picture { &:before { content: "\e060"; } } +.glyphicon-map-marker { &:before { content: "\e062"; } } +.glyphicon-adjust { &:before { content: "\e063"; } } +.glyphicon-tint { &:before { content: "\e064"; } } +.glyphicon-edit { &:before { content: "\e065"; } } +.glyphicon-share { &:before { content: "\e066"; } } +.glyphicon-check { &:before { content: "\e067"; } } +.glyphicon-move { &:before { content: "\e068"; } } +.glyphicon-step-backward { &:before { content: "\e069"; } } +.glyphicon-fast-backward { &:before { content: "\e070"; } } +.glyphicon-backward { &:before { content: "\e071"; } } +.glyphicon-play { &:before { content: "\e072"; } } +.glyphicon-pause { &:before { content: "\e073"; } } +.glyphicon-stop { &:before { content: "\e074"; } } +.glyphicon-forward { &:before { content: "\e075"; } } +.glyphicon-fast-forward { &:before { content: "\e076"; } } +.glyphicon-step-forward { &:before { content: "\e077"; } } +.glyphicon-eject { &:before { content: "\e078"; } } +.glyphicon-chevron-left { &:before { content: "\e079"; } } +.glyphicon-chevron-right { &:before { content: "\e080"; } } +.glyphicon-plus-sign { &:before { content: "\e081"; } } +.glyphicon-minus-sign { &:before { content: "\e082"; } } +.glyphicon-remove-sign { &:before { content: "\e083"; } } +.glyphicon-ok-sign { &:before { content: "\e084"; } } +.glyphicon-question-sign { &:before { content: "\e085"; } } +.glyphicon-info-sign { &:before { content: "\e086"; } } +.glyphicon-screenshot { &:before { content: "\e087"; } } +.glyphicon-remove-circle { &:before { content: "\e088"; } } +.glyphicon-ok-circle { &:before { content: "\e089"; } } +.glyphicon-ban-circle { &:before { content: "\e090"; } } +.glyphicon-arrow-left { &:before { content: "\e091"; } } +.glyphicon-arrow-right { &:before { content: "\e092"; } } +.glyphicon-arrow-up { &:before { content: "\e093"; } } +.glyphicon-arrow-down { &:before { content: "\e094"; } } +.glyphicon-share-alt { &:before { content: "\e095"; } } +.glyphicon-resize-full { &:before { content: "\e096"; } } +.glyphicon-resize-small { &:before { content: "\e097"; } } +.glyphicon-exclamation-sign { &:before { content: "\e101"; } } +.glyphicon-gift { &:before { content: "\e102"; } } +.glyphicon-leaf { &:before { content: "\e103"; } } +.glyphicon-eye-open { &:before { content: "\e105"; } } +.glyphicon-eye-close { &:before { content: "\e106"; } } +.glyphicon-warning-sign { &:before { content: "\e107"; } } +.glyphicon-plane { &:before { content: "\e108"; } } +.glyphicon-random { &:before { content: "\e110"; } } +.glyphicon-comments { &:before { content: "\e111"; } } +.glyphicon-magnet { &:before { content: "\e112"; } } +.glyphicon-chevron-up { &:before { content: "\e113"; } } +.glyphicon-chevron-down { &:before { content: "\e114"; } } +.glyphicon-retweet { &:before { content: "\e115"; } } +.glyphicon-shopping-cart { &:before { content: "\e116"; } } +.glyphicon-folder-close { &:before { content: "\e117"; } } +.glyphicon-folder-open { &:before { content: "\e118"; } } +.glyphicon-resize-vertical { &:before { content: "\e119"; } } +.glyphicon-resize-horizontal { &:before { content: "\e120"; } } +.glyphicon-hdd { &:before { content: "\e121"; } } +.glyphicon-bullhorn { &:before { content: "\e122"; } } +.glyphicon-certificate { &:before { content: "\e124"; } } +.glyphicon-thumbs-up { &:before { content: "\e125"; } } +.glyphicon-thumbs-down { &:before { content: "\e126"; } } +.glyphicon-hand-right { &:before { content: "\e127"; } } +.glyphicon-hand-left { &:before { content: "\e128"; } } +.glyphicon-hand-top { &:before { content: "\e129"; } } +.glyphicon-hand-down { &:before { content: "\e130"; } } +.glyphicon-circle-arrow-right { &:before { content: "\e131"; } } +.glyphicon-circle-arrow-left { &:before { content: "\e132"; } } +.glyphicon-circle-arrow-top { &:before { content: "\e133"; } } +.glyphicon-circle-arrow-down { &:before { content: "\e134"; } } +.glyphicon-globe { &:before { content: "\e135"; } } +.glyphicon-tasks { &:before { content: "\e137"; } } +.glyphicon-filter { &:before { content: "\e138"; } } +.glyphicon-fullscreen { &:before { content: "\e140"; } } +.glyphicon-dashboard { &:before { content: "\e141"; } } +.glyphicon-heart-empty { &:before { content: "\e143"; } } +.glyphicon-link { &:before { content: "\e144"; } } +.glyphicon-phone { &:before { content: "\e145"; } } +.glyphicon-usd { &:before { content: "\e148"; } } +.glyphicon-gbp { &:before { content: "\e149"; } } +.glyphicon-sort { &:before { content: "\e150"; } } +.glyphicon-sort-by-alphabet { &:before { content: "\e151"; } } +.glyphicon-sort-by-alphabet-alt { &:before { content: "\e152"; } } +.glyphicon-sort-by-order { &:before { content: "\e153"; } } +.glyphicon-sort-by-order-alt { &:before { content: "\e154"; } } +.glyphicon-sort-by-attributes { &:before { content: "\e155"; } } +.glyphicon-sort-by-attributes-alt { &:before { content: "\e156"; } } +.glyphicon-unchecked { &:before { content: "\e157"; } } +.glyphicon-expand { &:before { content: "\e158"; } } +.glyphicon-collapse { &:before { content: "\e159"; } } +.glyphicon-collapse-top { &:before { content: "\e160"; } } +.glyphicon-log-in { &:before { content: "\e161"; } } +.glyphicon-flash { &:before { content: "\e162"; } } +.glyphicon-log-out { &:before { content: "\e163"; } } +.glyphicon-new-window { &:before { content: "\e164"; } } +.glyphicon-record { &:before { content: "\e165"; } } +.glyphicon-save { &:before { content: "\e166"; } } +.glyphicon-open { &:before { content: "\e167"; } } +.glyphicon-saved { &:before { content: "\e168"; } } +.glyphicon-import { &:before { content: "\e169"; } } +.glyphicon-export { &:before { content: "\e170"; } } +.glyphicon-send { &:before { content: "\e171"; } } +.glyphicon-floppy-disk { &:before { content: "\e172"; } } +.glyphicon-floppy-saved { &:before { content: "\e173"; } } +.glyphicon-floppy-remove { &:before { content: "\e174"; } } +.glyphicon-floppy-save { &:before { content: "\e175"; } } +.glyphicon-floppy-open { &:before { content: "\e176"; } } +.glyphicon-credit-card { &:before { content: "\e177"; } } +.glyphicon-transfer { &:before { content: "\e178"; } } +.glyphicon-cutlery { &:before { content: "\e179"; } } +.glyphicon-header { &:before { content: "\e180"; } } +.glyphicon-compressed { &:before { content: "\e181"; } } +.glyphicon-earphone { &:before { content: "\e182"; } } +.glyphicon-phone-alt { &:before { content: "\e183"; } } +.glyphicon-tower { &:before { content: "\e184"; } } +.glyphicon-stats { &:before { content: "\e185"; } } +.glyphicon-sd-video { &:before { content: "\e186"; } } +.glyphicon-hd-video { &:before { content: "\e187"; } } +.glyphicon-subtitles { &:before { content: "\e188"; } } +.glyphicon-sound-stereo { &:before { content: "\e189"; } } +.glyphicon-sound-dolby { &:before { content: "\e190"; } } +.glyphicon-sound-5-1 { &:before { content: "\e191"; } } +.glyphicon-sound-6-1 { &:before { content: "\e192"; } } +.glyphicon-sound-7-1 { &:before { content: "\e193"; } } +.glyphicon-copyright-mark { &:before { content: "\e194"; } } +.glyphicon-registration-mark { &:before { content: "\e195"; } } +.glyphicon-cloud-download { &:before { content: "\e197"; } } +.glyphicon-cloud-upload { &:before { content: "\e198"; } } +.glyphicon-tree-conifer { &:before { content: "\e199"; } } +.glyphicon-tree-deciduous { &:before { content: "\e200"; } } +.glyphicon-briefcase { &:before { content: "\1f4bc"; } } +.glyphicon-calendar { &:before { content: "\1f4c5"; } } +.glyphicon-pushpin { &:before { content: "\1f4cc"; } } +.glyphicon-paperclip { &:before { content: "\1f4ce"; } } +.glyphicon-camera { &:before { content: "\1f4f7"; } } +.glyphicon-lock { &:before { content: "\1f512"; } } +.glyphicon-bell { &:before { content: "\1f514"; } } +.glyphicon-bookmark { &:before { content: "\1f516"; } } +.glyphicon-fire { &:before { content: "\1f525"; } } +.glyphicon-wrench { &:before { content: "\1f527"; } } -- cgit v1.2.3 From 9fa0a5d12718bef464e002d9b850aebcb63c79e4 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 18 Aug 2013 15:19:13 -0700 Subject: tweak some of the Glyphicon class names to match Bootstrap conventions --- less/glyphicons.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'less') diff --git a/less/glyphicons.less b/less/glyphicons.less index 1c6cf2fd7..2eb07876b 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -137,7 +137,7 @@ .glyphicon-warning-sign { &:before { content: "\e107"; } } .glyphicon-plane { &:before { content: "\e108"; } } .glyphicon-random { &:before { content: "\e110"; } } -.glyphicon-comments { &:before { content: "\e111"; } } +.glyphicon-comment { &:before { content: "\e111"; } } .glyphicon-magnet { &:before { content: "\e112"; } } .glyphicon-chevron-up { &:before { content: "\e113"; } } .glyphicon-chevron-down { &:before { content: "\e114"; } } @@ -154,11 +154,11 @@ .glyphicon-thumbs-down { &:before { content: "\e126"; } } .glyphicon-hand-right { &:before { content: "\e127"; } } .glyphicon-hand-left { &:before { content: "\e128"; } } -.glyphicon-hand-top { &:before { content: "\e129"; } } +.glyphicon-hand-up { &:before { content: "\e129"; } } .glyphicon-hand-down { &:before { content: "\e130"; } } .glyphicon-circle-arrow-right { &:before { content: "\e131"; } } .glyphicon-circle-arrow-left { &:before { content: "\e132"; } } -.glyphicon-circle-arrow-top { &:before { content: "\e133"; } } +.glyphicon-circle-arrow-up { &:before { content: "\e133"; } } .glyphicon-circle-arrow-down { &:before { content: "\e134"; } } .glyphicon-globe { &:before { content: "\e135"; } } .glyphicon-tasks { &:before { content: "\e137"; } } @@ -179,8 +179,8 @@ .glyphicon-sort-by-attributes-alt { &:before { content: "\e156"; } } .glyphicon-unchecked { &:before { content: "\e157"; } } .glyphicon-expand { &:before { content: "\e158"; } } -.glyphicon-collapse { &:before { content: "\e159"; } } -.glyphicon-collapse-top { &:before { content: "\e160"; } } +.glyphicon-collapse-down { &:before { content: "\e159"; } } +.glyphicon-collapse-up { &:before { content: "\e160"; } } .glyphicon-log-in { &:before { content: "\e161"; } } .glyphicon-flash { &:before { content: "\e162"; } } .glyphicon-log-out { &:before { content: "\e163"; } } -- cgit v1.2.3 From fe767a18d369080df509377e049b616c0c572dcc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 15:41:24 -0700 Subject: fixes #9798: update spacing on checkboxes and radios for horizontal --- less/forms.less | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index 798b07c17..0118e242c 100644 --- a/less/forms.less +++ b/less/forms.less @@ -326,21 +326,28 @@ input[type="checkbox"], // Horizontal forms are built on grid classes and allow you to create forms with // labels on the left and inputs on the right. -.form-horizontal .control-label, -.form-horizontal .radio-inline, -.form-horizontal .checkbox-inline { - padding-top: (@padding-base-vertical + 1); // Default padding plus a border -} - .form-horizontal { + + // Consistent vertical alignment of labels, radios, and checkboxes + .control-label, + .radio, + .checkbox, + .radio-inline, + .checkbox-inline { + margin-top: 0; + margin-bottom: 0; + padding-top: (@padding-base-vertical + 1); // Default padding plus a border + } + + // Make form groups behave like rows .form-group { .make-row(); } -} -// Only right align form labels here when the columns stop stacking -@media (min-width: @screen-tablet) { - .form-horizontal .control-label { - text-align: right; + // Only right align form labels here when the columns stop stacking + @media (min-width: @screen-tablet) { + .control-label { + text-align: right; + } } } -- cgit v1.2.3 From 5bd2d7ed7e5a2bae56de81bf550f2e4b1451ab25 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 18:49:07 -0700 Subject: fixes #9815: proper alignment of navbar nav if first child --- less/navbar.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/navbar.less b/less/navbar.less index 754b018ad..55707ca01 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -77,6 +77,10 @@ overflow-y: visible; } + // Account for first and last children spacing + .navbar-nav.navbar-left:first-child { + margin-left: -@navbar-padding-horizontal; + } .navbar-nav.navbar-right:last-child { margin-right: -@navbar-padding-horizontal; } -- cgit v1.2.3