rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity
20,211 Commits 108 Branches 89 Tags 547 MiB
d6a72c4e1b
Commit Graph

781 Commits

Author SHA1 Message Date
Chris Rebert
e6fdebb9c7 Merge pull request #18463 from twbs/nav-item-margin 
Introduce $nav-item-margin variable
/fyi @mdo
 2015-12-16 22:17:09 -08:00
Chris Rebert
92338da1f3 Merge pull request #18469 from twbs/card-deck-margin 
Introduce $card-deck-margin variable
/fyi @mdo; happy to tweak the var names if desired
 2015-12-16 22:16:36 -08:00
Chris Rebert
34fe668af2 Merge pull request #18472 from twbs/x-y-vars 
Rename 2 navbar variables to comply with updated naming convention
 2015-12-12 00:32:28 -08:00
Alexandr Kondrashov
c4c9e1959f Fix size of validation feedback icons 2015-12-08 14:54:37 +03:00
Chris Rebert
1861b05b5f Rename 2 navbar variables to comply with updated naming convention 
$navbar-padding-horizontal => $navbar-padding-x
$navbar-padding-vertical   => $navbar-padding-y

[skip sauce]
[skip validator]
 2015-12-08 01:30:23 -08:00
Chris Rebert
0330d4acc2 Introduce $btn-block-spacing-y variable 
[skip sauce]
 2015-12-08 01:14:09 -08:00
Chris Rebert
6798485323 Introduce $card-deck-margin variable 
[skip sauce]
[skip validator]
 2015-12-08 01:13:37 -08:00
Chris Rebert
de9ad37c5d Introduce $nav-item-margin variable 
[skip sauce]
 2015-12-08 01:12:57 -08:00
Chris Rebert
5871be0ce6 Refactor _utilities-spacing.scss; fixes #18129 2015-12-08 01:08:03 -08:00
Mark Otto
ac5be12f24 unfuck that border from rem to px 2015-12-08 00:49:31 -08:00
Mark Otto
60ad55b8f7 fixes #17776 2015-12-08 00:16:46 -08:00
Chris Rebert
9dacdce42c Use $input-btn-border-width for both .form-control and .btn borders; fixes #18424 
Both widgets need to use the same border width because of input groups.
Thus:
$btn-border-width   => $input-btn-border-width
$input-border-width => $input-btn-border-width

[skip sauce]
 2015-12-07 20:41:51 -08:00
Alexandr Kondrashov
750d45c9e9 Add an empty line at the end of the file 2015-12-08 03:46:16 +03:00
Alexandr Kondrashov
d4e9dad3de SVG: base64 > ASCII85 (fix merge) 2015-12-08 03:27:53 +03:00
Alexandr Kondrashov
568073feb9 SVG: base64 > ASCII85 2015-12-08 02:48:05 +03:00
Mark Otto
49674a8eba fixes #18425 by using vars for 1px borders 2015-12-06 16:45:40 -08:00
Mark Otto
239befe16b Merge branch 'list-inline-padding' into v4-dev 2015-12-06 16:29:35 -08:00
Chris Rebert
0759d76bd2 Add 3 more font-weight variables 
Refs #14368

[skip sauce]
[skip validator]
 2015-12-06 12:32:49 -08:00
vsn4ik
ad698d124a v4 - Add default param for form-icon variables 2015-12-05 21:32:25 +03:00
Chris Rebert
e8dcb2f917 Add $list-inline-padding variable 
[skip sauce]
[skip validator]
 2015-12-04 01:56:49 -08:00
Chris Rebert
3f2943424f Remove reference to defunct Customizer from v3 
[ci skip]
 2015-11-29 20:54:45 -08:00
Chris Rebert
ca68331b8b Add $list-group-border-width; refs #18150 
[skip sauce]
 2015-11-15 12:46:46 -08:00
Chris Rebert
e54a9d7e8d $list-group-border => $list-group-border-color 
[skip sauce]
 2015-11-15 12:43:43 -08:00
Chris Rebert
6a66d2dd92 Add $table-border-width; refs #18150 2015-11-14 23:24:48 -08:00
Chris Rebert
c174d7ab4e Add $popover-border-width; refs #18150 2015-11-14 23:11:20 -08:00
Chris Rebert
e3eaeb96e8 Add $thumbnail-border-width; refs #18150 2015-11-14 22:56:20 -08:00
Chris Rebert
13ac07a862 $thumbnail-border => $thumbnail-border-color 2015-11-14 22:54:53 -08:00
Chris Rebert
203264d7af Add $pagination-border-width; refs #18150 2015-11-14 22:53:18 -08:00
Chris Rebert
5f45f652f7 Rename $pagination-border => $pagination-border-color for clarity 2015-11-14 22:51:18 -08:00
Chris Rebert
687610e6f1 Add $pager-border-width; refs #18150 2015-11-14 22:50:40 -08:00
Chris Rebert
a4594bd445 $pager-border => $pager-border-color 2015-11-14 22:48:18 -08:00
Chris Rebert
a420b66210 Add $nav-tabs-link-border-width; refs #18150 2015-11-14 22:40:43 -08:00
Chris Rebert
1f29c306a6 Add $input-border-width; refs #18150 2015-11-14 22:40:43 -08:00
Chris Rebert
2d02910e01 $input-border => $input-border-color 2015-11-14 22:40:43 -08:00
Chris Rebert
2ea8950b26 Add $dropdown-border-width; refs #18150 2015-11-14 22:40:43 -08:00
Chris Rebert
76f7056321 $dropdown-border => $dropdown-border-color 2015-11-14 22:28: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
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
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
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
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
Chris Bell
be1bb9ec3e #17895 Added $alert-border-width that defaults to $border-width 2015-10-15 15:57:15 +01: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
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
Aleksey Khudyakov
7ad9d233f2 Add variable for card background color 2015-09-23 09:40:34 +10: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
Alexandr Kondrashov
c9725926b2 Merge remote-tracking branch 'twbs/v4-dev' into patch-1 
Conflicts:
	scss/_custom-forms.scss
	scss/_variables.scss
 2015-09-11 16:43:00 +03:00
Mark Otto
8f9e50c02d fixes #17385: add var for default link decoration 2015-09-01 21:14:51 -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
d119800489 fix #17356 2015-09-01 21:01:12 -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
Catalin Zalog
18395219cc Apply !default to SCSS variables 
Missed one variable :(
 2015-09-01 11:26:01 +03:00
XhmikosR
9420297dc2 SCSS lint fixes. 
[ci skip]
 2015-08-25 15:38:20 +03: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
Geremia Taglialatela
0376146d71 Change the default value of $font-size-sm to .875rem 2015-08-23 11:35:00 +02:00
Alexandr Kondrashov
353e0a49a9 compress SVGs 
Well compressed, but I'm sure it is possible to compress more
 2015-08-22 03:50:31 +03:00
Mark Otto
ba6cf4839b Merge pull request #17069 from kkirsche/patch-9 
Card variables should be in _variables.scss
 2015-08-20 22:02:35 -07:00
Kevin Kirsche
9e8bd818b2 Card variables should be in _variables.scss 
Fixes #17061
 2015-08-19 17:35:34 -04:00
Chris Bell
333be22824 Update _variables.scss 
Fixed spelling mistake. Changed table of "ontents" to "Contents".
 2015-08-19 22:06:39 +01:00
Mark Otto
d6b6a20a0d rewrite navbar once more for lower key styles and a new take on modifiers for improved customization 2015-08-18 00:46:29 -07:00
Mark Otto
f1e10c37fd rewrite navbar bits some more 2015-08-17 23:43:59 -07:00
Mark Otto
609c1ac2ff tighten up padding on inputs and buttons, disable fixed heights for now 2015-08-17 23:42:39 -07:00
Mark Otto
f0a8e56f80 tweak heading sizes 2015-08-17 21:13:52 -07:00
Mark Otto
c064eef67b Massive cleanup 
- Simpler main nav on all pages
- Back to purple masthead on homepage instead of dark graphite
- Active link styles on the main nav
- Cleaned up sidebar nav
- New docs layout name
- Homepage copy edits
- Updated bright purple docs color
 2015-08-14 22:45:55 -07:00
Mark Otto
1da01e68ba variables cleanup 
- new vars for .lead size and weight (previously had none)
- new var for default margin-bottom on h1-h6 elements (previously had none)
- rearranged vars to combine two typography sections into one in variables.scss
- reassigned border-width var to hr-border-width
- made hr-border more specific as hr-border-color
 2015-08-13 23:18:32 -07:00
Mark Otto
27fbc77ecb add note about variable structure 2015-08-13 23:13:38 -07:00
Mark Otto
9b1ee31567 nuke the shared padding vars and assign to individual components 
- no real need for everything to be 100% shared
- padding looked and felt too large for inputs but not for buttons
- tying forms and buttons seems fine, but throwing in pagination feels wrong
 2015-08-13 23:04:16 -07:00
Mark Otto
6af9412674 move form validation icon vars to variables file 2015-08-12 22:39:46 -07:00
Mark Otto
314161cb17 remove hella vars from the jumbotron 2015-08-12 20:28:46 -07:00
Mark Otto
786b1682a5 small vars change 2015-08-12 18:22:02 -07:00
Mark Otto
a90f6c7093 reorder variables, rename -color to -color 2015-08-10 23:38:41 -07:00
Mark Otto
67765587d9 no more use for that 2015-08-10 23:30:13 -07:00
Mark Otto
8c173cd4f8 remove unused badge vars 2015-08-10 23:29:54 -07:00
Mark Otto
c871e4c130 clarify comment 2015-08-10 23:29:36 -07:00
Mark Otto
8e0324362e remove unused variable 2015-08-10 23:29:04 -07:00
Mark Otto
e7b1123310 update button borders to match bgs for easier outline button styling 2015-08-09 22:49:21 -07:00
Mark Otto
7a50a2cbe8 introduce display heading classes 2015-08-09 21:17:27 -07:00
Mark Otto
7c3f5b6d59 rewrite some forms docs, use new validation styles and icons 2015-08-08 14:15:09 -07:00
Mark Otto
f534cabc7e wider horizontal padding 2015-08-05 23:14:41 -07:00
Mark Otto
d80f26fe49 unaffix sidebar and simplify styles of docs side nav to be more like v3 2015-08-05 00:38:36 -07:00
Mark Otto
0156fc1c9d mathematical! 2015-08-05 00:16:00 -07:00
Mark Otto
4665b9dd6f Add new variable for -box-shadow 2015-07-03 18:35:46 -07:00
Mark Otto
932ac79611 remove -darker 2015-07-03 18:33:31 -07:00
Mark Otto
ed42fc9b76 line-height-base to line-height var 2015-06-22 23:24:32 -07:00
Mark Otto
03a5ff6b82 remove commented out var 2015-06-22 22:52:14 -07:00
Mark Otto
057f82f8c3 indentation 2015-06-22 22:52:09 -07:00
Mark Otto
acca337ced Remove var 2015-06-22 19:02:30 -07:00
Mark Otto
75cf69a1ab drop more -base, clean up var spacing 2015-06-22 18:57:56 -07:00
Mark Otto
0ca9b21c34 drop the base (hahaha), no but seriously drop the -base from our vars since it's cleaner 2015-06-22 18:53:04 -07:00
Mark Otto
4565281df3 rename -horizontal and -vertical vars to -x and -y for consistency 2015-06-22 16:33:17 -07:00
Mark Otto
ce9c0f0125 tweak small forms, small inputs; trying to equalize their rendered dimensions 2015-06-22 16:30:31 -07:00
Mark Otto
e4d72c914d fix vars, grunt that shit 2015-06-19 00:01:57 -07:00
Mark Otto
169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
Mark Otto
840938f09d tweak code styles 2015-06-09 16:28:17 -07:00
Mark Otto
ddafee6ece disable flex to start 2015-05-22 22:33:45 -07:00
Mark Otto
7db7e59682 spacing 2015-04-29 11:49:41 -07:00
Mark Otto
b849be2edc rename media query var to match /cc @cvrebert 2015-04-29 11:49:25 -07:00
Mark Otto
95771f9658 clean up vars file a smidge 2015-04-29 11:48:58 -07:00
Mark Otto
47dfdc2880 darker secondary button border color 2015-04-29 11:42:38 -07:00
Mark Otto
9d4d6ef3a2 stub out flexbox grid variation via -flex 2015-04-27 01:43:14 -07:00
Mark Otto
209cdf33f9 update navbar and nav link values 2015-04-18 18:15:24 -07:00
Mark Otto
250c2200bf no more dl-horizontal offset or page-header vars 2015-04-18 11:53:10 -07:00
Mark Otto
35be16cffa remove legend vars as we no longer use them 2015-04-18 11:39:13 -07:00
Mark Otto
611a127a1e change the type scale a bit again 2015-04-17 16:49:48 -07:00
Mark Otto
7c1635cdb8 narrower borders to get closer to 1px everywhere 2015-04-17 00:44:36 -07:00
Mark Otto
af9ab7b1a7 tweak the font-sizes for headings 2015-04-17 00:21:57 -07:00
Mark Otto
236a86502e fix spacer vars 2015-04-15 15:30:26 -07:00
Mark Otto
8303b7b8c9 nuke shadows for now 2015-04-14 01:01:15 -07:00
Mark Otto
53a3ff74ca redo sidenav 2015-04-13 19:00:59 -07:00
Mark Otto
58082cd83e Merge branch 'master' into v4 
Conflicts:
	.gitignore
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_includes/components/navbar.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/grid.html
	docs/_includes/css/overview.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/third-party-support.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_includes/nav/main.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/migration.html
	js/affix.js
	js/alert.js
	js/button.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tests/visual/modal.html
	js/tooltip.js
	less/component-animations.less
	less/jumbotron.less
	less/mixins/background-variant.less
	less/mixins/buttons.less
	less/mixins/responsive-visibility.less
	less/mixins/text-emphasis.less
	less/navbar.less
	less/navs.less
	less/scaffolding.less
	less/tooltip.less
	less/utilities.less
	less/variables.less
	package.json
	scss/_buttons.scss
	scss/_forms.scss
	scss/_modal.scss
 2015-03-29 00:08:54 -07:00
Mark Otto
7dcd9c5d63 remove all customizer comments from variables file 2015-03-09 14:18:25 +00:00
Mark Otto
517977fca4 fix validation, run grunt dist 2015-03-01 14:11:22 -08:00
Chris Rebert
fd13e33aa4 add $use-hover-media-query to control @media (hover:hover) usage 2015-01-22 11:39:57 -08:00
Chris Rebert
f6ef89d6c3 Use expressions for thirds to avoid precision issues 2015-01-21 15:11:25 -08:00
Mark Otto
325748ff68 Merge branch 'master' into v4 
Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
 2015-01-19 14:48:12 -08:00
Gleb Mazovetskiy
93f51eb0e9 Automate breakpoints 
Breakpoints and container widths are now defined as maps.
 2014-12-24 22:27:11 +02:00
Gleb Mazovetskiy
e11208cc0b variables: fix fade-in 2014-12-20 16:37:43 +00:00
Mark Otto
1e136a70a2 Clean up some navbar.scss, drop the -float-breakpoint var entirely 2014-12-11 14:47:10 -08:00
Mark Otto
826aeec6e8 Merge pull request #13 from twbs/default-vars 
Apply !default to SCSS variables
 2014-12-11 12:20:05 -08:00
Chris Rebert
23aa0340df Apply !default to SCSS variables 
Per @thomas-mcdonald
 2014-12-09 16:24:05 -08:00
Gleb Mazovetskiy
5fefe06c3d Refactor grid-framework followup 
* Split up calc-grid-column, generate selectors in make-grid
* Iterate over $grid-breakpoints and (pull, push, offset)
 2014-12-07 16:22:39 +00:00
Mark Otto
bc3a2f669d fix vars order, remove rando grid class from mixin 2014-12-04 22:32:39 -08:00
Mark Otto
a1a3a007b6 tweak grid docs, add new tier 2014-12-04 21:02:04 -08:00
Mark Otto
4474630d77 restore px to base font size var 2014-12-04 00:10:24 -08:00
Mark Otto
c213ff820a fix the variables i broke, temporarily disabling line-height-computed 2014-12-04 00:09:37 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00