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

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

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

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

@ -1,16 +1,16 @@
.row .row
.col-xs-12.col-sm-3 .col-xs-12.col-sm-3
span 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 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 .visible-xs
.button-spacer .button-spacer
.col-xs-12.col-sm-9 .col-xs-12.col-sm-9
.input-group .input-group
input#searchArea.big-text-field.field-responsive.form-control(type='text', placeholder='Search our links') input#searchArea.big-text-field.field-responsive.form-control(type='text', placeholder='Search our links')
span.input-group-btn 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 .spacer
#search-results #search-results