diff --git a/public/css/lib/bootstrap/variables.less b/public/css/lib/bootstrap/variables.less index 6529f46265..ac4b3e67ac 100644 --- a/public/css/lib/bootstrap/variables.less +++ b/public/css/lib/bootstrap/variables.less @@ -15,9 +15,9 @@ @brand-primary: #5fcf80; @brand-success: #5fcfb8; -@brand-info: #76cf5f; +@brand-info: #5bc0de; @brand-warning: #f0ad4e; -@brand-danger: #501639; +@brand-danger: #d9534f; //== Scaffolding @@ -25,7 +25,7 @@ //## Settings for some of the most global styles. //** Background color for ``. -@body-bg: #441B09; +@body-bg: #f7ebe3; //** Global text color on ``. @text-color: @gray-dark; @@ -104,7 +104,7 @@ @border-radius-small: 3px; //** Global color for active items (e.g., navs or dropdowns). -@component-active-color: #fff; +@component-active-color: #eee; //** Global background color for active items (e.g., navs or dropdowns). @component-active-bg: @brand-primary; @@ -142,26 +142,26 @@ @btn-font-weight: normal; @btn-default-color: #333; -@btn-default-bg: #fff; +@btn-default-bg: #eee; @btn-default-border: #ccc; -@btn-primary-color: #fff; +@btn-primary-color: #eee; @btn-primary-bg: @brand-primary; @btn-primary-border: darken(@btn-primary-bg, 5%); -@btn-success-color: #fff; +@btn-success-color: #eee; @btn-success-bg: @brand-success; @btn-success-border: darken(@btn-success-bg, 5%); -@btn-info-color: #fff; +@btn-info-color: #eee; @btn-info-bg: @brand-info; @btn-info-border: darken(@btn-info-bg, 5%); -@btn-warning-color: #fff; +@btn-warning-color: #eee; @btn-warning-bg: @brand-warning; @btn-warning-border: darken(@btn-warning-bg, 5%); -@btn-danger-color: #fff; +@btn-danger-color: #eee; @btn-danger-bg: @brand-danger; @btn-danger-border: darken(@btn-danger-bg, 5%); @@ -173,7 +173,7 @@ //## //** `` background color -@input-bg: #fff; +@input-bg: #eee; //** `` background color @input-bg-disabled: @gray-lighter; @@ -210,7 +210,7 @@ //## Dropdown menu container and contents. //** Background for the dropdown menu. -@dropdown-bg: #fff; +@dropdown-bg: #eee; //** Dropdown menu `border-color`. @dropdown-border: rgba(0,0,0,.15); //** Dropdown menu `border-color` **for IE8**. @@ -374,7 +374,7 @@ // Inverted navbar links @navbar-inverse-link-color: @gray-light; -@navbar-inverse-link-hover-color: #fff; +@navbar-inverse-link-hover-color: #eee; @navbar-inverse-link-hover-bg: transparent; @navbar-inverse-link-active-color: @navbar-inverse-link-hover-color; @navbar-inverse-link-active-bg: darken(@navbar-inverse-bg, 10%); @@ -383,12 +383,12 @@ // Inverted navbar brand label @navbar-inverse-brand-color: @navbar-inverse-link-color; -@navbar-inverse-brand-hover-color: #fff; +@navbar-inverse-brand-hover-color: #eee; @navbar-inverse-brand-hover-bg: transparent; // Inverted navbar toggle @navbar-inverse-toggle-hover-bg: #333; -@navbar-inverse-toggle-icon-bar-bg: #fff; +@navbar-inverse-toggle-icon-bar-bg: #eee; @navbar-inverse-toggle-border-color: #333; @@ -403,7 +403,7 @@ @nav-disabled-link-color: @gray-light; @nav-disabled-link-hover-color: @gray-light; -@nav-open-link-hover-color: #fff; +@nav-open-link-hover-color: #eee; //== Tabs @nav-tabs-border-color: #ddd; @@ -428,19 +428,19 @@ //## @pagination-color: @link-color; -@pagination-bg: #fff; +@pagination-bg: #eee; @pagination-border: #ddd; @pagination-hover-color: @link-hover-color; @pagination-hover-bg: @gray-lighter; @pagination-hover-border: #ddd; -@pagination-active-color: #fff; +@pagination-active-color: #eee; @pagination-active-bg: @brand-primary; @pagination-active-border: @brand-primary; @pagination-disabled-color: @gray-light; -@pagination-disabled-bg: #fff; +@pagination-disabled-bg: #eee; @pagination-disabled-border: #ddd; @@ -499,7 +499,7 @@ //** Tooltip max width @tooltip-max-width: 200px; //** Tooltip text color -@tooltip-color: #fff; +@tooltip-color: #eee; //** Tooltip background color @tooltip-bg: #000; @tooltip-opacity: .9; @@ -515,7 +515,7 @@ //## //** Popover body background color -@popover-bg: #fff; +@popover-bg: #eee; //** Popover maximum width @popover-max-width: 276px; //** Popover border color @@ -529,7 +529,7 @@ //** Popover arrow width @popover-arrow-width: 10px; //** Popover arrow color -@popover-arrow-color: #fff; +@popover-arrow-color: #eee; //** Popover outer arrow width @popover-arrow-outer-width: (@popover-arrow-width + 1); @@ -557,9 +557,9 @@ @label-danger-bg: @brand-danger; //** Default label text color -@label-color: #fff; +@label-color: #eee; //** Default text color of a linked label -@label-link-hover-color: #fff; +@label-link-hover-color: #eee; //== Modals @@ -575,7 +575,7 @@ @modal-title-line-height: @line-height-base; //** Background color of modal content area -@modal-content-bg: #fff; +@modal-content-bg: #eee; //** Modal content border color @modal-content-border-color: rgba(0,0,0,.2); //** Modal content border color **for IE8** @@ -627,7 +627,7 @@ //** Background color of the whole progress component @progress-bg: #f5f5f5; //** Progress bar text color -@progress-bar-color: #fff; +@progress-bar-color: #eee; //** Default progress bar color @progress-bar-bg: @brand-primary; @@ -646,7 +646,7 @@ //## //** Background color on `.list-group-item` -@list-group-bg: #fff; +@list-group-bg: #eee; //** `.list-group-item` border color @list-group-border: #ddd; //** List group border radius @@ -686,14 +686,14 @@ @panel-border-radius: @border-radius-base; //** Border color for elements within panels -@panel-inner-border: #ddd; -@panel-footer-bg: #eee; +@panel-inner-border: #ccc; +@panel-footer-bg: #dedede; @panel-default-text: @gray-dark; @panel-default-border: #ddd; @panel-default-heading-bg: #f5f5f5; -@panel-primary-text: #fff; +@panel-primary-text: #eee; @panel-primary-border: @brand-primary; @panel-primary-heading-bg: @brand-primary; @@ -745,15 +745,15 @@ // //## -@badge-color: #fff; +@badge-color: #eee; //** Linked badge text color on hover -@badge-link-hover-color: #fff; +@badge-link-hover-color: #eee; @badge-bg: @gray-light; //** Badge text color in active nav link @badge-active-color: @link-color; //** Badge background color in active nav link -@badge-active-bg: #fff; +@badge-active-bg: #eee; @badge-font-weight: bold; @badge-line-height: 1; @@ -782,15 +782,15 @@ @carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6); -@carousel-control-color: #fff; +@carousel-control-color: #eee; @carousel-control-width: 15%; @carousel-control-opacity: .5; @carousel-control-font-size: 20px; -@carousel-indicator-active-bg: #fff; -@carousel-indicator-border-color: #fff; +@carousel-indicator-active-bg: #eee; +@carousel-indicator-border-color: #eee; -@carousel-caption-color: #fff; +@carousel-caption-color: #eee; //== Close @@ -799,7 +799,7 @@ @close-font-weight: bold; @close-color: #000; -@close-text-shadow: 0 1px 0 #fff; +@close-text-shadow: 0 1px 0 #eee; //== Code @@ -809,7 +809,7 @@ @code-color: #c7254e; @code-bg: #f9f2f4; -@kbd-color: #fff; +@kbd-color: #eee; @kbd-bg: #333; @pre-bg: #f5f5f5; diff --git a/public/css/styles.less b/public/css/styles.less index 2d50cf6968..54d9de8c9c 100644 --- a/public/css/styles.less +++ b/public/css/styles.less @@ -4,9 +4,16 @@ @import "lib/bootstrap-social"; @import "lib/animate.min.less"; -// Scaffolding -// ------------------------- +@font-face { + font-family: 'Lato Light'; + src: url('Lato-Light.ttf') format('svg'); + font-weight: normal; + font-style: normal; +} +h1,html,body,div,span,a,li,td,th { + font-family: 'Lato Light', sans-serif; +} html { position: relative; @@ -243,4 +250,15 @@ ul { .btn-social { width: 250px; +} + +.navbar { + background-color: #502D16; +} + +.navbar-default .navbar-nav > li > a { + color: #fff; + &:hover { + color: #ddd; + } } \ No newline at end of file diff --git a/public/fonts/Lato-Light.ttf b/public/fonts/Lato-Light.ttf new file mode 100755 index 0000000000..a958067a86 Binary files /dev/null and b/public/fonts/Lato-Light.ttf differ diff --git a/views/account/profile.jade b/views/account/profile.jade index 28c4382c09..a7b443c7a0 100644 --- a/views/account/profile.jade +++ b/views/account/profile.jade @@ -1,57 +1,61 @@ extends ../layout block content - h1 Update your profile here: - .animated.flipInX - form.form-horizontal(action='/account/profile', method='POST') - input(type='hidden', name='_csrf', value=_csrf) - .form-group - label.col-sm-2.control-label(for='email') Email - .col-sm-4 - input.form-control(type='email', name='email', id='email', value='#{user.email}') - .form-group - label.col-sm-2.control-label(for='name') Name - .col-sm-4 - input.form-control(type='text', name='name', id='name', value='#{user.profile.name}') - .form-group - label.col-sm-2.control-label(for='location') Location - .col-sm-4 - input.form-control(type='text', name='location', id='location', value='#{user.profile.location}') - .form-group - label.col-sm-2.control-label(for='website') Website - .col-sm-4 - input.form-control(type='text', name='website', id='website', value='#{user.profile.website}') - .form-group - .col-sm-offset-2.col-sm-4 - button.btn.btn.btn-primary(type='submit') - span.ion-edit - | Update my profile + .panel + .container + h1 Update your profile here: + .animated.flipInX + form.form-horizontal(action='/account/profile', method='POST') + input(type='hidden', name='_csrf', value=_csrf) + .form-group + label.col-sm-2.control-label(for='email') Email + .col-sm-4 + input.form-control(type='email', name='email', id='email', value='#{user.email}') + .form-group + label.col-sm-2.control-label(for='name') Name + .col-sm-4 + input.form-control(type='text', name='name', id='name', value='#{user.profile.name}') + .form-group + label.col-sm-2.control-label(for='location') Location + .col-sm-4 + input.form-control(type='text', name='location', id='location', value='#{user.profile.location}') + .form-group + label.col-sm-2.control-label(for='website') Website + .col-sm-4 + input.form-control(type='text', name='website', id='website', value='#{user.profile.website}') + .form-group + .col-sm-offset-2.col-sm-4 + button.btn.btn.btn-primary(type='submit') + span.ion-edit + | Update my profile - h3 Danger Zone - button.btn.btn-danger.confirm-deletion - span.ion-trash-b - | I want to delete my account - script. - $('.confirm-deletion').on("click", function() { - $('#modal-dialog').modal('show'); - }); - #modal-dialog.modal.animated.wobble - .modal-dialog - .modal-content - .modal-header - a.close(href='#', data-dismiss='modal', aria-hidden='true') × - h3 Are you really leaving us? - .modal-body - p Pro Tip: If you tweet feedback to  - a(href="https://twitter.com/intent/tweet?text=Hey%20@freecodecamp") @FreeCodeCamp - | , we'll act quickly on it! - .modal-footer - a.btn.btn-success.btn-block(href='#', data-dismiss='modal', aria-hidden='true') - span.ion-happy - | Nevermind, I'll stick around - br - form(action='/account/delete', method='POST') - input(type='hidden', name='_csrf', value=_csrf) - button.btn.btn-danger.btn-block(type='submit') - span.ion-trash-b - | Yes, Delete my account \ No newline at end of file + h3 Danger Zone + button.btn.btn-danger.confirm-deletion + span.ion-trash-b + | I want to delete my account + script. + $('.confirm-deletion').on("click", function() { + $('#modal-dialog').modal('show'); + }); + #modal-dialog.modal.animated.wobble + .modal-dialog + .modal-content + .modal-header + a.close(href='#', data-dismiss='modal', aria-hidden='true') × + h3 Are you really leaving us? + .modal-body + p Pro Tip: If you tweet feedback to  + a(href="https://twitter.com/intent/tweet?text=Hey%20@freecodecamp") @FreeCodeCamp + | , we'll act quickly on it! + .modal-footer + a.btn.btn-success.btn-block(href='#', data-dismiss='modal', aria-hidden='true') + span.ion-happy + | Nevermind, I'll stick around + br + form(action='/account/delete', method='POST') + input(type='hidden', name='_csrf', value=_csrf) + button.btn.btn-danger.btn-block(type='submit') + span.ion-trash-b + | Yes, Delete my account + br + br \ No newline at end of file diff --git a/views/layout.jade b/views/layout.jade index 4446076b81..325f4321d2 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -2,7 +2,6 @@ doctype html html head script(src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js") - link(href='http://fonts.googleapis.com/css?family=Lato&subset=latin,latin-ext', rel='stylesheet', type='text/css') include partials/meta title #{title} | Free Code Camp