0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

547 Commits

Author SHA1 Message Date
Chris Rebert
2315bc6052 scss/_nav.scss: Remove trailing whitespace
[ci skip]
2015-11-13 00:20:03 -08:00
Chris Rebert
98ec749117 Swap margin-right and margin-left ordering in .dropdown-toggle::after to make SCSS Lint happy
[ci skip]
2015-11-13 00:19:19 -08:00
Chris Rebert
0cdb204867 scss/_card.scss: Remove trailing whitespace
[ci skip]
2015-11-13 00:17:25 -08:00
Mark Otto
763cec82fb Merge pull request #18089 from almirsarajcic/v4-dev
Rename .help-block to .text-help
2015-11-12 23:57:22 -08:00
Mark Otto
0aec084cae Merge pull request #18093 from AndersMad/patch-1
Card fix static -> variable border radius
2015-11-12 23:56:45 -08:00
Mark Otto
cbb5e25482 Merge pull request #17939 from chrisbell08/#17895_alert_border_width
#17895 Added $alert-border-width that defaults to $border-width
2015-11-12 23:50:51 -08:00
Chris Rebert
5abd4e0142 Ports c256aca13c to v4
Refs #15947, #17542

[ci skip]
2015-11-12 23:47:13 -08:00
Chris Rebert
920f7fd695 Revert "Drop cursor pointer for button role"
This reverts commit 61067304cd.

The normalize.css pull request (https://github.com/necolas/normalize.css/pull/379 )
was REJECTED, *NOT* merged!
2015-11-12 23:44:29 -08:00
Mark Otto
f25d709025 Merge pull request #18061 from mathisonian/patch-1
remove bro from comment
2015-11-12 23:37:02 -08:00
Mark Otto
97b0d37732 space 2015-11-12 23:33:15 -08:00
Mark Otto
d18cc5f77b Merge branch 'reboot-cursor' of https://github.com/flexbox/bootstrap into flexbox-reboot-cursor 2015-11-12 23:31:19 -08:00
Mark Otto
d917f474f4 Merge pull request #17708 from biokillos/feature/add-variable-for-card-link-hover-state
Add variable for card-link hover state
2015-11-12 23:29:48 -08:00
Mark Otto
99219bac55 Merge pull request #17317 from dmbaughman/v4-media-breakpoint-between
v4 - Added  mixin to handle media queries that span multiple breakpoints
2015-11-12 23:27:16 -08:00
Mark Otto
6a526d4890 Merge pull request #17596 from neilhem/remove-fallback-colors
remove not used popover fallback variables
2015-11-12 23:23:53 -08:00
Mark Otto
1c9b773293 Merge pull request #17733 from chrisbell08/v4
Fix for Issue #17711 - Added clearfix mixin to the nav-pills class.
2015-11-12 23:20:35 -08:00
Mark Otto
9f66e7309c fix broke shit, ugh my bad 2015-11-12 23:15:31 -08:00
Mark Otto
6fd1c80d37 Merge pull request #17153 from kkirsche/patch-17
v4 — Change .has-error to .has-danger for uniformity.
2015-11-12 22:20:07 -08:00
Mark Otto
c1af4aa227 Merge pull request #17277 from kkirsche/patch-5
v4 — Use the body color for dropdown menu text in navbars
2015-11-12 22:17:02 -08:00
Mark Otto
fd8cd7ea88 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-11-12 22:15:09 -08:00
O'meid
677b7bd1c0 scss: move Figures from _type to _images 2015-11-12 22:13:13 -08:00
Mark Otto
f29eb4d213 Merge pull request #17241 from tagliala/font-size-sm-fix
v4: Change the default value of $font-size-sm to .875rem
2015-11-12 22:07:06 -08:00
Mark Otto
078c7cac8d manually pull in #17212 from @azmenak 2015-11-12 22:02:35 -08:00
Mark Otto
8d46755f99 Merge pull request #17137 from kkirsche/patch-10
v4: Dropdown caret is not horizontally alligned
2015-11-12 21:32:22 -08:00
Chris Rebert
be5e223177 Move [hidden] style from _utilities.scss to _reboot.scss; fixes #18230
[skip sauce]
2015-11-12 19:15:54 -08:00
Chris Rebert
fcbf49ae0a Merge pull request #18109 from twbs/color-utils-important
Add !important to text and background color utility classes
2015-11-12 17:02:56 -08:00
Chris Rebert
4f49654196 Merge pull request #18033 from twbs/invisible-important
Add !important to .invisible (visibility:hidden) utility class
2015-11-12 17:02:10 -08:00
Chris Rebert
019069a8b3 Merge pull request #18032 from twbs/text-transform-important
Add !important to text transform utility classes
2015-11-12 17:01:40 -08:00
Chris Rebert
cfd9c30eed Merge pull request #18182 from twbs/img-fluid-doc
Add comments explaining why we don't make `<img>`s responsive by default
2015-11-10 23:28:02 -08:00
Chris Rebert
91005397b3 Merge pull request #18094 from twbs/util-resp-comment
scss/_utilities-responsive.scss: Fix outdated comment heading
2015-11-10 23:26:46 -08:00
Chris Rebert
d8d709da1f Consolidate redundant heading style declaration
[skip sauce]
[skip validator]
2015-11-10 21:19:35 -08:00
Chris Rebert
1a0a2186b8 scss/_carousel.scss: Add missing backticks in comment
[ci skip]
2015-11-05 16:30:57 -08:00
Chris Rebert
be1232c580 Add comments explaining why we don't make <img>s responsive by default
Refs #18178

[ci skip]
2015-11-05 13:18:42 -08:00
Chris Rebert
36d20a8514 Merge pull request #18081 from twbs/ie9-click-comment
Give better description of IE9 transparent click bug & workaround
2015-11-03 12:19:34 -08:00
Bass Jobsen
0fdfde7709 Update _type.scss 2015-11-03 10:52:18 +01:00
Bass Jobsen
bffd2905b9 refactor blockqoutes to to avoid tag selectors & child selectors css v4 2015-11-03 10:17:21 +01:00
Bass Jobsen
63ea4a38f8 refactor list-inlineto toavoid tag selectors & child selectors 2015-11-03 01:53:28 +01:00
Mark Otto
bfa392b097 Merge pull request #18105 from twbs/simpler-retina
Simplify .img-retina mixin and add explanatory comments
2015-11-01 21:40:21 -08:00
Mark Otto
18d6e1a648 Merge pull request #18108 from twbs/split-bg
Move .bg-* utility classes into separate file
2015-11-01 21:39:56 -08:00
Chris Rebert
43b130022b scss/_progress.scss: Add comments for IE9 CSS hacks
[skip sauce]
[skip validator]
2015-10-31 14:37:22 -07:00
Chris Rebert
8bcf60148a Add !important to text and background color utility classes
[skip sauce]
[skip validator]
2015-10-29 21:40:42 -07:00
Chris Rebert
9d201a8ef2 Move .bg-* utility classes into separate file
[skip sauce]
[skip validator]
2015-10-29 21:37:28 -07:00
Chris Rebert
6e8f08dc67 Remove Less->SCSS converter comment left over from bootstrap-sass 2015-10-29 20:45:34 -07:00
Chris Rebert
e0aa54c684 Simplify .img-retina mixin and add explanatory comments
[skip sauce]
[skip validator]
2015-10-29 17:33:22 -07:00
Bass Jobsen
54335d513c cards mixins 2015-10-29 13:44:41 +01:00
Bass Jobsen
7b10659ec3 import cards mixins 2015-10-29 13:38:35 +01:00
Bass Jobsen
2e92360b8b add variant mixins 2015-10-29 13:34:41 +01:00
Chris Rebert
7d766e4a94 Yes, we still need this. Silly IE9 😢
See the IE9 note in https://developer.mozilla.org/en-US/docs/Web/CSS/%3Ahover#Browser_compatibility
The prereqs to trigger the bug are still present in v4.
/fyi @mdo

[skip sauce]
[skip validator]
2015-10-29 00:32:20 -07:00
Chris Rebert
ab84c1554a scss/_utilities-responsive.scss: Fix outdated comment heading
[skip sauce]
[skip validator]
2015-10-28 14:35:18 -07:00
Chris Rebert
364925f951 Fix typos in comments 2015-10-28 14:33:48 -07:00
AndersMad
61e9a01a28 Card fix static -> variable border radius
Changed card border radius image caps to use variable rather than static values
2015-10-28 21:54:56 +01:00
Almir Sarajcic
4264621cee Fix #17768 2015-10-28 16:27:55 +01:00
Chris Rebert
fd39d91058 Give better description of IE9 transparent click bug & workaround
[skip sauce]
[skip validator]
2015-10-27 12:47:04 -07:00
Chris Rebert
726525c0cf mixins/_progress.scss: Note that 0\0 media query hack is for IE9
[skip sauce]
[skip validator]
2015-10-27 12:34:26 -07:00
Chris Rebert
c3834b8d5a Merge pull request #18038 from twbs/fix-16947
Make heading class styles trump heading element styles
2015-10-27 09:38:20 -07:00
Mark Otto
368eda788d Merge pull request #17749 from Prelc/patch-1
Remove empty line from _grid.scss
2015-10-27 08:49:04 -07:00
XhmikosR
3c24bd89f7 Merge pull request #18039 from twbs/type-headings-trivial
Trivially simplify heading margin-bottom declarations
2015-10-27 07:41:34 +02:00
Chris Rebert
ee92e6d44d Merge pull request #18031 from twbs/fix-16836
Add !important to text alignment utility classes
2015-10-26 21:33:12 -07:00
Mark Otto
ee64b79a0c Merge pull request #18011 from kkirsche/patch-6
Use the `border-radius` mixin for `.label-pill`
2015-10-26 21:13:15 -07:00
Matthew Conlen
94043ac71c remove bro from comment 2015-10-26 13:40:08 -04:00
Chris Rebert
50df64797c https://github.com/necolas/normalize.css/pull/379 was rejected
Refs #15947
Somehow c256aca13c got lost during the SCSS translation...

[skip sauce]
2015-10-24 20:05:25 -07:00
Chris Rebert
25d724b279 _forms.scss: Copy over iOS <input> type compatibility note from v3
Refs b6e6a05b95
We ought to re-check this for iOS 9.1 at some point...

[skip sauce]
[skip validator]
2015-10-23 23:05:13 -07:00
Chris Rebert
5f30f2740b Trivially simplify heading margin-bottom declarations
[skip sauce]
[skip validator]
2015-10-23 19:23:06 -07:00
Chris Rebert
deeb74e321 Make heading class styles trump heading element styles; fixes #16947
[skip sauce]
[skip validator]
2015-10-23 17:03:33 -07:00
Chris Rebert
a30a5bb9b5 _grid.scss: Declare left margin before right margin for uniformity; refs #18036
[skip sauce]
[skip validator]
2015-10-23 15:58:10 -07:00
Chris Rebert
aff3fce63b bootstrap.scss: Cleanup comments; refs #18036
[skip sauce]
[skip validator]
2015-10-23 15:39:07 -07:00
Chris Rebert
e78cf3231c Add !important to .invisible (visibility:hidden) utility class
[skip sauce]
[skip validator]
2015-10-23 12:30:56 -07:00
Chris Rebert
62aecae328 Add !important to text transform utility classes 2015-10-23 12:26:31 -07:00
Chris Rebert
66039030e4 Add !important to text alignment utility classes
Refs #16836
[skip sauce]
[skip validator]
2015-10-23 12:25:03 -07:00
Chris Rebert
f730162072 Stop hardcoding grid tiers in flexbox alignment & ordering classes; fixes #18026
[skip sauce]
[skip validator]
2015-10-23 12:09:00 -07:00
Chris Rebert
d3cb2ca43c Stop hardcoding grid breakpoints in responsive alignment utility classes; fixes #18027
[skip sauce]
[skip validator]
2015-10-23 11:49:46 -07:00
Kevin Kirsche
fbbadaff3c Use $enable-rounded for .label-pill
Fix #18002
2015-10-22 08:05:47 -04:00
Chris Bell
be1bb9ec3e #17895 Added $alert-border-width that defaults to $border-width 2015-10-15 15:57:15 +01:00
Catalin Zalog
fec2a1d10f v4 - .c-select on background inherits white
This:
```
<div class="bg-info">
	<select class="c-select">
		<option selected>Open this select menu</option>
		<option value="1">One</option>
		<option value="2">Two</option>
		<option value="3">Three</option>
	</select>
</div>
```
render this:
http://s.zalog.ro/2015-10-14-19-45-11.png
2015-10-14 19:50:03 +03:00
Marko Prelec
d5e47c57f1 Extract list-unstyled mixin; closes #17792
/fyi @mdo
2015-10-13 01:24:11 -07:00
Mark Otto
8cb00d6420 Merge pull request #17701 from lesleh/patch-1
Reset iOS rounded inputs
2015-10-13 00:34:15 -07:00
Chris Rebert
2feaf0a27c Make $card-border-radius default to $border-radius
They already share the same value (`.25rem`)
Refs #17597
[skip sauce]
2015-10-12 16:32:15 -07:00
Chris Rebert
a180a3362a Move border-radius mixin from scss/_mixins.scss to scss/mixins/_border-radius.scss
Reunites the family.
Closes #17791
2015-10-08 08:56:13 -04:00
Chris Rebert
3137eec370 Move border-radius mixin from scss/_mixins.scss to scss/mixins/_border-radius.scss
Reunites the family.
Closes #17791
2015-10-07 00:07:48 -07:00
Marko Prelec
12c53ff609 Update _grid.scss
Removed empty row.
2015-10-01 14:33:10 +02:00
nextgenthemes
f7f29645a6 Rename .scsslint.yml to .scss-lint.yml 2015-09-30 00:50:45 +02:00
Chris Bell
67665241fa Removed trailing whitespace 2015-09-29 20:55:30 +01:00
Chris Bell
49379fd5f7 Fix for Issue #17711 - Added clearfix mixin to the nav-pills class. 2015-09-29 16:13:02 +01:00
Gleb Mazovetskiy
eabed0edf8 Change grid and container sizes to px
Changes grid and container sizes to `px`, as the
viewport pixel size does not depend on the font size.

The actual em values were inconsistent with the docs,
while the docs were not the same as the comments:

* `sm` breakpoint was 34em (544px) not 480px.
* `lg` container max-width was 60rem (960px), less gutter than `md`.
  Changed to 940px, same as Bootstrap 3.
* `xl` container max-width was 72.25rem which is 1140px not 1156px.
  Changed to 1140px matching the comment but not the docs.

Addresses #17070 and #17388.
2015-09-27 14:39:17 +01:00
Andrey
55994f3274 Add variable for card-link hover state 2015-09-26 14:57:13 +02:00
Leslie
b13ef4a3d2 Reset iOS rounded inputs
They can be rounded later on if $enable-rounded: true.
2015-09-25 14:19:28 +01:00
Aleksey Khudyakov
7ad9d233f2 Add variable for card background color 2015-09-23 09:40:34 +10:00
Mark Otto
918d0c7122 Merge pull request #17589 from vsn4ik/use_scss_if_not
v4 - Use "@if not $bool" expression
2015-09-22 15:26:28 -07:00
Catalin Zalog
c72a76e1fd Just some spaces... 2015-09-21 01:07:48 +03:00
Mark Otto
85f08df3b0 fixes border-width issues when customizing font-size by using 1px instead of .0625rem as default -width 2015-09-15 21:11:15 -07:00
Rakhat Jabagin
73b056ae50 remove not used popover fallback variables 2015-09-14 14:37:47 +06:00
vsn4ik
d73d79a7a0 Use "@if not $bool" selector 2015-09-13 16:02:58 +03:00
Mark Otto
339130c040 fixes #17583: only include clearfix on make-container mixin when not in flex mode 2015-09-12 12:30:57 -07:00
Guilherme Duarte
df040671bb Border width variable in list group items
Added usage of $border-width variable in all _list-group.scss references
2015-09-10 14:16:23 +02:00
David Leuliette
61067304cd Drop cursor pointer for button role 2015-09-09 17:14:34 +02:00
Chris Rebert
efac54c2a4 Merge pull request #17495 from vsn4ik/mv_text_hide
v4 - Rename file with text-hide mixin
2015-09-06 14:03:10 -07:00
Mark Otto
741f7d4b5a Fixes #17486: start work on responsive cards for decks, groups, and columns 2015-09-06 09:36:19 -07:00
vsn4ik
de44d2a3dd Rename file with text-hide mixin 2015-09-06 14:40:19 +03:00
Mark Otto
584cfdd72b Fixes #17230: Renames .navbar-static-top to .navbar-full and adds docs for it 2015-09-05 20:58:28 -07:00
Mark Otto
c0b5f71874 remoe comment /cc @cvrebert 2015-09-05 20:54:25 -07:00
Gleb Mazovetskiy
79aebf6c1d Merge pull request #17364 from twbs/avoid-parent-selector-suffix2
Remove all uses of `selector &` to support nested import
2015-09-05 10:14:59 +01:00
Mark Otto
b8c77aaf3b float the breadcrumb items to deal with that pesky inline-block madness 2015-09-04 21:28:01 -07:00
Mark Otto
1a6aad4548 only apply border radius mixins if rounded corners are enabled; alternate fix to #17426 2015-09-03 09:04:51 -07:00
Luke Bonaccorsi
319009a72b Added .navbar-toggleable-md class
In Bootstrap 3, the menu collapsed on the -sm- breakpoint, I believe the equivalent of this breakpoint in Bootstrap 4 is actually the -md- breakpoint. The navbar currently has no option to collapse at the -md- breakpoint and I'd like to add this.
2015-09-02 22:08:52 +01:00
Xavier Gallardo
750656fc9c Add a license header to bootstrap.scss 2015-09-02 15:08:21 -04:00
David Baughman
b1fa07b1f7 Adding new line to end of file 2015-09-02 10:09:55 -07:00
Mark Otto
5fc4b35349 Merge pull request #17168 from kkirsche/patch-19
v4 - Rename .img-responsive class to .img-fluid
2015-09-02 00:33:26 -07:00
Andrew Smith
b424626e97 Update all usages of 'control-label' with 'form-control-label' in docs 2015-09-02 15:01:02 +10:00
Kevin Kirsche
57943ed8ee Use the body color for dropdown menu text
Fix #17276
2015-09-01 21:23:43 -07:00
Mark Otto
57998dc274 linter 2015-09-01 21:23:26 -07:00
Mark Otto
cf70fce245 mention overrides too 2015-09-01 21:20:35 -07:00
Mark Otto
f8e13cb35f Merge pull request #17358 from tomByrer/patch-1
clarifies that normalize.css is a dependency of reboot
2015-09-01 21:19:12 -07:00
Mark Otto
468a9d9359 fixes #17379: override search input box-sizing to match our global overrides 2015-09-01 21:16:26 -07:00
Mark Otto
8f9e50c02d fixes #17385: add var for default link decoration 2015-09-01 21:14:51 -07:00
Kevin Kirsche
54fba7cbe5 Rename .img-responsive class to .img-fluid
Fix #17166
2015-09-01 21:12:28 -07:00
Mark Otto
7f18d02e56 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-09-01 21:12:06 -07:00
Mark Otto
29c3eddaeb fixes #17412: reverse display heading classes to match h1-h6 headings 2015-09-01 21:11:53 -07:00
Mark Otto
003f507de3 Merge pull request #17334 from neilhem/media-flex-align
Media vertical align flexbox classes
2015-09-01 21:01:45 -07:00
Mark Otto
d119800489 fix #17356 2015-09-01 21:01:12 -07:00
Mark Otto
b5c93eafb8 Merge pull request #17333 from neilhem/combine-size-mixins
Combine size & square mixins into one
2015-09-01 20:25:25 -07:00
Mark Otto
a748e251fd Merge pull request #17259 from twbs/v4gc
v4: Conditional predefined grid classes
2015-09-01 20:16:22 -07:00
Mark Otto
c053f23fe6 Merge pull request #17362 from omeid/v4-container-mixin
Semantic grid: add make-container-breakpoint
2015-09-01 20:13:52 -07:00
Catalin Zalog
18395219cc Apply !default to SCSS variables
Missed one variable :(
2015-09-01 11:26:01 +03:00
Chris Rebert
8ad1f8ddbe Merge pull request #17331 from twbs/fix-17323
rm unused $state param from form-control-validation mixin
2015-08-29 15:55:45 -07:00
David Baughman
e481c8fff2 Merge branch 'v4-dev' into v4-media-breakpoint-between 2015-08-27 13:41:24 -07:00
O'meid
c42d0e10f4 scss: semantic grid: add make-container-breakpoint
Signed-off-by: O'meid <public@omeid.me>
2015-08-28 00:48:06 +10:00
Gleb Mazovetskiy
f7b27a02ce Remove all uses of selector &
If we want to support namespaced import:

```scss
.twbs {
  @import 'bootstrap';
}
```

We cannot use `selector &`, see sass/sass#1817.

`fieldset[disabled] &` is not needed as we no longer support IE8.
2015-08-27 13:11:14 +01:00
XhmikosR
3e66427127 Less to Sass typos.
[ci skip]
2015-08-27 08:14:39 +03:00
Tom Byrer
d2930ce1ad clarifies normalize.css is a dependency
Perhaps I'm a little slow & need to have things spelled out :)
https://github.com/twbs/bootstrap/issues/17301#issuecomment-134469886
2015-08-26 18:59:08 -06:00
Chris Rebert
c6e648d79b rm responsive-invisibility mixin since it's only used once
inline the one remaining usage into .hidden-print's definition
rm now-empty scss/_utilities-responsive.scss file

[skip sauce]
[skip validator]
2015-08-26 15:31:36 -07:00
Chris Rebert
19e996c623 tree shaking: rm unused responsive-visibility mixin
[skip sauce]
[skip validator]
2015-08-26 15:06:09 -07:00
Rakhat Jabagin
56aadd25da add media vertical flexbox classes 2015-08-26 16:50:24 +06:00
Rakhat Jabagin
865911c35d combine size & square mixins into one 2015-08-26 16:17:00 +06:00
Chris Rebert
5c239aae7d rm unused $state param from form-control-validation mixin; fixes #17323
[skip sauce]
[skip validator]
2015-08-26 01:32:26 -07:00
David Baughman
026682bf0d Added mixin to handle media queries that span multiple breakpoints 2015-08-25 12:53:14 -07:00
Mark Otto
5fc3b1d540 Merge pull request #17113 from JanStevens/v4-fix-retina-mixin
Fixes the _image mixing by prefixing the parameters with $
2015-08-25 07:45:02 -07:00
XhmikosR
9420297dc2 SCSS lint fixes.
[ci skip]
2015-08-25 15:38:20 +03:00
Felipe
67995d034e PropertySortOrder
Properties should be ordered border-top, border-bottom
2015-08-24 16:44:55 -05:00
Kevin Kirsche
29e4dd2fba Fix accidental triple colon from :before to ::before conversion
Fix #17288 — Sorry about that!
2015-08-24 15:47:04 -04:00
Kevin Kirsche
d51f0a4f81 Use double colons for psuedo elements
Fix #17052
2015-08-24 13:22:10 -04:00
Mark Otto
c8ab0a56c2 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-08-23 23:16:18 -07:00
Mark Otto
7d194a9bd3 wrap box-shadows in mixin in custom forms. fixes #17242 2015-08-23 23:13:14 -07:00
Mark Otto
19deadda95 shorter 2015-08-23 23:00:47 -07:00
Mark Otto
02069152a2 Merge pull request #17147 from kkirsche/patch-14
v4 - Dropup caret direction incorrect
2015-08-23 22:59:43 -07:00
Mark Otto
7633d4c603 Make predefined grid classes conditional
- Add explicit -grid-classes variable and set to true by default
- Wrap .row and .col generation in the boolean var
2015-08-23 22:13:58 -07:00
Catalin Zalog
793db36640 Apply !default to SCSS variables
!default to all variables.
2015-08-24 01:44:16 +03:00
Mark Otto
e75504366d Merge pull request #17120 from kkirsche/patch-5
Add white background to cards by default
2015-08-23 14:44:53 -07:00
Kevin Kirsche
e707a45b1f v4 - Dropup caret direction incorrect
Fix #17144
2015-08-23 08:12:56 -04:00
Kevin Kirsche
44acff459b Add white background to cards
Fix #17117
2015-08-23 08:10:55 -04:00
Geremia Taglialatela
0376146d71 Change the default value of $font-size-sm to .875rem 2015-08-23 11:35:00 +02:00
Mark Otto
a5bfbe0fca fix remaining scss lint errors 2015-08-23 01:12:00 -07:00