Skip to content
GitLab
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
2211af5e
Commit
2211af5e
authored
10 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
more rems in docs
parent
3d362276
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/css/docs.min.css
+22
-21
docs/assets/css/docs.min.css
docs/assets/less/docs.less
+23
-22
docs/assets/less/docs.less
with
45 additions
and
43 deletions
+45
-43
docs/assets/css/docs.min.css
+
22
-
21
View file @
2211af5e
...
@@ -277,6 +277,7 @@ body {
...
@@ -277,6 +277,7 @@ body {
}
}
.bs-docs-footer
{
.bs-docs-footer
{
margin-top
:
6rem
;
margin-top
:
6rem
;
font-size
:
85%
;
color
:
#777
;
color
:
#777
;
text-align
:
center
;
text-align
:
center
;
border-top
:
1px
solid
#e5e5e5
;
border-top
:
1px
solid
#e5e5e5
;
...
@@ -412,7 +413,7 @@ body {
...
@@ -412,7 +413,7 @@ body {
}
}
@media
(
min-width
:
768px
)
{
@media
(
min-width
:
768px
)
{
.bs-docs-header
{
.bs-docs-header
{
font-size
:
24px
;
font-size
:
1.5rem
;
text-align
:
left
;
text-align
:
left
;
}
}
.bs-docs-header
h1
{
.bs-docs-header
h1
{
...
@@ -433,8 +434,8 @@ body {
...
@@ -433,8 +434,8 @@ body {
.carbonad
{
.carbonad
{
width
:
auto
!important
;
width
:
auto
!important
;
height
:
auto
!important
;
height
:
auto
!important
;
padding
:
20px
!important
;
padding
:
1.25rem
!important
;
margin
:
30px
-30px
-31px
!important
;
margin
:
2rem
-2rem
-2rem
!important
;
overflow
:
hidden
;
overflow
:
hidden
;
/* clearfix */
/* clearfix */
font-size
:
13px
!important
;
font-size
:
13px
!important
;
...
@@ -491,10 +492,10 @@ body {
...
@@ -491,10 +492,10 @@ body {
@media
(
min-width
:
992px
)
{
@media
(
min-width
:
992px
)
{
.carbonad
{
.carbonad
{
position
:
absolute
;
position
:
absolute
;
top
:
30px
;
top
:
2rem
;
right
:
60px
;
right
:
4rem
;
width
:
330px
!important
;
width
:
330px
!important
;
padding
:
1
5px
!important
;
padding
:
1
rem
!important
;
margin
:
0
!important
;
margin
:
0
!important
;
}
}
.bs-docs-masthead
.carbonad
{
.bs-docs-masthead
.carbonad
{
...
@@ -502,9 +503,9 @@ body {
...
@@ -502,9 +503,9 @@ body {
}
}
}
}
.bs-docs-featurette
{
.bs-docs-featurette
{
padding-top
:
40px
;
padding-top
:
3rem
;
padding-bottom
:
40px
;
padding-bottom
:
3rem
;
font-size
:
1
6px
;
font-size
:
1
rem
;
line-height
:
1.5
;
line-height
:
1.5
;
color
:
#555
;
color
:
#555
;
text-align
:
center
;
text-align
:
center
;
...
@@ -516,45 +517,45 @@ body {
...
@@ -516,45 +517,45 @@ body {
border-top
:
0
;
border-top
:
0
;
}
}
.bs-docs-featurette-title
{
.bs-docs-featurette-title
{
margin-bottom
:
5px
;
margin-bottom
:
.5rem
;
font-size
:
30px
;
font-size
:
2rem
;
font-weight
:
normal
;
font-weight
:
normal
;
color
:
#333
;
color
:
#333
;
}
}
.half-rule
{
.half-rule
{
width
:
100px
;
width
:
6rem
;
margin
:
40px
auto
;
margin
:
2.5rem
auto
;
}
}
.bs-docs-featurette
h3
{
.bs-docs-featurette
h3
{
margin-bottom
:
5px
;
margin-bottom
:
.5rem
;
font-weight
:
normal
;
font-weight
:
normal
;
color
:
#333
;
color
:
#333
;
}
}
.bs-docs-featurette-img
{
.bs-docs-featurette-img
{
display
:
block
;
display
:
block
;
margin-bottom
:
20px
;
margin-bottom
:
1.25rem
;
color
:
#333
;
color
:
#333
;
}
}
.bs-docs-featurette-img
:hover
{
.bs-docs-featurette-img
:hover
{
color
:
#
428bca
;
color
:
#
027de7
;
text-decoration
:
none
;
text-decoration
:
none
;
}
}
.bs-docs-featurette-img
img
{
.bs-docs-featurette-img
img
{
display
:
block
;
display
:
block
;
margin-bottom
:
1
5px
;
margin-bottom
:
1
rem
;
}
}
@media
(
min-width
:
480px
)
{
@media
(
min-width
:
480px
)
{
.bs-docs-featurette
.img-responsive
{
.bs-docs-featurette
.img-responsive
{
margin-top
:
30px
;
margin-top
:
2rem
;
}
}
}
}
@media
(
min-width
:
768px
)
{
@media
(
min-width
:
768px
)
{
.bs-docs-featurette
{
.bs-docs-featurette
{
padding-top
:
100px
;
padding-top
:
6rem
;
padding-bottom
:
100px
;
padding-bottom
:
6rem
;
}
}
.bs-docs-featurette-title
{
.bs-docs-featurette-title
{
font-size
:
40px
;
font-size
:
2.5rem
;
}
}
.bs-docs-featurette
.lead
{
.bs-docs-featurette
.lead
{
max-width
:
80%
;
max-width
:
80%
;
...
...
This diff is collapsed.
Click to expand it.
docs/assets/less/docs.less
+
23
-
22
View file @
2211af5e
...
@@ -134,6 +134,7 @@ body {
...
@@ -134,6 +134,7 @@ body {
.bs-docs-footer {
.bs-docs-footer {
margin-top: 6rem;
margin-top: 6rem;
font-size: 85%;
color: #777;
color: #777;
text-align: center;
text-align: center;
border-top: 1px solid #e5e5e5;
border-top: 1px solid #e5e5e5;
...
@@ -293,7 +294,7 @@ body {
...
@@ -293,7 +294,7 @@ body {
@media (min-width: 768px) {
@media (min-width: 768px) {
.bs-docs-header {
.bs-docs-header {
font-size:
24px
;
font-size:
1.5rem
;
text-align: left;
text-align: left;
}
}
.bs-docs-header h1 {
.bs-docs-header h1 {
...
@@ -321,8 +322,8 @@ body {
...
@@ -321,8 +322,8 @@ body {
.carbonad {
.carbonad {
width: auto !important;
width: auto !important;
height: auto !important;
height: auto !important;
padding:
20px
!important;
padding:
1.25rem
!important;
margin:
30px -30px -31px
!important;
margin:
2rem -2rem -2rem
!important;
overflow: hidden; /* clearfix */
overflow: hidden; /* clearfix */
font-size: 13px !important;
font-size: 13px !important;
line-height: 16px !important;
line-height: 16px !important;
...
@@ -367,7 +368,7 @@ body {
...
@@ -367,7 +368,7 @@ body {
// }
// }
// .bs-docs-header .carbonad-text a,
// .bs-docs-header .carbonad-text a,
// .bs-docs-header .carbonad-tag a {
// .bs-docs-header .carbonad-tag a {
// color:
#563d7c
!important;
// color:
@bs-purple
!important;
// }
// }
@media (min-width: 480px) {
@media (min-width: 480px) {
...
@@ -392,10 +393,10 @@ body {
...
@@ -392,10 +393,10 @@ body {
@media (min-width: 992px) {
@media (min-width: 992px) {
.carbonad {
.carbonad {
position: absolute;
position: absolute;
top:
30px
;
top:
2rem
;
right:
60px; // 15px instead of 0 since box-sizing
right:
4rem;
width: 330px !important;
width: 330px !important;
padding: 1
5px
!important;
padding: 1
rem
!important;
margin: 0 !important;
margin: 0 !important;
}
}
.bs-docs-masthead .carbonad {
.bs-docs-masthead .carbonad {
...
@@ -409,9 +410,9 @@ body {
...
@@ -409,9 +410,9 @@ body {
//
//
.bs-docs-featurette {
.bs-docs-featurette {
padding-top:
40px
;
padding-top:
3rem
;
padding-bottom:
40px
;
padding-bottom:
3rem
;
font-size: 1
6px
;
font-size: 1
rem
;
line-height: 1.5;
line-height: 1.5;
color: #555;
color: #555;
text-align: center;
text-align: center;
...
@@ -424,46 +425,46 @@ body {
...
@@ -424,46 +425,46 @@ body {
}
}
.bs-docs-featurette-title {
.bs-docs-featurette-title {
margin-bottom:
5px
;
margin-bottom:
.5rem
;
font-size:
30px
;
font-size:
2rem
;
font-weight: normal;
font-weight: normal;
color: #333;
color: #333;
}
}
.half-rule {
.half-rule {
width:
100px
;
width:
6rem
;
margin:
40px
auto;
margin:
2.5rem
auto;
}
}
.bs-docs-featurette h3 {
.bs-docs-featurette h3 {
margin-bottom:
5px
;
margin-bottom:
.5rem
;
font-weight: normal;
font-weight: normal;
color: #333;
color: #333;
}
}
.bs-docs-featurette-img {
.bs-docs-featurette-img {
display: block;
display: block;
margin-bottom:
20px
;
margin-bottom:
1.25rem
;
color: #333;
color: #333;
}
}
.bs-docs-featurette-img:hover {
.bs-docs-featurette-img:hover {
color:
#428bca
;
color:
@brand-primary
;
text-decoration: none;
text-decoration: none;
}
}
.bs-docs-featurette-img img {
.bs-docs-featurette-img img {
display: block;
display: block;
margin-bottom: 1
5px
;
margin-bottom: 1
rem
;
}
}
@media (min-width: 480px) {
@media (min-width: 480px) {
.bs-docs-featurette .img-responsive {
.bs-docs-featurette .img-responsive {
margin-top:
30px
;
margin-top:
2rem
;
}
}
}
}
@media (min-width: 768px) {
@media (min-width: 768px) {
.bs-docs-featurette {
.bs-docs-featurette {
padding-top:
100px
;
padding-top:
6rem
;
padding-bottom:
100px
;
padding-bottom:
6rem
;
}
}
.bs-docs-featurette-title {
.bs-docs-featurette-title {
font-size:
40px
;
font-size:
2.5rem
;
}
}
.bs-docs-featurette .lead {
.bs-docs-featurette .lead {
max-width: 80%;
max-width: 80%;
...
...
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