Layout changes

This commit is contained in:
Markus Janhunen 2016-11-19 13:43:04 +02:00
parent df07540719
commit 9b3525d72a
6 changed files with 140 additions and 58 deletions

View File

@ -0,0 +1,82 @@
.nav-small
font-size: .7em
font-weight: 600
line-height: 320%
a.nav-link
color: #55595c
a.active.nav-link, a.nav-link hover
font-weight: bold
a.nav-link hover
font-weight: bold
label.toggle-bordered-simple
border-radius: 5px !important
.toggle
active label
font-weight: bold
.dark
border-bottom: 0px
margin-top: 0px
color: rgba(255, 255, 255, 0.2)
background: #313131
background: -moz-linear-gradient(top, #555555 0%, #313131 100%)
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #1a1d2b), color-stop(100%, #313131))
background: -webkit-linear-gradient(top, #555555 0%, #313131 100%)
background: -o-linear-gradient(top, #555555 0%, #313131 100%)
background: -ms-linear-gradient(top, #555555 0%, #313131 100%)
background: linear-gradient(to bottom, #555555 0%, #313131 100%)
h1 , h2 , h3 , h4 , h5 , h6 , p , table
color: rgba(white, 0.8)
font-weight: 600
p , table
color: rgba(white, 0.8)
a
color: rgba(white, 0.6)
.container
padding-top: 50px
padding-bottom: 40px
.muub
padding-bottom: 10px
color: white
.slogan
font-weight: bolder
color: rgba(255, 255, 255, 0.8)
.copyright
background-color: rgba(0,0,0,0.2)
text-shadow: 1px 1px 1px rgba(0,0,0,0.1)
padding: 25px 0px 15px 60px
font-size: 13px
display: block
form
input, textarea
color: #999
background-color: rgba(0,0,0,0.2)
border-color: rgba(0,0,0,0.25)
.input-group-addon
color: #999
background-color: rgba(0,0,0,0.4)
border-color: rgba(0,0,0,0.25)
.input-group-btn:not(:first-child) > .btn
border-bottom-left-radius: 4px
border-top-left-radius: 4px
footer
.icon-angle-right:before
color: white
body
font-family: "ProximaNova", Arial, Helvetica, sans-serif
-webkit-font-smoothing: antialiased
font-size: 16px

View File

@ -19,3 +19,4 @@
*/
@import 'bootstrap';
@import "new_dev";

View File

@ -62,7 +62,7 @@ h4 , h5 , h6
.height-500
height: 500px
.big_heading
text-align: center
margin-top: $marign
@ -497,27 +497,6 @@ h4 , h5 , h6
border-right: 2px solid black
border-bottom-right-radius: 12px
.dark
border-bottom: 0px
margin-top: 0px
color: rgba(255, 255, 255, 0.2)
background: #313131
background: -moz-linear-gradient(top, #555555 0%, #313131 100%)
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #1a1d2b), color-stop(100%, #313131))
background: -webkit-linear-gradient(top, #555555 0%, #313131 100%)
background: -o-linear-gradient(top, #555555 0%, #313131 100%)
background: -ms-linear-gradient(top, #555555 0%, #313131 100%)
background: linear-gradient(to bottom, #555555 0%, #313131 100%)
h1 , h2 , h3 , h4 , h5, p , table
color: rgba(white, 0.8)
a
color: rgba(white, 0.6)
.container
padding-top: 50px
padding-bottom: 40px
.muub
padding-bottom: 10px
color: white
.padding-xs .row
padding-top: 10px

View File

@ -6,29 +6,48 @@
/ Footer Logo
= image_tag "web_logo_mobile.png" , :class => "footer-logo"
/ Small Description
%p Live in bootcamp, learn the code
%ul.pull-right.nomargin.list-inline.mobile-block
%li.list-inline-item
=link_to "Terms & Conditions" , page_path(:terms)
%li.list-inline-item •
%li.list-inline-item
=link_to "Privacy" , page_path(:privacy)
%p.slogan Live in bootcamp, learn the code
%address
%table
%tbody
%tr
%td
%i.fa.icon-location
%br/
%br/
%br/
%td
Fiskarsintie 513
%br/
10480 Antskog
%br/
Finland
%tr
%td
%i.fa.icon-phone
%td Phone: +358-40 7308052
%tr
%td
%i.fa.icon-mail
%td
%a{:href => "mailto:info@webdev.camp"} info@webdev.camp
.col-md-1
.col-md-2
%h5.letter-spacing-1 Resources
%h6.letter-spacing-1 RESOURCES
%ul.footer-links.list-unstyled
%li= link_to "Teachers" , page_path(:course , anchor: :teachers)
%li.icon-angle-right= link_to "Teachers" , page_path(:course , anchor: :teachers)
%li= link_to "Payment Plans" , page_path(:payment)
.col-md-1
.col-md-2
%h5.letter-spacing-1 Oppertunities
%h6.letter-spacing-1 OPPORTUNITIES
%ul.footer-links.list-unstyled
%li= link_to "Sponsoring" , page_path(:sponsoring)
%li= link_to "Teaching" , page_path(:teaching)
.col-md-1
.col-md-2.footer-sign
.col-md-3.footer-sign
%h5.letter-spacing-1 Account
%ul.footer-links.list-unstyled
-if user_signed_in?
@ -39,11 +58,17 @@
%li
= simple_form_for(:user, :url => session_url(:user), :html => { :role => 'form' , class: "form-horizontal"}) do |f|
.input-group
%span.input-group-addon
%i.fa.icon-mail
= f.email_field :email, class: 'form-control' , placeholder: :email
.input-group
%span.input-group-addon
%i.fa.icon-lock
= f.password_field :password, class: 'form-control' , placeholder: :password
.input-group-btn
= f.submit "Sign in" , class: "btn btn-success"
= f.submit "Sign in" , class: "btn btn-success btn-block"
.margin-top-20
%a.social-icon.social-icon-border.social-facebook.pull-left{"data-placement" => "top", :href => "https://www.facebook.com/webdev.camp", :title => "Facebook" , target: :blank }
%i.icon-facebook
@ -51,23 +76,18 @@
%i.icon-twitter
%a.social-icon.social-icon-border.social-instagram.pull-left{"data-placement" => "top", :href => "https://www.instagram.com/webdev.camp/", :title => "Instagram" , target: :blank }
%i.icon-instagram
.copyright
.container
%address.row
.col-md-4
%i.fa.icon-location
Fiskarsintie 513
%br/
10480 Antskog
%br/
Finland
.col-md-4
%i.fa.icon-phone
Phone: +358-40 7308052
.col-md-4
%i.fa.icon-mail
%a{:href => "mailto:info@webdev.camp"} info@webdev.camp
© All Rights Reserved, Web Dev Camp, a subsidiary of Lightning Raisa & Torsten Oy
.container-fluid
.row.copyright
.col-md-9
© All Rights Reserved, Web Dev Camp, a subsidiary of Lightning Raisa & Torsten Oy
.col-md-3.text-right
%ul.nomargin.list-inline.mobile-block
%li.list-inline-item
=link_to "Terms & Conditions" , page_path(:terms)
%li.list-inline-item •
%li.list-inline-item
=link_to "Privacy" , page_path(:privacy)
:javascript
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

View File

@ -10,9 +10,9 @@
%li.nav-item= link_to "Camp" , page_path(:camp) , class: "nav-link"
%li.nav-item= link_to "Apply" , new_user_registration_path , class: "nav-link"
%li.nav-item= link_to "Q & A" , page_path(:answers) , class: "nav-link"
%li.nav-item= link_to "|" , class: "nav-link"
-if user_signed_in?
%li.visible-xs.nav-item= sign_out_link class: "nav-link"
%li.visible-xs.nav-item= link_to "Account" , edit_user_registration_path , class: "nav-link"
%li.nav-item.nav-small= sign_out_link class: "nav-link"
%li.nav-item.nav-small= link_to "Account" , edit_user_registration_path , class: "nav-link"
-else
%li.visible-xs.nav-item= link_to "Sign in" , new_user_session_path, class: "nav-link"
%li.visible-xs.nav-item= link_to "Sign up" , new_user_registration_path, class: "nav-link"
%li.nav-item.nav-small= link_to "Sign in" , new_user_session_path, class: "nav-link"

View File

@ -4,7 +4,7 @@
.container
.spacer-big
%ul.nav.nav-tabs{:role => "tablist"}
-faq_sections.each do |section|
%li.nav-item
@ -14,7 +14,7 @@
-faq_sections.each do |section|
.tab-pane{:role => "tabpanel" , id: "t#{section}" , :class => ("active" if "course" == section)}
-t(section).keys.each do |qa|
#faq_toggle.toggle
#faq_toggle.toggle.toggle-transparent.toggle-bordered-simple
%label
= t("#{section}.#{qa}.q")
.toggle-content