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
88a92e43
Commit
88a92e43
authored
Apr 18, 2015
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move abbr stuff for tooltip to reboot, clean up type scss
parent
81fb0340
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
60 additions
and
105 deletions
+60
-105
scss/_reboot.scss
scss/_reboot.scss
+5
-2
scss/_type.scss
scss/_type.scss
+55
-103
No files found.
scss/_reboot.scss
View file @
88a92e43
...
...
@@ -94,9 +94,12 @@ p {
margin-bottom
:
1rem
;
}
abbr
[
title
]
{
// Abbreviations and acronyms
abbr
[
title
],
//
Add
data-
*
attribute
to
help
out
our
tooltip
plugin
,
per
https
:
//
github
.com
/
twbs
/
bootstrap
/
issues
/
5257
abbr
[
data-original-title
]
{
cursor
:
help
;
border-bottom
-color
:
#ccc
;
border-bottom
:
1px
dotted
$abbr-border-color
;
}
address
{
...
...
scss/_type.scss
View file @
88a92e43
...
...
@@ -3,8 +3,9 @@
// --------------------------------------------------
//
// Headings
//
-------------------------
//
h1
,
h2
,
h3
,
h4
,
h5
,
h6
,
.h1
,
.h2
,
.h3
,
.h4
,
.h5
,
.h6
{
...
...
@@ -49,23 +50,15 @@ h4, .h4 { font-size: $font-size-h4; }
h5
,
.h5
{
font-size
:
$font-size-h5
;
}
h6
,
.h6
{
font-size
:
$font-size-h6
;
}
// Body text
// -------------------------
// p {
// margin-top: 0;
// margin-bottom: 1rem;
// }
.lead
{
font-size
:
1
.25rem
;
font-weight
:
300
;
}
//
// Horizontal rules
//
-------------------------
//
hr
{
margin-top
:
$spacer
;
...
...
@@ -75,8 +68,9 @@ hr {
}
// Emphasis & misc
// -------------------------
//
// Emphasis
//
// Ex: (12px small font / 14px base font) * 100% = about 85%
small
,
...
...
@@ -91,22 +85,9 @@ mark,
}
//
// Lists
// -------------------------
// Unordered and Ordered lists
// ul,
// ol {
// margin-top: 0;
// margin-bottom: ($line-height-computed / 2);
// ul,
// ol {
// margin-bottom: 0;
// }
// }
// List options
//
// Unstyled keeps list items block level, just removes default browser padding and list-style
.list-unstyled
{
...
...
@@ -126,22 +107,6 @@ mark,
}
}
// Description Lists
// dl {
// margin-top: 0; // Remove browser default
// margin-bottom: $line-height-computed;
// }
// dt,
// dd {
// line-height: $line-height-base;
// }
// dt {
// font-weight: bold;
// }
// dd {
// margin-left: 0; // Undo browser default
// }
// Horizontal description lists w/ grid classes
.dl-horizontal
{
margin-right
:
-
$grid-gutter-width
;
...
...
@@ -150,69 +115,56 @@ mark,
}
//
// Misc
// -------------------------
// // Abbreviations and acronyms
// abbr[title],
// // Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
// abbr[data-original-title] {
// cursor: help;
// border-bottom: 1px dotted $abbr-border-color;
// }
//
// Builds on `abbr`
.initialism
{
font-size
:
90%
;
text-transform
:
uppercase
;
}
// // Blockquotes
// blockquote {
// padding: ($spacer / 2) $spacer;
// margin-bottom: $spacer;
// font-size: $blockquote-font-size;
// border-left: .25rem solid $blockquote-border-color;
// p,
// ul,
// ol {
// &:last-child {
// margin-bottom: 0;
// }
// }
// footer {
// display: block;
// font-size: 80%; // back to default font-size
// line-height: $line-height-base;
// color: $blockquote-small-color;
// &:before {
// content: "\2014 \00A0"; // em dash, nbsp
// }
// }
// }
// // Opposite alignment of blockquote
// .blockquote-reverse {
// padding-right: $spacer;
// padding-left: 0;
// text-align: right;
// border-right: .25rem solid $blockquote-border-color;
// border-left: 0;
// // Account for citation
// footer {
// &:before { content: ""; }
// &:after {
// content: "\00A0 \2014"; // nbsp, em dash
// }
// }
// }
// // Addresses
// address {
// margin-bottom: $line-height-computed;
// font-style: normal;
// line-height: $line-height-base;
// }
// Blockquotes
.blockquote
{
padding
:
(
$spacer
/
2
)
$spacer
;
margin-bottom
:
$spacer
;
font-size
:
$blockquote-font-size
;
border-left
:
.25rem
solid
$blockquote-border-color
;
p
,
ul
,
ol
{
&
:last-child
{
margin-bottom
:
0
;
}
}
footer
{
display
:
block
;
font-size
:
80%
;
// back to default font-size
line-height
:
$line-height-base
;
color
:
$blockquote-small-color
;
&
:before
{
content
:
"\2014 \00A0"
;
// em dash, nbsp
}
}
}
// Opposite alignment of blockquote
.blockquote-reverse
{
padding-right
:
$spacer
;
padding-left
:
0
;
text-align
:
right
;
border-right
:
.25rem
solid
$blockquote-border-color
;
border-left
:
0
;
// Account for citation
footer
{
&
:before
{
content
:
""
;
}
&
:after
{
content
:
"\00A0 \2014"
;
// nbsp, em dash
}
}
}
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