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 01faffa0..f246f9b6 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/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 72056d40..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,17 +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; - - } - &.whole-page .tabs { - border-top: 0; } .tabs > .tab { diff --git a/bower.json b/bower.json index 76662b7d..2afd32d7 100644 --- a/bower.json +++ b/bower.json @@ -23,4 +23,4 @@ "bskyb-breadcrumb": "~0.2.0", "bskyb-hash-manager": "~0.2.3" } -} \ No newline at end of file +} diff --git a/grunt/aliases.js b/grunt/aliases.js index 8c758bfa..20117edd 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 "svgs": ['clean:svgs-min', 'clean:svgs', 'svgmin:icons', 'grunticon'],