mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-08 17:22:31 +03:00
Merge branch '2.2.2-wip' into exploratory
Conflicts: docs/assets/css/bootstrap.css docs/getting-started.html docs/templates/pages/getting-started.mustache less/accordion.less less/alerts.less less/breadcrumbs.less less/buttons.less less/code.less less/dropdowns.less less/forms.less less/navbar.less less/progress-bars.less less/responsive-navbar.less less/tables.less less/thumbnails.less less/tooltip.less less/wells.less
This commit is contained in:
+2
-2
@@ -69,7 +69,7 @@
|
||||
@paddingMini: 1px 6px; // 24px
|
||||
|
||||
@baseBorderRadius: 4px;
|
||||
@borderRadiusLarge: 5px;
|
||||
@borderRadiusLarge: 6px;
|
||||
@borderRadiusSmall: 3px;
|
||||
|
||||
|
||||
@@ -126,7 +126,7 @@
|
||||
|
||||
@dropdownLinkColor: @grayDark;
|
||||
@dropdownLinkColorHover: @white;
|
||||
@dropdownLinkColorActive: @dropdownLinkColor;
|
||||
@dropdownLinkColorActive: @white;
|
||||
|
||||
@dropdownLinkBackgroundActive: @linkColor;
|
||||
@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
|
||||
|
||||
Reference in New Issue
Block a user