Skip to content

Commit c1ba0cb

Browse files
author
Shawn McCool
committed
Merge pull request #66 from jeroengerits/master
Change SCSS and HTML (see commits)
2 parents da208a5 + 184cb7c commit c1ba0cb

File tree

6 files changed

+56
-6
lines changed

6 files changed

+56
-6
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ This is the Laravel.IO community portal site. The site is entirely open source a
55
### Requirements
66

77
1. PHP 5.4
8+
2. Vagrant
9+
3. Chef
10+
4. Virtualbox
11+
5. NodeJS
812

913
### Recommended
1014

@@ -80,7 +84,7 @@ After pulling down changes, ssh into the vagrant box and run the update_environm
8084
Because we keep the generated / minified css out of the repository, we must have a workflow for compiling the styles.
8185
* Install the latest NodeJS
8286
* Then, go to /public folder and run "npm install"
83-
* Finally, run "compass watch" in your /public folder and the minified css will be generated and also your filesystem will watch for file changes (and overwrites the .css). You can also run "compass compile" as a single one-time command to generate the css.
87+
* Finally, run "compass watch" in your /public folder and the minified css will be generated and also your filesystem will watch for file changes (and overwrites the .css). You can also run "compass compile" as a single one-time command to generate the css and don't watch the filesystem.
8488

8589
### Contribution
8690

app/views/contributors/_member_card.blade.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<div class="contributor member">
22
<h2>{{ $contributor->name }}</h2>
3+
<p class="github-link">
4+
<a href="{{ $contributor->github_url }}">Github profile</a>
5+
</p>
36
<p class="avatar">
47
<img src="{{ $contributor->user->image_url }}" alt="{{ $contributor->name }}">
58
</p>
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
<div class="contributor nonMember">
22
<h2>{{ $contributor->name }}</h2>
3+
<p class="github-link">
4+
<a href="{{ $contributor->github_url }}">Github profile</a>
5+
</p>
36
<p class="avatar">
47
<img src="{{ $contributor->avatar_url }}" alt="{{ $contributor->name }}">
58
</p>
6-
<p class="count">Count: {{ $contributor->contribution_count }}</p>
9+
<p class="count">
10+
Count: {{ $contributor->contribution_count }}
11+
</p>
712
</div>

app/views/home/index.blade.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
@foreach($articles as $article)
1010
@include('articles._small_summary')
1111
@endforeach
12+
<p>
13+
<a href="{{ action('Controllers\ArticlesController@getIndex') }}">See all articles</a>
14+
</p>
1215
</div>
1316
</section>
1417

public/scss/modules/_hero-section.scss

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,28 @@
1616
h1 {
1717
color: #fff;
1818
}
19+
a {
20+
color:#fff;
21+
text-decoration: underline;
22+
&:hover {
23+
color: $lioGrey;
24+
text-shadow:none;
25+
}
26+
}
1927
}
2028
.posts {
2129
float: left;
2230
color: #fff;
2331
width: 60%;
2432
padding: 4% 5% 2% 5%;
25-
33+
a {
34+
color:#fff;
35+
text-decoration: underline;
36+
&:hover {
37+
color: $lioGrey;
38+
text-shadow:none;
39+
}
40+
}
2641
}
2742
}
2843

public/stylesheets/app.css

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7423,20 +7423,40 @@ header {
74237423
.hero-section .description h1 {
74247424
color: #fff;
74257425
}
7426-
/* line 20, ../scss/modules/_hero-section.scss */
7426+
/* line 19, ../scss/modules/_hero-section.scss */
7427+
.hero-section .description a {
7428+
color: #fff;
7429+
text-decoration: underline;
7430+
}
7431+
/* line 22, ../scss/modules/_hero-section.scss */
7432+
.hero-section .description a:hover {
7433+
color: #524f4f;
7434+
text-shadow: none;
7435+
}
7436+
/* line 28, ../scss/modules/_hero-section.scss */
74277437
.hero-section .posts {
74287438
float: left;
74297439
color: #fff;
74307440
width: 60%;
74317441
padding: 4% 5% 2% 5%;
74327442
}
7443+
/* line 33, ../scss/modules/_hero-section.scss */
7444+
.hero-section .posts a {
7445+
color: #fff;
7446+
text-decoration: underline;
7447+
}
7448+
/* line 36, ../scss/modules/_hero-section.scss */
7449+
.hero-section .posts a:hover {
7450+
color: #524f4f;
7451+
text-shadow: none;
7452+
}
74337453

7434-
/* line 29, ../scss/modules/_hero-section.scss */
7454+
/* line 44, ../scss/modules/_hero-section.scss */
74357455
.hero-section .dark {
74367456
background-color: #ef4531;
74377457
}
74387458

7439-
/* line 33, ../scss/modules/_hero-section.scss */
7459+
/* line 48, ../scss/modules/_hero-section.scss */
74407460
.hero-section .darker {
74417461
background-color: #ee3823;
74427462
}

0 commit comments

Comments
 (0)