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

Fix rebase bugs

Browse Source
This commit is contained in:
Berkeley Martinez
2016-01-15 05:04:44 -08:00
parent 564d8c620f
commit d7cba7c449
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/less/main.less
View File

@ -390,6 +390,10 @@ p {
border-radius: 6px;
}
.btn-bigger {
font-size: 30px;
}
.big-text-field {
font-size: 30px;
height: 57px;
@ -448,11 +452,6 @@ thead {
color: @body-bg;
}
.navbar-right {
background-color: #215f1e;
text-align: center;
}
.signup-btn-nav {
margin-top: -2px !important;
padding-top: 10px !important;

19
server/views/challenges/showZiplineOrBasejump.jade
View File

@ -2,17 +2,16 @@ extends ../layout-wide
block content
.row
.col-md-4.bonfire-top
h1.text-center= name
h4.text-center= name
hr
h4
ol
for step, index in description
.row.checklist-element(id="#{dashedName + index}")
.col-xs-3.col-sm-1.col-md-2.padded-ionic-icon.text-center
input(type='checkbox' class='challenge-list-checkbox')
.col-xs-9.col-sm-11.col-md-10
li.step-text.wrappable!= step
.col-md-8
ol
for step, index in description
.row.checklist-element(id="#{dashedName + index}")
.col-xs-3.col-sm-1.col-md-2.padded-ionic-icon.text-center
input(type='checkbox' class='challenge-list-checkbox')
.col-xs-9.col-sm-11.col-md-10
li.step-text.wrappable!= step
.col-xs-12.col-sm-12.col-md-8
.embed-responsive.embed-responsive-16by9
iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}')
br

6
server/views/stories/news-nav.jade
View File

@ -1,16 +1,16 @@
.row
.col-xs-12.col-sm-3
span
a.btn.btn-primary.btn-big.btn-block.btn-responsive(href='/stories/submit' class="#{ page === 'hot' ? '' : 'hidden' }") Submit a link
a.btn.btn-primary.btn-bigger.btn-block.btn-responsive(href='/stories/submit' class="#{ page === 'hot' ? '' : 'hidden' }") Submit a link
span
a.btn.btn-success.btn-big.btn-block.btn-responsive(href='/news/' class="#{ (page !== 'hot') ? '' : 'hidden' }") All
a.btn.btn-success.btn-bigger.btn-block.btn-responsive(href='/news/' class="#{ (page !== 'hot') ? '' : 'hidden' }") All
.visible-xs
.button-spacer
.col-xs-12.col-sm-9
.input-group
input#searchArea.big-text-field.field-responsive.form-control(type='text', placeholder='Search our links')
span.input-group-btn
button#searchbutton.btn.btn-big.btn-primary.btn-responsive(type='button') Search
button#searchbutton.btn.btn-bigger.btn-primary.btn-responsive(type='button') Search
.spacer
#search-results