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
36e4cd02
Commit
36e4cd02
authored
Apr 16, 2015
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move .img- classes to new _images.scss; move hr to _type.scss
parent
cd3bc6a0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
43 additions
and
41 deletions
+43
-41
scss/_images.scss
scss/_images.scss
+28
-0
scss/_scaffolding.scss
scss/_scaffolding.scss
+3
-41
scss/_type.scss
scss/_type.scss
+11
-0
scss/bootstrap.scss
scss/bootstrap.scss
+1
-0
No files found.
scss/_images.scss
0 → 100644
View file @
36e4cd02
// Responsive images (ensure images don't scale beyond their parents)
.img-responsive
{
@include
img-responsive
();
}
// Rounded corners
.img-rounded
{
@include
border-radius
(
$border-radius-lg
);
}
// Image thumbnails
.img-thumbnail
{
padding
:
$thumbnail-padding
;
line-height
:
$line-height-base
;
background-color
:
$thumbnail-bg
;
border
:
1px
solid
$thumbnail-border
;
border-radius
:
$thumbnail-border-radius
;
transition
:
all
.2s
ease-in-out
;
@include
box-shadow
(
0
1px
2px
rgba
(
0
,
0
,
0
,.
075
));
// Keep them at most 100% wide
@include
img-responsive
(
inline-block
);
}
// Perfect circle
.img-circle
{
border-radius
:
50%
;
// set radius in percents
}
scss/_scaffolding.scss
View file @
36e4cd02
...
...
@@ -10,9 +10,11 @@
// http://getbootstrap.com/getting-started/#third-box-sizing
// Credit: Jon Neal & CSS-Tricks
// http://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/
html
{
box-sizing
:
border-box
;
}
*,
*
:before
,
*
:after
{
...
...
@@ -40,7 +42,7 @@ html {
@viewport
{
width
:
device-width
;
}
//
Body reset
//
Reset HTML, body, and more
html
{
font-size
:
$font-size-root
;
...
...
@@ -55,7 +57,6 @@ body {
background-color
:
$body-bg
;
}
// Reset fonts for relevant elements
input
,
button
,
select
,
...
...
@@ -89,45 +90,6 @@ img {
vertical-align
:
middle
;
}
// Responsive images (ensure images don't scale beyond their parents)
.img-responsive
{
@include
img-responsive
();
}
// Rounded corners
.img-rounded
{
@include
border-radius
(
$border-radius-lg
);
}
// Image thumbnails
.img-thumbnail
{
padding
:
$thumbnail-padding
;
line-height
:
$line-height-base
;
background-color
:
$thumbnail-bg
;
border
:
1px
solid
$thumbnail-border
;
border-radius
:
$thumbnail-border-radius
;
transition
:
all
.2s
ease-in-out
;
@include
box-shadow
(
0
1px
2px
rgba
(
0
,
0
,
0
,.
075
));
// Keep them at most 100% wide
@include
img-responsive
(
inline-block
);
}
// Perfect circle
.img-circle
{
border-radius
:
50%
;
// set radius in percents
}
// Horizontal rules
hr
{
margin-top
:
$spacer
;
margin-bottom
:
$spacer
;
border
:
0
;
border-top
:
.0625rem
solid
$hr-border
;
}
// iOS "clickable elements" fix for role="button"
//
...
...
scss/_type.scss
View file @
36e4cd02
...
...
@@ -65,6 +65,17 @@ p {
}
// Horizontal rules
// -------------------------
hr
{
margin-top
:
$spacer
;
margin-bottom
:
$spacer
;
border
:
0
;
border-top
:
.0625rem
solid
$hr-border
;
}
// Emphasis & misc
// -------------------------
...
...
scss/bootstrap.scss
View file @
36e4cd02
...
...
@@ -9,6 +9,7 @@
// Core CSS
@import
"scaffolding"
;
@import
"type"
;
@import
"images"
;
@import
"code"
;
@import
"grid"
;
@import
"tables"
;
...
...
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