root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 14 Packages Projects Releases Wiki Activity
6,137 Commits 125 Branches 94 Tags 690 MiB
Commit Graph

1877 Commits

Author SHA1 Message Date
Mark Otto 68827689e8 Use `.form-control` in input sizing CSS 2013-07-26 15:41:16 -07:00
Mark Otto 1cf0a07f17 Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3 
Conflicts:
	css.html
 2013-07-26 15:08:45 -07:00
Mark Otto 444973e54d Fixes #8605: use `.form-control` in `.input-group` instead of HTML tags 2013-07-26 14:31:24 -07:00
Mark Otto 9e98b733f1 Vars update 
* Drop progress bar text-shadow
* Reorganize popover and tooltip vars and fix complier error due to
missing `;`
* Run `grunt`
 2013-07-26 11:08:27 -07:00
Mark Otto e62e992b88 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-26 10:44:46 -07:00
Yulong Liu e4300fa1bf fix background of btn-link 2013-07-26 22:27:55 +08:00
Yulong Liu a2f120a7aa remove background:none 2013-07-26 21:59:50 +08:00
James Holland 2e7593a40d Update forms.less to remove .form-horizontal .row + .row 
use .form-group to apply consistent vertical spacing on form rows
 2013-07-26 09:04:39 -04:00
syed 1b8ba0d159 move things around :) 
Moved pager, pagination, popovers, tooltip, progress bars & type
properties to variables.less
 2013-07-26 17:04:15 +05:00
Fred Delrieu 06980ae5a1 Small typo 2013-07-26 10:10:35 +02:00
Mark Otto 210ee63693 Fixes #8586: add addional color text classes to apply all of branch colors easily 2013-07-26 00:18:18 -07:00
Mark Otto 56404bc89b Add `.panel-title` to panel component to mirror modals 
/cc @leeaston
 2013-07-25 21:16:43 -07:00
Mark Otto 2a4a6fe0f0 Merge pull request #8611 from twitter/bs3_form_classes 
Updated BS3 form classes
 2013-07-25 20:31:11 -07:00
Mark Otto 35aad07456 Add comment about opacity mixin not being used 2013-07-25 19:56:04 -07:00
Mark Otto 27cedf71d5 Update form validation states 
* Once again no longer applies to single inputs (this is a bit simpler,
but I'm open to new ideas) but the entire set of inputs, labels, and
help text within a particular element. However, the styles are not too
dependent on markup or layout, so they're super flexible.
* Simplified the markup in the validation docs examples to match latest
changes.
* Renamed `.form-state-validation` mixin to `.form-control-validation`
to match naming of prev commit.
 2013-07-25 19:45:14 -07:00
Mark Otto 71d3d2c3f6 Spacing 2013-07-25 18:55:00 -07:00
Mark Otto 13bc74b636 Refactor forms styles 
* Reorganize forms.less
* Change from attribute selectors to `.form-control`. Few lines, less
specific (meaning easier overrides as `element[type=""]` is more
specific than a class), less intrusive, and more performant.
* Add `.form-group` for basic spacing in vertical forms.
* Remove (unnecessary?) `margin: 0;` from `form` element (as far as I
can tell no browser sets that anyway).
 2013-07-25 18:29:51 -07:00
Chris Rebert 90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00
Mark Otto c7995cf964 move some thing around 2013-07-25 10:50:59 -07:00
Mark Otto f94d9ce096 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into 3.0.0-wip 2013-07-25 10:11:30 -07:00
Mark Otto 768e7edabf fixes #8571 completely: add better th support for table classes 2013-07-25 10:01:42 -07:00
Geremia Taglialatela 0017f7fca4 Navbar toggle is not vertically aligned (3.0.0-wip) with custom navbar height 
When using navbar heights higher that default, the navbar-toggle button is not centered.

Fiddle demonstrating this issue (compiled with `@navbar-height: 60px;`): http://jsfiddle.net/tagliala/mRVMe/2/


Another fiddle with the proposed fix: http://jsfiddle.net/tagliala/mRVMe/3/
 2013-07-25 17:09:12 +02:00
syed a06afd8320 Moved navs inline properties to variables.less and customize.html & nav-customize.html 2013-07-25 12:43:14 +05:00
syed f8d5a974bc Moving navbar inline properties to variables.less and customize.html 2013-07-25 11:58:25 +05:00
Mark Otto 1f40da9676 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	dist/css/bootstrap.min.css
 2013-07-24 16:53:34 -07:00
Mark Otto 51de38e5b9 make again 2013-07-24 16:52:47 -07:00
Mark Otto 61ac20ebb5 Merge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap into salman-javed-confiz-3.0.0-wip 2013-07-24 16:42:13 -07:00
Mark Otto a36f444c25 Merge pull request #8583 from liuyl/disabled 
set cursor to not-allowed for disabled elements
 2013-07-24 16:32:25 -07:00
Mark Otto 3080104642 make footer border color use header border color in modals 2013-07-24 16:31:17 -07:00
syed 2e6fcefc5c 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.
 2013-07-24 18:43:21 +05:00
liuyl 7e9532dabe set cursor to not-allowed for disabled elements 2013-07-24 17:10:27 +08:00
Salman Javed 0caab585f5 issues fixed for nav-justified on pills on android default browser. 2013-07-24 13:39:16 +05:00
Mark Otto 18157e9f39 Run make on prev commits 2013-07-23 23:48:17 -07:00
Mark Otto 9029b4c06c Update forms vars 
* Reorganize layout
* Add input group var
* Add legend border var
 2013-07-23 23:25:46 -07:00
Mark Otto 398038c798 Update dropdown vars 
* Update `.nav-divider` mixin to simplify to a 1px line (one value
instead of two in parametric mixin)
* Rename and consolidate dropdown caret vars
* Add vars to Customizer
 2013-07-23 23:18:53 -07:00
Mark Otto cdf6019e11 Update code vars 
* Drop the `rgba()` border and fallback because fuck that noise
* Add vars to customizer
* Remove rogue `:`
 2013-07-23 23:13:15 -07:00
Mark Otto ba954db159 Update close vars 
* Remove dupe hover color var (again, it's not necessary to have it's
own var here since we're controlling it via `opacity`)
* Add to customizer
 2013-07-23 23:09:06 -07:00
Mark Otto a5cc1300f6 Update carousel vars 
* Remove `@carousel-control-hover-color` since that's just the same as
the default control color and all we change is `opacity` (it's required
for specificity).
* Add vars to customizer
* Update customizer nav to include new section
* Remove the `li` from the var names
* Consolidate and simplify `text-shadow` vars
 2013-07-23 23:03:57 -07:00
Mark Otto b0dd2f902d Update and add `@btn-hover-color` to Customize page 2013-07-23 22:53:30 -07:00
Mark Otto 1803b2f09e Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-23 22:49:13 -07:00
Mark Otto 1d1bd62598 Fixes #8571: allow table classes in thead and tfoot 2013-07-23 22:27:49 -07:00
Mark Otto 4cec956e0c Drop rounded corners on `.table-bordered` 
* Cuts  close to 100 lines of CSS from the table CSS
* File size aside, this drastically simplifies CSS for folks looking to
build on top of the `.table-bordered` option as a starting point
 2013-07-23 10:48:30 -07:00
Mark Otto b5f2482a58 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	dist/css/bootstrap.min.css
 2013-07-23 10:19:04 -07:00
Mark Otto 8aa3c375f0 No more left margin on dd elements, fixes #8567 2013-07-23 10:18:34 -07:00
Francis Brunelle 4b9cacae91 @badge-bg should be @gray-light not #f5f5f5 2013-07-23 00:05:45 -04:00
Mark Otto 12468c6103 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	dist/css/bootstrap.min.css
 2013-07-21 08:52:25 -07:00
Mark Otto e78ba0ff82 Merge pull request #8545 from liuyl/refactor-btngroups 
refactor button-groups.less
 2013-07-21 08:49:52 -07:00
liuyl f5fc6254c7 refactor button-groups.less 2013-07-21 20:03:59 +08:00
liuyl be2693369d remove useless display:inline-block 2013-07-21 19:44:30 +08:00
Mark Otto a63db4d2f9 Update file input to remove height and line-height 
This particular form control is wildly inaccurate across browsers, so
we're removing the `height` and `line-height`, but adding `display:
block` so it renders similarly to our other inputs.
 2013-07-20 21:09:03 -07:00
Mark Otto 51dfa21009 Remove more commented out CSS from forms 2013-07-20 19:32:21 -07:00
Mark Otto 732e4196fb Remove commented out CSS 2013-07-20 19:31:56 -07:00
syed 330f40c864 moving forms, labels and list-group to variables.less 2013-07-20 13:38:27 +05:00
syed 1683e6767a moving code and dropdowns to variables.less 2013-07-20 13:17:56 +05:00
syed c2e37414d8 Move inline properties to variables.less 
moved buttons.less, carousel.less & close.less in this commit
 2013-07-20 12:56:20 +05:00
Mark Otto 4b7f63a3a2 Update vars for badges, breadcrumbs; update customize page 2013-07-20 00:03:08 -07:00
Mark Otto b6238c5f20 Fixes #8385: update carousel captions 
* No longer hidden by default--up to users to figure that part out with
longer content
* Cleaned up styles and spacing
 2013-07-19 17:36:03 -07:00
Mark Otto 95b9f44190 Fixes #8278: fix on print 2013-07-19 16:49:38 -07:00
Mark Otto 4b0fa356f3 Variables reorganization and breadcrumbs update 
* Place component vars alongside the rest of the component vars
* Redo some of the breadcrumbs code to add a var and remove
`text-shadow`
 2013-07-19 11:44:35 -07:00
syed 65ee36a7bf Improved and followed pattern suggestions 2013-07-19 23:14:13 +05:00
syed 5e898fa2a1 move breadcrumb.less inline properties and also added @color-2 missed in last commit 2013-07-19 18:39:51 +05:00
syed b37127e2fc move badges inline properties to variables.less 2013-07-19 18:29:19 +05:00
syed 95be924926 Move accordion inline properties to variables.les 2013-07-19 18:18:01 +05:00
Mark Otto e440ff4b3f `<input>` and `<select>` sizing update 
Restores `font-size` and more to the `<select>` element while also
changing from `min-height` to `height` for input sizing.

Fixes #8520 as opened by @ShaunR (would've merged that PR but I moved
everything around right before).
 2013-07-18 19:53:32 -07:00
Mark Otto 820558916f Fixes #8516: correct input-small and input-large on select elements 2013-07-18 15:36:41 -07:00
Mark Otto 7d9fb1dda7 Jankily fix input group wrapping with button groups in Firefox (fixes #8321, #8429, and #8067) 2013-07-18 15:28:38 -07:00
Chris Rebert 86efc140e2 add comments to gloss Unicode codepoint hex 2013-07-18 11:49:39 -07:00
Mark Otto b372661a17 fixes #8206: Use navbar height var to compute vertical padding on navbar-brand 2013-07-18 02:23:38 -07:00
Mark Otto 64efa86036 for some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed dimensions 2013-07-18 02:19:13 -07:00
Mark Otto 898ee8f13b twerk comment 2013-07-18 01:46:31 -07:00
Mark Otto 6e04925328 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-18 01:25:28 -07:00
Mark Otto e72b524d41 Fixes #8374: ensure navbar is always at least 50px 2013-07-18 01:25:08 -07:00
fat 6ec8a1e44f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-18 01:08:19 -07:00
Mark Otto 181b276774 Fixes #8397: better navbar padding with grid gutter stuff 2013-07-18 01:04:54 -07:00
fat 37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
Mark Otto d87431a29e spacing and local var rename 2013-07-18 00:56:36 -07:00
Mark Otto 0c45458fcc Merge branch 'patch-1' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-1 2013-07-18 00:55:36 -07:00
Mark Otto 02bddac091 Merge pull request #8380 from joeybaker/patch-1 
Remove unneeded prefixes from some mixins
 2013-07-18 00:50:15 -07:00
Mark Otto 8dc7807dcd change characters 2013-07-18 00:48:02 -07:00
Mark Otto 1363ffa473 Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip 2013-07-18 00:43:48 -07:00
Mark Otto e7bc9e1c3d Vurrriables and shit 2013-07-18 00:23:35 -07:00
Mark Otto 79a10feb7a Fixes #8452: adds `.active` to table classes 2013-07-18 00:10:22 -07:00
Mark Otto e5bfd8c00b Fixes #8441: remove `@font-size-mini` 2013-07-17 23:56:20 -07:00
Mark Otto bc79f8a399 Bump tooltips to use `@font-size-small` (11px to 12px) 2013-07-17 23:55:58 -07:00
Mark Otto e57758cbb4 Drop `.nav-header` for `.dropdown-header` 
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
 2013-07-17 23:54:09 -07:00
Mark Otto 3604b86806 fixes #8477: use var for rounded image border-radius 2013-07-17 23:41:05 -07:00
Mark Otto d3a139622e fixes #8491: add vars for table padding 2013-07-17 23:34:04 -07:00
Mark Otto cb9cc972ed Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-16 13:36:02 -07:00
Mark Otto 5967ef64a3 remove margin from left side of navs since it's no longer being set 2013-07-16 11:49:04 -07:00
Mark Otto 522004e67a remove webkit-overflow-scrolling from modal for now /cc #8495 2013-07-16 11:26:48 -07:00
Chris Rebert 76063ea739 Add missing backtick in comment 2013-07-16 10:49:59 -07:00
Mark Otto 89555cb61c Merge pull request #8453 from cvrebert/retina-rename 
rename .retina-image => .img-retina
 2013-07-11 14:17:11 -07:00
Bass Jobsen 3a17578a94 Update forms.less 
All variables should be set in variables.less?
 2013-07-11 21:24:06 +02:00
Chris Rebert a41fd16da2 rename .retina-image => .img-retina 2013-07-11 12:07:35 -07:00
liuyl 0d5c3c2ecf simplify type.less 2013-07-09 09:22:36 +08:00
Mark Otto 1045226544 Merge pull request #8415 from cvrebert/code.less-cleanup 
code.less: cleanup styles that get immediately overriden later in the file
 2013-07-08 06:57:37 -07:00
Mark Otto f69afc1b23 Merge pull request #8414 from cvrebert/dropdowns-LESS-nesting 
use LESS nesting more in dropdowns.less
 2013-07-08 06:56:57 -07:00
Mark Otto b2b09f679a Merge pull request #8413 from cvrebert/misc-less-refactoring 
refactor {badges,jumbotron,media,popover,print}.less (mostly nesting)
 2013-07-08 06:56:35 -07:00
Mark Otto e0d1b83e25 Merge pull request #8412 from cvrebert/pagination-nesting 
use nesting more in pagination.less
 2013-07-08 06:55:50 -07:00
Mark Otto 46378c7ba3 Merge pull request #8411 from cvrebert/navbar-LESS-nesting 
more nesting in navbar.less
 2013-07-08 06:55:16 -07:00
Chris Rebert e40aee9c9e code.less: cleanup styles that get immediately overriden later in the file 2013-07-07 20:03:52 -07:00
Chris Rebert 7e154740f3 use LESS nesting more in dropdowns.less 2013-07-07 19:54:07 -07:00
Chris Rebert dcf1b60f2b refactor {badges,jumbotron,media,popover,print}.less (mostly nesting) 2013-07-07 19:46:20 -07:00
Chris Rebert 6bda16f6be use nesting more in pagination.less 2013-07-07 19:30:51 -07:00
Chris Rebert d9cd5e4e0c more nesting in navbar.less 2013-07-07 19:22:18 -07:00
Chris Rebert 6e03639af2 more nesting in buttons.less 2013-07-07 19:16:38 -07:00
Mark Otto 084291aac7 Merge pull request #8408 from cvrebert/progress-bar-variant-mixin 
extract .progress-bar-variant mix-in
 2013-07-07 18:27:43 -07:00
Mark Otto 906d04a4aa Merge pull request #8407 from cvrebert/label-variant-mixin 
extract .label-variant mix-in
 2013-07-07 18:26:54 -07:00
Mark Otto 65141338df Merge pull request #8406 from cvrebert/navs-nesting 
more nesting in navs.less
 2013-07-07 18:26:26 -07:00
Mark Otto 03becfb9e3 Merge pull request #8405 from cvrebert/button-groups-nesting 
more nesting in button-groups.less
 2013-07-07 18:25:48 -07:00
Chris Rebert d2fb35d546 extract .progress-bar-variant mix-in 2013-07-07 15:44:18 -07:00
Chris Rebert a7dd1088d2 extract .label-variant mix-in 2013-07-07 15:38:43 -07:00
Chris Rebert 15bd6eadf3 more nesting in navs.less 2013-07-07 15:31:18 -07:00
Chris Rebert f12d6401f2 more nesting in button-groups.less 2013-07-07 15:27:06 -07:00
Chris Rebert e757ddd60f extract .alert-variant mix-in 2013-07-07 15:21:40 -07:00
Maurice Wahba 8a84da6341 Carousel no longer dependent on glyphicons 
Used laquo/raquo for control buttons
Updated docs
 2013-07-06 22:26:40 +04:00
Mark Otto fffb37ecea Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:24:40 -05:00
Mark Otto 3279181f42 Merge pull request #8378 from liuyl/aftertosibling 
optimize breadcrumb
 2013-07-05 12:23:14 -07:00
Mark Otto 30c138c4bf Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:22:46 -05:00
Mark Otto dd691b5c36 Merge pull request #8390 from liuyl/typeahead 
delete typeahead style
 2013-07-05 12:21:49 -07:00
Mark Otto 4f922d6e3f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:21:33 -05:00
Mark Otto 61823dbff1 Move `hr` to scaffolding.less (out of type.less) and simplify styles 2013-07-05 14:21:05 -05:00
Mark Otto 88a266b800 Add tfoot back (addresses more than #8387) 2013-07-05 14:15:00 -05:00
liuyl 969529c80e refactor pagination 2013-07-05 20:18:57 +08:00
liuyl 3bd42511f4 refactor pagination 2013-07-05 20:17:20 +08:00
liuyl e6529e9588 delete typeahead style 2013-07-05 15:09:16 +08:00
Joey Baker 2d56997c61 Remove unneeded prefixes 
Per caniuse, prefixes for transitions and transforms can be reduced to just `-webkit` and `-ms`. http://caniuse.com/#search=transform
http://caniuse.com/#search=transition
 2013-07-03 08:11:28 -07:00
liuyl 5b69d34053 use sibling selector instead of pseudo selector 2013-07-03 20:37:36 +08:00
Chris Rebert da072fff21 refactor tables.less to use nesting more 2013-07-02 11:42:37 -07:00
Mark Otto 749dc35328 comma for the guardian angel /cc @cvrebert 2013-07-01 20:18:44 -07:00
Mark Otto a049dcb7f6 Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-responsive-tables 
Conflicts:
	less/mixins.less
 2013-07-01 20:06:16 -07:00
Mark Otto 9ed9fba460 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-01 19:49:49 -07:00
Mark Otto 5b2d933524 Fixes #8350: unfuck Chrome number input element cursor /cc @cvrebert @eintnohick 2013-07-01 19:49:29 -07:00
Mark Otto 526d1399c5 Merge pull request #8348 from Rowno/compiled-font-shorthand 
Prevent the font shorthand from getting compiled as division
 2013-07-01 19:43:15 -07:00
Mark Otto 08b3515fd7 fixes #8345: use inline-block on .img-responsive 2013-07-01 19:42:43 -07:00
Mark Otto f8eb9136eb Merge pull request #8352 from liuyl/simplifytable 
simplify tables.less
 2013-07-01 18:23:17 -07:00
Mark Otto 9da90adb4c fixes #8068: add .help-block to form field state mixin 2013-07-01 18:21:19 -07:00
Mark Otto c9df1db502 fixes #7367: slightly larger carousel indicators 2013-07-01 18:16:59 -07:00
Mark Otto 7ad9fbef8b Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-01 17:32:14 -07:00
Mark Otto a27ecfccf3 Make more components mixin-friendly 2013-07-01 17:32:07 -07:00
Julian Thilo fea69df80c Fix responsive utilities for table elements 
This change prevents situations where specificity causes some rules to
be overridden by the ones intended for mobile.
* Added mixin `responsive-invisibility()`
* Swapped out `display: none !important;` for new mixin
 2013-07-01 21:13:57 +02:00
liuyl e5e9d5916a simplify tables.less 2013-07-01 20:29:41 +08:00
Roland Warmerdam 2e8752b26f Prevent the font shorthand from getting compiled as division 2013-07-01 10:51:08 +12:00
Francis Brunelle 6a20810ca4 reset left padding for .media-list, .pagination and .pager 2013-06-29 16:06:14 -04:00
Mark Otto 0a92efce0c Nuke hella things 
* Any mentions of .btn-mini
* Old docs page that somehow found it's way back
 2013-06-28 09:24:46 -07:00
Mark Otto 09cdee2f03 Overall responsive `img` styles 
`img`s are no longer responsive by default. Instead, use
`.img-responsive` as a class or mixin. Existing `.thumbnail > img` and
`.img-thumbnail` classes now make use of this as a mixin as well.
 2013-06-28 00:09:10 -07:00
Mark Otto 88ece4fc59 fixes #7961 a bit: adds css for extra tooltip placement options. /cc @fat you just need dat js prolly 2013-06-27 20:50:21 -07:00
Mark Otto bf3c5e070e remove submenus. for more context: http://www.youtube.com/watch?v=ggWyUEuGcWY&feature=youtu.be&t=48s 2013-06-27 20:49:29 -07:00
Mark Otto 0682068929 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-27 20:17:59 -07:00
Mark Otto 69b7c5a2af Merge pull request #7995 from hrach/patch-3 
Fixed mixin btn-pseudo-state background for [disabled] buttons
 2013-06-27 20:17:48 -07:00
Mark Otto d9a662ed1d fixes #7977: prevent some table bullshit on input groups 2013-06-27 20:15:44 -07:00
Mark Otto 5156234c23 update grid col mixin to use latest css from grid cols 2013-06-27 19:54:30 -07:00
Mark Otto ca8ca2177f fixes #4852: popover carets fully functional in ie8 holy carp wtfbqq huge shoutout to @PumaOmaR 2013-06-27 19:36:56 -07:00
Mark Otto 62f76ad33f Merge branch '3.0.0-wip' into bs3_remove_icons 
Conflicts:
	docs/components.html
 2013-06-27 18:49:05 -07:00
Mark Otto cb483b6758 Add parens so sublime picks up on syntax highlighting 2013-06-27 18:45:08 -07:00
Mark Otto c9ccbd2cf0 Fixes #8329: add `!important` to `.hidden` 2013-06-27 18:43:29 -07:00
Mark Otto cc43ba35d7 Merge pull request #8301 from cvrebert/patch-3 
Fix spelling in comment
 2013-06-25 17:11:31 -07:00
Mark Otto 0f371d409f Merge pull request #8300 from cvrebert/patch-2 
Fix typo in comment
 2013-06-25 17:11:20 -07:00
Mark Otto 2da485d6bb Merge pull request #8299 from cvrebert/patch-1 
Spelling in comment
 2013-06-25 17:10:59 -07:00
Chris Rebert d82941265c Fix 2 typos 2013-06-25 17:07:51 -06:00
Bass Jobsen 321190535f Update mixins.less 
Add a the function .make-small-column. See also http://stackoverflow.com/a/17308128/1596547
 2013-06-26 01:05:45 +02:00
Chris Rebert 8ee0e39ef9 Fix spelling in comment 2013-06-25 17:05:26 -06:00
Chris Rebert d2b5f4e45c Fix typo in comment 2013-06-25 17:03:57 -06:00
Chris Rebert 64a01f01cb Spelling in comment 2013-06-25 17:01:46 -06:00
Mark Otto ac90fbf4d8 Merge pull request #8297 from cvrebert/patch-1 
rm pre{white-space:pre-wrap;} since redundant to Normalize
 2013-06-25 14:57:41 -07:00
Chris Rebert 1bb159aa6f rm fallback white-space for <code> 
If my analysis is right, this should be unnecessary.
 2013-06-25 15:53:48 -06:00
Chris Rebert 9b97d63188 rm pre{white-space:pre-wrap;} since redundant to Normalize.css 2013-06-25 14:48:57 -07:00
Mark Otto 327a951ca3 Move mixin to mixins.less 2013-06-25 13:32:21 -07:00
Chris Rebert 83c4073ec7 refactor responsive-utilities slightly 2013-06-25 12:23:56 -07:00
Luis Hdez 9ed5b5e653 Fix line breaks on add-ons with spaces 2013-06-25 14:34:57 +02:00
Mark Otto 573a197417 Move grid offsets to desktop only (fixes #8229) 2013-06-23 15:15:42 -07:00
Mark Otto b76d98eee3 Fixes #8211: restore proper table grid class behavior 
Needs work though—we shouldn't be setting this stuff with the attribute
selectors, but it's the easiest solution for now.
 2013-06-23 15:05:50 -07:00
Mark Otto 2a47037ab0 Fixes #8266: remove unnecessary `strong` and `em` styles 2013-06-23 10:24:50 -07:00
Francis Brunelle 7fd121fecb Reset left padding for .carousel-indicators 2013-06-22 21:38:02 -03:00
Aristeides Stathopoulos 72183d9a45 Update variables.less 2013-06-22 18:45:25 +03:00
Aristeides Stathopoulos aad76f21f6 Update navbar.less 2013-06-22 18:44:04 +03:00
Aristeides Stathopoulos b51e1e0d8c Update navbar.less 2013-06-22 14:41:31 +03:00
Aristeides Stathopoulos 2ba3b47dc6 Update navbar.less 
navbar padding-left and padding-right should be calculated from the grid-gutter-width variable.
 2013-06-22 14:34:17 +03:00
Mark Otto b0e943399d Improve alignment of navbar brand and fix up left padding on list groups 2013-06-21 17:21:44 -07:00
Mark Otto ef8e5853cb Fixes #8154: enforce full width `.navbar-nav.pull-right` in mobile 
Prevents an odd alignment issue in mobile views by forcing the nav
links to be full width without undoing the float.
 2013-06-20 17:15:09 -07:00
Mark Otto 82f9de9459 Fixes #8159: Be more specific about disabled inputs to avoid iOS bug 
Attached disabled styles to the exact input types rather than all
inputs and reseting the checkbox/radios. If setting `background-color:
transparent;`, iOS renders no background on the disabled control.
 2013-06-20 17:02:10 -07:00
Mark Otto 90d4343f66 Fixes #8093: Removes invalid focus styles on inputs 2013-06-20 16:42:05 -07:00
Mark Otto 2aec6dae59 Fixes #7730: Better hiding of empty titles in popovers 
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.

/cc @fat becaue I probably did this wrong <3
 2013-06-20 16:02:05 -07:00
Mark Otto eee719f608 Merge pull request #8193 from mediafreakch/3.0.0-wip 
Fixes broken layout for .input-group-addons within .input-large. Follows...
 2013-06-20 15:44:08 -07:00
Mark Otto f64fe29003 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.
 2013-06-20 15:40:37 -07:00
Mark Otto 1b89a63a48 Use `@font-family-base` for headings font-family variable 2013-06-20 15:38:18 -07:00
Mark Otto 3c60645ec0 Merge pull request #8237 from luishdez/feature/var-heading-family 
Add heading font family variable
 2013-06-20 15:36:49 -07:00
nextgenthemes 110fc88601 rename '.navbar .nav' to '.navbar-nav' 2013-06-20 19:40:30 +03:00
Luis Hdez cd09f3213b Add heading font family variable 2013-06-20 12:50:30 +02:00
Mark Otto 546d40a143 Add support for `tr`, `th`, and `td` to responsive utilities 2013-06-18 19:16:50 -07:00
Edgar Schnueriger 6a79f53899 Use correct font-size to calculate input-heights 2013-06-18 21:43:34 +02:00
Mark Otto 4b4079b224 Addresses #8199: darker default button 2013-06-18 11:16:43 -07:00
Mark Otto bcc3af4b2a Fixes #7599: Improved print styles for a few key components 
* Updates `.table` to always enforce a solid white background
* Update button groups and dropdowns to always use black carets
* Add a 1px solid black border to labels (in the future we should add a
border to these perhaps for better printing)
 2013-06-17 20:56:02 -07:00
Mark Otto 37f4a25be4 Better clearing on `.dl-horizontal` for empty `dd` elements 
Instead of clearing the entire `.dl-horizontal`, we've moved the
clearfix mixin to the `dd` level to solve two problems in one: empty
`dd`s mid-list, and empty `dd` as the last child.

Addresses a few old issues, including #2824, #3819, #3821, #4062,
#6707, and #7180.

Sorry that took so long :D.
 2013-06-17 14:21:16 -07:00
Mark Otto 4436e727ed Properly unstyle the `.list-unstyled` class by switching from `margin` to `padding` 
Also add better comments
 2013-06-17 14:21:16 -07:00
Mark Otto 84c0dc13ba Remove explicit, unncessary `line-height` on `li` elements 2013-06-17 14:21:16 -07:00
Mark Otto 731cbb302e Better base `ul` and `ol` styles 
Turns out we were nixing the default browser spacing for bullets and
numbers, so this reverts that and instead just twerks the top/bottom
`margin`.
 2013-06-17 14:21:16 -07:00
Edgar Schnueriger b0d202455d Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed 2013-06-17 18:56:17 +02:00
FLOKER 125e472d6f redundant lines removed 2013-06-16 22:18:46 +02:00
Mark Otto ac3521fef4 Remove WebKit overflow scrolling for now 2013-06-16 10:56:30 -07:00
Mark Otto 6ce154c7ed Fixes #8175: Update input min-height vars to fix FF21 input rendering 2013-06-15 11:46:13 -07:00
Mark Otto d74a9634b0 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-09 23:45:23 -07:00
Mark Otto 441bbe1998 Another grid update 
* Update docs to include table of grid levels and behaviors
* Change from .col-md to .col-sm to match existing size variables we use elsewhere
* Keep .col-lg as-is though for simplicity as we won't likely add a fourth level of the grid
* Combine responsive .container breakpoints with grid breakpoints in grid.less
* Other misc docs updates
 2013-06-08 18:34:16 -02:30
William Ghelfi df5ddeb7cc Set validation states also for addons 2013-06-06 21:00:32 -04:00
Mark Otto 45c5b4e45c restore .col-*-12 classes for now 2013-06-03 21:51:35 -07:00
Mark Otto 286955167a prep for less 1.4 with double parens in functions 2013-06-03 21:48:52 -07:00
Mark Otto a05f6d4cea fixes #8066: add missing % functions to grid less code 2013-06-03 11:58:38 -07:00
Mark Otto 2f70477621 fixes #8059: update navbar responsive break variable 2013-06-02 15:51:28 -07:00
Mark Otto 21441f1292 Move the grid offset, push, and pull classes to be tablets-up instead of desktop-up 2013-06-02 15:33:42 -07:00
Mark Otto 19d0726609 Grid updates 
- Removed mixins for generating grid classes
- Thus, we manually declare every grid class, from 1-11 (12th unit is
excluded as that's the same as no grid columns)
- No more need for `.col` base class (yay!)
- Negative indent the rows at tablets and above once again (ugh, still
working through this part)
- Add support for `.col-md` for tablet-specific grid columns
- Still need to figure out offsets, pushes, and pulls on other
devices—right now only available on desktop
 2013-06-02 13:38:45 -07:00
Mark Otto b62fa23d9a Merge pull request #8006 from aristath/3.0.0-wip 
using screen-size variables for grids
 2013-06-02 11:58:30 -07:00
Mark Otto 75db70a6c2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-02 11:57:28 -07:00
Javier Martinez Fernandez c89a6edf09 Remove form-actions-bg 
If form-actions has been removed, this variable is no needed anymore.
 2013-05-29 22:09:33 +03:00
Mark Otto 8899c30f16 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-27 19:23:17 -07:00
Aristeides Stathopoulos 6fda25b4c1 Adding variables for container sizes 2013-05-27 23:00:39 +03:00
Aristeides Stathopoulos 2b088ef44e using screen-size variables for grids 2013-05-27 19:33:14 +03:00
Jan Škrášek 33b5c32c8c Fixed mixin btn-pseudo-state background for [disabled] buttons 2013-05-26 18:14:25 +02:00
Mark Otto 60575dfb46 Gradients refactor 
* Add start and end support to the horizontal gradient as well
* Change all variables from camelCase to use-dashes
* Better comments in the gradients mixins area
* Update current uses of gradients in dropdowns and carousel to specify only two values by direct assignment of variables
 2013-05-25 13:16:15 -07:00
Mark Otto 5ea070bdf6 Merge branch '3.0.0-wip' of https://github.com/hppycoder/bootstrap into hppycoder-3.0.0-wip 2013-05-24 21:18:07 -07:00
Robert Burns 79666385f7 Use base padding for input-group-addon class 2013-05-24 08:14:11 -04:00
Mark Otto 371d14e217 Remove commented out code and properly nest CSS again for .collapse 2013-05-23 21:06:02 -07:00
Chad Smith c47d9932cb Found editor spacing issues with tabs instead of spaces, formatting to fit the entrance criteria 2013-05-21 16:29:35 -04:00
Chad Smith 230d6de88a Vertical gradients now can have percentages passed in as arguments to allow finer control over the backgrounds it produces 2013-05-21 16:25:59 -04:00
Mark Otto 0c167a1d9d Fixes #7474: Use `@input-height-base` in `.navbar-vertical-align()` for `.navbar-form` 2013-05-19 22:12:48 -07:00
Mark Otto 35573db810 Fixes #7611: fix optgroup formatting for Firefox 2013-05-19 22:06:10 -07:00
Mark Otto 5fbb9e9f5d More row change ups: 
* No more negative side margins
* However, keep the negative margin for nested rows
 2013-05-16 21:03:56 -07:00
Mark Otto 9762f95bde Change up link alerts 
* No more children selectors to set all links in alerts as a special color because buttons and more wrongly inherited color
* Adds .alert-link for easy styling in any alert
 2013-05-16 20:53:59 -07:00
Mark Otto 5dd6dbd624 Nuke rem font-size mixin 2013-05-16 20:18:03 -07:00
Mark Otto 1983ca03ec Form validation and horizontal row update 
* changed .row-label to .control-label as used elsewhere already
* changed .formFieldState mixin to .form-field-validation
 2013-05-16 20:17:42 -07:00
Mark Otto e5d6a40a77 Redo the responsive utilities stuff 
* Update docs language
* Enforce display: block; on all utilities for now
* Fix up docs CSS for the tests
 2013-05-16 19:13:58 -07:00
Mark Otto c73588b313 Drop .form-actions 2013-05-16 18:46:12 -07:00
Mark Otto d8b749a4d3 Fix z-index of carousel indicators 2013-05-16 18:29:53 -07:00
fat 92245e8bc7 change dropdown strategy to use an overlay - fixes mobile click anywhere + allows for firefox middle click 2013-05-16 12:50:06 -07:00
Mark Otto f3d8577734 Run make on previous commit; twerk box shadow back to commented out version 2013-05-15 10:16:11 -07:00
m.seegmüller 6289e24f66 Fixed ugly outline in select fields 
Removes .tab-focus() on select-fields
 2013-05-15 16:14:44 +02:00
m.seegmüller 7780133c1c Fixed ugly outline 
Removes outline (especially on select-elements in firefox)
 2013-05-15 15:44:28 +02:00
Mark Otto 28a081cb20 Overhaul form control and button sizing, and some type styles 
* New padding approach with separate horizontal and vertical padding
variables
* Improved sizing in large and small buttons and form controls
* Dropped the `.btn-mini` (since we have no `.input-mini` to match, and
holy fuck those were small buttons)
* Dropped the `.pagination-mini` as well because once again, to hell
with such small components
* Changed `@line-height-headings` to `@headings-line-height`
* Removed the `@headings-font-family` because it was honestly kind of
useless
 2013-05-14 23:21:30 -07:00
Mark Otto a41d566d5e margin on bottom of navbar nav by default, also round links in mobile views (unround in desktop) 2013-05-14 22:08:56 -07:00
Mark Otto e23f661f3f Fixes #7885 and #7886: only right align horizontal form labels when above 768px 2013-05-14 18:59:13 -07:00
Mark Otto 1d8ff36afa Add .panel-footer 2013-05-14 18:55:37 -07:00
Robert Burns a38a3429fc Fix caret position 2013-05-13 20:03:53 -04:00
Mark Otto dd7bb71554 spacing 2013-05-12 21:00:37 -07:00
Mark Otto 2093635de1 Merge branch '3.0.0-wip' of https://github.com/rvinay88/bootstrap into rvinay88-3.0.0-wip 2013-05-12 20:57:07 -07:00
Mark Otto 41a76e8e7a Less specific dropdown styles, change up navbar dropdown styles 2013-05-12 16:30:54 -07:00
Mark Otto da4e7ab15c fix broke example 2013-05-12 16:13:39 -07:00
Mark Otto 37c1122ded Consolidate active dropdown toggle styles and comment out the rest 2013-05-12 16:12:13 -07:00
Mark Otto 2d10d61fde Restore commented out dropdown styles, get open dropdown state working again 2013-05-12 16:03:56 -07:00
Mark Otto 92adcfabb5 Start some nav and dropdown cleanup 
* Remove border-radii on top of tab dropdown menus
* Remove the .dropdown and .dropup styles and instead place  on all
* Use  on dropdown carets intead of separately applying margin with a top alignment
* Some other misc cleanup
 2013-05-12 15:47:18 -07:00
Vinay Raghu ca5685c1f8 Timestamp correction 2 2013-05-12 12:25:56 +05:30
Vinay Raghu 3b6b9b3fa6 Timestamp correction 2013-05-12 12:25:47 +05:30
Blake Embrey 60c24ddd97 Fix the selectors for the .input-group-btn selector. 2013-05-11 09:38:48 -07:00
Vinay Raghu 5e13f57870 Changed Screen Notations on responsive-utilities.less and recompiled the stylesheet 2013-05-11 19:28:59 +05:30
Mark Otto 8051695c87 Merge pull request #7838 from blakeembrey/btn-group-radius 
Remove the overrides and resets from button groups
 2013-05-10 16:35:25 -07:00
Mark Otto 76ecfdfdc1 Font-size and line-height tweaks 
* Use 1.428 for line-height instead of 1.5
* Use  function for full pixel values instead of decimals
 2013-05-10 10:33:35 -07:00
Mark Otto 8261866ff2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-10 10:31:52 -07:00
Aaron 94cc333553 Fix component margin and padding values to use @line-height-computed 2013-05-10 09:21:27 -06:00
Mark Otto dbbd48f7bc remove duplicate text scaling 2013-05-09 17:29:07 -07:00
Mark Otto 90e4ff73d2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	less/forms.less
 2013-05-09 17:22:48 -07:00
Mark Otto 6fba68eb8b Unitless line-height 
* Instead of 20px as @line-height-base, use 1.5
* Update typographic scale for headings to use unitless as well--required some twerking of decimals a bit and some rounding
* Introduce new @line-height-computed value, which takes base font-size and multiplies it by 1.5, for use in padding and margin on components
 2013-05-09 17:20:46 -07:00
Blake Embrey 579d566299 Update button groups to use not selector and remove redundant CSS. 2013-05-09 16:53:28 -07:00
Mark Otto 7b6352d2cf Fix up navbar forms by using inline form as a mixin; fix docs for those 2013-05-09 16:41:35 -07:00
Mark Otto 1fdfee8de0 Merge pull request #7837 from blakeembrey/input-group-radius 
Remove input-group border radius resets
 2013-05-09 16:30:48 -07:00
Mark Otto 293a3baca3 More forms overhaul 
* Refactor the .forms-horizontal code--much simpler now and built on the Bootstrap grid system instead
* Remove all the margins on form controls for simpler styling everywhere else--was overriding that way too often
* Drop .help-inline, but keep .help-block
* Drop the unused input grid class overrides
 2013-05-09 15:05:06 -07:00
Blake Embrey 9716b73f67 Make the border-radius on input-groups to be overrides instead of resets on every size. 2013-05-09 14:48:27 -07:00
Blake Embrey 4a03d45651 Make icons antialiased on Webkit browsers. 2013-05-09 13:48:02 -07:00
Blake Embrey cc5e6619b4 Remove backface-visibility from progress bars. 2013-05-09 13:09:33 -07:00
Mark Otto edb733ebc7 Super massive docs overhaul 
* Bring back the navbar up top
* Pull the docs content back into separate pages because a 6.6k line docs file is just crazy
* Recenter the page content and bring back affixed side nav (needs work)
 2013-05-08 21:56:08 -07:00
Mark Otto 54561f1121 hide entire navbar in print views 2013-05-08 19:57:42 -07:00
Mark Otto 1cb880b4f1 Fixes #7816: revert negative margin on .navbar-nav 2013-05-08 19:55:20 -07:00
Mark Otto 509f2244da Merge pull request #7809 from twitter/bs3_adding_btn_default 
BS3: Require .btn-default for all standard buttons
 2013-05-08 11:47:43 -07:00
Mark Otto f03d337151 indentation fix 2013-05-07 23:43:51 -07:00
Mark Otto c459c657f8 Update forms 
* Overhaul the form control sizing section to only show sizing via grid columns as parents, not as classes on inputs
* Restore the inline-form option
* Restore the bottom margin on form controls and make them block level instead of inline-block
* More misc docs cleanup for forms
 2013-05-07 21:56:55 -07:00
Mark Otto 86598cac6b Fixes #7796: change @list-group-active-text to @list-group-active-color 2013-05-07 20:01:57 -07:00
Mark Otto d7f84d1220 Require .btn-default for regular buttons 
* Instead of , use  for standard, gray button
* Improves ability to customize buttons by encouraging folks to not override .btn and thus overriding all button modifier classes
* Updates docs to reflect the change
* Reorganize buttons CSS
 2013-05-07 18:07:06 -07:00
Mark Otto f06294d80f Outdent nav links a bit more so they line up in navbar 2013-05-07 10:33:41 -07:00
Mark Otto 49da7d8020 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-04 13:11:31 -07:00
Mark Otto dcf7cc084d Fixes #7783: nuke bottom margin on fixed-bottom-navbar 2013-05-04 13:11:20 -07:00
Chris Rebert e0b9b86d32 use @screen-small var in grid.less 
Per comment by @nextgenthemes on/in cd06c5baac
 2013-05-03 17:38:58 -07:00
Mark Otto c3b9ac4676 Merge pull request #7621 from jeremydenoun/patch-1 
Fix flickering on progress bar width update
 2013-05-03 17:32:54 -07:00
Mark Otto 7d41a38769 Fixes #7511: add support for nested button groups so you can use dropdowns in your button groups 2013-05-03 16:16:26 -07:00
Mark Otto ee0789ff8f Fixes #7721: change @navbar-text to @navbar-color, along with inverse options 2013-05-03 15:29:32 -07:00
Mark Otto 4357ed72e0 Update justified nav CSS for proper selectors 2013-05-03 15:18:27 -07:00
Mark Otto 747e108e0b Merge pull request #7670 from DarDar/3.0.0-wip 
Use @font-size-... variables instead of hardcoded font-size in px
 2013-05-03 15:05:29 -07:00
Mark Otto e1d947f53e Scope .table-bordered styles to immediate children only 2013-05-03 14:56:57 -07:00
Mark Otto 14861e9cc3 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-03 14:11:23 -07:00
Mark Otto b5d68f59c2 Add cursor: pointer; to .checkbox and .radio and their inline counterparts 2013-05-03 11:56:00 -07:00
Mark Otto e1c67b149f More navbar CSS and docs cleanup 
* Rearrange sections
* Add code snippets for text and links in navbars
* Add .navbar-link back in
* Add mention of .navbar-text, but it still needs to be re-implemented
* Update nav to reflect new order
 2013-05-02 23:13:43 -07:00
Mark Otto 94792b9dae Improve buttons in navbars 
* Add top margin, calculated by subtracting height of an input from height of a navbar, and dividing by two
* Uses the same method as .navbar-form
* To use, add .navbar-btn to any button outside a form element
* Also add section to docs detailing buttons in navbars, and add more ids for the other unlinked and unmentioned sections in the side nav
 2013-05-02 23:05:09 -07:00
Mark Otto 23ae6405f5 delete lingering navbar dividers code since we nuked that awhile back 2013-05-02 22:58:30 -07:00
Mark Otto bec8c90fd7 Cleanup .navbar-form styles 
* Nuke the commented out navbar forms code that's not currently needed
* Add a few more examples to the .navbar-form docs section
* Remove (for now at least) top padding on checkbox and radios
 2013-05-02 22:54:14 -07:00
Kevin Ingersoll 08fea3304a Fix input border flicker in Chrome from @garoevans, closes #7689 2013-05-03 15:33:12 +12:00
DarDar 9cd3a92713 Use @font-size-... variables instead of hardcoded font-size in px 2013-05-02 08:05:00 +02:00
Mark Otto 47155e8aa3 outdent the rows for tablets and above 2013-04-30 19:35:52 -07:00
Mark Otto 0780faad45 make that left/right padding, not top/bottom on navbar 2013-04-30 19:20:41 -07:00
Mark Otto 69f5447afa add back bottom margin to navbars 2013-04-30 19:12:48 -07:00
Mark Otto e8b7318646 no need for zero padding on navbar top/bottom; better comment 2013-04-30 19:07:28 -07:00
Mark Otto 6dd4cbd20b no units on 0 values 2013-04-30 19:06:30 -07:00
Mark Otto 0f17f9b7f7 Fixes #7744: update grid mixin to use latest grid styles 2013-04-30 13:03:10 -07:00
Mark Otto 26bc36107e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-04-28 22:46:10 -07:00
Mark Otto e13d05317e single colon pseudo element for ie8 2013-04-28 22:45:56 -07:00