Skip to content

Commit 9a8f788

Browse files
abhiraoabhirao
committed
Merge branch 'rails3' of https://github.com/hacketyhack/hackety-hack.com into rails3
2 parents ebe7c3f + daef5b4 commit 9a8f788

27 files changed

Lines changed: 2265 additions & 35 deletions

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ db/*.sqlite3
33
log/*.log
44
tmp/
55
.sass-cache/
6-
*.rbc
6+
*.rbc
7+
.DS_Store

‎app/assets/images/logo-star.png‎

14 KB
Loading

‎app/assets/images/rails.png‎

-6.49 KB
Binary file not shown.

‎app/assets/images/rubyplusshoes.png‎

26.5 KB
Loading

‎app/assets/images/screenshots/lesson.png‎

92.3 KB
Loading

‎app/assets/images/screenshots/new_program.png‎

42.5 KB
Loading

‎app/assets/stylesheets/answers.css.scss‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎app/assets/stylesheets/api/rels.css.scss‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/assets/stylesheets/application.css renamed to app/assets/stylesheets/application.css.scss

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
* This is a manifest file that'll automatically include all the stylesheets available in this directory
33
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
44
* the top of the compiled file, but it's generally better to create a new file per style scope.
5+
*
56
*= require_self
6-
*= require_tree .
7-
*/
7+
*/
8+
9+
/* We're doing our manifest file a little differently to work with bootstrap... */
10+
@import "lib/bootstrap/bootstrap.scss";
11+
@import "lib/shared.css.scss";
12+
@import "layout.css.scss";
13+
@import "forms.css.scss";
14+
@import "content.css.scss"

‎app/assets/stylesheets/content.css.scss‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
.home {
2+
section {
3+
@include clearfix;
4+
margin: 0 36px 36px;
5+
padding-bottom: 36px;
6+
border-bottom: 6px dotted $linkColor;
7+
8+
font-size: 1.7em;
9+
10+
h1 {
11+
font-size: 1.6em;
12+
/* text-transform: uppercase;*/
13+
}
14+
p {
15+
font-size: 1em;
16+
line-height: 1.5em;
17+
margin-bottom: 1em;
18+
}
19+
20+
img.new_program {
21+
float: left;
22+
@include columns(5);
23+
margin-right: $gridGutterWidth*2;
24+
}
25+
img.lesson {
26+
float: right;
27+
@include columns(8);
28+
margin-left: $gridGutterWidth*2;
29+
30+
}
31+
}
32+
33+
section.last {
34+
border: none;
35+
margin-bottom: 0;
36+
}
37+
}

0 commit comments

Comments
 (0)