Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Data-tracking label for carousel navigators #315

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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).

Expand Down Expand Up @@ -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!).

Expand Down
2 changes: 1 addition & 1 deletion app/src/js/toolkit/components/carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ toolkit.carousel = (function(video, detect) {
extraClass = (id=='next' || id=='previous') ? ' hidden-touch ' : '';
icon = 'skycon-' + action.icon;
label = (action.speak) ? '<span class="speak">' + action.label + '</span>' : action.label;
html += '<a href="#" class="skycom-internal supportive ' + extraClass + id + '" >';
html += '<a href="#" class="skycom-internal supportive ' + extraClass + id + '" data-tracking-label="' + action.label.toLowerCase() + '">';
html += '<span class="semi-circle"><i class="' + icon + '" aria-hidden="true"></i></span>' + label;
html += '</a>';
}
Expand Down
20 changes: 15 additions & 5 deletions app/src/sass/demo/_menu.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -81,4 +91,4 @@ body {
//
//#toolkit-menu-tabs > *, #toolkit-menu-tabs > * > * {
// position: relative;
//}
//}
10 changes: 4 additions & 6 deletions app/src/sass/toolkit/components/_inPageNav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ $tab-height: 45px;
.tabpanel {
display: none;
width: 100%;
margin-top: 20px;

&.selected {
display: block;
}
Expand All @@ -20,7 +22,7 @@ $tab-height: 45px;
display: none;
position: absolute;
right: 0;
top: 21px;
top: 1px;
z-index:10;

a {
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
"bskyb-breadcrumb": "~0.2.0",
"bskyb-hash-manager": "~0.2.3"
}
}
}
1 change: 1 addition & 0 deletions grunt/aliases.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down