Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
b88c05d5
Commit
b88c05d5
authored
10 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
clean up comments and spacing
parent
88a92e43
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
scss/_alert.scss
+4
-1
scss/_alert.scss
scss/_badge.scss
+0
-1
scss/_badge.scss
scss/_button-group.scss
+6
-2
scss/_button-group.scss
scss/_buttons.scss
+10
-5
scss/_buttons.scss
with
20 additions
and
9 deletions
+20
-9
scss/_alert.scss
+
4
-
1
View file @
b88c05d5
...
...
@@ -3,8 +3,9 @@
// --------------------------------------------------
//
// Base styles
//
-------------------------
//
.alert
{
padding
:
$alert-padding
;
...
...
@@ -34,6 +35,7 @@
font-weight
:
$alert-link-font-weight
;
}
// Dismissible alerts
//
// Expand the right padding and account for the close button's positioning.
...
...
@@ -50,6 +52,7 @@
}
}
// Alternate styles
//
// Generate contextual modifier classes for colorizing the alert.
...
...
This diff is collapsed.
Click to expand it.
scss/_badge.scss
+
0
-
1
View file @
b88c05d5
...
...
@@ -3,7 +3,6 @@
// --------------------------------------------------
// Base class
.badge
{
position
:
relative
;
top
:
-.1em
;
...
...
This diff is collapsed.
Click to expand it.
scss/_button-group.scss
+
6
-
2
View file @
b88c05d5
...
...
@@ -2,6 +2,7 @@
// Button groups
// --------------------------------------------------
// Make the div behave like a button
.btn-group
,
.btn-group-vertical
{
...
...
@@ -103,8 +104,9 @@
.btn-group-lg
>
.btn
{
@extend
.btn-lg
;
}
//
// Split button dropdowns
//
----------------------
//
// Give the line between buttons some depth
.btn-group
>
.btn
+
.dropdown-toggle
{
...
...
@@ -143,8 +145,10 @@
}
//
// Vertical button groups
//
----------------------
//
.btn-group-vertical
{
>
.btn
,
...
...
This diff is collapsed.
Click to expand it.
scss/_buttons.scss
+
10
-
5
View file @
b88c05d5
...
...
@@ -3,8 +3,9 @@
// --------------------------------------------------
//
// Base styles
//
--------------------------------------------------
//
.btn
{
display
:
inline-block
;
...
...
@@ -58,8 +59,9 @@ fieldset[disabled] a.btn {
}
//
// Alternate buttons
//
--------------------------------------------------
//
.btn-primary
{
@include
button-variant
(
$btn-primary-color
,
$btn-primary-bg
,
$btn-primary-border
);
...
...
@@ -81,8 +83,9 @@ fieldset[disabled] a.btn {
}
//
// Link buttons
//
-------------------------
//
// Make a button look and behave like a link
.btn-link
{
...
...
@@ -121,8 +124,9 @@ fieldset[disabled] a.btn {
}
//
// Button Sizes
//
--------------------------------------------------
//
.btn-lg
{
// line-height: ensure even-numbered height of button next to large input
...
...
@@ -137,8 +141,9 @@ fieldset[disabled] a.btn {
}
//
// Block button
//
--------------------------------------------------
//
.btn-block
{
display
:
block
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets