Skip to content

Commit

Permalink
Adjusted font size for text styles.
Browse files Browse the repository at this point in the history 
Adjusted font size for text styles.
  • Loading branch information
@honeysilvas
honeysilvas committed Jan 3, 2016
1 parent 8e49dcb commit 08126ad
Show file tree
Hide file tree
Showing 19 changed files with 153 additions and 69 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ A simple, lightweight and modular CSS front-end framework for styling websites q


# Documentation
View the Getting Started Guide at http://blastpad.co/ui/release/beta/documentation/
View the Getting Started Guide at http://blastpad.co/ui/documentation/



# Examples
View the examples at http://blastpad.co/ui/release/beta/example/
View the examples at http://blastpad.co/ui/example/



Expand Down
58 changes: 46 additions & 12 deletions asset/module/css/blastpad_ui.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,41 +440,75 @@ body {
}

/* Headings */
h1 { font-size: 2em;}
h2 { font-size: 1.8em;}
h3 { font-size: 1.6em;}
h4 { font-size: 1.4em;}
h5 { font-size: 1.2em;}
h6 { font-size: 1em;}
h1 {
font-size: 2.4em;
line-height: 1.2em;
}

h2 {
font-size: 1.8em;
line-height: 1.2em;
}

h3 {
font-size: 1.2em;
line-height: 1.8em;
}

h4 {
font-size: 1em;
line-height: 1.8em;
}

h5 {
font-size: 0.9em;
line-height: 1.8em;
}

h6 {
font-size: 0.8em;
line-height: 1.8em;
}

/* Paragraph */
p {
line-height: 1.8em;
}

/* Font size. */
.bp_extra_extra_small_text {
font-size: 0.7em;
font-size: 0.6em;
line-height: 1.8em;
}

.bp_extra_small_text {
font-size: 0.8em;
font-size: 0.7em;
line-height: 1.8em;
}

.bp_small_text {
font-size: 0.9em;
line-height: 0.9em;
line-height: 1.8em;
}

.bp_medium_text {
font-size: 1em;
line-height: 1.8em;
}

.bp_large_text {
font-size: 2em;
font-size: 1.8em;
line-height: 1.2em;
}

.bp_extra_large_text {
font-size: 3em;
font-size: 2.4em;
line-height: 1.2em;
}

.bp_extra_extra_large_text {
font-size: 4em;
font-size: 4.8em;
line-height: 1.2em;
}

/* Flashcard */
Expand Down
2 changes: 1 addition & 1 deletion asset/module/css/blastpad_ui.min.css
View file

Large diffs are not rendered by default.

40 changes: 34 additions & 6 deletions asset/module/css/typography/default.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,37 @@ body {
}

/* Headings */
h1 { font-size: 2em;}
h2 { font-size: 1.8em;}
h3 { font-size: 1.6em;}
h4 { font-size: 1.4em;}
h5 { font-size: 1.2em;}
h6 { font-size: 1em;}
h1 {
font-size: 2.4em;
line-height: 1.2em;
}

h2 {
font-size: 1.8em;
line-height: 1.2em;
}

h3 {
font-size: 1.2em;
line-height: 1.8em;
}

h4 {
font-size: 1em;
line-height: 1.8em;
}

h5 {
font-size: 0.9em;
line-height: 1.8em;
}

h6 {
font-size: 0.8em;
line-height: 1.8em;
}

/* Paragraph */
p {
line-height: 1.8em;
}
18 changes: 12 additions & 6 deletions asset/module/css/typography/extra.css
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,38 @@

/* Font size. */
.bp_extra_extra_small_text {
font-size: 0.7em;
font-size: 0.6em;
line-height: 1.8em;
}

.bp_extra_small_text {
font-size: 0.8em;
font-size: 0.7em;
line-height: 1.8em;
}

.bp_small_text {
font-size: 0.9em;
line-height: 0.9em;
line-height: 1.8em;
}

.bp_medium_text {
font-size: 1em;
line-height: 1.8em;
}

.bp_large_text {
font-size: 2em;
font-size: 1.8em;
line-height: 1.2em;
}

.bp_extra_large_text {
font-size: 3em;
font-size: 2.4em;
line-height: 1.2em;
}

.bp_extra_extra_large_text {
font-size: 4em;
font-size: 4.8em;
line-height: 1.2em;
}

/* Flashcard */
Expand Down
2 changes: 1 addition & 1 deletion asset/motif/layout/full_width/index.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!--[if IE]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<link href="http://blastpad.co/ui/release/beta/vendor/blastpad_ui/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/vendor/blastpad_ui/0.0.6/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div class="bp_container bp_full">
Expand Down
2 changes: 1 addition & 1 deletion asset/motif/layout/left_sidebar/index.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!--[if IE]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<link href="http://blastpad.co/ui/release/beta/asset/css/" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/vendor/blastpad_ui/0.0.6/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div class="bp_container bp_full_height">
Expand Down
2 changes: 1 addition & 1 deletion asset/motif/layout/right_sidebar/index.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!--[if IE]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<link href="http://blastpad.co/ui/release/beta/asset/css/" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/vendor/blastpad_ui/0.0.6/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div class="bp_container bp_full_height">
Expand Down
2 changes: 1 addition & 1 deletion asset/motif/layout/three_columns/index.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!--[if IE]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<link href="http://blastpad.co/ui/release/beta/asset/css/" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/vendor/blastpad_ui/0.0.6/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div class="bp_container bp_full_height">
Expand Down
2 changes: 1 addition & 1 deletion asset/motif/layout/wide/index.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!--[if IE]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<link href="http://blastpad.co/ui/release/beta/vendor/blastpad_ui/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/vendor/blastpad_ui/0.0.6/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
</head>
<body class="bp_black">
<div class="bp_container bp_wide bp_white bp_full_height">
Expand Down
2 changes: 1 addition & 1 deletion example/article/index.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<meta name="MobileOptimized" content="320" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui" />
<meta http-equiv="cleartype" content="on" />
<link href="http://blastpad.co/ui/release/beta/vendor/blastpad_ui/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/vendor/blastpad_ui/0.0.6/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
</head>
<body>
<!--header>
Expand Down
2 changes: 1 addition & 1 deletion example/boilerplate/index.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!--[if IE]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<link href="http://blastpad.co/ui/release/beta/vendor/blastpad_ui/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/vendor/blastpad_ui/0.0.6/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div class="bp_container bp_wide">
Expand Down
3 changes: 1 addition & 2 deletions example/grid/index.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
<meta name="MobileOptimized" content="320" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui" />
<meta http-equiv="cleartype" content="on" />
<link href="http://blastpad.co/ui/release/beta/vendor/blastpad_ui/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />

<link href="http://blastpad.co/ui/vendor/blastpad_ui/0.0.6/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
</head>

<body>
Expand Down
9 changes: 4 additions & 5 deletions example/index.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@
<meta name="MobileOptimized" content="320" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui" />
<meta http-equiv="cleartype" content="on" />
<!--link href="http://blastpad.co/ui/release/beta/vendor/blastpad_ui/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" /-->
<link href="https://fonts.googleapis.com/css?family=Montserrat" rel="stylesheet" type="text/css" />
<link href="https://fonts.googleapis.com/css?family=Sofia" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/release/beta/asset/css/" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/release/beta/asset/blueprint/blastpad_ui/css/custom.css" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/vendor/blastpad_ui/0.0.6/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/asset/blueprint/blastpad_ui/css/custom.css" rel="stylesheet" type="text/css" />
</head>

<body>
Expand All @@ -28,8 +27,8 @@
<div class="bp_menu">
<nav>
<ul>
<li><a href="http://blastpad.co/ui/release/beta/documentation">Getting Started</a></li>
<li><a href="http://blastpad.co/ui/release/beta/example">Examples</a></li>
<li><a href="http://blastpad.co/ui/documentation">Getting Started</a></li>
<li><a href="http://blastpad.co/ui/example">Examples</a></li>
<li><a href="https://github.com/blastpad/BlastPad_UI">Download</a></li>
</ul>
</nav>
Expand Down
2 changes: 1 addition & 1 deletion example/login/index.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<meta name="MobileOptimized" content="320" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui" />
<meta http-equiv="cleartype" content="on" />
<link href="http://blastpad.co/ui/release/beta/vendor/blastpad_ui/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/vendor/blastpad_ui/0.0.6/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
</head>

<body>
Expand Down
9 changes: 4 additions & 5 deletions example/one_page/index.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@
<meta name="MobileOptimized" content="320" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui" />
<meta http-equiv="cleartype" content="on" />
<!--link href="../../asset/font/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" /-->
<!--link href="http://blastpad.co/ui/release/beta/vendor/blastpad_ui/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" /-->
<link href="http://blastpad.co/ui/vendor/blastpad_ui/0.0.6/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
<link href="../../../../src/style" rel="stylesheet" type="text/css" />
<link href="../../../../vendor/blastpad_ui/asset/css/module/motif/base/dark_on_light.css" rel="stylesheet" type="text/css" />
<link href="../../../../vendor/blastpad_ui/asset/css/module/grid/fixed.css" rel="stylesheet" type="text/css" />
<link href="asset/css/style.css" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/vendor/blastpad_ui/asset/css/module/motif/base/dark_on_light.css" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/vendor/blastpad_ui/asset/css/module/grid/fixed.css" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/asset/css/style.css" rel="stylesheet" type="text/css" />
</head>
<body>
<header>
Expand Down
2 changes: 1 addition & 1 deletion example/register/index.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<meta name="MobileOptimized" content="320" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimal-ui" />
<meta http-equiv="cleartype" content="on" />
<link href="http://blastpad.co/ui/release/beta/vendor/blastpad_ui/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
<link href="http://blastpad.co/ui/vendor/blastpad_ui/0.0.6/asset/module/css/blastpad_ui.min.css" rel="stylesheet" type="text/css" />
</head>

<body>
Expand Down
Loading

0 comments on commit 08126ad

Please sign in to comment.