Skip to content

Commit 7197256

Browse files
JuanjoSalvadorJuanjoSalvador
authored
Merge pull request #17 from janmarkuslanger/master
Structure / Typo / Adding Files
2 parents 9efd4cb + 4e7f047 commit 7197256

10 files changed

Lines changed: 53 additions & 42 deletions

File tree

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ Just install it using Yarn or NPM.
1717
#### Using NPM
1818

1919
npm install cake-css
20-
20+
2121
### Usage
2222

2323
And then simply import the stylesheet on your `index.html` file.
2424

2525
<link rel="stylesheet" type="text/css" href="/path/to/cake/cake.min.css">
26-
26+
2727
#### CDN
2828

2929
<link rel="stylesheet" type="text/css" href="https://unpkg.com/cake-css@0.0.3/build/dist/cake.min.css">
3030

3131
### Acknowledgements
3232

33-
Cake CSS is srrongly influenced by:
33+
Cake CSS is strongly influenced by:
3434

3535
* [Twitter Bootstrap](http://getboostrap.com)
3636
* [Min CSS](http://mincss.com)

‎build/dist/cake.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/base.scss‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
1-
/* FONTS */
2-
3-
@import url('https://fonts.googleapis.com/css?family=Cabin');
4-
@import url('https://fonts.googleapis.com/css?family=Lora');
5-
6-
$cabin: 'Cabin', sans-serif;
7-
$lora: 'Lora', serif;
8-
9-
/* BASE COLORS */
10-
11-
$white: #f5f5f5;
12-
$darker: #444;
13-
141
body {
15-
font-family: $lora;
2+
font-family: $main-font;
163
background-color: $white;
174
}
185

@@ -41,7 +28,7 @@ a:hover {
4128

4229
/*
4330
* CLASSES
44-
*/
31+
*/
4532

4633
.center {
4734
text-align: center;
@@ -53,7 +40,7 @@ footer {
5340
background-color: darkred;
5441
width: 100%;
5542
color: white;
56-
font-family: $cabin;
43+
font-family: $alternative-font;
5744
padding: 12px;
5845
float: left;
5946
}
@@ -63,7 +50,7 @@ footer {
6350
*/
6451

6552
h1, h2, h3, h4, h5, h6 {
66-
font-family: $cabin;
53+
font-family: $alternative-font;
6754
}
6855

6956
h1 {
@@ -87,4 +74,4 @@ h4 {
8774
font-size: 8em;
8875
color: darkred;
8976
}
90-
}
77+
}

‎src/cake.scss‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,20 @@
88
*/
99

1010
/* DO NOT REMOVE THIS. This is the base CSS, needed! */
11-
@import 'base';
12-
13-
/* Cake CSS Modules. Remove whatever you don't need and rebuild */
11+
@import 'normalize';
1412

13+
/* Vars */
14+
@import 'fonts';
1515
@import 'colors';
1616
@import 'grid';
17+
18+
/* Base */
19+
@import 'base';
20+
21+
/* Cake CSS Modules. Remove whatever you don't need and rebuild */
1722
@import 'boxes';
1823
@import 'buttons';
1924
@import 'forms';
2025
@import 'tables';
2126
@import 'messages';
22-
@import 'nav';
27+
@import 'nav';

‎src/colors.scss‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
/* ALPHA COLORS */
1+
/* BASE COLORS */
2+
$white: #f5f5f5;
3+
$darker: #444;
24

5+
/* ALPHA COLORS */
36
$default: rgba(233, 235, 248, 1);
47
$dark: rgba(64, 78, 77, 0.5);
58
$primary: rgba(91, 192, 235, 0.8);
@@ -8,7 +11,6 @@ $warning: rgba(253, 231, 76, 0.8);
811
$success: rgba(155, 197, 61, 0.8);
912

1013
/* HOVER COLORS */
11-
1214
$h_default: rgba(180, 184, 197, 1);
1315
$h_dark: rgba(64, 78, 77, 1);
1416
$h_primary: rgba(91, 192, 235, 1);
@@ -20,4 +22,4 @@ $msg_default: rgba(180, 184, 197, 0.3);
2022
$msg_primary: rgba(91, 192, 235, 0.3);
2123
$msg_danger: rgba(195, 66, 63, 0.3);
2224
$msg_warning: rgba(253, 231, 76, 0.3);
23-
$msg_success: rgba(155, 197, 61, 0.3);
25+
$msg_success: rgba(155, 197, 61, 0.3);

‎src/fonts.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@import url('https://fonts.googleapis.com/css?family=Cabin');
22
@import url('https://fonts.googleapis.com/css?family=Lora');
33

4-
$cabin: 'Cabin', sans-serif;
5-
$lora: 'Lora', serif;
4+
$main-font: 'Lora', serif;
5+
$alternative-font: 'Cabin', sans-serif;

‎src/forms.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ input[type=number],
55
input[type=color],
66
input[type=email] {
77
height: 2.5em;
8-
font-family: 'Cabin', sans-serif;
8+
font-family: $alternative-font;
99
font-size: 1em;
1010
width: 100%;
1111
}
1212

1313
label.form-input {
14-
font-family: 'Cabin', sans-serif;
14+
font-family: $alternative-font;
1515
font-size: 1.3em;
1616
position: relative;
1717
float: right;
1818
vertical-align: center;
19-
}
19+
}

‎src/grid.scss‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
* {
2-
box-sizing: border-box;
3-
}
4-
51
[class*="col-"] {
62
float: left;
73
min-height: 1px;
@@ -46,7 +42,3 @@
4642
margin: 0 auto;
4743
max-width: 1200px;
4844
}
49-
50-
.container *{
51-
box-sizing: border-box;
52-
}

‎src/normalize.scss‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
* {
2+
padding: 0;
3+
margin: 0;
4+
-webkit-box-sizing: border-box;
5+
-moz-box-sizing: border-box;
6+
box-sizing: border-box;
7+
}

‎test/index.html‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!DOCTYPE html>
2+
<html lang="en" dir="ltr">
3+
<head>
4+
<meta charset="utf-8">
5+
<title></title>
6+
<link rel="stylesheet" type="text/css" href="../build/dist/cake.min.css">
7+
</head>
8+
<body>
9+
10+
<h1>Headline h1</h1>
11+
<h2>Headline h2</h2>
12+
<h3>Headline h3</h3>
13+
<h4>Headline h4</h4>
14+
<h5>Headline h5</h5>
15+
<h6>Headline h6</h6>
16+
17+
</body>
18+
</html>

0 commit comments

Comments
 (0)