From ae33045c15f536463a7de36103f2bfd2436c1319 Mon Sep 17 00:00:00 2001 From: telly Date: Tue, 23 Sep 2014 10:25:09 +0100 Subject: [PATCH 1/4] LDB|PM|JH: Removing border-top 0 from the navigation --- app/src/sass/toolkit/components/_inPageNav.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/sass/toolkit/components/_inPageNav.scss b/app/src/sass/toolkit/components/_inPageNav.scss index 72056d40..127d4355 100644 --- a/app/src/sass/toolkit/components/_inPageNav.scss +++ b/app/src/sass/toolkit/components/_inPageNav.scss @@ -107,9 +107,6 @@ $tab-height: 45px; border-top: solid 1px #dcdcdc; } - &.whole-page .tabs { - border-top: 0; - } .tabs > .tab { @include box-sizing(border-box); From b7ababafa458077a686f399ccd67c4f0fa379853 Mon Sep 17 00:00:00 2001 From: telly Date: Fri, 6 Feb 2015 14:25:11 +0000 Subject: [PATCH 2/4] BM|PM: Adding data-tracking-label to carousel navigators --- .gitignore | 1 + README.md | 7 ++++--- app/src/js/toolkit/components/carousel.js | 4 ++-- grunt/aliases.js | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 55fad55c..a40d43e8 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ screenshot/v2-v1-diff.json Gemfile.lock /build build +dist/ diff --git a/README.md b/README.md index f642c44a..7e9c2ab9 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ 2. [Setup](#setup) 3. [Building/Running the Toolkit](#buildingrunning-the-toolkit) 2. [Code Overview](#code-overview) - 1. [Folder Structure](#folder-structure) + 1. [Folder Structure](#folder-structure) 3. [Feature Requests & Bugs](#feature-requests--bugs) 1. [Supported Browsers](#supported-browsers) 3. [Contributing](CONTRIBUTING.md) @@ -65,6 +65,7 @@ Update the toolkit by making your change and testing it within the demo site. * `grunt test` : Runs the unit tests in [PhantomJS](http://phantomjs.org/) * `grunt test-cross-browser` : Runs the unit tests using multiple browsers remotely. * `grunt fonts` : Only needed to rebuild the Icon Fonts (skycons). + * `grunt build-js` : Just build the JS. Please help us out by contributing any changes you make locally back into the source project. See [CONTRIBUTING.md](CONTRIBUTING.md). @@ -124,11 +125,11 @@ The repository contains two main components; the Web Toolkit and the demo site. ├── package.json => NodeJS config file, includes version number for toolkit ├── rakefile => build script └── README.md - + ## Feature Requests + Bugs -Please take a look through currently open and closed issues to see if your feature/bug has already been discussed. If not, feel free to open new issues and let us know about any bugs that you find. +Please take a look through currently open and closed issues to see if your feature/bug has already been discussed. If not, feel free to open new issues and let us know about any bugs that you find. This project is currently maintained out of the hard work from a very few contributers who are working on other projects at the same time. If you could write any updates and submit pull requests (see [Contributing](CONTRIBUTING.md)) this would be amazing (and you would get your request looked at much faster!). diff --git a/app/src/js/toolkit/components/carousel.js b/app/src/js/toolkit/components/carousel.js index dbcb8f7d..634d731c 100644 --- a/app/src/js/toolkit/components/carousel.js +++ b/app/src/js/toolkit/components/carousel.js @@ -161,7 +161,7 @@ toolkit.carousel = (function(video, detect) { callback: callback }); } - + return this; }, next: function(pause, callback) { @@ -309,7 +309,7 @@ toolkit.carousel = (function(video, detect) { extraClass = (id=='next' || id=='previous') ? ' hidden-touch ' : ''; icon = 'skycon-' + action.icon; label = (action.speak) ? '' + action.label + '' : action.label; - html += ''; + html += ''; html += '' + label; html += ''; } diff --git a/grunt/aliases.js b/grunt/aliases.js index 5dcacc03..c72aff5f 100644 --- a/grunt/aliases.js +++ b/grunt/aliases.js @@ -4,6 +4,7 @@ module.exports = { // standard build tasks that lints your JS "build": ['jshint', 'version_sync', 'dev-build'], "serve": ['build','connect:app', 'open:app', 'watch'], + "build-js": ['jshint', 'requirejs', 'uglify'], // misc tasks "fonts": ['clean:fonts-min', 'clean:fonts', 'svgmin:fonts', 'webfont', 'cssmin:skycons'], From f18828b920b014174937ad7f064f71ae88d39cd7 Mon Sep 17 00:00:00 2001 From: telly Date: Thu, 12 Feb 2015 11:04:03 +0000 Subject: [PATCH 3/4] BM|PM: changing carousel interaction tracking labels to be based on label --- app/src/js/toolkit/components/carousel.js | 2 +- bower.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/js/toolkit/components/carousel.js b/app/src/js/toolkit/components/carousel.js index 7067908c..1ec3b745 100644 --- a/app/src/js/toolkit/components/carousel.js +++ b/app/src/js/toolkit/components/carousel.js @@ -314,7 +314,7 @@ toolkit.carousel = (function(video, detect) { extraClass = (id=='next' || id=='previous') ? ' hidden-touch ' : ''; icon = 'skycon-' + action.icon; label = (action.speak) ? '' + action.label + '' : action.label; - html += ''; + html += ''; html += '' + label; html += ''; } diff --git a/bower.json b/bower.json index a6cacaeb..c6ea4bbe 100644 --- a/bower.json +++ b/bower.json @@ -22,6 +22,6 @@ "bskyb-detect": "~0.0.4", "bskyb-event": "~0.1.1", "bskyb-colours": "~0.1.0", - "skyglobal-breadcrumb": "~0.1.5" + "skyglobal-breadcrumb": "~0.2.0" } } From 32bdd1b6df915a3f60e2ad675a55d041752ef4dd Mon Sep 17 00:00:00 2001 From: telly Date: Tue, 7 Apr 2015 11:56:14 +0100 Subject: [PATCH 4/4] DN|JA: Fix in page nav on mobile --- app/src/sass/demo/_menu.scss | 20 ++++++++++++++----- .../sass/toolkit/components/_inPageNav.scss | 7 ++++--- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/app/src/sass/demo/_menu.scss b/app/src/sass/demo/_menu.scss index 8568689d..3b34f41f 100644 --- a/app/src/sass/demo/_menu.scss +++ b/app/src/sass/demo/_menu.scss @@ -1,18 +1,28 @@ .main-menu.tabs-container.main-menu .primary [role=tablist]{ margin-bottom: 0; + > li.selected a, > li:hover a{ border:0; } } -.main-menu.tabs-container.main-menu .tabs{ - margin-top: 0; - margin-bottom: 0; - border:0; + +.main-menu.tabs-container.main-menu { + &, + .tabs-container, + .tabpanel { + margin: 0; + } + + .tabs { + border: 0; + } } + .main-menu .tabpanel{ border-bottom: 1px solid #ccc; } + .secondary-menu, #toolkit-menu-tabs.stick{ position: fixed; @@ -81,4 +91,4 @@ body { // //#toolkit-menu-tabs > *, #toolkit-menu-tabs > * > * { // position: relative; -//} \ No newline at end of file +//} diff --git a/app/src/sass/toolkit/components/_inPageNav.scss b/app/src/sass/toolkit/components/_inPageNav.scss index 127d4355..6e296584 100644 --- a/app/src/sass/toolkit/components/_inPageNav.scss +++ b/app/src/sass/toolkit/components/_inPageNav.scss @@ -3,6 +3,8 @@ $tab-height: 45px; .tabpanel { display: none; width: 100%; + margin-top: 20px; + &.selected { display: block; } @@ -20,7 +22,7 @@ $tab-height: 45px; display: none; position: absolute; right: 0; - top: 21px; + top: 1px; z-index:10; a { @@ -98,14 +100,13 @@ $tab-height: 45px; .tabs-container.page-nav { position: relative; + margin: 20px 0; .tabs { position: relative; - margin: 20px 0; padding-right: 46px; border-bottom: solid 1px #dcdcdc; border-top: solid 1px #dcdcdc; - } .tabs > .tab {