Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
b88c05d5
Commit
b88c05d5
authored
Apr 18, 2015
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clean up comments and spacing
parent
88a92e43
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
9 deletions
+20
-9
scss/_alert.scss
scss/_alert.scss
+4
-1
scss/_badge.scss
scss/_badge.scss
+0
-1
scss/_button-group.scss
scss/_button-group.scss
+6
-2
scss/_buttons.scss
scss/_buttons.scss
+10
-5
No files found.
scss/_alert.scss
View file @
b88c05d5
...
@@ -3,8 +3,9 @@
...
@@ -3,8 +3,9 @@
// --------------------------------------------------
// --------------------------------------------------
//
// Base styles
// Base styles
//
-------------------------
//
.alert
{
.alert
{
padding
:
$alert-padding
;
padding
:
$alert-padding
;
...
@@ -34,6 +35,7 @@
...
@@ -34,6 +35,7 @@
font-weight
:
$alert-link-font-weight
;
font-weight
:
$alert-link-font-weight
;
}
}
// Dismissible alerts
// Dismissible alerts
//
//
// Expand the right padding and account for the close button's positioning.
// Expand the right padding and account for the close button's positioning.
...
@@ -50,6 +52,7 @@
...
@@ -50,6 +52,7 @@
}
}
}
}
// Alternate styles
// Alternate styles
//
//
// Generate contextual modifier classes for colorizing the alert.
// Generate contextual modifier classes for colorizing the alert.
...
...
scss/_badge.scss
View file @
b88c05d5
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
// --------------------------------------------------
// --------------------------------------------------
// Base class
.badge
{
.badge
{
position
:
relative
;
position
:
relative
;
top
:
-.1em
;
top
:
-.1em
;
...
...
scss/_button-group.scss
View file @
b88c05d5
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
// Button groups
// Button groups
// --------------------------------------------------
// --------------------------------------------------
// Make the div behave like a button
// Make the div behave like a button
.btn-group
,
.btn-group
,
.btn-group-vertical
{
.btn-group-vertical
{
...
@@ -103,8 +104,9 @@
...
@@ -103,8 +104,9 @@
.btn-group-lg
>
.btn
{
@extend
.btn-lg
;
}
.btn-group-lg
>
.btn
{
@extend
.btn-lg
;
}
//
// Split button dropdowns
// Split button dropdowns
//
----------------------
//
// Give the line between buttons some depth
// Give the line between buttons some depth
.btn-group
>
.btn
+
.dropdown-toggle
{
.btn-group
>
.btn
+
.dropdown-toggle
{
...
@@ -143,8 +145,10 @@
...
@@ -143,8 +145,10 @@
}
}
//
// Vertical button groups
// Vertical button groups
//
----------------------
//
.btn-group-vertical
{
.btn-group-vertical
{
>
.btn
,
>
.btn
,
...
...
scss/_buttons.scss
View file @
b88c05d5
...
@@ -3,8 +3,9 @@
...
@@ -3,8 +3,9 @@
// --------------------------------------------------
// --------------------------------------------------
//
// Base styles
// Base styles
//
--------------------------------------------------
//
.btn
{
.btn
{
display
:
inline-block
;
display
:
inline-block
;
...
@@ -58,8 +59,9 @@ fieldset[disabled] a.btn {
...
@@ -58,8 +59,9 @@ fieldset[disabled] a.btn {
}
}
//
// Alternate buttons
// Alternate buttons
//
--------------------------------------------------
//
.btn-primary
{
.btn-primary
{
@include
button-variant
(
$btn-primary-color
,
$btn-primary-bg
,
$btn-primary-border
);
@include
button-variant
(
$btn-primary-color
,
$btn-primary-bg
,
$btn-primary-border
);
...
@@ -81,8 +83,9 @@ fieldset[disabled] a.btn {
...
@@ -81,8 +83,9 @@ fieldset[disabled] a.btn {
}
}
//
// Link buttons
// Link buttons
//
-------------------------
//
// Make a button look and behave like a link
// Make a button look and behave like a link
.btn-link
{
.btn-link
{
...
@@ -121,8 +124,9 @@ fieldset[disabled] a.btn {
...
@@ -121,8 +124,9 @@ fieldset[disabled] a.btn {
}
}
//
// Button Sizes
// Button Sizes
//
--------------------------------------------------
//
.btn-lg
{
.btn-lg
{
// line-height: ensure even-numbered height of button next to large input
// line-height: ensure even-numbered height of button next to large input
...
@@ -137,8 +141,9 @@ fieldset[disabled] a.btn {
...
@@ -137,8 +141,9 @@ fieldset[disabled] a.btn {
}
}
//
// Block button
// Block button
//
--------------------------------------------------
//
.btn-block
{
.btn-block
{
display
:
block
;
display
:
block
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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