Skip to content

Commit

Permalink
top nav
Browse files Browse the repository at this point in the history
  • Loading branch information
alexch committed Nov 15, 2017
1 parent e9ddf4b commit 8c31237
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 15 deletions.
Binary file added CodeLikeThis_Wireframes.pdf
Binary file not shown.
18 changes: 11 additions & 7 deletions lib/app_page.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
class AppPage < BootstrapPage

def logo klass: nil, style: nil
a(href: '/') {
img.logo(src: '/images/logo.png',
alt: "Code like this.",
href: '/',
a(href: 'http://www.burlingtoncodeacademy.com') {
img.logo(src: '/images/burlingtoncodeacademy-logo.png',
alt: "Burlington Code Academy",
class: ['logo', klass].compact,
style: [style].compact)
}
Expand All @@ -18,12 +17,17 @@ def navbar_brand_content
end

def navbar_items
nav_item name: "Blog", href: "http://codelikethis.tumblr.com"
# nav_item name: "Blog", href: "http://codelikethis.tumblr.com"
nav_item name: "Bootcamp", href: "http://http://www.burlingtoncodeacademy.com/bootcamp/"
nav_item name: "Learn", href: "/"
nav_item name: "News", href: "http://www.burlingtoncodeacademy.com/news/"
nav_item name: "Apply Now", href: "http://www.burlingtoncodeacademy.com/apply/"

nav_item name: "Lessons", href: "/lessons"
nav_item name: "Test First", href: "http://testfirst.org/"
nav_item name: "Labs", href: "http://testfirst.org/live"
nav_item name: "Alex", href: "http://alexchaffee.com"

# nav_item name: "Test First", href: "http://testfirst.org/"
# nav_item name: "Alex", href: "http://alexchaffee.com"
# widget DonateButton
end

Expand Down
9 changes: 5 additions & 4 deletions lib/bootstrap_page.rb
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,14 @@ def navbar_brand_content
end

def navbar_content
nav class: 'navbar navbar-expand-md navbar-dark bg-dark fixed-top' do
nav class: 'navbar navbar-expand-md fixed-top navbar-light bg-light' do
a class: 'navbar-brand', href: '#' do
navbar_brand_content
end

# hamburger button
button :class => 'navbar-toggler', :type => 'button',
button :class => 'navbar-toggler',
:type => 'button',
'data-toggle' => 'collapse',
'data-target' => '#pageNavbar',
'aria-controls' => 'navbarsExampleDefault',
Expand All @@ -108,10 +109,10 @@ def navbar_content
end

div :class => 'collapse navbar-collapse', :id => 'pageNavbar' do
ul :class => 'navbar-nav mr-auto' do
ul :class => 'navbar-nav ml-auto' do
navbar_items
end
navbar_search
# navbar_search
end
end
end
Expand Down
18 changes: 18 additions & 0 deletions lib/home.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,28 @@
require 'courses_table'

class Home < Erector::Widget
def centered_codelikethis_logo
center class: 'ml-auto mr-auto' do
img.logo(src: '/images/logo.png',
alt: "Code like this!",
style: 'height: 2rem'
)
br
text "Powered by Burlington Code Academy"
end
end

def content

div.row {
centered_codelikethis_logo
}

br
br

div.row {

div(class: 'col-sm') {
div.bubble {
p {
Expand Down
Binary file added public/images/burlingtoncodeacademy-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions public/scss/codelikethis.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ body {
text-rendering: optimizelegibility;
}

//.non_footer {
// background: white;
//}
//
nav.navbar {
background: white;
}

//center.logo {
// background: $nice-blue;
//}
Expand Down
5 changes: 5 additions & 0 deletions public/stylesheets/codelikethis.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ body {
text-rendering: optimizelegibility;
}

/* line 14, ../scss/codelikethis.scss */
nav.navbar {
background: white;
}

/* line 122, ../scss/codelikethis.scss */
section.slide {
border-top: 1px solid #ddd;
Expand Down

0 comments on commit 8c31237

Please sign in to comment.