Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
masonstrap
Commits
3522778a
Commit
3522778a
authored
Jan 03, 2013
by
Thomas Park
Browse files
amelia, superhero: for multiple google web fonts, make single request
parent
91e96175
Changes
6
Hide whitespace changes
Inline
Side-by-side
amelia/bootstrap.css
View file @
3522778a
@import
url('//fonts.googleapis.com/css?family=Lobster')
;
@import
url('//fonts.googleapis.com/css?family=Cabin:400,700')
;
@import
url('//fonts.googleapis.com/css?family=Lobster|Cabin:400,700')
;
/*!
* Bootstrap v2.2.2
*
...
...
amelia/bootstrap.min.css
View file @
3522778a
@import
url('//fonts.googleapis.com/css?family=Lobster')
;
@import
url('//fonts.googleapis.com/css?family=Cabin:400,700')
;
@import
url('//fonts.googleapis.com/css?family=Lobster|Cabin:400,700')
;
article
,
aside
,
details
,
figcaption
,
figure
,
footer
,
header
,
hgroup
,
nav
,
section
{
display
:
block
;}
audio
,
canvas
,
video
{
display
:
inline-block
;
*
display
:
inline
;
*
zoom
:
1
;}
audio
:not
([
controls
])
{
display
:
none
;}
...
...
amelia/bootswatch.less
View file @
3522778a
...
...
@@ -6,8 +6,7 @@
// TYPOGRAPHY
// -----------------------------------------------------
@import url('//fonts.googleapis.com/css?family=Lobster');
@import url('//fonts.googleapis.com/css?family=Cabin:400,700');
@import url('//fonts.googleapis.com/css?family=Lobster|Cabin:400,700');
h6 {
color: @textColor;
...
...
superhero/bootstrap.css
View file @
3522778a
@import
url(//fonts.googleapis.com/css?family=Oswald)
;
@import
url(//fonts.googleapis.com/css?family=Noticia+Text)
;
@import
url('//fonts.googleapis.com/css?family=Oswald|Noticia+Text')
;
/*!
* Bootstrap v2.2.2
*
...
...
superhero/bootstrap.min.css
View file @
3522778a
@import
url(//fonts.googleapis.com/css?family=Oswald)
;
@import
url(//fonts.googleapis.com/css?family=Noticia+Text)
;
@import
url('//fonts.googleapis.com/css?family=Oswald|Noticia+Text')
;
article
,
aside
,
details
,
figcaption
,
figure
,
footer
,
header
,
hgroup
,
nav
,
section
{
display
:
block
;}
audio
,
canvas
,
video
{
display
:
inline-block
;
*
display
:
inline
;
*
zoom
:
1
;}
audio
:not
([
controls
])
{
display
:
none
;}
...
...
superhero/bootswatch.less
View file @
3522778a
...
...
@@ -6,8 +6,7 @@
// TYPOGRAPHY
// --------------------------------------------------
@import url(//fonts.googleapis.com/css?family=Oswald);
@import url(//fonts.googleapis.com/css?family=Noticia+Text);
@import url('//fonts.googleapis.com/css?family=Oswald|Noticia+Text');
h1 small, h2 small, h3 small, h4 small, h5 small, h6 small, h6 {
font-family: @headingsFontFamily;
...
...
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