0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

332 Commits

Author SHA1 Message Date
Bas Bosman
09464b5d41 Remove old accordion remnant 2013-08-14 16:33:35 +02:00
Mark Otto
3c772b1ceb lighter default navbar, add borders to navbars, tweak padding and alignments 2013-08-13 13:39:21 -07:00
Mark Otto
a2b9988eb9 Media query (grid and responsive utilities) overhaul
Grid classes have been changed to account for a fourth set of classes,
meaning we now have XS, S, M, and L options. Specifically, we made the
following changes:

* Renames `.col-` to `.col-xs-`
* Adds `.col-md-` for devices 992px wide and up
* Remaps `.col-lg-` for devices 1200px wide and up

Alongside that, we've updated our media queries to better handle
advanced grid layouts:

* All column classes now kick in when they hit a `min-width`, undoing
the #9128 fix in
https://github.com/twbs/bootstrap/commit/db45a60cc86190a060f0baf0b3961cb
c690f3a65
* All column offsets, pushes, and pulls are scoped to an appropriate
range, meaning a `min-width` and `max-width` (thanks for the idea,
@eratzlaff)

We've also modified the widths of our grid containers for the small
device grid (now a max 720px instead of 728px) and large device grid
(now a max 1140px instead of 1170px) to avoid horizontal scrollbar
problems in Firefox (likely due to box-sizing, which is why we didn't
see it in 2.x).

Similarly, we've updated the responsive ultility classes to match the
new four media query approach of the grid system. That means we've:

* Added new `.visible-xs` and `.hidden-xs` classes
* Reassigns visible and hidden classes for small, medium, and large to
matching grid system media queries
* Updates docs examples to match grid system and account for fourth
utility range

-----

Fixes the following:

* #9135: fourth grid tier
* #9302: undoes previous range change for small grid system, so no need
to update any docs here
* #8755: consistent grid and responsive utilities schemas)
* #9195, #9216, and #9227: no more horizontal scrollbars
2013-08-12 00:28:50 -07:00
Mark Otto
0819cfc450 addressing #9189 manually, part 7: thumbnails vars 2013-08-11 19:32:16 -07:00
Mark Otto
c2cfd3153b addressing #9189 manually, part 6: add a navbar margin var, but avoid the navbar-nav var because that should really be customizable 2013-08-11 18:32:52 -07:00
Mark Otto
a66cdb0c30 addressing #9189 manually, part 4: input group background var 2013-08-11 18:09:56 -07:00
Mark Otto
83f1a75e7a addressing #9189 manually, part 3: forms 2013-08-11 18:06:26 -07:00
Mark Otto
286636755a spacing 2013-08-11 17:47:53 -07:00
Mark Otto
58b90dae15 addressing #9189 manually, part 2: dropdown header and disabled link colors (and refactor commenting styles) 2013-08-11 17:47:30 -07:00
Mark Otto
8b76e0d0f0 addressing #9189 manually, part 1: code and pre vars 2013-08-11 17:23:19 -07:00
Mark Otto
1ff1dfb2bd fixes #9348 by ditching a comment 2013-08-11 16:07:45 -07:00
Mark Otto
2f1fcca6c5 Fixes #9145: Fix tooltip opacity
Update tooltips to not use RGBa colors so IE8 can have tooltips, too
(means we're now using `opacity`).
2013-08-06 11:18:53 -07:00
Mark Otto
db45a60cc8 Scope tablet classes to tablets range only
Fixes #9128
2013-08-05 20:55:30 -07:00
Mark Otto
219f0fe7c5 Merge branch '3.0.0-wip' into bs3_alerts_default_class
Conflicts:
	dist/css/bootstrap.min.css
2013-08-05 20:00:23 -07:00
Mark Otto
04dc221037 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
Conflicts:
	customize.html
	less/alerts.less
	less/badges.less
	less/button-groups.less
	less/buttons.less
	less/carousel.less
2013-08-05 16:03:10 -07:00
Mark Otto
9bbe8a020a Merge pull request #9121 from Flydiverny/alerts
Added padding variable for alerts and changed customize.html
2013-08-05 15:40:22 -07:00
Mark Otto
c4281f3919 Update labels to include a base class
* Builds on the new button styles by requiring a `.btn-default` for the
regular, gray labels
* Updates components examples to show new stuff
2013-08-05 15:30:28 -07:00
Markus Maga
9108ab9fb8 Added padding variable for alerts and changed customize.html Warning state (which doesn't exist anymore) 2013-08-06 00:06:57 +02:00
Mark Otto
01c46bfc0f More button updates
- Fixes #9113 (caret colors in dropdown buttons)
- Darken borders around buttons for contrast in button groups
2013-08-05 11:30:50 -07:00
Mark Otto
41eef69e6f Fixes #8786 (part 2): new default button styles
Also relevant: http://www.youtube.com/watch?v=Ldyx3KHOFXw
2013-08-05 09:02:59 -07:00
Mark Otto
11e46845b2 fixes #9063: add var for navbar border radius 2013-08-05 00:47:23 -07:00
Mark Otto
73c048578d Enable input focus state customization
- Add new mixin to generate and customize focus state as needed
- Adds variable to set default color
- Include clear disclaimer about customizing this—it's about users', so
don't go making everything bright red and expect them not to be
confused or alarmed.

Relevant issues: #2742, #4185, #7942, #8171, #8610, #9044
2013-08-04 23:05:54 -07:00
Chris Rebert
23ef8c0c20 Greater standardization of sizing terminology
In class names:
* large => lg
* small => sm
* mini => xs ("Extra small")

In screen size categories:
* Tiny => Extra small
2013-08-03 21:39:57 -07:00
Mark Otto
173dac4e54 Tighten up buttons and form controls
* Smaller padding on buttons and large buttons
* Same with inputs and large inputs
* Remove about 10px from height of large inputs/buttons and 4px from
regular ones

Fixes #8707 and #8700.

(Also relevant: #8711)
2013-08-02 15:09:48 -07:00
Andrey Popp
0d7940d950 get rid of out of order variable declaration 2013-07-29 03:04:12 +04:00
syed
1aedb7862c move things around
Moved alerts, badges, button groups, buttons, carousel, close to
variables.less and customize.html
2013-07-28 17:32:08 +05: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
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
Mark Otto
c7995cf964 move some thing around 2013-07-25 10:50:59 -07: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
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
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
Francis Brunelle
4b9cacae91 @badge-bg should be @gray-light not #f5f5f5 2013-07-23 00:05:45 -04: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
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
b372661a17 fixes #8206: Use navbar height var to compute vertical padding on navbar-brand 2013-07-18 02:23:38 -07:00
Mark Otto
181b276774 Fixes #8397: better navbar padding with grid gutter stuff 2013-07-18 01:04:54 -07:00
Mark Otto
e7bc9e1c3d Vurrriables and shit 2013-07-18 00:23:35 -07:00
Mark Otto
e5bfd8c00b Fixes #8441: remove @font-size-mini 2013-07-17 23:56:20 -07:00
Mark Otto
d3a139622e fixes #8491: add vars for table padding 2013-07-17 23:34:04 -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
Aristeides Stathopoulos
72183d9a45 Update variables.less 2013-06-22 18:45:25 +03: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
Luis Hdez
cd09f3213b Add heading font family variable 2013-06-20 12:50:30 +02: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
Edgar Schnueriger
b0d202455d Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed 2013-06-17 18:56:17 +02: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
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
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
Aristeides Stathopoulos
6fda25b4c1 Adding variables for container sizes 2013-05-27 23:00:39 +03: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
1d8ff36afa Add .panel-footer 2013-05-14 18:55:37 -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
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
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
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
ee0789ff8f Fixes #7721: change @navbar-text to @navbar-color, along with inverse options 2013-05-03 15:29:32 -07:00
Mark Otto
2ffa0e4409 Add maximum bounds variables for so our responsive utilities don't overlap 2013-04-27 11:55:45 -07:00
Kevin
9ce7f22e99 Adding media queries breakpoints variables 2013-04-27 18:47:47 +02:00
Mark Otto
e0d60b1325 Fixes #7617: lowercase and dash gray color vars 2013-04-21 19:35:36 -07:00
Mark Otto
364f8330a1 Fixes #7648: Thumbnail caption should use @text-color variable. Also adds other thumbnail vars 2013-04-21 18:29:06 -07:00
Mark Otto
2d5ab9a2de Make alerts use variables better 2013-04-20 15:47:07 -07:00
Mark Otto
ab7070bb49 change var from @table-border to @table-border-color 2013-04-14 19:45:32 -07:00
Mark Otto
ae98f1803f add modal variables and tweak padding for min-height on modal title 2013-04-12 20:56:19 -07:00
Agustin Colchado
7fb1c1cb89 Reordering variables that were being used before they were declared. Under some compilers (dotless & sublime 2 package), this would cause the compile to break. Variables in question were:
@dropdown-link-active-bg
@navbar-link-color
@navbar-inverse-link-color
2013-04-10 02:27:11 -07:00
Tom Pietschker
a05ff7e507 rename btn bg variables so that they are consistent with the other variables 2013-04-07 17:52:12 -04:00
Tom Pietschker
c4d8aa2b0f rename the navbar-inverse-brand variables for consistency 2013-04-07 17:47:53 -04:00
Mark Otto
2f8deea95a add .panel-primary 2013-03-31 22:22:52 -07:00
Mark Otto
db284a97d6 more consistent navbar vars 2013-03-31 17:56:31 -07:00
Mark Otto
4cbefa1179 remove unused responsive navbar vars 2013-03-31 17:37:28 -07:00
Mark Otto
0441bbba42 more consisten dropdown vars 2013-03-31 17:36:23 -07:00
Mark Otto
896ee79473 more consistent forms vars; drop search border radius since no more search form 2013-03-31 17:33:55 -07:00
Mark Otto
8b9d488377 more consistent btn vars 2013-03-31 17:32:45 -07:00
Mark Otto
b7fa0d3434 -background to -bg for body and table vars 2013-03-31 17:29:05 -07:00
Mark Otto
d6f37f3c56 @link-color-hover to @link-hover-color 2013-03-31 17:27:22 -07:00
Mark Otto
376bd20b3a -background to -bg on wells vars 2013-03-31 17:25:52 -07:00
Mark Otto
52e4148302 better grid var comments 2013-03-31 17:25:27 -07:00
Mark Otto
626189dbfc @state-*-background to @state-*-bg vars 2013-03-31 17:24:06 -07:00
Mark Otto
d5fa1d80bb use @pagination- vars on pager component; change @pagination-bg-active to @pagination-active-bg 2013-03-31 17:22:12 -07:00
Mark Otto
996ec4ca69 -background to -bg on pagination vars 2013-03-31 17:20:16 -07:00
Mark Otto
f2e5c32936 -background to -bg on jumbotron vars 2013-03-31 17:19:47 -07:00
Mark Otto
6b23a66c29 -background to -bg on tooltip and popover vars 2013-03-31 17:19:12 -07:00
Mark Otto
cf843c5cad -background to -bg on labels vars 2013-03-31 17:18:07 -07:00
Mark Otto
b56371b145 active item on list group should use @component-active-bg 2013-03-31 17:17:25 -07:00
Mark Otto
5c601e7ac2 new @component-active-bg variable 2013-03-31 12:16:16 -07:00
Mark Otto
674768b177 restore px unit on @font-size-base 2013-03-31 12:00:04 -07:00
Mark Otto
2a9604fdd2 add list group component 2013-03-30 16:07:50 -07:00
Mark Otto
9fff2d3fb6 Change error to danger for all classes; add panels component 2013-03-30 14:15:18 -07:00
Mark Otto
6012d8221b Exploring rems as font-size unit
* Added a new mixin to calculate rems and pixels for IE fallback
* Updated the body, p, and .lead elements to use the new .font-size() mixin
* New mixin has default value of 14px or 1.4rem
* Still needs exploration, and change this means lots of work rejiggering margins and line-heights
* Related, started to reorganize the mixins a bit to call out mixins that are used by the framework and not utilities or snippets
2013-03-17 11:33:07 -07:00
Mark Otto
bb38fa5286 Overhaul the grid system and its docs
* Add new grid mixins adapted from Preboot (http://github.com/mdo/preboot)
* Drop the @grid-row-width and @grid-column-width variables
* Add the @grid-float-breakpoint variable, as used in Preboot
* Add support for .push* and .pull* classes for column ordering manipulation
* Document all the things
2013-03-15 23:21:10 -07:00
Luke Page
5054c17ab8 make less files compile with strict maths in 1.4.0 2013-03-06 16:38:20 +00:00
Mark Otto
e0647e8273 nuke commented out unused var 2013-03-01 12:37:36 -08:00
Mark Otto
5a30e52aac Fixes #6995: Add disabled navbar nav link support 2013-02-28 23:20:58 -08:00
Mark Otto
acdffe696c Bring back the label, make it scale somewhat with the font-size of the parent using percentages and ems 2013-02-17 22:20:49 -08:00
Mark Otto
96953c2072 update makefile to work again; gitignore the compiled docs _gh_pages folder; test makefile with darkened navbar active bg 2013-02-13 12:30:56 -08:00
Mark Otto
b04acb37e8 finish modal tweaks 2013-02-07 19:31:12 -08:00
Mark Otto
37a6879ca5 White navbar brand text for inverted navbar 2013-02-05 20:39:09 -08:00
Mark Otto
6993fadf7e Simplify input and input group sizing
* Remove .input-mini because who really needs inputs that small
* Remove unnecessary border-radius resets from large and small input groups
2013-02-02 17:31:26 -08:00
Mark Otto
04aae2f56c Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip 2013-02-02 17:01:29 -08:00
Mark Otto
c64aa26d06 Add @btn-color variable and use in buttons and carets; fixes dropup caret as well 2013-02-02 13:03:18 -08:00
Mark Otto
d53af49afe Refactor colors and progress bars
* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
2013-02-01 16:21:38 -08:00
Gil Barbara
e69912c163 Update line-height and padding for input sizes 2013-01-31 19:00:22 -02:00
Mark Otto
5663833bfc Restore .btn-info 2013-01-17 19:51:22 -08:00
Mark Otto
01b32f472d Simplify and bring back the grid mixin for generating spans and offsets 2013-01-17 10:49:10 -08:00
Mark Otto
f535201781 improve navbar vars and fix side nav alignment 2013-01-16 23:33:26 -08:00
Mark Otto
9ba14cfb7c More navbar derping 2013-01-16 16:14:41 -08:00
Mark Otto
960804cea3 mo betta new navbar styles; hook up some changed vars 2013-01-16 15:35:41 -08:00
Mark Otto
85db846b65 mobile-first navs, navbar, grids, and type 2013-01-15 17:55:14 -08:00
Mark Otto
1916eb7c7f Fix btn link hover and tweak dropdown border/shadows 2013-01-13 04:04:16 -08:00
Mark Otto
a9a66e9c34 finetune buttons flattened colors 2013-01-12 17:51:57 -08:00
Mark Otto
ff02043bbc Flatten navbar 2013-01-12 14:31:18 -08:00
Fabien
c91bf424b0 Add glyphicons font path variable 2013-01-11 18:32:00 +01:00
Mark Otto
0da31ceb51 Cleanup spacing in variables file 2012-12-26 14:06:21 -06:00
Mark Otto
cdb25e11ef lighter buttons closer to todays versions 2012-12-20 01:21:09 -08:00
Mark Otto
14844db862 Holy shit, buttons, button states, and input states updated 2012-12-19 23:37:33 -08:00
Mark Otto
a27952efd0 Unfuck the fucked gradient with it's fucked mix() of background colors; nuke commented out code 2012-12-19 23:12:38 -08:00
Mark Otto
9b4e5746a4 More button tweaks 2012-12-19 22:54:04 -08:00
Mark Otto
c38b7206eb overhaul buttons 2012-12-19 22:25:56 -08:00
Mark Otto
7449e2e5a1 Remove @black and just use #000 2012-12-19 22:02:57 -08:00
Mark Otto
b6945a2168 Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones 2012-12-19 21:37:16 -08:00
Mark Otto
4c82dd3645 Refactor input groups
* Deprecate .input-append and .input-prepend
* Use new, single base class for component, .input-group
* Deprecate .addon for .input-group-addon
* For compatibility with all buttons, require .input-group-btn to wrap buttons and button dropdowns
* Still need to reimplement with segmented button dropdowns, but that's dependent on a refactor of those first
2012-12-09 21:46:14 -08:00
Mark Otto
adc2c779a0 grid vars updated 2012-11-30 15:43:07 -08:00
Mark Otto
b8b266ca7c popovers and tooltips vars 2012-11-30 15:40:44 -08:00
Mark Otto
e34b3730b7 form state vars 2012-11-30 15:38:31 -08:00
Mark Otto
0a93bc143d hero unit and pagination vars 2012-11-30 15:36:16 -08:00
Mark Otto
51c418d468 alignment 2012-11-30 15:34:35 -08:00
Mark Otto
62a2220035 navbar vars 2012-11-30 15:33:56 -08:00
Mark Otto
a09cea44ae more vars changed 2012-11-30 15:27:13 -08:00
Mark Otto
01421ecd62 remove sprites vars, change zindex vars 2012-11-30 15:23:13 -08:00
Mark Otto
12a00f62a9 remove color variables, swap others were appropro 2012-11-30 15:18:49 -08:00