diff --git a/config/env/default.js b/config/env/default.js index 98d191a9bf..064103aa33 100644 --- a/config/env/default.js +++ b/config/env/default.js @@ -13,8 +13,7 @@ module.exports = { app: { title: 'Trustroots', - description: 'Travellers community for sharing, hosting and getting people together. Built with hitchhikers in mind. A world that encourages trust and adventure.', - tagline: 'Hospitality exchange community for hitchhikers and other travellers.' + description: 'Travellers community for sharing, hosting and getting people together. We want a world that encourages trust and adventure.' }, maxUploadSize: process.env.MAX_UPLOAD_SIZE || 10000000, // 10MB. Remember to change this to Nginx configs as well port: process.env.PORT || 3000, diff --git a/config/env/development.js b/config/env/development.js index e824598173..fa96e9be59 100644 --- a/config/env/development.js +++ b/config/env/development.js @@ -25,8 +25,7 @@ module.exports = { }, app: { title: 'Trustroots Development version', - description: 'Trustroots development version.', - tagline: 'This is a test version, please go to Trustroots.org for the real thing.' + description: 'Trustroots development version.' }, // Mapbox is publicly exposed to the frontend // To use MapBox maps, copy map values from production.js diff --git a/config/env/test.js b/config/env/test.js index e6a8d94566..2cff702cee 100644 --- a/config/env/test.js +++ b/config/env/test.js @@ -26,8 +26,7 @@ module.exports = { port: 3001, app: { title: 'Trustroots test environment.', - description: 'Trustroots test environment.', - tagline: 'Trustroots test environment.' + description: 'Trustroots test environment.' }, mapbox: { // Mapbox is publicly exposed to the frontend diff --git a/fontello.json b/fontello.json index 3e98780ac3..efe7e0da59 100644 --- a/fontello.json +++ b/fontello.json @@ -162,6 +162,12 @@ "code": 59421, "src": "fontawesome" }, + { + "uid": "e4dde1992f787163e2e2b534b8c8067d", + "css": "down", + "code": 59436, + "src": "fontawesome" + }, { "uid": "a73c5deb486c8d66249811642e5d719a", "css": "refresh", diff --git a/modules/core/client/controllers/app.client.controller.js b/modules/core/client/controllers/app.client.controller.js index 85e15b5d50..64f3e3e6e7 100644 --- a/modules/core/client/controllers/app.client.controller.js +++ b/modules/core/client/controllers/app.client.controller.js @@ -53,6 +53,9 @@ } } + /** + * Sign out authenticated user + */ function signout($event) { if($event) { $event.preventDefault(); @@ -79,12 +82,6 @@ */ $scope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) { - // Redirect away from frontpage if user is authenticated - if(toState.name === 'home' && Authentication.user) { - event.preventDefault(); - $state.go('search'); - } - // Redirect to login page if no user if(toState.requiresAuth && !Authentication.user) { // Cancel stateChange diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js index 70f0f958c5..2ed80a250e 100644 --- a/modules/core/client/controllers/header.client.controller.js +++ b/modules/core/client/controllers/header.client.controller.js @@ -12,6 +12,7 @@ var vm = this; // Exposed + vm.$state = $state; vm.isCollapsed = false; vm.isHidden = false; vm.toggleCollapsibleMenu = toggleCollapsibleMenu; diff --git a/modules/core/client/directives/tr-boards.client.directive.js b/modules/core/client/directives/tr-boards.client.directive.js index c79b15dafb..8f78c6aac3 100644 --- a/modules/core/client/directives/tr-boards.client.directive.js +++ b/modules/core/client/directives/tr-boards.client.directive.js @@ -116,6 +116,14 @@ 'name': 'Matas Astrauskas', 'url': 'http://www.matasphoto.com/', 'file': 'mr-hitchgirl2.jpg' + }, + 'mountainforest': { + // https://unsplash.com/photos/VNseEaTt9w4 + 'name': 'Sven Scheuermeier', + 'url': 'hhttps://unsplash.com/sveninho', + 'file': 'ss-mountainforest.jpg', + 'license': 'CC', + 'license_url': 'https://creativecommons.org/publicdomain/zero/1.0/', // https://unsplash.com/license } }; diff --git a/modules/core/client/fonts/OpenSans-Regular-webfont.eot b/modules/core/client/fonts/OpenSans-Regular-webfont.eot old mode 100644 new mode 100755 index 6bbc3cf58c..bcd55e13ea Binary files a/modules/core/client/fonts/OpenSans-Regular-webfont.eot and b/modules/core/client/fonts/OpenSans-Regular-webfont.eot differ diff --git a/modules/core/client/fonts/OpenSans-Regular-webfont.svg b/modules/core/client/fonts/OpenSans-Regular-webfont.svg deleted file mode 100644 index 25a3952340..0000000000 --- a/modules/core/client/fonts/OpenSans-Regular-webfont.svg +++ /dev/null @@ -1,1831 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/core/client/fonts/OpenSans-Regular-webfont.ttf b/modules/core/client/fonts/OpenSans-Regular-webfont.ttf old mode 100644 new mode 100755 index c537f8382a..c2fc964c0b Binary files a/modules/core/client/fonts/OpenSans-Regular-webfont.ttf and b/modules/core/client/fonts/OpenSans-Regular-webfont.ttf differ diff --git a/modules/core/client/fonts/OpenSans-Regular-webfont.woff b/modules/core/client/fonts/OpenSans-Regular-webfont.woff old mode 100644 new mode 100755 index e231183dce..ad4492ecec Binary files a/modules/core/client/fonts/OpenSans-Regular-webfont.woff and b/modules/core/client/fonts/OpenSans-Regular-webfont.woff differ diff --git a/modules/core/client/fonts/README.md b/modules/core/client/fonts/README.md index e525656fd1..fdbd110ba9 100644 --- a/modules/core/client/fonts/README.md +++ b/modules/core/client/fonts/README.md @@ -4,6 +4,11 @@ Open Sans is a humanist sans serif typeface designed by [Steve Matteson](https:/ ### License [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) +# Webfont +Generated with [Fontsquirrel.com](http://www.fontsquirrel.com/tools/webfont-generator). + +See [generator_config.txt](generator_config.txt) and [../less/layout/fonts.less](../less/layout/fonts.less). + ### Read more * http://www.google.com/fonts/specimen/Open+Sans * http://en.wikipedia.org/wiki/Open_Sans diff --git a/modules/core/client/fonts/generator_config.txt b/modules/core/client/fonts/generator_config.txt new file mode 100755 index 0000000000..1cc13061bf --- /dev/null +++ b/modules/core/client/fonts/generator_config.txt @@ -0,0 +1,5 @@ +# Font Squirrel Font-face Generator Configuration File +# Upload this file to the generator to recreate the settings +# you used to create these fonts. + +{"mode":"expert","formats":["ttf","woff","woff2","eotz"],"tt_instructor":"default","fix_gasp":"xy","fix_vertical_metrics":"Y","metrics_ascent":"","metrics_descent":"","metrics_linegap":"","add_spaces":"Y","add_hyphens":"Y","fallback":"none","fallback_custom":"100","options_subset":"basic","subset_custom":"","subset_custom_range":"","subset_ot_features_list":"","css_stylesheet":"stylesheet.css","filename_suffix":"-webfont","emsquare":"2048","spacing_adjustment":"0"} \ No newline at end of file diff --git a/modules/core/client/fonts/opensans-light-webfont.eot b/modules/core/client/fonts/opensans-light-webfont.eot new file mode 100755 index 0000000000..0b6f0ffa2b Binary files /dev/null and b/modules/core/client/fonts/opensans-light-webfont.eot differ diff --git a/modules/core/client/fonts/opensans-light-webfont.ttf b/modules/core/client/fonts/opensans-light-webfont.ttf new file mode 100755 index 0000000000..1d8f5ed7a1 Binary files /dev/null and b/modules/core/client/fonts/opensans-light-webfont.ttf differ diff --git a/modules/core/client/fonts/opensans-light-webfont.woff b/modules/core/client/fonts/opensans-light-webfont.woff new file mode 100755 index 0000000000..684e10264b Binary files /dev/null and b/modules/core/client/fonts/opensans-light-webfont.woff differ diff --git a/modules/core/client/fonts/opensans-light-webfont.woff2 b/modules/core/client/fonts/opensans-light-webfont.woff2 new file mode 100755 index 0000000000..006473fae1 Binary files /dev/null and b/modules/core/client/fonts/opensans-light-webfont.woff2 differ diff --git a/modules/core/client/fonts/opensans-regular-webfont.woff2 b/modules/core/client/fonts/opensans-regular-webfont.woff2 new file mode 100755 index 0000000000..850bcd33bf Binary files /dev/null and b/modules/core/client/fonts/opensans-regular-webfont.woff2 differ diff --git a/modules/core/client/fonts/opensans-semibold-webfont.eot b/modules/core/client/fonts/opensans-semibold-webfont.eot new file mode 100755 index 0000000000..a89dc87e35 Binary files /dev/null and b/modules/core/client/fonts/opensans-semibold-webfont.eot differ diff --git a/modules/core/client/fonts/opensans-semibold-webfont.ttf b/modules/core/client/fonts/opensans-semibold-webfont.ttf new file mode 100755 index 0000000000..a00565a789 Binary files /dev/null and b/modules/core/client/fonts/opensans-semibold-webfont.ttf differ diff --git a/modules/core/client/fonts/opensans-semibold-webfont.woff b/modules/core/client/fonts/opensans-semibold-webfont.woff new file mode 100755 index 0000000000..3c3d228769 Binary files /dev/null and b/modules/core/client/fonts/opensans-semibold-webfont.woff differ diff --git a/modules/core/client/fonts/opensans-semibold-webfont.woff2 b/modules/core/client/fonts/opensans-semibold-webfont.woff2 new file mode 100755 index 0000000000..c7e9cfbd8c Binary files /dev/null and b/modules/core/client/fonts/opensans-semibold-webfont.woff2 differ diff --git a/modules/core/client/img/board/ss-mountainforest.jpg b/modules/core/client/img/board/ss-mountainforest.jpg new file mode 100644 index 0000000000..36d73c2626 Binary files /dev/null and b/modules/core/client/img/board/ss-mountainforest.jpg differ diff --git a/modules/core/client/less/bootstrap/buttons.less b/modules/core/client/less/bootstrap/buttons.less index b8b9269e5a..830b92a32e 100644 --- a/modules/core/client/less/bootstrap/buttons.less +++ b/modules/core/client/less/bootstrap/buttons.less @@ -2,10 +2,7 @@ * Buttons */ .btn { - //border: 0; - font-family: @font-family-brand; - font-weight: 400; - font-style: normal; + .font-brand-regular(); text-shadow: none; &, &:hover { .box-shadow(none); @@ -17,7 +14,7 @@ } } - // A new button style + // New button styles &.btn-inverse { .button-variant(@btn-inverse-color; @btn-inverse-bg; @btn-inverse-border); &:hover { @@ -25,11 +22,24 @@ background-color: rgba(red(@btn-inverse-border), green(@btn-inverse-border), blue(@btn-inverse-border), .1); } } + &.btn-inverse-primary { + .button-variant(@btn-inverse-primary-color; @btn-inverse-primary-bg; @btn-inverse-primary-border); + &:hover { + border-color: rgba(red(@btn-inverse-primary-border), green(@btn-inverse-primary-border), blue(@btn-inverse-primary-border), .8); + background-color: rgba(red(@btn-inverse-primary-border), green(@btn-inverse-primary-border), blue(@btn-inverse-primary-border), .1); + } + } // Special colors for buttons appended to inputs &.btn-input { .button-variant(@brand-primary; @input-bg; @input-border); } + + // Bigger button size `action` + &.btn-action { + padding: 15px 30px; + font-size: 20px; + } } // Fix problem with inverse button hover state covering input border .input-group-btn:last-child > .btn.btn-inverse { diff --git a/modules/core/client/less/bootstrap/forms.less b/modules/core/client/less/bootstrap/forms.less index 6981f0947c..4090fbd8ec 100644 --- a/modules/core/client/less/bootstrap/forms.less +++ b/modules/core/client/less/bootstrap/forms.less @@ -25,7 +25,7 @@ input[type="color"] { label { color: @gray-light; - font-family: @font-family-brand; + .font-brand-regular(); } .radio label, .checkbox label { @@ -55,7 +55,7 @@ label + .checkbox { opacity: 1; padding: 5px 0; margin: 0; - font-family: @font-family-brand; + .font-brand-regular(); color: @gray-light; &.ng-hide-add.ng-hide-add-active, &.ng-hide-remove.ng-hide-remove-active { diff --git a/modules/core/client/less/bootstrap/nav.less b/modules/core/client/less/bootstrap/nav.less index 8716320072..b170adf9db 100644 --- a/modules/core/client/less/bootstrap/nav.less +++ b/modules/core/client/less/bootstrap/nav.less @@ -1,7 +1,5 @@ .nav { - font-family: @font-family-brand; - font-weight: 400; - font-style: normal; + .font-brand-regular(); } /** diff --git a/modules/core/client/less/bootstrap/panels.less b/modules/core/client/less/bootstrap/panels.less index ad606fa3d5..3c3d2ca11a 100644 --- a/modules/core/client/less/bootstrap/panels.less +++ b/modules/core/client/less/bootstrap/panels.less @@ -30,11 +30,9 @@ border-bottom: 1px solid @panel-border; border-radius: 0; padding: 10px 0; - font-family: @font-family-brand; font-size: 22px; line-height: 24px; - font-weight: 400; - font-style: normal; + .font-brand-regular(); @media (max-width: @screen-xs-max) { font-size: 19px; } diff --git a/modules/core/client/less/bootstrap/sidebar.less b/modules/core/client/less/bootstrap/sidebar.less index 9363c4d080..bb47ed3044 100644 --- a/modules/core/client/less/bootstrap/sidebar.less +++ b/modules/core/client/less/bootstrap/sidebar.less @@ -5,9 +5,7 @@ */ .sidebar { - font-family: @font-family-brand; - font-weight: 400; - font-style: normal; + .font-brand-regular(); // Using https://github.com/zumba/angular-waypoints &.sidebar-sticky { diff --git a/modules/core/client/less/global-variables.less b/modules/core/client/less/global-variables.less index 881e1ab750..3e6a81f3d4 100644 --- a/modules/core/client/less/global-variables.less +++ b/modules/core/client/less/global-variables.less @@ -143,11 +143,11 @@ @font-family-base: @font-family-sans-serif; @font-family-brand-light: 'open_sans-light', @font-family-sans-serif; -@font-weight-brand-light: 'normal';//300; +@font-weight-brand-light: 300; @font-family-brand-regular: 'open_sans-regular', @font-family-sans-serif; -@font-weight-brand-regular: 'normal';//400; +@font-weight-brand-regular: 400; @font-family-brand-semibold: 'open_sans-semibold', @font-family-sans-serif; -@font-weight-brand-semibold: 'normal';//500; +@font-weight-brand-semibold: 500; @text-highlight: lighten(@brand-primary, 40%); @text-highlight-color: @text-color; diff --git a/modules/core/client/less/layout/board.less b/modules/core/client/less/layout/board.less index b86d2a76e3..f4c4a95912 100644 --- a/modules/core/client/less/layout/board.less +++ b/modules/core/client/less/layout/board.less @@ -64,13 +64,10 @@ } } } - &.board-default { - background-color: @brand-secondary; - .page-header { - h1, h2 { - background: @brand-secondary; - } - } + + // Add inset shadow + &.board-inset { + box-shadow: inset 0 0 10px rgba(0,0,0,0.3); } .page-header { @@ -86,6 +83,7 @@ } } + // Fix panels inside boards .panel { color: @text-color; text-shadow: none; @@ -96,13 +94,9 @@ * Most of the images for .board are coming from core/trBoards directive. Check it out. * Keep just the most simplest stuff here. */ - &.board-map { - // Screenshot from our own map... - background-image: url(/modules/core/img/board/map.jpg); - } &.board-error { // Photo by Mikael Korpela - // https://creativecommons.org/licenses/by-nc-nd/4.0/ + // @link https://creativecommons.org/licenses/by-nc-nd/4.0/ background-image: url(/modules/core/img/board/error.jpg); } diff --git a/modules/core/client/less/layout/fonts.less b/modules/core/client/less/layout/fonts.less index 5c01ed0eb6..8db8e93b84 100644 --- a/modules/core/client/less/layout/fonts.less +++ b/modules/core/client/less/layout/fonts.less @@ -1,13 +1,41 @@ -// Trustroots font -// http://www.google.com/fonts/specimen/Open+Sans -// http://www.apache.org/licenses/LICENSE-2.0.html - @font-face { - font-family: 'Open Sans'; - src: url('/modules/core/fonts/OpenSans-Regular-webfont.eot'); - src: url('/modules/core/fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('/modules/core/fonts/OpenSans-Regular-webfont.woff') format('woff'), - url('/modules/core/fonts/OpenSans-Regular-webfont.ttf') format('truetype'), - url('/modules/core/fonts/OpenSans-Regular-webfont.svg#open_sansregular') format('svg'); - font-weight: 400; - font-style: normal; - } +/** + * Trustroots Open Sans font + * + * Don't host this via Google: https://m.signalvnoise.com/control-your-type-google-fonts-chrome-trouble-c21e1a106436#.hpkj6qc04 + * + * @link http://www.google.com/fonts/specimen/Open+Sans + * @link http://www.apache.org/licenses/LICENSE-2.0.html + */ + +@font-face { + font-family: 'open_sans-light'; + src: url('/modules/core/fonts/opensans-light-webfont.eot'); + src: url('/modules/core/fonts/opensans-light-webfont.eot?#iefix') format('embedded-opentype'), + url('/modules/core/fonts/opensans-light-webfont.woff2') format('woff2'), + url('/modules/core/fonts/opensans-light-webfont.woff') format('woff'), + url('/modules/core/fonts/opensans-light-webfont.ttf') format('truetype'); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: 'open_sans-regular'; + src: url('/modules/core/fonts/opensans-regular-webfont.eot'); + src: url('/modules/core/fonts/opensans-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('/modules/core/fonts/opensans-regular-webfont.woff2') format('woff2'), + url('/modules/core/fonts/opensans-regular-webfont.woff') format('woff'), + url('/modules/core/fonts/opensans-regular-webfont.ttf') format('truetype'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'open_sans-semibold'; + src: url('/modules/core/fonts/opensans-semibold-webfont.eot'); + src: url('/modules/core/fonts/opensans-semibold-webfont.eot?#iefix') format('embedded-opentype'), + url('/modules/core/fonts/opensans-semibold-webfont.woff2') format('woff2'), + url('/modules/core/fonts/opensans-semibold-webfont.woff') format('woff'), + url('/modules/core/fonts/opensans-semibold-webfont.ttf') format('truetype'); + font-weight: 600; + font-style: normal; +} diff --git a/modules/core/client/less/layout/footer.less b/modules/core/client/less/layout/footer.less index 0ef4c5c003..8015f46ff9 100644 --- a/modules/core/client/less/layout/footer.less +++ b/modules/core/client/less/layout/footer.less @@ -7,7 +7,7 @@ overflow: visible; clear: both; background: @gray-dark url(/modules/core/img/footer.jpg) 50% 0 repeat-x; - font-family: @font-family-brand; + .font-brand-regular(); font-size: @font-size-small; color: lighten(#000, 70%); text-shadow: 1px 1px 1px rgba(0,0,0,.5); diff --git a/modules/core/client/less/layout/header.less b/modules/core/client/less/layout/header.less index 1a0a175677..ec93e03ecb 100644 --- a/modules/core/client/less/layout/header.less +++ b/modules/core/client/less/layout/header.less @@ -5,9 +5,7 @@ width: 100%; height: @navbar-height; clear: both; - font-family: @font-family-brand; - font-weight: 400; - font-style: normal; + .font-brand-regular(); color: @navbar-default-color; .navbar { .box-shadow(0 0 8px rgba(0,0,0,0.1)); @@ -71,11 +69,15 @@ .header-welcome { text-align: center; padding: 5px 0 0 0; + .header-more-text, .header-welcome-text { display: inline-block; padding: 0; font-size: 18px; - font-family: @font-family-brand; + .font-brand-light(); + } + .header-more-text { + font-size: 14px; } .header-welcome-text, .btn { diff --git a/modules/core/client/less/layout/layout.less b/modules/core/client/less/layout/layout.less index 8bc68ba9f1..5a4ef33223 100644 --- a/modules/core/client/less/layout/layout.less +++ b/modules/core/client/less/layout/layout.less @@ -78,7 +78,7 @@ body { #tr-main { clear: both; overflow: auto; - padding-bottom: (@footer-height + 30px); + padding-bottom: @article-padding-bottom; @media (max-width: @screen-xs-max) { padding-bottom: 30px; } diff --git a/modules/core/client/less/layout/typography.less b/modules/core/client/less/layout/typography.less index 681bfff4fa..1bf072bc09 100644 --- a/modules/core/client/less/layout/typography.less +++ b/modules/core/client/less/layout/typography.less @@ -2,15 +2,35 @@ * TrustRoots core typography styles */ +// Font mixins +.font-brand-light() { + font-family: @font-family-brand-light; + font-style: normal; + font-weight: @font-weight-brand-light; +} +.font-brand-regular() { + font-family: @font-family-brand-regular; + font-style: normal; + font-weight: @font-weight-brand-regular; +} +.font-brand-semibold() { + font-family: @font-family-brand-semibold; + font-style: normal; + font-weight: @font-weight-brand-semibold; +} + +// Helper classes +.font-brand-light { .font-brand-light() } +.font-brand-regular { .font-brand-regular() } +.font-brand-semibold { .font-brand-semibold() } + ::selection { background: @text-highlight; color: @text-highlight-color; } h1, h2, h3, h4 { - font-family: @font-family-brand; - font-weight: 400; - font-style: normal; + .font-brand-regular(); } blockquote { diff --git a/modules/core/client/less/modules/flash.less b/modules/core/client/less/modules/flash.less index 3c41be9dda..9f97e0bc74 100644 --- a/modules/core/client/less/modules/flash.less +++ b/modules/core/client/less/modules/flash.less @@ -8,9 +8,7 @@ right: 0; top: @navbar-height; text-align: center; - font-family: @font-family-brand; - font-weight: 400; - font-style: normal; + .font-brand-regular(); z-index: @zindex-modal+11; .alert { diff --git a/modules/core/client/less/modules/icons.less b/modules/core/client/less/modules/icons.less index 3f10c58a58..1d39bbee0a 100644 --- a/modules/core/client/less/modules/icons.less +++ b/modules/core/client/less/modules/icons.less @@ -11,16 +11,16 @@ */ // Cache buster -@icon-version: "2015-09-02"; +@icon-version: "2016-01-22"; @icon-li-width: (30em / 14); @font-face { font-family: 'tricons'; - src: url('/lib/fontello/fonts/tricons.eot?v=@{icon-version}'); - src: url('/lib/fontello/fonts/tricons.eot?v=@{icon-version}#iefix') format('embedded-opentype'), - url('/lib/fontello/fonts/tricons.woff?v=@{icon-version}') format('woff'), - url('/lib/fontello/fonts/tricons.ttf?v=@{icon-version}') format('truetype'), - url('/lib/fontello/fonts/tricons.svg?v=@{icon-version}#tricons') format('svg'); + src: url('/lib/fontello/font/tricons.eot?v=@{icon-version}'); + src: url('/lib/fontello/font/tricons.eot?v=@{icon-version}#iefix') format('embedded-opentype'), + url('/lib/fontello/font/tricons.woff?v=@{icon-version}') format('woff'), + url('/lib/fontello/font/tricons.ttf?v=@{icon-version}') format('truetype'), + url('/lib/fontello/font/tricons.svg?v=@{icon-version}#tricons') format('svg'); font-weight: normal; font-style: normal; } diff --git a/modules/core/client/less/modules/leaflet.less b/modules/core/client/less/modules/leaflet.less index a37152c75f..b5e9890167 100644 --- a/modules/core/client/less/modules/leaflet.less +++ b/modules/core/client/less/modules/leaflet.less @@ -519,9 +519,7 @@ /* More mobile friendly layer-control */ .leaflet-control-layers { label { - font-family: @font-family-brand; - font-weight: 400; - font-style: normal; + .font-brand-regular(); font-size: 15px; line-height: 15px; padding: 8px; diff --git a/modules/core/server/controllers/core.server.controller.js b/modules/core/server/controllers/core.server.controller.js index c20f6f1bdf..13d31775fd 100644 --- a/modules/core/server/controllers/core.server.controller.js +++ b/modules/core/server/controllers/core.server.controller.js @@ -3,7 +3,7 @@ var errorHandler = require('./errors.server.controller'); /** - * Render the main applicaion page + * Render the main application page */ exports.renderIndex = function(req, res) { diff --git a/modules/core/server/views/layout.server.view.html b/modules/core/server/views/layout.server.view.html index d1cbf64527..27d9f3ad22 100644 --- a/modules/core/server/views/layout.server.view.html +++ b/modules/core/server/views/layout.server.view.html @@ -94,9 +94,9 @@ -
+
{% block content %}{% endblock %} -
+ diff --git a/modules/core/server/views/partials/about-links.server.view.html b/modules/core/server/views/partials/about-links.server.view.html index 7bce3e73b2..de64d5d0ca 100644 --- a/modules/core/server/views/partials/about-links.server.view.html +++ b/modules/core/server/views/partials/about-links.server.view.html @@ -1,5 +1,5 @@ {# #} -
  • About
    • +
  • About
  • Contact & Support
  • FAQ
  • Blog
    • @@ -7,4 +7,5 @@
  • Privacy
  • Rules
  • Team
    • -
  • Volunteering
    • +
  • Foundation
    • +
  • Volunteering
    • diff --git a/modules/core/server/views/partials/header.server.view.html b/modules/core/server/views/partials/header.server.view.html index ce5f084df2..eee5219d7f 100644 --- a/modules/core/server/views/partials/header.server.view.html +++ b/modules/core/server/views/partials/header.server.view.html @@ -7,6 +7,7 @@ Become a member or Login + Read more

    diff --git a/modules/pages/client/config/pages.client.routes.js b/modules/pages/client/config/pages.client.routes.js index cd26484fc6..6e15572057 100755 --- a/modules/pages/client/config/pages.client.routes.js +++ b/modules/pages/client/config/pages.client.routes.js @@ -60,6 +60,11 @@ url: '/media', title: 'Media', templateUrl: 'modules/pages/views/media.client.view.html' + }). + state('volunteering', { + url: '/volunteering', + title: 'Volunteering', + templateUrl: 'modules/pages/views/volunteering.client.view.html' }); /** @@ -69,8 +74,9 @@ $stateProvider.state('home', { url: '/', templateUrl: 'modules/pages/views/home.client.view.html', - footerTransparent: true, - headerHidden: true + controller: 'HomeController', + controllerAs: 'home', + footerHidden: true }); } else { $stateProvider.state('home', {url: '/'}); diff --git a/modules/pages/client/controllers/home.client.controller.js b/modules/pages/client/controllers/home.client.controller.js new file mode 100644 index 0000000000..b781786631 --- /dev/null +++ b/modules/pages/client/controllers/home.client.controller.js @@ -0,0 +1,22 @@ +(function() { + 'use strict'; + + angular + .module('pages') + .controller('HomeController', HomeController); + + /* @ngInject */ + function HomeController($log, $window, $location, Authentication) { + + var headerHeight = angular.element('#tr-header').height() || 0; + + // View model + var vm = this; + + // Exposed to the view + vm.windowHeight = angular.element('html').height() - headerHeight; + + vm.boards = Authentication.user ? 'wavewatching' : ['rainbowpeople', 'hitchroad', 'desertgirl', 'sierranevada', 'wavewatching', 'hitchgirl1', 'hitchgirl2']; + + } +})(); diff --git a/modules/pages/client/img/screenshot-profile.png b/modules/pages/client/img/screenshot-profile.png new file mode 100644 index 0000000000..5d09abfce3 Binary files /dev/null and b/modules/pages/client/img/screenshot-profile.png differ diff --git a/modules/pages/client/img/screenshot-profile@2x.png b/modules/pages/client/img/screenshot-profile@2x.png new file mode 100644 index 0000000000..bc15a687b7 Binary files /dev/null and b/modules/pages/client/img/screenshot-profile@2x.png differ diff --git a/modules/pages/client/img/screenshot-search.png b/modules/pages/client/img/screenshot-search.png new file mode 100644 index 0000000000..02040213ee Binary files /dev/null and b/modules/pages/client/img/screenshot-search.png differ diff --git a/modules/pages/client/img/screenshot-search@2x.png b/modules/pages/client/img/screenshot-search@2x.png new file mode 100644 index 0000000000..4175e288f9 Binary files /dev/null and b/modules/pages/client/img/screenshot-search@2x.png differ diff --git a/modules/pages/client/img/wohoo.png b/modules/pages/client/img/wohoo.png new file mode 100644 index 0000000000..fc52bd4e3c Binary files /dev/null and b/modules/pages/client/img/wohoo.png differ diff --git a/modules/pages/client/img/wohoo@2x.png b/modules/pages/client/img/wohoo@2x.png new file mode 100644 index 0000000000..fa886dbc24 Binary files /dev/null and b/modules/pages/client/img/wohoo@2x.png differ diff --git a/modules/pages/client/less/about.less b/modules/pages/client/less/about.less deleted file mode 100644 index 9fad04a571..0000000000 --- a/modules/pages/client/less/about.less +++ /dev/null @@ -1,15 +0,0 @@ -/** - * About page styles - */ -.about-footer { - h2, *:not(.btn) { - text-shadow: 1px 1px 2px rgba(0,0,0,.3); - } - margin-bottom: -30px; -} - -.about-footer-content { - background: rgba(0,0,0,0.5); - padding-top: 30px; - padding-bottom: 30px; -} diff --git a/modules/pages/client/less/common.less b/modules/pages/client/less/common.less index 94e9b23a8d..db46e2de90 100644 --- a/modules/pages/client/less/common.less +++ b/modules/pages/client/less/common.less @@ -1,6 +1,8 @@ .page-header { display: block; - font: 48px/1 @font-family-brand; + font-size: 48px; + line-height: 48px; + .font-brand-regular(); margin-bottom: 50px; position: relative; text-align: center; diff --git a/modules/pages/client/less/home.less b/modules/pages/client/less/home.less index 90db565312..e964a8d0f2 100644 --- a/modules/pages/client/less/home.less +++ b/modules/pages/client/less/home.less @@ -1,106 +1,228 @@ /** * Home page */ -@home-page-gaps: 25px; -.home { +// Section - intro +.home-intro { + margin-top: @navbar-height; text-align: center; padding: 0; +} - .logo, +// Upmost element at intro section +.home-logo { + margin-bottom: 40px; + margin-top: 30px; +} +// Downmost element at intro section +.home-down { + font-size: 35px; + opacity: .8; + margin: 30px 0 0 0; +} +.home-tagline, +.home-tagline-auth { + margin: 0 auto; +} +.home-join { + margin-top: 40px; +} +.home-tagline, +.home-tagline-auth { + text-shadow: 1px 1px 6px rgba(0, 0, 0, .6); +} +.home-tagline, +.home-tagline-auth { + color: #fff; + padding: 0; + font-size: 45px; + line-height: 50px; + .font-brand-semibold(); +} +.home-subtagline { + font-size: 30px; + line-height: 40px; +} +.home-tagline-auth { + font-size: 35px; + line-height: 45px; +} +// Note `max-height` here instead of max-width +@media screen and (max-height: 700px) { + padding-top: 0; + .home-logo, .home-tagline, - .home-extra, - .btn-group { - margin: @home-page-gaps auto; + .home-tagline-auth { + margin: 15px auto; } - - // Note "max-height" here - @media screen and (max-height: 700px) { - padding-top: 0; - .logo, - .home-tagline, - .home-extra, - .btn-group { - margin: round(@home-page-gaps/2) auto; - } - } - - .home-tagline, - .home-extra { - text-shadow: 1px 1px 6px rgba(0, 0, 0, .6); + .home-logo { + max-width: 170px; + max-height: 170px; } + .home-tagline-auth, .home-tagline { - color: #fff; - font-family: @font-family-brand; - font-style: normal; - font-weight: 400; - font-size: 30px; + font-size: 32px; + line-height: 40px; + } + .home-subtagline { + font-size: 28px; + line-height: 38px; + } +} +@media (max-width: @screen-sm-max) { + .home-subtagline { + font-size: 25px; line-height: 35px; - padding: 0; } - .home-extra { - &, a { - font-size: @font-size-base; - color: rgba(255, 255, 255, .95); - text-decoration: none; - } - a:hover { - color: #fff; - text-decoration: underline; - } +} +@media (max-width: @screen-xs-max) { + .home-tagline-auth, + .home-tagline { + font-size: 22px; + line-height: 28px; } - // Home page buttons - .btn-group { - .box-shadow(0 0 8px rgba(0, 0, 0, .3)); + .home-subtagline { + font-size: 20px; + line-height: 29px; } - .btn-home-readmore, - .btn-home-login, - .btn-home-signup { - color: #fff; - text-shadow: 1px 1px 1px rgba(0, 0, 0, .3); - border: 0; - transition: background-color 0.2s; +} + + +// Home - Browser window +.home-browser { + border: 1px solid @gray-light; + border-radius: 10px; + padding: 10px; + width: 100%; + max-width: 620px; + margin: 10px auto; + @media (max-width: @screen-sm-max) { + border-radius: 6px; + padding: 5px; } - .btn-home-login { - background-color: @brand-primary; - &:hover { - background-color: lighten(@brand-primary, 3%); - border: 0; +} +.home-browser-circle { + float: left; + .square(10px); + margin: 0 5px 10px 0; + border-radius: 50%; + border: 1px solid @gray-light; + @media (max-width: @screen-sm-max) { + .square(5px); + margin: 0 3px 5px 0; + } +} +.home-browser-screenshot { + display: block; + overflow: hidden; + width: 100%; + clear: both; + margin: 0 auto; + background-repeat: no-repeat; + border-radius: 5px; + max-width: 600px; + min-height: 387px; + @media (max-width: @screen-sm-max) { + border-radius: 3px; + min-height: 200px; + } +} +.home-browser-screenshot-search { + .img-retina('/modules/pages/img/screenshot-search.png', '/modules/pages/img/screenshot-search@2x.png', 600px, 387px); +} +.home-browser-screenshot-profile { + .img-retina('/modules/pages/img/screenshot-profile.png', '/modules/pages/img/screenshot-profile@2x.png', 600px, 387px); +} + +// Home section - hospex & how +.home-how { + background: #fff; + padding: 50px 0; + @media (max-width: @screen-sm-max) { + padding: 30px 0 10px 0; + } +} + + +.home-wohoo { + width: 207px; + height: 162px; + .img-retina('/modules/pages/img/wohoo.png', '/modules/pages/img/wohoo@2x.png', 207px, 162px); +} + +// Home section - footer +.home-footer { + margin-bottom: -@article-padding-bottom; + background-position: 50% bottom; + padding-top: 30px; + text-shadow: none; + // Normally this background won't work well on small screens with white text, so we'll just hide it + &.board-bokeh { + @media (max-width: @screen-sm-max) { + background-image: none !important; + box-shadow: none; } } - .btn-home-signup { - background-color: @brand-secondary; - &:hover { - background-color: lighten(@brand-secondary, 3%); - border: 0; + .boards-credits { + display: block; + padding: 30px; + a { + text-decoration: none; + + } + // On bigger screens: + // Make credits slightly opaque and add hover effects + @media (min-width: @screen-md-min) { + opacity: 0.5; + a:hover { + border-bottom: 1px solid #fff; + } + &:hover { + transition: opacity 0.3s linear; + opacity: 1; + } + } + @media (max-width: @screen-sm-max) { + font-size: 13px; + a { + border-bottom: 1px solid #fff; + } } } - .btn-home-readmore { - background-color: #e79800; +} + +.home-footer-some { + margin: 40px 0; + font-size: 20px; +} + +.home-footer-join { + margin: 80px 0; +} + +// This requires `a` and `:not(.btn)` due they are defined for `.board a {}` at core-module's `layout/board.less` +a.home-footer-more:not(.btn) { + text-decoration: none; +} + +.home-footer-pages { + font-size: 20px; + line-height: 40px; + a:not(.btn) { + text-decoration: none; &:hover { - background-color: lighten(#e79800, 3%); - border: 0; + border-bottom: 1px solid #fff; } } - @media (max-width: @screen-xs-max) { - .home-tagline { - font-size: 18px; - line-height: 25px; - } - .btn-group { - border-radius: @border-radius-base; - overflow: hidden; - .btn { - width: 100%; - margin: 0; - border-radius: 0; - &:first-child { - .border-top-radius(@border-radius-base); - } - &:last-child { - .border-bottom-radius(@border-radius-base); - } - } + &:before { + display: block; + width: 40%; + height: 1px; + background: #fff; + content: ''; + margin: 27px 0 18px 0; + @media (max-width: @screen-sm-max) { + width: 100%; } } } diff --git a/modules/pages/client/less/volunteering.less b/modules/pages/client/less/volunteering.less new file mode 100644 index 0000000000..b2b6b5d748 --- /dev/null +++ b/modules/pages/client/less/volunteering.less @@ -0,0 +1,11 @@ +.volunteer-header { + padding-top: 130px; + padding-bottom: 50px; + &.board-happyhippies { + background-position: 50% 30%; + } + @media (min-width: @screen-sm-min) { + padding-top: 260px; + padding-bottom: 200px; + } +} diff --git a/modules/pages/client/views/about.client.view.html b/modules/pages/client/views/about.client.view.html index 13ef37f8f7..221e1b44bc 100644 --- a/modules/pages/client/views/about.client.view.html +++ b/modules/pages/client/views/about.client.view.html @@ -76,7 +76,7 @@

    The core team

    Volunteering

    We appreciate a hard working, getting things done attitude. We'll aim to keep the entry level for volunteers as low as possible. No bureaucracy. Pragmatic approach. Trust.

    -

    Read more

    +

    Read more

    diff --git a/modules/pages/client/views/donate.client.view.html b/modules/pages/client/views/donate.client.view.html index 9c1a01cafe..4b393d92ea 100644 --- a/modules/pages/client/views/donate.client.view.html +++ b/modules/pages/client/views/donate.client.view.html @@ -35,7 +35,7 @@

    Can I donate bitcoin?


    I’m unable to give money at this time, are there other ways I can help?

    -

    Yes! Become a volunteer and make a difference.

    +

    Yes! Become a volunteer and make a difference.

    diff --git a/modules/pages/client/views/faq.client.view.html b/modules/pages/client/views/faq.client.view.html index 1b2bab5589..d80d89d8a8 100644 --- a/modules/pages/client/views/faq.client.view.html +++ b/modules/pages/client/views/faq.client.view.html @@ -121,7 +121,7 @@

    Who decides what gets done?

    - Anyone can join us as a volunteer. We're huge fans of do-cracy and getting things done attitude. We have a core team which is formed from the most active volunteers. There isn't voting or other buraucratic processes involved, but you get more responsibility by simply becoming active contributor and showing your communication skills. Great community values simple translation jobs just as much as highly skilled development. We'll aim to keep the entry level for volunteers as low as possible. No bureaucracy. Pragmatic approach. Trust. + Anyone can join us as a volunteer. We're huge fans of do-cracy and getting things done attitude. We have a core team which is formed from the most active volunteers. There isn't voting or other buraucratic processes involved, but you get more responsibility by simply becoming active contributor and showing your communication skills. Great community values simple translation jobs just as much as highly skilled development. We'll aim to keep the entry level for volunteers as low as possible. No bureaucracy. Pragmatic approach. Trust.

    That said, any well organized project needs efficient teams working on specific issues (such as safety or site's features/UX). Rather than building complicated voting mechanisms or other structures, we'll try to concentrate in fostering volunteers into responsible, skilled teams. It's also important to make sure everyone has the same goal and vision. diff --git a/modules/pages/client/views/foundation.client.view.html b/modules/pages/client/views/foundation.client.view.html index 033559a660..7dad3c9a1b 100644 --- a/modules/pages/client/views/foundation.client.view.html +++ b/modules/pages/client/views/foundation.client.view.html @@ -12,22 +12,60 @@

    Trustroots Foundation

    -
    -

    Trustroots is owned and operated by Trustroots Foundation, a non-profit Limited by Guarantee (LBG) under section 60 exemption, registered in the United Kingdom in March 2015.

    -
    +
    +
    + +
    +
    + +
    + + + +
    + +

    Vision

    +

    “A world that encourages trust and adventure.”

    + +
    +
    + +

    Mission

    +

    Trustroots seeks to be a platform for sharing and getting people together. We aim to connect likeminded people together. We encourage trust, adventure and intercultural connections.

    + +
    +
    + +

    Values

    +
      +
    • Trust
      • +
    • Adventure
      • +
    • Transparency
      • +
    • Freedom
      • +
    +
    +
    +
    diff --git a/modules/pages/client/views/home.client.view.html b/modules/pages/client/views/home.client.view.html index c1218c0468..eecc3b6d34 100644 --- a/modules/pages/client/views/home.client.view.html +++ b/modules/pages/client/views/home.client.view.html @@ -1,29 +1,144 @@ -
    + +
    - - + +

    Trustroots

    -

    -
    -
    -
    -
    - -
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +

    How does it work?

    +
    +

    Have a look! Travel anywhere and easily find great people who want to meet you as well. See where other travellers are and help each other out, whether through welcoming them to your home, sharing your stories or becoming friends.

    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    + +
    + +

    + + Share the beautiful you with the world. +

    + Put yourself in the shoes of others: what would you like to know about your travel buddies? What should they know about you? +

    + Be genuine yourself. +

    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +

    +

    + Join Trustroots +

    +
    +
    +
    +
    + + +
    +
    + +
    +
    +

    Foundation

    +

    Owned and operated by Trustroots Foundation, a non-profit registered in the United Kingdom since March 2015.

    +

    Learn more

    +
    +
    +

    Team

    +

    Trustroots is being built by a small team of activists who felt that the world of sharing is being taken over by corporations trying to monetize people's willingness to help each other. Same team brought you also Hitchwiki, Trashwiki and Nomadwiki.

    +

    Meet the team

    +
    +
    +

    Free and open source

    +

    We think it's a shame that former non profits have been sold to venture capital. We've been running other notable free and open projects for a decade now and we hope our deeds so far speak for us.

    +

    For developers

    +
    +
    + +
    +
    + +
    + +
      +
      • +
      • +
      • +
    + + + + + +
    + +
    +
    diff --git a/modules/pages/client/views/manifesto-text.client.partial.html b/modules/pages/client/views/manifesto-text.client.partial.html index 3d697fc5c6..d76957eaeb 100644 --- a/modules/pages/client/views/manifesto-text.client.partial.html +++ b/modules/pages/client/views/manifesto-text.client.partial.html @@ -1,4 +1,5 @@ -

    Manifesto

    +

    Manifesto

    +
    We want a world that encourages trust, adventure and intercultural connections.

    Our willingness to help each other should not be monetized. Trustroots is completely free to use and will remain so forever. @@ -6,5 +7,3 @@

    Manifesto

    We believe in beauty, simplicity and transparency.

    We emphasize community. -

    -See you! diff --git a/modules/pages/client/views/team.client.view.html b/modules/pages/client/views/team.client.view.html index 20b57f98bc..1f56b89d04 100644 --- a/modules/pages/client/views/team.client.view.html +++ b/modules/pages/client/views/team.client.view.html @@ -140,7 +140,7 @@

    Volunteering

    Help us build Trustroots! Nobody can do everything, but everyone can do something.
    - Get active! + Get active!

    diff --git a/modules/pages/client/views/volunteering.client.view.html b/modules/pages/client/views/volunteering.client.view.html new file mode 100644 index 0000000000..da96105a9c --- /dev/null +++ b/modules/pages/client/views/volunteering.client.view.html @@ -0,0 +1,28 @@ +
    +
    +
    +
    +

    + +

    +

    Volunteering

    +
    +
    +
    +
    + +
    + +
    + +
    + +

    Trustroots is a community of travellers for sharing, hosting and getting people together.

    + +

    Help us build Trustroots! Nobody can do everything, but everyone can do something.

    + +

    Read more and Contact us

    + +
    +
    +
    diff --git a/modules/statistics/client/less/statistics.less b/modules/statistics/client/less/statistics.less index b2ca38e0db..f6fd8e0593 100644 --- a/modules/statistics/client/less/statistics.less +++ b/modules/statistics/client/less/statistics.less @@ -11,9 +11,7 @@ font-size: 50px; line-height: 55px; color: @brand-primary; - font-family: @font-family-brand; - font-weight: 400; - font-style: normal; + .font-brand-light(); } .stats-count-lg { font-size: 70px; diff --git a/modules/support/client/views/support.client.view.html b/modules/support/client/views/support.client.view.html index 34a3c75b66..5043a6e935 100644 --- a/modules/support/client/views/support.client.view.html +++ b/modules/support/client/views/support.client.view.html @@ -103,10 +103,10 @@

    Contact us

    See also

    -
    diff --git a/modules/users/client/less/authentication.less b/modules/users/client/less/authentication.less index 9ab58ef156..27cb4844f6 100644 --- a/modules/users/client/less/authentication.less +++ b/modules/users/client/less/authentication.less @@ -17,6 +17,8 @@ padding: 10px; border: 0; outline: none; + // z-index to cover `box-shadow` of the text input + z-index: 3; &:hover { background: #fff; } diff --git a/modules/users/client/less/profile-edit.less b/modules/users/client/less/profile-edit.less index 184171362e..91f8a1d0b8 100644 --- a/modules/users/client/less/profile-edit.less +++ b/modules/users/client/less/profile-edit.less @@ -3,9 +3,7 @@ .profile-firstname, .profile-lastname { .h2(); - font-family: @font-family-brand; - font-weight: normal; - font-style: normal; + .font-brand-regular(); margin: 0 10px 5px 0; } .profile-firstname {