diff --git a/app/assets/stylesheets/layouts/_default.scss b/app/assets/stylesheets/layouts/_default.scss index 0a58742f..e8356220 100644 --- a/app/assets/stylesheets/layouts/_default.scss +++ b/app/assets/stylesheets/layouts/_default.scss @@ -14,7 +14,7 @@ body { } section { - @extend .col-sm-12, .col-md-8, .col-lg-8; + @extend .col-sm-12, .col-md-12, .col-lg-12; } a, @@ -135,3 +135,30 @@ ul { float: left; margin: 5px 20px 15px 0px; } + +.container .jumbotron, .container-fluid .jumbotron { + padding: 10px 30px; + background-color: $bg; + margin: 0 auto 2rem; + + h1 { + font-weight: normal; + line-height: 3.4rem; + font-size: 3.2rem; + letter-spacing: -1px; + color: black; + margin-bottom: 0.5rem; + padding: 0.1em 0; + } + + p, li { + line-height: 2.3rem; + font-size: 2rem; + color: #000; + } + + .btn { + background-color: #cc0000; + border-color: #ff9999; + } +} diff --git a/app/assets/stylesheets/layouts/_variables.scss b/app/assets/stylesheets/layouts/_variables.scss index cbeed480..7785e343 100644 --- a/app/assets/stylesheets/layouts/_variables.scss +++ b/app/assets/stylesheets/layouts/_variables.scss @@ -6,15 +6,16 @@ $main-secondary: lighten($main, 10%); $main-highlight: lighten($main, 40%); $header-title-color: #ffffff; -$header-bg-color: #cc0100; -$navbar-text-color: #ffffff; -$navbar-bg-color: #95040b; -$navbar-bg-highlight-color: #2c3230; +$header-bg-color: #ffffff; +$navbar-text-color: #cc0000; +$navbar-text-hover-color: #000; +$navbar-bg-color: #ffffff; +$navbar-bg-highlight-color: #ffffff; $footer-text-color: #ffffff; $footer-bg-color: #2c3230; -$links: $header-bg-color; -$links-hover: $navbar-bg-color; +$links: $navbar-text-color; +$links-hover: $navbar-text-hover-color; // FONTS $main-font: 'Lora', Helvetica, serif; diff --git a/app/assets/stylesheets/modules/_header.scss b/app/assets/stylesheets/modules/_header.scss index c319f509..b7b450b6 100644 --- a/app/assets/stylesheets/modules/_header.scss +++ b/app/assets/stylesheets/modules/_header.scss @@ -24,4 +24,14 @@ header { .navbar-toggle:hover { background-color: transparent; } + + .navbar-brand { + padding: 0px; + + } + .navbar-brand>img { + height: 100%; + padding: 10px; + width: auto; + } } diff --git a/app/assets/stylesheets/modules/_navigation.scss b/app/assets/stylesheets/modules/_navigation.scss index 38ea0809..a8d99577 100644 --- a/app/assets/stylesheets/modules/_navigation.scss +++ b/app/assets/stylesheets/modules/_navigation.scss @@ -2,11 +2,14 @@ background-color: $navbar-bg-color; color: $navbar-text-color; font-family: $secondary-font; + font-weight: bold; text-transform: uppercase; + text-decoration: underline; letter-spacing: 0.1em; &:hover { - color: $navbar-text-color; + color: $navbar-text-hover-color; + text-decoration: underline; background-color: $navbar-bg-highlight-color; } } @@ -19,3 +22,10 @@ .navbar { margin: 0 $padding; } + +.navbar-brand, +.navbar-nav li a { + line-height: 130px; + height: 130px; + padding-top: 0; +} diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 46176a6b..08c83df1 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1 +1,18 @@ +
+

Montreal's Ruby Community

+

+ Montreal.rb is a community group of Montreal-based Ruby and Ruby on Rails developers. + It's aim is to help support local developers by creating a thriving forum for learning and discussion, and also just spread the RoR good word. + We are providing the community with a wide range of events and activities, such as: +

+ +

Learn more

+
+ +
<%= render template: 'events/index' %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index b7172dbb..e8e9ba62 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -7,9 +7,8 @@ <%= icon('bars', class: 'fa-2x') %> - <%= link_to root_path do %> -

Montreal.rb

- + <%= link_to root_path, class: 'navbar-brand' do %> + <%= image_tag 'montreal-rb.png', alt: 'Montreal.rb' %> <% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index bbc1dacd..26825459 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -23,12 +23,7 @@ <%= yield %> - - - <%= render 'layouts/footer' %>