gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into ux-improvements

Browse Source 
Conflicts:
	seed_data/coursewares.json
This commit is contained in:
Michael Q Larson
2015-02-22 18:17:47 -08:00
parent 55f892a974 19e8795055
commit f4fcb565f4
6 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/css/main.less
View File

@@ -720,6 +720,20 @@ iframe.iphone {
margin-bottom: 50px; margin-bottom: 50px;
} }
.btn-primary-ghost{
background: transparent;
color: @brand-primary;
/* CSS Transition */
-webkit-transition: background .2s ease-in-out, border .2s ease-in-out;
-moz-transition: background .2s ease-in-out, border .2s ease-in-out;
-ms-transition: background .2s ease-in-out, border .2s ease-in-out;
-o-transition: background .2s ease-in-out, border .2s ease-in-out;
transition: background .2s ease-in-out, border .2s ease-in-out;
}
//uncomment this to see the dimensions of all elements outlined in red //uncomment this to see the dimensions of all elements outlined in red
//* { //* {
// border-color: red; // border-color: red;

5
seed_data/coursewares.json
View File

@@ -3322,11 +3322,12 @@
"challengeType": 0 "challengeType": 0
}, },
{ {
"_id": "bd8123c8c441eddfaeb5bdef", "_id": "bd7123c9c441eddfaeb5bdef",
"name": "Meet Booleans", "name": "Meet Booleans",
"difficulty": "9.98", "difficulty": "9.98",
"description": [ "description": [
"Return true" "Return true",
"Some additional directions"
], ],
"tests": [ "tests": [
"expect(welcomeToBooleans()).to.be.a(\"boolean\");", "expect(welcomeToBooleans()).to.be.a(\"boolean\");",

10
views/bonfire/show.jade
View File

@@ -66,17 +66,15 @@ block content
.bonfire-instructions .bonfire-instructions
p= brief p= brief
#brief-instructions #brief-instructions
.text-center #more-info.btn.btn-primary.btn-block.btn-primary-ghost
button#more-info.btn.btn-info span.ion-arrow-down-b
span.ion-help-circled
| More information | More information
#long-instructions.row.hide #long-instructions.row.hide
.col-xs-12 .col-xs-12
for sentence in details for sentence in details
p!= sentence p!= sentence
.text-center #less-info.btn.btn-primary.btn-block.btn-primary-ghost
button#less-info.btn.btn-info span.ion-arrow-up-b
span.ion-help-circled
| Less information | Less information
#submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter) #submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter)
#showAllButton.btn.btn-info.btn-big.btn-block Show all coding challenges #showAllButton.btn.btn-info.btn-big.btn-block Show all coding challenges

10
views/coursewares/showHTML.jade
View File

@@ -29,17 +29,15 @@ block content
.bonfire-instructions .bonfire-instructions
p!= brief p!= brief
#brief-instructions #brief-instructions
.text-center #more-info.btn.btn-primary.btn-block.btn-primary-ghost
button#more-info.btn.btn-info span.ion-arrow-down-b
span.ion-help-circled
| More information | More information
#long-instructions.row.hide #long-instructions.row.hide
.col-xs-12 .col-xs-12
for sentence in details for sentence in details
p!= sentence p!= sentence
.text-center #less-info.btn.btn-primary.btn-block.btn-primary-ghost
button#less-info.btn.btn-info span.ion-arrow-up-b
span.ion-help-circled
| Less information | Less information
br br
.btn.btn-info#showAllCoursewares .btn.btn-info#showAllCoursewares

10
views/coursewares/showJS.jade
View File

@@ -24,17 +24,15 @@ block content
.bonfire-instructions .bonfire-instructions
p= brief p= brief
#brief-instructions #brief-instructions
.text-center #more-info.btn.btn-primary.btn-block.btn-primary-ghost
button#more-info.btn.btn-info span.ion-arrow-down-b
span.ion-help-circled
| More information | More information
#long-instructions.row.hide #long-instructions.row.hide
.col-xs-12 .col-xs-12
for sentence in details for sentence in details
p!= sentence p!= sentence
.text-center #less-info.btn.btn-primary.btn-block.btn-primary-ghost
button#less-info.btn.btn-info span.ion-arrow-up-b
span.ion-help-circled
| Less information | Less information
#submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter) #submitButton.btn.btn-primary.btn-big.btn-block Run code (ctrl + enter)
br br

3
views/resources/learn-to-code.jade
View File

@@ -6,7 +6,10 @@ block content
img.img-responsive.img-center(src='https://s3.amazonaws.com/freecodecamp/wide-social-banner.png') img.img-responsive.img-center(src='https://s3.amazonaws.com/freecodecamp/wide-social-banner.png')
br br
.text-center .text-center
if (user)
a.btn.btn-cta.signup-btn.next-challenge-button(href="/challenges") Take me to my next challenge a.btn.btn-cta.signup-btn.next-challenge-button(href="/challenges") Take me to my next challenge
else
a.btn.btn-cta.signup-btn.next-challenge-button(href="/signin") Start learning to code (it's free)
br br
.row .row
.col-xs-12.col-sm-12.col-md-4 .col-xs-12.col-sm-12.col-md-4