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
ac1ed746
Commit
ac1ed746
authored
Apr 18, 2015
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more comments and formatting clean up
parent
2237572e
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
87 additions
and
52 deletions
+87
-52
scss/_input-group.scss
scss/_input-group.scss
+33
-22
scss/_labels.scss
scss/_labels.scss
+4
-1
scss/_media.scss
scss/_media.scss
+4
-0
scss/_modal.scss
scss/_modal.scss
+2
-0
scss/_nav.scss
scss/_nav.scss
+5
-0
scss/_pagination.scss
scss/_pagination.scss
+5
-3
scss/_popover.scss
scss/_popover.scss
+1
-0
scss/_responsive-embed.scss
scss/_responsive-embed.scss
+3
-1
scss/_tables.scss
scss/_tables.scss
+2
-17
scss/_utilities-responsive.scss
scss/_utilities-responsive.scss
+5
-0
scss/_utilities.scss
scss/_utilities.scss
+23
-8
No files found.
scss/_input-group.scss
View file @
ac1ed746
...
@@ -2,8 +2,11 @@
...
@@ -2,8 +2,11 @@
// Input groups
// Input groups
// --------------------------------------------------
// --------------------------------------------------
//
// Base styles
// Base styles
// -------------------------
//
.input-group
{
.input-group
{
position
:
relative
;
// For dropdowns
position
:
relative
;
// For dropdowns
display
:
table
;
display
:
table
;
...
@@ -32,6 +35,24 @@
...
@@ -32,6 +35,24 @@
}
}
}
}
.input-group-addon
,
.input-group-btn
,
.input-group
.form-control
{
display
:
table-cell
;
&
:not
(
:first-child
)
:not
(
:last-child
)
{
@include
border-radius
(
0
);
}
}
.input-group-addon
,
.input-group-btn
{
width
:
1%
;
white-space
:
nowrap
;
vertical-align
:
middle
;
// Match the inputs
}
// Sizing options
// Sizing options
//
//
// Remix the default form control sizing classes into new ones for easier
// Remix the default form control sizing classes into new ones for easier
...
@@ -49,27 +70,10 @@
...
@@ -49,27 +70,10 @@
}
}
// Display as table-cell
//
// -------------------------
.input-group-addon
,
.input-group-btn
,
.input-group
.form-control
{
display
:
table-cell
;
&
:not
(
:first-child
)
:not
(
:last-child
)
{
@include
border-radius
(
0
);
}
}
// Addon and addon wrapper for buttons
.input-group-addon
,
.input-group-btn
{
width
:
1%
;
white-space
:
nowrap
;
vertical-align
:
middle
;
// Match the inputs
}
// Text input groups
// Text input groups
// -------------------------
//
.input-group-addon
{
.input-group-addon
{
padding
:
$padding-base-vertical
$padding-base-horizontal
;
padding
:
$padding-base-vertical
$padding-base-horizontal
;
font-size
:
$font-size-base
;
font-size
:
$font-size-base
;
...
@@ -100,7 +104,11 @@
...
@@ -100,7 +104,11 @@
}
}
}
}
//
// Reset rounded corners
// Reset rounded corners
//
.input-group
.form-control
:first-child
,
.input-group
.form-control
:first-child
,
.input-group-addon
:first-child
,
.input-group-addon
:first-child
,
.input-group-btn
:first-child
>
.btn
,
.input-group-btn
:first-child
>
.btn
,
...
@@ -126,8 +134,11 @@
...
@@ -126,8 +134,11 @@
border-left
:
0
;
border-left
:
0
;
}
}
//
// Button input groups
// Button input groups
// -------------------------
//
.input-group-btn
{
.input-group-btn
{
position
:
relative
;
position
:
relative
;
// Jankily prevent input button groups from wrapping with `white-space` and
// Jankily prevent input button groups from wrapping with `white-space` and
...
...
scss/_labels.scss
View file @
ac1ed746
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
// Labels
// Labels
// --------------------------------------------------
// --------------------------------------------------
.label
{
.label
{
display
:
inline-block
;
display
:
inline-block
;
padding
:
.25em
.4em
;
padding
:
.25em
.4em
;
...
@@ -35,8 +36,10 @@ a.label {
...
@@ -35,8 +36,10 @@ a.label {
}
}
}
}
// Colors
// Colors
// Contextual variations (linked labels get darker on :hover)
//
// Contextual variations (linked labels get darker on :hover).
.label-default
{
.label-default
{
@include
label-variant
(
$label-default-bg
);
@include
label-variant
(
$label-default-bg
);
...
...
scss/_media.scss
View file @
ac1ed746
//
// Media
// --------------------------------------------------
.media
{
.media
{
// Proper spacing between instances of .media
// Proper spacing between instances of .media
margin-top
:
15px
;
margin-top
:
15px
;
...
...
scss/_modal.scss
View file @
ac1ed746
...
@@ -2,11 +2,13 @@
...
@@ -2,11 +2,13 @@
// Modals
// Modals
// --------------------------------------------------
// --------------------------------------------------
// .modal-open - body class for killing the scroll
// .modal-open - body class for killing the scroll
// .modal - container to scroll within
// .modal - container to scroll within
// .modal-dialog - positioning shell for the actual modal
// .modal-dialog - positioning shell for the actual modal
// .modal-content - actual modal w/ bg and corners and shit
// .modal-content - actual modal w/ bg and corners and shit
// Kill the scroll on the body
// Kill the scroll on the body
.modal-open
{
.modal-open
{
overflow
:
hidden
;
overflow
:
hidden
;
...
...
scss/_nav.scss
View file @
ac1ed746
...
@@ -2,6 +2,11 @@
...
@@ -2,6 +2,11 @@
// Navs
// Navs
// --------------------------------------------------
// --------------------------------------------------
//
// Base styles
//
.nav
{
.nav
{
margin-bottom
:
0
;
margin-bottom
:
0
;
@extend
.list-unstyled
;
@extend
.list-unstyled
;
...
...
scss/_pagination.scss
View file @
ac1ed746
//
//
// Pagination (multiple pages)
// Pagination (multiple pages)
// --------------------------------------------------
// --------------------------------------------------
.pagination
{
.pagination
{
display
:
inline-block
;
display
:
inline-block
;
padding-left
:
0
;
padding-left
:
0
;
...
@@ -70,15 +72,15 @@
...
@@ -70,15 +72,15 @@
}
}
}
}
//
// Sizing
// Sizing
//
--------------------------------------------------
//
// Large
.pagination-lg
{
.pagination-lg
{
@include
pagination-size
(
$padding-lg-vertical
,
$padding-lg-horizontal
,
$font-size-lg
,
$border-radius-lg
);
@include
pagination-size
(
$padding-lg-vertical
,
$padding-lg-horizontal
,
$font-size-lg
,
$border-radius-lg
);
}
}
// Small
.pagination-sm
{
.pagination-sm
{
@include
pagination-size
(
$padding-sm-vertical
,
$padding-sm-horizontal
,
$font-size-sm
,
$border-radius-sm
);
@include
pagination-size
(
$padding-sm-vertical
,
$padding-sm-horizontal
,
$font-size-sm
,
$border-radius-sm
);
}
}
scss/_popover.scss
View file @
ac1ed746
...
@@ -45,6 +45,7 @@
...
@@ -45,6 +45,7 @@
padding
:
9px
14px
;
padding
:
9px
14px
;
}
}
// Arrows
// Arrows
//
//
// .popover-arrow is outer, .popover-arrow:after is inner
// .popover-arrow is outer, .popover-arrow:after is inner
...
...
scss/_responsive-embed.scss
View file @
ac1ed746
// Embeds responsive
//
//
// Responsive embed
// --------------------------------------------------
// Credit: Nicolas Gallagher and SUIT CSS.
// Credit: Nicolas Gallagher and SUIT CSS.
.embed-responsive
{
.embed-responsive
{
...
...
scss/_tables.scss
View file @
ac1ed746
//
//
// Reset tabular elements
// Custom tables
//
// --------------------------------------------------
// table {
// background-color: $table-bg;
// }
// caption {
// padding-top: $table-cell-padding;
// padding-bottom: $table-cell-padding;
// color: $text-muted;
// text-align: left;
// }
// th {
// text-align: left;
// }
//
//
...
...
scss/_utilities-responsive.scss
View file @
ac1ed746
...
@@ -2,6 +2,11 @@
...
@@ -2,6 +2,11 @@
// Responsive: Utility classes
// Responsive: Utility classes
// --------------------------------------------------
// --------------------------------------------------
//
// Mixins
//
@each
$bp
in
map-keys
(
$grid-breakpoints
)
{
@each
$bp
in
map-keys
(
$grid-breakpoints
)
{
.hidden-
#{
$bp
}
-up
{
.hidden-
#{
$bp
}
-up
{
@include
media-breakpoint-up
(
$bp
)
{
@include
media-breakpoint-up
(
$bp
)
{
...
...
scss/_utilities.scss
View file @
ac1ed746
...
@@ -3,10 +3,14 @@
...
@@ -3,10 +3,14 @@
// --------------------------------------------------
// --------------------------------------------------
//
// Floats
// Floats
//
.clearfix
{
.clearfix
{
@include
clearfix
();
@include
clearfix
();
}
}
.center-block
{
.center-block
{
@include
center-block
();
@include
center-block
();
}
}
...
@@ -14,10 +18,16 @@
...
@@ -14,10 +18,16 @@
.pull-right
{
.pull-right
{
@include
pull-right
();
@include
pull-right
();
}
}
.pull-left
{
.pull-left
{
@include
pull-left
();
@include
pull-left
();
}
}
//
// Screenreaders
//
.sr-only
{
.sr-only
{
@include
sr-only
();
@include
sr-only
();
}
}
...
@@ -27,13 +37,6 @@
...
@@ -27,13 +37,6 @@
}
}
// Inverse
.inverse
{
color
:
$gray-lighter
;
background-color
:
$gray-dark
;
}
//
//
// Spacing
// Spacing
//
//
...
@@ -157,6 +160,10 @@
...
@@ -157,6 +160,10 @@
}
}
//
// Text
//
// Alignment
// Alignment
.text-left
{
text-align
:
left
;
}
.text-left
{
text-align
:
left
;
}
.text-right
{
text-align
:
right
;
}
.text-right
{
text-align
:
right
;
}
...
@@ -170,8 +177,8 @@
...
@@ -170,8 +177,8 @@
.text-uppercase
{
text-transform
:
uppercase
;
}
.text-uppercase
{
text-transform
:
uppercase
;
}
.text-capitalize
{
text-transform
:
capitalize
;
}
.text-capitalize
{
text-transform
:
capitalize
;
}
// Contextual colors
// Contextual colors
.text-muted
{
.text-muted
{
color
:
$text-muted
;
color
:
$text-muted
;
}
}
...
@@ -186,10 +193,18 @@
...
@@ -186,10 +193,18 @@
@include
text-emphasis-variant
(
'.text-danger'
,
$state-danger-text
);
@include
text-emphasis-variant
(
'.text-danger'
,
$state-danger-text
);
// Contextual backgrounds
// Contextual backgrounds
// For now we'll leave these alongside the text classes until v4 when we can
// For now we'll leave these alongside the text classes until v4 when we can
// safely shift things around (per SemVer rules).
// safely shift things around (per SemVer rules).
// Inverse
// Todo: redo this as a proper class
.inverse
{
color
:
$gray-lighter
;
background-color
:
$gray-dark
;
}
.bg-primary
{
.bg-primary
{
// Given the contrast here, this is the only class to have its color inverted
// Given the contrast here, this is the only class to have its color inverted
// automatically.
// automatically.
...
...
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