Compare commits

...

41 Commits
2.2.0 ... 3.3.0

Author SHA1 Message Date
Jose Bolos
1d931671ff Version 3.3.0 2021-04-27 15:03:22 +01:00
Jose Bolos
9d95c79625 Version 3.2.1 2021-04-27 15:53:29 +02:00
Jose Bolos
b8029c56f7 Fix security vuln by bumping express-hbs
Also bumps pa11y-webservice to the latest version.
2021-04-27 15:53:29 +02:00
Sangita Mane
9a23b79d89 #165 - Added list view option for the dashboard. (#279)
* Added list view & grid view buttons on the dashboard, on click of which switches the view and avoids truncation of title of the page.

* Indentation fixed.
2021-04-20 09:58:33 +02:00
Jose Bolos
b7d45c0913 Reorder the routes to avoid MongoDB ObjectID error
When trying to add a new URL, the Node.js MongoDB driver complains with the following error:
```
ObjectID generation failed. Argument passed in must be a single String of 12 bytes or a string of 24 hex characters
```

This is because the `/new` url gets captured by the `/:id` route defined in `/route/task/index.js`. It's another instance of #244 that I missed when fixing it.
2021-04-09 11:30:35 +02:00
Jose Bolos
9ae73dc446 Replace Travis with GH actions 2021-04-09 11:04:12 +02:00
Jose Bolos
ff8142b4e4 Version 3.2.0 (#270) 2020-10-05 17:35:43 +01:00
Jose Bolos
2f7e8ae451 Update dependencies (#269) 2020-10-05 17:04:12 +01:00
Sam Clulow
a2cc2c7942 Replace Chalk with Kleur (#264)
- Remove Chalk
- Add Kleur
- Update index.js
- Update copyright in README

Fixes #256
2020-06-29 16:27:44 +01:00
Jose Bolos
59f657b422 Update all devdependencies to the latest versions (#258) 2020-04-28 12:33:36 +01:00
Jose Bolos
ea3183791c Version 3.1.0 (#246)
* Version 3.1.0

Also minor bump to pa11y-webservice

* Bump webservice so it includes data fixtures
2019-09-27 11:44:24 +01:00
Jose Bolos
102a237d2e Bump webservice version and other deps (#245) 2019-09-20 15:59:21 +01:00
Jose Bolos
7c77467dcf Fix incorrect values being passed to ObjectID (#244)
Due to the routes being defined in the wrong order, certain urls (e.g. `/tasks/:taskid:/edit`) are being captured by the results route instead (e.g. `/tasks/:taskid:/:resultid:`). This is causing the wrong method to being called with parts of the path like `edit`, `run`, etc. being passed as an argument to ObjectID(). As these are not valid MongoDB IDs, the method displays instead an error message:

> Argument passed in must be a single String of 12 bytes or a string of 24 hex characters

Also change the path to the favicon image to be not relative, as this is causing a `favicon.png` string to be sent as an argument to ObjectID() when visiting certain pages due to the previous issue.
2019-09-20 14:57:15 +01:00
Jose Bolos
2de7e59f44 Bump webservice to 3.0.1 (#243)
Fixes a problem with tests not running when cron jobs are triggered.
2019-09-13 15:14:36 +01:00
Jeremy Englert
c7bd2a53b6 Adds new images to Readme (#239) 2019-08-01 09:20:02 +01:00
Jose Bolos
350f94a0d4 Version 3.0.0 (#236)
Includes several updates to the migration guide and the README.
2019-07-16 15:16:06 +01:00
Jose Bolos
a5ce220509 Update all dependencies and standardise versions (#235) 2019-07-16 14:08:27 +01:00
Jose Bolos
ce07206899 Update dependencies (#234)
* Bumps pa11y-webservice and client to the new versions requiring node 8+
* Update tests to account for the new URL. Integration tests now include a localhost URL, this updates the tests to reflect that.
* Increase test timeout to avoid travis failing
2019-07-16 13:41:39 +01:00
Juga Paazmaya
1609c8d667 Updates Node.js min version to 8 and removes npm as dependency (#228)
* Update Node.js min version to 8 and remove npm as dependency

* Test against Node.js 8 and 10 at Travis

* Add Node.js v12 in Travis
2019-05-15 12:32:20 +01:00
Jose Bolos
c1dcbf4436 Adds debugging info to startup log (#225)
There are two ways of setting a configuration for this app: config files, and environment variables. This makes it easy for the app to run with a different config from the one that you intend to run it with.

Currently, only the NODE_ENV variable and server url are being printed out on startup.

This PR adds the database config and the cron config to the details being displayed. This may help debug configuration issues, database issues, and specially making easier to understand what config is being used when for example running in a container.
2019-05-15 10:57:08 +01:00
James Loveridge
ef769d95e1 Add MongoDB installation instructions for Mac/Linux (#218) 2018-10-24 20:19:35 +01:00
Rowan Manning
1f685bafa2 Version 2.4.2 2018-06-21 11:40:50 +01:00
Frank van Gemeren
97413a26ab Update insecure dependencies. Fixes #210 partially (#211) 2018-06-21 11:36:46 +01:00
Mike Tanaka
edfd51a366 Make the rule name match the reported error so we can ignore it. (#209)
It's defined as WCAG2AA.Principle1.Guideline1_4.1_4_3.G18, but gets reported as WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail
2018-05-11 10:48:03 +01:00
Frank van Gemeren
d96035a6ee Fix link target (#206) 2018-04-04 14:28:27 +01:00
Rowan Manning
93bea1dbac Version 2.4.1 2017-11-28 14:56:32 +00:00
Rowan Manning
7307fd6d61 Update pa11y-webservice to fix HTML CodeSniffer 2017-11-28 14:55:06 +00:00
Rowan Manning
aa7d694da7 Version 2.4.0 2017-11-23 10:01:18 +00:00
Elena Musatova
b144970564 Results page: export graph in PNG (#197) 2017-11-23 09:56:23 +00:00
Rowan Manning
37d94b0005 Version 2.3.0 2017-10-31 16:13:13 +00:00
Elena Musatova
66d97769a0 Updated results page (#196)
* Update gitignore

* Update makefile. Add hbs helper

* Collect all selectors for errors/warnings/notices

* Add list of techniques that help to solve problems

* Remove task-stats block from sidebar

* Remove script from Makefile

* Update tooltips. Map standards and techniques

* Update layout for new components: new tabs, errors panels, lists of selectors, tooltips and popovers

* Update styles for new layout and components

* Graph buttons and popovers styles

* Reformat less code

* Include popover. Update IE styles

* Problem details. Context popovers

* Update graph buttons. Add sorting by number of errors

* Update graph buttons params

* Fix tooltip names

* Swap details and ignore link-buttons

* Set ignore link colors
2017-10-31 16:10:24 +00:00
Michael Mior
a8013834c5 Fix Travis CI badge in README (#193) 2017-09-27 09:44:56 +01:00
Hollie Kay
bfe47003c7 remove survey (#192) 2017-09-12 13:54:40 +01:00
Hollie Kay
fb062fba48 Add Danny's article to resources (#191) 2017-08-17 13:46:42 +01:00
Hollie Kay
774b522676 add survey link to readme (#190)
also adds a header to make it look more exciting and like a proper section, instead of a list of random sentences
2017-08-14 11:55:48 +01:00
Jose Bolos
defb044f19 Version 2.2.2 2017-03-23 09:06:29 +00:00
Snyk bot
8f6ef9f204 fix: package.json to reduce vulnerabilities (#185)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:qs:20170213
- https://snyk.io/vuln/npm:qs:20170213

Latest report for pa11y/dashboard:
https://snyk.io/test/github/pa11y/dashboard
2017-03-23 09:00:24 +00:00
Rowan Manning
b24076abf1 Tooling update (#184)
* Use a common Makefile/build process

* Use ESLint with the pa11y lint config
2017-03-21 13:41:46 +00:00
Snyk bot
e27e129677 fix: package.json to reduce vulnerabilities (#179)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:moment:20161019

Latest report for pa11y/dashboard:
https://snyk.io/test/github/pa11y/dashboard
2017-02-20 15:16:48 +00:00
Rowan Manning
f7c3b5e99a Version 2.2.1 2017-02-07 13:21:23 +00:00
Rowan Manning
2ec9139ab0 Fix task editing when no actions are specified (#178) 2017-02-07 13:20:36 +00:00
103 changed files with 6728 additions and 4282 deletions

View File

@@ -1,3 +1,2 @@
coverage coverage
node_modules
public/js public/js

3
.eslintrc.js Normal file
View File

@@ -0,0 +1,3 @@
'use strict';
module.exports = require('pa11y-lint-config/eslint/es2017');

50
.github/workflows/tests.yml vendored Normal file
View File

@@ -0,0 +1,50 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests.
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
name: Build and lint
on:
push:
branches: # Run actions when code is committed to these branches
- master
pull_request:
branches: # Run actions when a PR is pushed based on one of these branches
- master
jobs:
checkout_and_test:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- node-version: 8.x
lint: true # Linter is run only once to shorten the total build time
- node-version: 10.x
- node-version: 12.x
steps:
- name: Checkout code from ${{ github.repository }}
uses: actions/checkout@v2
- name: Setup node
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- name: MongoDB in GitHub Actions
uses: supercharge/mongodb-github-action@1.3.0
with:
mongodb-version: 3.4
- name: Install dependencies
run: npm i
- name: Run linter
if: ${{ matrix.lint }}
run: make lint
- name: Create test config
run: cp config/test.sample.json config/test.json
- name: Start test app
run: NODE_ENV=test node index.js &
- name: Wait / Sleep
uses: jakejarvis/wait-action@v0.1.0
with:
time: '10s'
- name: Run tests
run: make ci

3
.gitignore vendored
View File

@@ -7,3 +7,6 @@ config/test.json
# Generated npm files # Generated npm files
node_modules node_modules
npm-debug.log npm-debug.log
# JetBrains IDE
.idea

94
.jscsrc
View File

@@ -1,94 +0,0 @@
{
"disallowEmptyBlocks": true,
"disallowImplicitTypeConversion": [
"binary",
"boolean",
"numeric",
"string"
],
"disallowKeywordsOnNewLine": [
"catch",
"else"
],
"disallowMixedSpacesAndTabs": true,
"disallowMultipleSpaces": true,
"disallowMultipleVarDecl": true,
"disallowNewlineBeforeBlockStatements": true,
"disallowParenthesesAroundArrowParam": true,
"disallowQuotedKeysInObjects": true,
"disallowSpaceAfterObjectKeys": {
"allExcept": [
"method"
]
},
"disallowSpaceAfterPrefixUnaryOperators": true,
"disallowSpaceBeforeComma": true,
"disallowSpaceBeforeSemicolon": true,
"disallowSpacesInCallExpression": true,
"disallowSpacesInFunction": {
"beforeOpeningRoundBrace": true
},
"disallowSpacesInsideArrayBrackets": true,
"disallowSpacesInsideBrackets": true,
"disallowSpacesInsideObjectBrackets": true,
"disallowSpacesInsideParentheses": true,
"disallowSpacesInsideTemplateStringPlaceholders": true,
"disallowTrailingComma": true,
"disallowTrailingWhitespace": true,
"disallowVar": true,
"disallowYodaConditions": true,
"maximumLineLength": 100,
"requireArrowFunctions": true,
"requireBlocksOnNewline": true,
"requireCamelCaseOrUpperCaseIdentifiers": true,
"requireCapitalizedConstructors": true,
"requireCommaBeforeLineBreak": true,
"requireCurlyBraces": true,
"requireDotNotation": true,
"requireFunctionDeclarations": true,
"requireLineBreakAfterVariableAssignment": true,
"requireLineFeedAtFileEnd": true,
"requireObjectKeysOnNewLine": true,
"requireParenthesesAroundIIFE": true,
"requireSemicolons": true,
"requireSpaceAfterBinaryOperators": true,
"requireSpaceAfterKeywords": [
"if",
"else",
"for",
"while",
"do",
"switch",
"try",
"catch"
],
"requireSpaceAfterLineComment": {
"allExcept": [
"="
]
},
"requireSpaceBeforeBinaryOperators": true,
"requireSpaceBeforeBlockStatements": true,
"requireSpaceBeforeObjectValues": true,
"requireSpaceBetweenArguments": true,
"requireSpacesInConditionalExpression": true,
"requireSpacesInForStatement": true,
"requireSpacesInFunction": {
"beforeOpeningCurlyBrace": true
},
"requireTemplateStrings": true,
"validateIndentation": "\t",
"validateLineBreaks": "LF",
"validateNewlineAfterArrayElements": true,
"validateParameterSeparator": ", ",
"validateQuoteMarks": "'",
"excludeFiles": [
"coverage",
"node_modules",
"public/js"
]
}

View File

@@ -1,26 +0,0 @@
{
"curly": true,
"eqeqeq": true,
"esversion": 6,
"forin": true,
"globals": {
"after": true,
"afterEach": true,
"before": true,
"beforeEach": true,
"describe": true,
"it": true
},
"latedef": "nofunc",
"maxcomplexity": 6,
"maxdepth": 2,
"maxparams": 4,
"noarg": true,
"node": true,
"nonew": true,
"nonstandard": true,
"shadow": false,
"strict": true,
"undef": true,
"unused": true
}

View File

@@ -1,24 +0,0 @@
# Language/versions
language: node_js
matrix:
include:
- node_js: '4'
- node_js: '5'
- node_js: '6'
# Build only master (and pull-requests)
branches:
only:
- master
# Services setup
services:
- mongodb
# Build script
before_script:
- cp config/test.sample.json config/test.json
- NODE_ENV=test node index.js &
- sleep 5 # give server time to start
script: 'make ci'

View File

@@ -1,6 +1,61 @@
# Changelog # Changelog
## 3.3.0 (2021-04-27)
* Add new list view to the dashboard (thanks @sangitamane)
* Upgrade express-hbs to the latest version in order to address several potential vulnerabilities
* Fixes a MongoDB "ObjectID generation failed" error.
* Update pa11y-webservice to version 3.2.1 and pa11y to version 5.3.1
## 3.2.0 (2020-10-05)
* Update pa11y to version 5.3.0, which means better compatibility with sites using AMD modules
* Update pa11y-webservice to version 3.2.0, which adds the ability to configure the number of workers running pa11y tests
* Update several dependencies
* Replace chalk with kleur
## 3.1.0 (2019-09-27)
* Display the task ID before each line of output, so it's clear to which task a line of output belongs to when they run in parallel.
* Bump pa11y-webservice version, which fixes an issue with some pages failing to run.
* Fix incorrect routes passing an invalid value to Mongo's ObjectID.
## 3.0.0 (2019-07-16)
* Update pa11y to v5, which replaces Phantomjs with Headless Chrome
* Update dependencies
* Several bug fixes and documentation updates
* See the [migration guide](https://github.com/pa11y/pa11y-dashboard/blob/master/MIGRATION.md#migrating-from-20-to-30) for details of the breaking changes in this release
## 2.4.2 (2018-06-21)
* Update dependencies
* body-parser: ~1.17.1 to ^1.18.3
* compression: ~1.6 to ^1.7.2
* express: ~4.15.2 to ^4.16.3
* moment: ~2.15.2 to ^2.22.2
## 2.4.1 (2017-11-28)
* Update dependencies
* pa11y-webservice: ^2.3.0 to ^2.3.1
## 2.4.0 (2017-11-23)
* Add the ability to export the results graph as a PNG, see #197 for more information
## 2.3.0 (2017-10-31)
* Large overhaul of the results page, see #196 for more information
## 2.2.2 (2017-03-23)
* Upgrades `body-parser` and `express`. Fixes a vulnerability in `qs`: https://snyk.io/vuln/npm:qs:20170213
## 2.2.1 (2017-02-07)
* Fix task editing when no actions are specified
## 2.2.0 (2017-01-27) ## 2.2.0 (2017-01-27)
* Add support for Pa11y actions * Add support for Pa11y actions

View File

@@ -1,18 +1,29 @@
# Migration Guide
Migration Guide
===============
Pa11y Dashboard's API changes between major versions. This is a guide to help you make the switch when this happens. Pa11y Dashboard's API changes between major versions. This is a guide to help you make the switch when this happens.
## Table of Contents
Table Of Contents - [Migrating from 2.0 to 3.0](#migrating-from-20-to-30)
-----------------
- [Migrating from 1.0 to 2.0](#migrating-from-10-to-20) - [Migrating from 1.0 to 2.0](#migrating-from-10-to-20)
## Migrating from 2.0 to 3.0
Migrating from 1.0 to 2.0 ### PhantomJS to Headless Chrome
-------------------------
Pa11y Dashboard 3 uses version 5 of Pa11y, which replaces PhantomJS with [Headless Chrome](https://developers.google.com/web/updates/2017/04/headless-chrome). This allows us to use more modern JavaScript APIs and make Pa11y testing more stable.
As a result of this change, [Pa11y Dashboard's requirements](../README.md#requirements) have changed, and you may need to install additional dependencies required by Chrome before being able to use this version.
### Node.js Support
Pa11y Webservice 3 requires Node.js version 8 or greater. Versions 4 and 6 are not supported any more.
### Miscellaneous
The default viewport dimensions for Pa11y have been changed from `1024x768` to `1280x1024`. This could make pa11y report a different number of errors if different content appears on the page based on its width, so results obtained with v2 and v3 may not be comparable.
## Migrating from 1.0 to 2.0
### Node.js Support ### Node.js Support

View File

@@ -1,59 +1,41 @@
include Makefile.node
# Color helpers # We need to run integration tests recursively
C_CYAN=\x1b[34;01m export INTEGRATION_FLAGS := --recursive
C_RESET=\x1b[0m
# Group targets
all: deps lint test
ci: lint test
# Install dependencies # Verify tasks
deps: # ------------
@echo "$(C_CYAN)> installing dependencies$(C_RESET)"
@npm install
# Lint JavaScript # Lint alias for backwards compatibility
lint: jshint jscs lint: verify
# Run JSHint
jshint:
@echo "$(C_CYAN)> linting javascript$(C_RESET)"
@./node_modules/.bin/jshint .
# Run JavaScript Code Style # Client-side asset tasks
jscs: # -----------------------
@echo "$(C_CYAN)> checking javascript code style$(C_RESET)"
@./node_modules/.bin/jscs .
# Run all tests
test: test-integration
# Run integration tests
test-integration:
@echo "$(C_CYAN)> running integration tests$(C_RESET)"
@./node_modules/.bin/mocha ./test/integration --reporter spec --recursive --timeout 5000 --slow 50
# Compile LESS # Compile LESS
less: less:
@echo "$(C_CYAN)> compiling less$(C_RESET)" @lessc -x ./public/less/main.less ./public/css/site.min.css
@./node_modules/.bin/lessc -x ./public/less/main.less ./public/css/site.min.css @$(TASK_DONE)
# Compile client-side JavaScript # Compile client-side JavaScript
uglify: uglify:
@echo "$(C_CYAN)> compiling client-side JavaScript$(C_RESET)" @uglifyjs \
@./node_modules/.bin/uglifyjs \
public/js/vendor/jquery/jquery.min.js \ public/js/vendor/jquery/jquery.min.js \
public/js/vendor/bootstrap/js/alert.js \ public/js/vendor/bootstrap/js/alert.js \
public/js/vendor/bootstrap/js/dropdown.js \ public/js/vendor/bootstrap/js/dropdown.js \
public/js/vendor/bootstrap/js/tooltip.js \ public/js/vendor/bootstrap/js/tooltip.js \
public/js/vendor/bootstrap/js/transition.js \ public/js/vendor/bootstrap/js/transition.js \
public/js/vendor/bootstrap/js/collapse.js \ public/js/vendor/bootstrap/js/collapse.js \
public/js/vendor/bootstrap/js/tab.js \
public/js/vendor/bootstrap/js/popover.js \
public/js/vendor/flot/jquery.flot.js \ public/js/vendor/flot/jquery.flot.js \
public/js/vendor/flot/jquery.flot.dashes.js \ public/js/vendor/flot/jquery.flot.dashes.js \
public/js/vendor/flot/jquery.flot.time.js \ public/js/vendor/flot/jquery.flot.time.js \
public/js/vendor/flot/jquery.flot.selection.js \ public/js/vendor/flot/jquery.flot.selection.js \
public/js/vendor/flot/jquery.flot.resize.js \ public/js/vendor/flot/jquery.flot.resize.js \
public/js/vendor/helpers/html2canvas.min.js \
public/js/site.js \ public/js/site.js \
-o ./public/js/site.min.js -o ./public/js/site.min.js
@$(TASK_DONE)
.PHONY: test

125
Makefile.node Normal file
View File

@@ -0,0 +1,125 @@
#
# Node.js Makefile
# ================
#
# Do not update this file manually it's maintained separately on GitHub:
# https://github.com/rowanmanning/makefiles/blob/master/Makefile.node
#
# To update to the latest version, run `make update-makefile`.
#
# Meta tasks
# ----------
.PHONY: test
# Useful variables
# ----------------
NPM_BIN = ./node_modules/.bin
export PATH := $(NPM_BIN):$(PATH)
export EXPECTED_COVERAGE := 90
export INTEGRATION_TIMEOUT := 10000
export INTEGRATION_SLOW := 4000
# Output helpers
# --------------
TASK_DONE = echo "$@ done"
# Group tasks
# -----------
all: install ci
ci: verify test
# Install tasks
# -------------
clean:
@git clean -fxd
@$(TASK_DONE)
install: node_modules
@$(TASK_DONE)
node_modules: package.json
@npm prune --production=false
@npm install
@$(TASK_DONE)
# Verify tasks
# ------------
verify: verify-javascript verify-dust verify-spaces
@$(TASK_DONE)
verify-javascript: verify-eslint verify-jshint verify-jscs
@$(TASK_DONE)
verify-dust:
@if [ -e .dustmiterc* ]; then dustmite --path ./view && $(TASK_DONE); fi
verify-eslint:
@if [ -e .eslintrc* ]; then eslint . && $(TASK_DONE); fi
verify-jshint:
@if [ -e .jshintrc* ]; then jshint . && $(TASK_DONE); fi
verify-jscs:
@if [ -e .jscsrc* ]; then jscs . && $(TASK_DONE); fi
verify-spaces:
@if [ -e .editorconfig* ] && [ -x $(NPM_BIN)/lintspaces ]; then \
git ls-files | xargs lintspaces -e .editorconfig && $(TASK_DONE); \
fi
verify-coverage:
@if [ -d coverage ]; then \
if [ -x $(NPM_BIN)/nyc ]; then \
nyc check-coverage --lines $(EXPECTED_COVERAGE) --functions $(EXPECTED_COVERAGE) --branches $(EXPECTED_COVERAGE) && $(TASK_DONE); \
else \
if [ -x $(NPM_BIN)/istanbul ]; then \
istanbul check-coverage --statement $(EXPECTED_COVERAGE) --branch $(EXPECTED_COVERAGE) --function $(EXPECTED_COVERAGE) && $(TASK_DONE); \
fi \
fi \
fi
# Test tasks
# ----------
test: test-unit-coverage verify-coverage test-integration
@$(TASK_DONE)
test-unit:
@if [ -d test/unit ]; then mocha test/unit --recursive && $(TASK_DONE); fi
test-unit-coverage:
@if [ -d test/unit ]; then \
if [ -x $(NPM_BIN)/nyc ]; then \
nyc --reporter=text --reporter=html $(NPM_BIN)/_mocha test/unit --recursive && $(TASK_DONE); \
else \
if [ -x $(NPM_BIN)/istanbul ]; then \
istanbul cover $(NPM_BIN)/_mocha -- test/unit --recursive && $(TASK_DONE); \
else \
make test-unit; \
fi \
fi \
fi
test-integration:
@if [ -d test/integration ]; then mocha test/integration --timeout $(INTEGRATION_TIMEOUT) --slow $(INTEGRATION_SLOW) $(INTEGRATION_FLAGS) && $(TASK_DONE); fi
# Tooling tasks
# -------------
update-makefile:
@curl -s https://raw.githubusercontent.com/rowanmanning/makefiles/master/Makefile.node > Makefile.node
@$(TASK_DONE)

View File

@@ -1,5 +1,4 @@
Pa11y Dashboard # Pa11y Dashboard
===============
Pa11y Dashboard is a web interface to the [Pa11y][pa11y] accessibility reporter; allowing you to focus on *fixing* issues rather than hunting them down. Pa11y Dashboard is a web interface to the [Pa11y][pa11y] accessibility reporter; allowing you to focus on *fixing* issues rather than hunting them down.
@@ -8,25 +7,39 @@ Pa11y Dashboard is a web interface to the [Pa11y][pa11y] accessibility reporter;
[![Build status][shield-build]][info-build] [![Build status][shield-build]][info-build]
[![GPL-3.0 licensed][shield-license]][info-license] [![GPL-3.0 licensed][shield-license]][info-license]
--- ![dashboard](https://user-images.githubusercontent.com/6110968/61603347-0bce1000-abf2-11e9-87b2-a53f91d315bb.jpg)
![results-page](https://user-images.githubusercontent.com/6110968/62183438-05851580-b30f-11e9-9bc4-b6a4823ae9e8.jpg)
✨ 🔜 ✨ The Pa11y team is very excited to announce plans for the successor to Pa11y Dashboard and Pa11y Webservice, codename "Sidekick". Help us define the features that you want to see by visiting the [proposal][sidekick-proposal]. ✨
--- ---
## Requirements
![dashboard](https://f.cloud.github.com/assets/1225142/1549567/f0361e72-4de8-11e3-8d14-3fe6900cc15d.jpg) Pa11y Dashboard is a [Node.js][node] application and requires a stable or LTS version of Node, currently version 8 or greater.
![results-page](https://f.cloud.github.com/assets/1225142/1549568/f225aa54-4de8-11e3-8b25-ef2f405997a3.jpg)
Pa11y Dashboard also requires a [MongoDB][mongo] database to be available so it can store the results of the tests. The database doesn't have to be in the same server or computer where Pa11y Dashboard is running from.
Setup Since version 3, Pa11y Dashboard uses Headless Chrome in order to run the tests. This means that additional dependencies maybe be required.
-----
Pa11y Dashboard requires [Node.js][node] 4+. See the [Pa11y][pa11y] documentation for detailed instructions on how to install this on your operating system. In [Unix-like](https://en.wikipedia.org/wiki/Unix-like) systems you may need to install the `libnss3` and `libgconf-2-4` libraries in order to be able to run Chrome. If you're trying to run the app in a headless environment (e.g. the cloud, or a headless server), you may also need to configure Xvfb before. Please refer to the documentation from your provider for details on how to do this.
You'll also need to have [MongoDB][mongo] installed and running. See the [MongoDB install guide][mongo-install] for more information on this. ## Setup
You'll then need to clone this repo locally and install dependencies with `npm install`. Now you need to add some configuration before you can run the application. We can do this in two ways: In order to run Pa11y Dashboard, we recommend cloning this repository locally:
```sh
git clone https://github.com/pa11y/pa11y-dashboard.git
```
Then installing the dependencies:
```sh
cd pa11y-dashboard
npm install
```
You'll also need to have [MongoDB][mongo] installed and running. For quick access, you can install via a package manager such as on Mac OS `brew install mongodb` or on Linux (Debian) it would be `apt-get install mongodb`. To run MongoDB, you can run `mongod` in the command line. See the [MongoDB install guide][mongo-install] for more detailed information.
The last step before being able to run the application is to define a configuration for it. This can be done in two ways:
### Option 1: Using Environment Variables ### Option 1: Using Environment Variables
@@ -56,13 +69,11 @@ Now that you've got your application configured, make sure you have a MongoDB se
NODE_ENV=development node index.js NODE_ENV=development node index.js
``` ```
See [development instructions](#development) for more information about running locally (and restarting automatically when files change). See [Contributing](#contributing) for more information about running locally (and restarting automatically when files change).
If you run into problems, check the [troubleshooting guide][troubleshooting]. If you run into problems, check the [troubleshooting guide][troubleshooting].
## Configurations
Configurations
--------------
The boot configurations for Pa11y Dashboard are as follows. Look at the sample JSON files in the repo for example usage. The boot configurations for Pa11y Dashboard are as follows. Look at the sample JSON files in the repo for example usage.
@@ -81,30 +92,24 @@ The boot configurations for Pa11y Dashboard are as follows. Look at the sample J
### webservice ### webservice
This can either be an object containing [Pa11y Webservice configurations][pa11y-webservice-config], or a string which is the base URL of a [Pa11y Webservice][pa11y-webservice] instance you are running separately. If using environment variables, prefix the webservice vars with `WEBSERVICE_`. This can either be an object containing [Pa11y Webservice configurations][pa11y-webservice-config], or a string which is the base URL of a [Pa11y Webservice][pa11y-webservice] instance you are running separately. If using environment variables, prefix the webservice vars with `WEBSERVICE_`.
## Contributing
Contributing
------------
There are many ways to contribute to Pa11y Dashboard, we cover these in the [contributing guide](CONTRIBUTING.md) for this repo. There are many ways to contribute to Pa11y Dashboard, we cover these in the [contributing guide](CONTRIBUTING.md) for this repo.
If you're ready to contribute some code, you'll need to clone the repo and get set up as outlined in the [setup guide](#setup). If you're ready to contribute some code, you'll need to clone the repo and get set up as outlined in the [setup guide](#setup). You'll then need to start the application in test mode with:
You'll need to start the application in test mode with:
```sh ```sh
NODE_ENV=test node index.js NODE_ENV=test node index.js
``` ```
Now you'll be able to run the following commands: You'll now be able to run the following commands:
```sh ```sh
make # Run the lint and test tasks together make verify # Verify all of the code (ESLint)
make lint # Run linters with the correct config make test # Run all tests
make test # Run integration tests make test-integration # Run the integration tests
``` ```
Code with lint errors or failing tests will not be accepted, please use the build tools outlined above.
To compile the client-side JavaScript and CSS, you'll need the following commands. Compiled code is committed to the repository. To compile the client-side JavaScript and CSS, you'll need the following commands. Compiled code is committed to the repository.
```sh ```sh
@@ -112,14 +117,12 @@ make less # Compile the site CSS from LESS files
make uglify # Compile and uglify the client-side JavaScript make uglify # Compile and uglify the client-side JavaScript
``` ```
## Useful Resources
Useful Resources * [Setting up An Accessibility Dashboard from Scratch with Pa11y on DigitalOcean](https://una.im/pa11y-dash/)
------- * [Monitoring Web Accessibility Compliance With Pa11y Dashboard](https://www.lullabot.com/articles/monitoring-web-accessibility-compliance-with-pa11y-dashboard)
* [Setting up An Accessibility Dashboard from Scratch with Pa11y on DigitalOcean][resource-una-k]
## Support and Migration
Support and Migration
---------------------
Pa11y Dashboard major versions are normally supported for 6 months after their last minor release. This means that patch-level changes will be added and bugs will be fixed. The table below outlines the end-of-support dates for major versions, and the last minor release for that version. Pa11y Dashboard major versions are normally supported for 6 months after their last minor release. This means that patch-level changes will be added and bugs will be fixed. The table below outlines the end-of-support dates for major versions, and the last minor release for that version.
@@ -127,19 +130,16 @@ We also maintain a [migration guide](MIGRATION.md) to help you migrate.
| :grey_question: | Major Version | Last Minor Release | Node.js Versions | Support End Date | | :grey_question: | Major Version | Last Minor Release | Node.js Versions | Support End Date |
| :-------------- | :------------ | :----------------- | :--------------- | :--------------- | | :-------------- | :------------ | :----------------- | :--------------- | :--------------- |
| :heart: | 2 | N/A | 4+ | N/A | | :heart: | 3 | N/A | 8+ | N/A |
| :hourglass: | 2 | 2.4.2 | 4+ | 2020-01-16 |
| :skull: | 1 | 1.12 | 0.106 | 2016-12-05 | | :skull: | 1 | 1.12 | 0.106 | 2016-12-05 |
If you're opening issues related to these, please mention the version that the issue relates to. If you're opening issues related to these, please mention the version that the issue relates to.
## License
License
-------
Pa11y Dashboard is licensed under the [GNU General Public License 3.0][info-license].<br/> Pa11y Dashboard is licensed under the [GNU General Public License 3.0][info-license].<br/>
Copyright &copy; 20132017, Team Pa11y Copyright &copy; 20132020, Team Pa11y and contributors
[gpl]: http://www.gnu.org/licenses/gpl-3.0.html [gpl]: http://www.gnu.org/licenses/gpl-3.0.html
[mongo]: http://www.mongodb.org/ [mongo]: http://www.mongodb.org/
@@ -148,16 +148,15 @@ Copyright &copy; 20132017, Team Pa11y
[pa11y]: https://github.com/pa11y/pa11y [pa11y]: https://github.com/pa11y/pa11y
[pa11y-webservice-config]: https://github.com/pa11y/webservice#configurations [pa11y-webservice-config]: https://github.com/pa11y/webservice#configurations
[phantom]: http://phantomjs.org/ [phantom]: http://phantomjs.org/
[resource-una-k]: https://una.im/pa11y-dash/
[sidekick-proposal]: https://github.com/pa11y/sidekick/blob/master/PROPOSAL.md [sidekick-proposal]: https://github.com/pa11y/sidekick/blob/master/PROPOSAL.md
[travis]: https://travis-ci.org/pa11y/dashboard [travis]: https://travis-ci.org/pa11y/dashboard
[travis-img]: https://travis-ci.org/pa11y/dashboard.png?branch=master [travis-img]: https://travis-ci.org/pa11y/dashboard.png?branch=master
[troubleshooting]: https://github.com/pa11y/dashboard/blob/master/TROUBLESHOOTING.md [troubleshooting]: https://github.com/pa11y/dashboard/blob/master/TROUBLESHOOTING.md
[info-license]: LICENSE
[info-node]: package.json [info-node]: package.json
[info-build]: https://travis-ci.org/pa11y/dashboard [info-build]: https://travis-ci.org/pa11y/pa11y-dashboard
[info-license]: LICENSE
[shield-version]: https://img.shields.io/github/package-json/v/pa11y/pa11y-dashboard.svg
[shield-node]: https://img.shields.io/node/v/pa11y/pa11y-dashboard.svg
[shield-build]: https://img.shields.io/travis/pa11y/pa11y-dashboard/master.svg
[shield-license]: https://img.shields.io/badge/license-GPL%203.0-blue.svg [shield-license]: https://img.shields.io/badge/license-GPL%203.0-blue.svg
[shield-node]: https://img.shields.io/badge/node.js%20support-46-brightgreen.svg
[shield-version]: https://img.shields.io/badge/version-2.2.0-blue.svg
[shield-build]: https://img.shields.io/travis/pa11y/dashboard/master.svg

40
app.js
View File

@@ -12,7 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
const bodyParser = require('body-parser'); const bodyParser = require('body-parser');
@@ -70,6 +69,7 @@ function initApp(config, callback) {
require('./view/helper/date')(hbs); require('./view/helper/date')(hbs);
require('./view/helper/string')(hbs); require('./view/helper/string')(hbs);
require('./view/helper/url')(hbs); require('./view/helper/url')(hbs);
require('./view/helper/conditionals')(hbs);
// Populate view locals // Populate view locals
app.express.locals = { app.express.locals = {
@@ -84,16 +84,14 @@ function initApp(config, callback) {
settings: {} settings: {}
}; };
app.express.use((req, res, next) => { app.express.use((request, response, next) => {
res.locals.isHomePage = (req.path === '/'); response.locals.isHomePage = (request.path === '/');
res.locals.host = req.hostname; response.locals.host = request.hostname;
next(); next();
}); });
// Load routes // Load routes
require('./route/index')(app); require('./route/index')(app);
require('./route/task/index')(app);
require('./route/result/index')(app);
require('./route/result/download')(app); require('./route/result/download')(app);
if (!config.readonly) { if (!config.readonly) {
require('./route/new')(app); require('./route/new')(app);
@@ -103,29 +101,33 @@ function initApp(config, callback) {
require('./route/task/ignore')(app); require('./route/task/ignore')(app);
require('./route/task/unignore')(app); require('./route/task/unignore')(app);
} }
// Needs to be loaded after `/route/new`
require('./route/task/index')(app);
// Needs to be loaded after `/route/task/edit`
require('./route/result/index')(app);
// Error handling // Error handling
app.express.get('*', (req, res) => { app.express.get('*', (request, response) => {
res.status(404); response.status(404);
res.render('404'); response.render('404');
}); });
app.express.use((err, req, res, next) => { app.express.use((error, request, response, next) => {
/* jshint unused: false */ /* eslint no-unused-vars: 'off' */
if (err.code === 'ECONNREFUSED') { if (error.code === 'ECONNREFUSED') {
err = new Error('Could not connect to Pa11y Webservice'); error = new Error('Could not connect to Pa11y Webservice');
} }
app.emit('route-error', err); app.emit('route-error', error);
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
res.locals.error = err; response.locals.error = error;
} }
res.status(500); response.status(500);
res.render('500'); response.render('500');
}); });
app.server.listen(config.port, err => { app.server.listen(config.port, error => {
const address = app.server.address(); const address = app.server.address();
app.address = `http://${address.address}:${address.port}`; app.address = `http://${address.address}:${address.port}`;
callback(err, app); callback(error, app);
}); });
} }

View File

@@ -12,7 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
const fs = require('fs'); const fs = require('fs');

8
data/.eslintrc.js Normal file
View File

@@ -0,0 +1,8 @@
'use strict';
// Clone the main config
var config = module.exports = JSON.parse(JSON.stringify(require('../.eslintrc')));
// Disable max line length/statements
config.rules['max-len'] = 'off';
config.rules['max-statements'] = 'off';

View File

@@ -910,7 +910,7 @@ function getStandards() {
description: 'If any audio plays automatically for longer than 3 seconds, check that there is the ability to pause, stop or mute the audio.' description: 'If any audio plays automatically for longer than 3 seconds, check that there is the ability to pause, stop or mute the audio.'
}, },
{ {
name: 'WCAG2AA.Principle1.Guideline1_4.1_4_3.G18', name: 'WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail',
description: 'This element has insufficient contrast at this conformance level. Expected a contrast ratio of at least 4.5:1, but text in this element has a contrast ratio of /{value/}. Recommendation: /{colour recommendations/}.' description: 'This element has insufficient contrast at this conformance level. Expected a contrast ratio of at least 4.5:1, but text in this element has a contrast ratio of /{value/}. Recommendation: /{colour recommendations/}.'
}, },
{ {

608
data/techniques.js Normal file
View File

@@ -0,0 +1,608 @@
// This file is part of Pa11y Dashboard.
//
// Pa11y Dashboard is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Pa11y Dashboard is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
// jscs:disable maximumLineLength
'use strict';
module.exports = getTechniques;
function getTechniques() {
return {
H30: {
title: 'H30: Providing link text that describes the purpose of a link for anchor elements',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H30'
},
H37: {
title: 'H37: Using alt attributes on img elements',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H37'
},
H67: {
title: 'H67: Using null alt text and no title attribute on img elements for images that AT should ignore',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H67'
},
G94: {
title: 'G94: Providing short text alternative for non-text content that serves the same purpose and presents the same information as the non-text content',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G94'
},
H36: {
title: 'H36: Using alt attributes on images used as submit buttons',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H36'
},
H24: {
title: 'H24: Providing text alternatives for the area elements of image maps ',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H24'
},
G73: {
title: 'G73: Providing a long description in another location with a link to it that is immediately adjacent to the non-text content',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G73'
},
G74: {
title: 'G74: Providing a long description in text near the non-text content, with a reference to the location of the long description in the short description',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G74'
},
H2: {
title: 'H2: Combining adjacent image and text links for the same resource',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H2'
},
H53: {
title: 'H53: Using the body of the object element',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H53'
},
G92: {
title: 'G92: Providing long description for non-text content that serves the same purpose and presents the same information',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G92'
},
H35: {
title: 'H35: Providing text alternatives on applet elements ',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H35'
},
G158: {
title: 'G158: Providing an alternative for time-based media for audio-only content',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G158'
},
G159: {
title: 'G159: Providing an alternative for time-based media for video-only content',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G159'
},
G166: {
title: 'G166: Providing audio that describes the important video content and describing it as such',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G166'
},
G87: {
title: 'G87: Providing closed captions',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G87'
},
G93: {
title: 'G93: Providing open (always visible) captions',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G93'
},
G69: {
title: 'G69: Providing an alternative for time based media',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G69'
},
G78: {
title: 'G78: Providing a second, user-selectable, audio track that includes audio descriptions',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G78'
},
G173: {
title: 'G173: Providing a version of a movie with audio descriptions',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G173'
},
G8: {
title: 'G8: Providing a movie with extended audio descriptions',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G8'
},
G9: {
title: 'G9: Creating captions for live synchronized media',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G9'
},
G54: {
title: 'G54: Including a sign language interpreter in the video stream',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G54'
},
G81: {
title: 'G81: Providing a synchronized video of the sign language interpreter that can be displayed in a different viewport or overlaid on the image by the player',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G81'
},
G150: {
title: 'G150: Providing text based alternatives for live audio-only content',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G150'
},
G151: {
title: 'G151: Providing a link to a text transcript of a prepared statement or script if the script is followed',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G151'
},
G157: {
title: 'G157: Incorporating a live audio captioning service into a Web page',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G157'
},
H42: {
title: 'H42: Using h1-h6 to identify headings',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H42'
},
H93: {
title: 'H93: Ensuring that id attributes are unique on a Web page',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H93'
},
H44: {
title: 'H44: Using label elements to associate text labels with form controls',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H44'
},
H65: {
title: 'H65: Using the title attribute to identify form controls when the label element cannot be used',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H65'
},
H49: {
title: 'H49: Using semantic markup to mark emphasized or special text',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H49'
},
H63: {
title: 'H63: Using the scope attribute to associate header cells and data cells in data tables',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H63'
},
H43: {
title: 'H43: Using id and headers attributes to associate data cells with header cells in data tables',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H43'
},
H39: {
title: 'H39: Using caption elements to associate data table captions with data tables',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H39'
},
H73: {
title: 'H73: Using the summary attribute of the table element to give an overview of data tables',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H73'
},
H71: {
title: 'H71: Providing a description for groups of form controls using fieldset and legend elements ',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H71'
},
H85: {
title: 'H85: Using OPTGROUP to group OPTION elements inside a SELECT',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H85'
},
H48: {
title: 'H48: Using ol, ul and dl for lists or groups of links',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H48'
},
G141: {
title: 'G141: Organizing a page using headings',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G141'
},
G57: {
title: 'G57: Ordering the content in a meaningful sequence',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G57'
},
G96: {
title: 'G96: Providing textual identification of items that otherwise rely only on sensory information to be understood',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G96'
},
G14: {
title: 'G14: Ensuring that information conveyed by color differences is also available in text',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G14'
},
G182: {
title: 'G182: Ensuring that additional visual cues are available when text color differences are used to convey information',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G182'
},
F23: {
title: 'F23: Failure of 1.4.2 due to playing a sound longer than 3 seconds where there is no mechanism to turn it off',
url: 'http://www.w3.org/TR/WCAG20-TECHS/F23'
},
G18: {
title: 'G18: Ensuring that a contrast ratio of at least 4.5:1 exists between text (and images of text) and background behind the text',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G18'
},
G145: {
title: 'G145: Ensuring that a contrast ratio of at least 3:1 exists between text (and images of text) and background behind the text',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G145'
},
F24: {
title: 'F24: Failure of Success Criterion 1.4.3, 1.4.6 and 1.4.8 due to specifying foreground colors without specifying background colors or vice versa',
url: 'http://www.w3.org/TR/WCAG20-TECHS/F24'
},
G142: {
title: 'G142: Using a technology that has commonly-available user agents that support zoom',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G142'
},
G140: {
title: 'G140: Separating information and structure from presentation to enable different presentations',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G140'
},
C22: {
title: 'C22: Using CSS to control visual presentation of text',
url: 'http://www.w3.org/TR/WCAG20-TECHS/C22'
},
C30: {
title: 'C30: Using CSS to replace text with images of text and providing user interface controls to switch',
url: 'http://www.w3.org/TR/WCAG20-TECHS/C30'
},
G17: {
title: 'G17: Ensuring that a contrast ratio of at least 7:1 exists between text (and images of text) and background behind the text',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G17'
},
G56: {
title: 'G56: Mixing audio files so that non-speech sounds are at least 20 decibels lower than the speech audio content',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G56'
},
G148: {
title: 'G148: Not specifying background color, not specifying text color, and not using technology features that change those defaults',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G148'
},
G156: {
title: 'G156: Using a technology that has commonly-available user agents that can change the foreground and background of blocks of text',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G156'
},
G175: {
title: 'G175: Providing a multi color selection tool on the page for foreground and background colors',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G175'
},
H87: {
title: 'G146: Using liquid layout',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G146'
},
C19: {
title: 'C19: Specifying alignment either to the left OR right in CSS',
url: 'http://www.w3.org/TR/WCAG20-TECHS/C19'
},
G172: {
title: 'G172: Providing a mechanism to remove full justification of text',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G172'
},
G169: {
title: 'G169: Aligning text on only one side',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G169'
},
G188: {
title: 'G188: Providing a button on the page to increase line spaces and paragraph spaces',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G188'
},
C21: {
title: 'C21: Specifying line spacing in CSS',
url: 'http://www.w3.org/TR/WCAG20-TECHS/C21'
},
SCR20: {
title: 'SCR20: Using both keyboard and other device-specific functions',
url: 'http://www.w3.org/TR/WCAG20-TECHS/SCR20'
},
F10: {
title: 'F10: Failure of Success Criterion 2.1.2 and Conformance Requirement 5 due to combining multiple content formats in a way that traps users inside one format type',
url: 'http://www.w3.org/TR/WCAG20-TECHS/F10'
},
F40: {
title: 'F40: Failure of Success Criterion 2.2.1 and 2.2.4 due to using meta redirect with a time limit',
url: 'http://www.w3.org/TR/WCAG20-TECHS/F40'
},
F41: {
title: 'F41: Failure of Success Criterion 2.2.1, 2.2.4, and 3.2.5 due to using meta refresh to reload the page',
url: 'http://www.w3.org/TR/WCAG20-TECHS/F41'
},
SCR33: {
title: 'SCR33: Using script to scroll content, and providing a mechanism to pause it',
url: 'http://www.w3.org/TR/WCAG20-TECHS/SCR33'
},
SCR22: {
title: 'SCR22: Using scripts to control blinking and stop it in five seconds or less',
url: 'http://www.w3.org/TR/WCAG20-TECHS/SCR22'
},
G187: {
title: 'G187: Using a technology to include blinking content that can be turned off via the user agent',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G187'
},
G152: {
title: 'G152: Setting animated gif images to stop blinking after n cycles (within 5 seconds)',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G152'
},
G186: {
title: 'G186: Using a control in the Web page that stops moving, blinking, or auto-updating content',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G186'
},
G191: {
title: 'G191: Providing a link, button, or other mechanism that reloads the page without any blinking content',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G191'
},
F4: {
title: 'F4: Failure of Success Criterion 2.2.2 due to using text-decoration:blink without a mechanism to stop it in less than five seconds',
url: 'http://www.w3.org/TR/WCAG20-TECHS/F4'
},
F47: {
title: 'F47: Failure of Success Criterion 2.2.2 due to using the blink element',
url: 'http://www.w3.org/TR/WCAG20-TECHS/F47'
},
G5: {
title: 'G5: Allowing users to complete an activity without any time limit',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G5'
},
SCR14: {
title: 'SCR14: Using scripts to make nonessential alerts optional',
url: 'http://www.w3.org/TR/WCAG20-TECHS/SCR14'
},
G105: {
title: 'G105: Saving data so that it can be used after a user re-authenticates',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G105'
},
G181: {
title: 'G181: Encoding user data as hidden or encrypted data in a re-authorization page',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G181'
},
G19: {
title: 'G19: Ensuring that no component of the content flashes more than three times in any 1-second period',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G19'
},
G176: {
title: 'G176: Keeping the flashing area small enough',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G176'
},
H64: {
title: 'H64: Using the title attribute of the frame and iframe elements',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H64'
},
G1: {
title: 'G1: Adding a link at the top of each page that goes directly to the main content area',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G1'
},
G123: {
title: 'G123: Adding a link at the beginning of a block of repeated content to go to the end of the block',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G123'
},
G124: {
title: 'G124: Adding links at the top of the page to each area of the content',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G124'
},
H69: {
title: 'H69: Providing heading elements at the beginning of each section of content',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H69'
},
H25: {
title: 'H25: Providing a title using the title element',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H25'
},
H4: {
title: 'H4: Creating a logical tab order through links, form controls, and objects',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H4'
},
H77: {
title: 'H77: Identifying the purpose of a link using link text combined with its enclosing list item',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H77'
},
H78: {
title: 'H78: Identifying the purpose of a link using link text combined with its enclosing paragraph',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H78'
},
H79: {
title: 'H79: Identifying the purpose of a link in a data table using the link text combined with its enclosing table cell and associated table header cells',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H79'
},
H80: {
title: 'H80: Identifying the purpose of a link using link text combined with the preceding heading element',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H80'
},
H81: {
title: 'H81: Identifying the purpose of a link in a nested list using link text combined with the parent list item under which the list is nested',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H81'
},
H33: {
title: 'H33: Supplementing link text with the title attribute',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H33'
},
G125: {
title: 'G125: Providing links to navigate to related Web pages',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G125'
},
G64: {
title: 'G64: Providing a Table of Contents',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G64'
},
G63: {
title: 'G63: Providing a site map',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G63'
},
G161: {
title: 'G161: Providing a search function to help users find content',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G161'
},
G126: {
title: 'G126: Providing a list of links to all other Web pages',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G126'
},
G185: {
title: 'G185: Linking to all of the pages on the site from the home page',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G185'
},
G130: {
title: 'G130: Providing descriptive headings',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G130'
},
G131: {
title: 'G131: Providing descriptive labels',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G131'
},
G149: {
title: 'G149: Using user interface components that are highlighted by the user agent when they receive focus',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G149'
},
G165: {
title: 'G165: Using the default focus indicator for the platform so that high visibility default focus indicators will carry over',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G165'
},
G195: {
title: 'G195: Using an author-supplied, highly visible focus indicator',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G195'
},
C15: {
title: 'C15: Using CSS to change the presentation of a user interface component when it receives focus',
url: 'http://www.w3.org/TR/WCAG20-TECHS/C15'
},
SCR31: {
title: 'SCR31: Using script to change the background color or border of the element with focus',
url: 'http://www.w3.org/TR/WCAG20-TECHS/SCR31'
},
H59: {
title: 'H59: Using the link element and navigation tools',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H59'
},
H57: {
title: 'H57: Using language attributes on the html element ',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H57'
},
H58: {
title: 'H58: Using language attributes to identify changes in the human language ',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H58'
},
H40: {
title: 'H40: Using description lists',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H40'
},
H54: {
title: 'H54: Using the dfn element to identify the defining instance of a word',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H54'
},
H60: {
title: 'H60: Using the link element to link to a glossary',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H60'
},
G62: {
title: 'G62: Providing a glossary',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G62'
},
G70: {
title: 'G70: Providing a function to search an online dictionary',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G70'
},
G102: {
title: 'G102: Providing the expansion or explanation of an abbreviation',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G102'
},
G55: {
title: 'G55: Linking to definitions',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G55'
},
H28: {
title: 'H28: Providing definitions for abbreviations by using the abbr element',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H28'
},
G97: {
title: 'G97: Providing the first use of an abbreviation immediately before or after the expanded form',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G97'
},
G86: {
title: 'G86: Providing a text summary that can be understood by people with lower secondary education level reading ability',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G86'
},
G103: {
title: 'G103: Providing visual illustrations, pictures, and symbols to help explain ideas, events, and processes',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G103'
},
G79: {
title: 'G79: Providing a spoken version of the text',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G79'
},
G153: {
title: 'G153: Making the text easier to read',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G153'
},
G160: {
title: 'G160: Providing sign language versions of information, ideas, and processes that must be understood in order to use the content',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G160'
},
H62: {
title: 'H62: Using the ruby element',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H62'
},
G107: {
title: 'G107: Using \'activate\' rather than \'focus\' as a trigger for changes of context',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G107'
},
H32: {
title: 'H32: Providing submit buttons',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H32'
},
G61: {
title: 'G61: Presenting repeated components in the same relative order each time they appear',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G61'
},
G197: {
title: 'G197: Using labels, names, and text alternatives consistently for content that has the same functionality',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G197'
},
H83: {
title: 'H83: Using the target attribute to open a new window on user request and indicating this in link text',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H83'
},
G83: {
title: 'G83: Providing text descriptions to identify required fields that were not completed',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G83'
},
G84: {
title: 'G84: Providing a text description when the user provides information that is not in the list of allowed values',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G84'
},
G85: {
title: 'G85: Providing a text description when user input falls outside the required format or values',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G85'
},
G89: {
title: 'G89: Providing expected data format and example',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G89'
},
G184: {
title: 'G184: Providing text instructions at the beginning of a form or set of fields that describes the necessary input',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G184'
},
H90: {
title: 'H90: Indicating required form controls using label or legend',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H90'
},
G177: {
title: 'G177: Providing suggested correction text',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G177'
},
G98: {
title: 'G98: Providing the ability for the user to review and correct answers before submitting',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G98'
},
G99: {
title: 'G99: Providing the ability to recover deleted information',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G99'
},
G155: {
title: 'G155: Providing a checkbox in addition to a submit button',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G155'
},
G164: {
title: 'G164: Providing a stated time within which an online request (or transaction) may be amended or canceled by the user after making the request',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G164'
},
G168: {
title: 'G168: Requesting confirmation to continue with selected action',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G168'
},
G71: {
title: 'G71: Providing a help link on every Web page',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G71'
},
G193: {
title: 'G193: Providing help by an assistant in the Web page',
url: 'http://www.w3.org/TR/WCAG20-TECHS/G193'
},
F77: {
title: 'F77: Failure of Success Criterion 4.1.1 due to duplicate values of type ID',
url: 'http://www.w3.org/TR/WCAG20-TECHS/F77'
},
H91: {
title: 'H91: Using HTML form controls and links',
url: 'http://www.w3.org/TR/WCAG20-TECHS/H91'
}
};
}

View File

@@ -12,10 +12,9 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
const chalk = require('chalk'); const kleur = require('kleur');
const config = require('./config'); const config = require('./config');
process.on('SIGINT', () => { process.on('SIGINT', () => {
@@ -23,28 +22,39 @@ process.on('SIGINT', () => {
process.exit(); process.exit();
}); });
require('./app')(config, (err, app) => { require('./app')(config, (error, app) => {
if (error) {
console.error(error.stack);
process.exit(1);
}
console.log(''); console.log('');
console.log(chalk.underline.magenta('Pa11y Dashboard started')); console.log(kleur.underline().magenta('Pa11y Dashboard started'));
console.log(chalk.grey('mode: %s'), process.env.NODE_ENV); console.log(kleur.grey('mode: %s'), process.env.NODE_ENV);
console.log(chalk.grey('uri: %s'), app.address); console.log(kleur.grey('uri: %s'), app.address);
app.on('route-error', err => { app.on('route-error', error => {
const stack = (err.stack ? err.stack.split('\n') : [err.message]); const stack = (error.stack ? error.stack.split('\n') : [error.message]);
const msg = chalk.red(stack.shift()); const msg = kleur.red(stack.shift());
console.error(''); console.error('');
console.error(msg); console.error(msg);
console.error(chalk.grey(stack.join('\n'))); console.error(kleur.grey(stack.join('\n')));
}); });
// Start the webservice if required // Start the webservice if required
if (typeof config.webservice === 'object') { if (typeof config.webservice === 'object') {
require('pa11y-webservice')(config.webservice, (err, webservice) => { require('pa11y-webservice')(config.webservice, (error, webservice) => {
if (error) {
console.error(error.stack);
process.exit(1);
}
console.log(''); console.log('');
console.log(chalk.underline.cyan('Pa11y Webservice started')); console.log(kleur.underline().cyan('Pa11y Webservice started'));
console.log(chalk.grey('mode: %s'), process.env.NODE_ENV); console.log(kleur.grey('mode: %s'), process.env.NODE_ENV);
console.log(chalk.grey('uri: %s'), webservice.server.info.uri); console.log(kleur.grey('uri: %s'), webservice.server.info.uri);
console.log(kleur.grey('database: %s'), config.webservice.database);
console.log(kleur.grey('cron: %s'), config.webservice.cron);
}); });
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "pa11y-dashboard", "name": "pa11y-dashboard",
"version": "2.2.0", "version": "3.3.0",
"private": true, "private": true,
"description": "Pa11y Dashboard is a visual web interface to the Pa11y accessibility reporter", "description": "Pa11y Dashboard is a visual web interface to the Pa11y accessibility reporter",
"keywords": [ "keywords": [
@@ -21,30 +21,31 @@
"bugs": "https://github.com/pa11y/dashboard/issues", "bugs": "https://github.com/pa11y/dashboard/issues",
"license": "GPL-3.0", "license": "GPL-3.0",
"engines": { "engines": {
"node": ">=4" "node": ">=8",
"npm": ">=6"
}, },
"dependencies": { "dependencies": {
"body-parser": "~1.15", "body-parser": "~1.19.0",
"chalk": "~1.1", "compression": "~1.7.4",
"compression": "~1.6", "express": "~4.17.1",
"express": "~4.14", "express-hbs": "~2.4.0",
"express-hbs": "~1.0", "http-headers": "~3.0.2",
"http-headers": "^3.0.1", "kleur": "~4.1.2",
"moment": "~2.13", "moment": "~2.29.0",
"pa11y-webservice": "^2.3.0", "pa11y-webservice": "~3.2.1",
"pa11y-webservice-client-node": "^1.2.1", "pa11y-webservice-client-node": "~2.0.0",
"underscore": "~1.8" "underscore": "~1.11.0"
}, },
"devDependencies": { "devDependencies": {
"bower": "~1.7", "bower": "^1.8.8",
"cheerio": "~0.20", "cheerio": "^1.0.0-rc.3",
"jscs": "^2", "eslint": "^6.8.0",
"jshint": "^2", "less": "^3.11.1",
"less": "~2.7", "mocha": "^7.2.0",
"mocha": "^2", "pa11y-lint-config": "^1.2.1",
"proclaim": "^3", "proclaim": "^3.6.0",
"request": "^2.74", "request": "^2.88.2",
"uglify-js": "~2.6" "uglify-js": "^3.11.0"
}, },
"scripts": { "scripts": {
"start": "node index.js", "start": "node index.js",

File diff suppressed because one or more lines are too long

View File

@@ -18,13 +18,17 @@ $(document).ready(function(){
var data = {}; var data = {};
var standardsList = $('[data-role="standards-list"]'); var standardsList = $('[data-role="standards-list"]');
var standardSelect = $('[data-role="new-task-select"]'); var standardSelect = $('[data-role="new-task-select"]');
var expandLink = $('[data-role="expander"]');
var taskListSelector = $('[data-role="task-list"] a'); var taskListSelector = $('[data-role="task-list"] a');
var detailsCollapse = $('[data-role="details-collapse"]');
var contextPopover = $('[data-role="context-popover"]');
var ruleTooltip = $('[data-role="rule-tooltip"]');
var toTopLinks = $('[data-role="top"]'); var toTopLinks = $('[data-role="top"]');
var zoomResetButton = $('[data-role="zoom-reset"]'); var zoomResetButton = $('[data-role="zoom-reset"]');
var graphContainer = $('[data-role="graph"]'); var graphContainer = $('[data-role="graph"]');
var dateSelectDropdownMenu = $('[data-role="date-select-dropdown-menu"]'); var dateSelectDropdownMenu = $('[data-role="date-select-dropdown-menu"]');
var legend = graphContainer.parent('.graph-container').find('.dashedLegend'); var legend = graphContainer.parent('.graph-container').find('.dashedLegend');
var list = localStorage.getItem("listview") || ""; // get choice or nothing
var graphOptions = { var graphOptions = {
series: { series: {
@@ -73,32 +77,25 @@ $(document).ready(function(){
$('body').addClass('custom-legend'); $('body').addClass('custom-legend');
} }
// Toggle appearance of lists of error/warnings/notices // Update details button title by click
expandLink.click( function(){ detailsCollapse.click(function(){
$(this).next().slideToggle('slow', function(){}); $(this).toggleClass('btn_state_collapsed');
if ($(this).hasClass('showing')) {
$(this).find('span.expander').html('↓');
$(this).attr('aria-expanded', false);
}
else {
$(this).find('span.expander').html('↑');
$(this).attr('aria-expanded', true);
}
$(this).toggleClass('showing');
}); });
$(document).on('keydown.lists', '[data-role="expander"]', function (e) {
var $this = $(this);
var k = e.which || e.keyCode;
if (!/(13|32)/.test(k)) { // Initialize context popovers
return; $(contextPopover).popover({
} container: 'body',
if (k === 13 || k === 32) { placement: 'bottom'
$this.click(); });
}
e.preventDefault(); $(document.body).click(function (e) {
e.stopPropagation(); $(contextPopover).each(function () {
if (!$(this).is(e.target) && $(this).has(e.target).length === 0 && $('.popover').has(e.target).length === 0) {
if ($(this).data('bs.popover').tip().hasClass('in')) {
$(this).popover('toggle');
}
}
});
}); });
// Back to top links // Back to top links
@@ -137,7 +134,7 @@ $(document).ready(function(){
plotGraphData(); plotGraphData();
}); });
$('[data-role="rules-tooltip"]').tooltip(); ruleTooltip.tooltip();
// Function to animate sections // Function to animate sections
function animateSection (sectionName, offset){ function animateSection (sectionName, offset){
@@ -177,6 +174,7 @@ $(document).ready(function(){
function plotGraphData () { function plotGraphData () {
$.plot(graphContainer, getData(), graphOptions); $.plot(graphContainer, getData(), graphOptions);
exportGraph();
} }
function getData() { function getData() {
@@ -207,6 +205,37 @@ $(document).ready(function(){
zoomResetButton.toggleClass('hidden'); zoomResetButton.toggleClass('hidden');
} }
function exportGraph() {
var exportBtn = $('.btn_action_export');
exportBtn.click(function(e) {
e.preventDefault();
var fileName = $('h1').text().toLowerCase().split(' ').join('_');
var date = new Date();
fileName += '_' + date.getDate() + '-' + (date.getMonth() + 1) + '-' + date.getFullYear();
html2canvas($('.graph').get(0), {
onrendered: function (canvas) {
downloadFile(canvas.toDataURL('image/png'), fileName + '.png');
}
});
});
}
function downloadFile(dataurl, filename) {
var link = document.createElement('a');
link.href = dataurl;
link.setAttribute('download', filename);
var clickEvent = document.createEvent('MouseEvents');
clickEvent.initEvent('click', false, true);
link.dispatchEvent(clickEvent);
return false;
}
graphContainer.bind('plotselected', function (event, ranges) { graphContainer.bind('plotselected', function (event, ranges) {
// clamp the zooming to prevent eternal zoom // clamp the zooming to prevent eternal zoom
if (ranges.xaxis.to - ranges.xaxis.from < 0.00001) { if (ranges.xaxis.to - ranges.xaxis.from < 0.00001) {
@@ -287,7 +316,7 @@ $(document).ready(function(){
var previousPoint = null; var previousPoint = null;
graphContainer.bind('plothover', function (event, pos, item) { graphContainer.bind('plothover', function (event, pos, item) {
if (item) { if (item) {
if (previousPoint != item.dataIndex) { if (previousPoint !== item.dataIndex) {
previousPoint = item.dataIndex; previousPoint = item.dataIndex;
$('[data-role="tooltip"]').remove(); $('[data-role="tooltip"]').remove();
var count = item.datapoint[1].toFixed(0); var count = item.datapoint[1].toFixed(0);
@@ -370,4 +399,38 @@ $(document).ready(function(){
$.fn.collapse.Constructor.prototype.keydown $.fn.collapse.Constructor.prototype.keydown
); );
// List View
$('.btn-list').click(function () {
var elements = $("#grid-container .task-card");
for (i = 0; i < elements.length; i++) {
$(elements[i]).removeClass('col-md-4 col-sm-6');
$(elements[i]).addClass('col-md-12');
$(elements[i]).find('.gridview:nth-child(1)').addClass('listview col-md-9 col-sm-8');
$(elements[i]).find('.gridview:nth-child(2)').addClass('listview col-md-3 col-sm-4 task-actions clearfix');
$(elements[i]).find('.gridview').removeClass('gridview');
};
$('.view-btn').removeClass('btn-default')
$(this).addClass('btn-default');
localStorage.setItem("listview", "yes") //save the choice
});
// Grid View
$('.btn-grid').click(function () {
var elements = $("#grid-container .task-card");
for (i = 0; i < elements.length; i++) {
$(elements[i]).removeClass('col-md-12');
$(elements[i]).addClass('col-md-4 col-sm-6');
$(elements[i]).find('.listview').addClass('gridview')
$(elements[i]).find('.listview:nth-child(1)').removeClass('listview col-md-9 col-sm-8');
$(elements[i]).find('.listview:nth-child(2)').removeClass('listview col-md-3 col-sm-4 task-actions clearfix');
};
$('.view-btn').removeClass('btn-default')
$(this).addClass('btn-default')
localStorage.setItem("listview", "") //clears the choice
});
//load the view as per user's choice
if (list === 'yes') {
$('.btn-list').trigger('click');
}
}); });

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -2,7 +2,6 @@
// Alerts // Alerts
// -------------------------------------------------- // --------------------------------------------------
// Base styles // Base styles
// ------------------------- // -------------------------
@@ -18,6 +17,7 @@
// Specified for the h4 to prevent conflicts of changing @headingsColor // Specified for the h4 to prevent conflicts of changing @headingsColor
color: inherit; color: inherit;
} }
// Provide class for links that match alerts // Provide class for links that match alerts
.alert-link { .alert-link {
font-weight: @alert-link-font-weight; font-weight: @alert-link-font-weight;
@@ -56,12 +56,15 @@
.alert-success { .alert-success {
.alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text); .alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text);
} }
.alert-info { .alert-info {
.alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text); .alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text);
} }
.alert-warning { .alert-warning {
.alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text); .alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text);
} }
.alert-danger { .alert-danger {
.alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text); .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);
} }

View File

@@ -2,7 +2,6 @@
// Badges // Badges
// -------------------------------------------------- // --------------------------------------------------
// Base classes // Base classes
.badge { .badge {
display: inline-block; display: inline-block;
@@ -46,6 +45,7 @@ a.list-group-item.active > .badge,
color: @badge-active-color; color: @badge-active-color;
background-color: @badge-active-bg; background-color: @badge-active-bg;
} }
.nav-pills > li > a > .badge { .nav-pills > li > a > .badge {
margin-left: 3px; margin-left: 3px;
} }

View File

@@ -39,7 +39,6 @@
// Tables ===================================================================== // Tables =====================================================================
.table { .table {
tr.success, tr.success,
tr.warning, tr.warning,
tr.danger { tr.danger {
@@ -112,7 +111,6 @@ input[type="color"],
// Navs ======================================================================= // Navs =======================================================================
.pagination { .pagination {
a { a {
color: #fff; color: #fff;
@@ -152,7 +150,6 @@ input[type="color"],
// Indicators ================================================================= // Indicators =================================================================
.alert { .alert {
a, a,
.alert-link { .alert-link {
color: #fff; color: #fff;

View File

@@ -2,7 +2,6 @@
// Breadcrumbs // Breadcrumbs
// -------------------------------------------------- // --------------------------------------------------
.breadcrumb { .breadcrumb {
padding: 8px 15px; padding: 8px 15px;
margin-bottom: @line-height-computed; margin-bottom: @line-height-computed;

View File

@@ -10,6 +10,7 @@
.btn-default & { .btn-default & {
border-top-color: @btn-default-color; border-top-color: @btn-default-color;
} }
.btn-primary &, .btn-primary &,
.btn-success &, .btn-success &,
.btn-warning &, .btn-warning &,
@@ -18,10 +19,12 @@
border-top-color: #fff; border-top-color: #fff;
} }
} }
.dropup { .dropup {
& .btn-default .caret { & .btn-default .caret {
border-bottom-color: @btn-default-color; border-bottom-color: @btn-default-color;
} }
.btn-primary, .btn-primary,
.btn-success, .btn-success,
.btn-warning, .btn-warning,
@@ -94,6 +97,7 @@
.border-right-radius(0); .border-right-radius(0);
} }
} }
// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
.btn-group > .btn:last-child:not(:first-child), .btn-group > .btn:last-child:not(:first-child),
.btn-group > .dropdown-toggle:not(:first-child) { .btn-group > .dropdown-toggle:not(:first-child) {
@@ -104,15 +108,18 @@
.btn-group > .btn-group { .btn-group > .btn-group {
float: left; float: left;
} }
.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0; border-radius: 0;
} }
.btn-group > .btn-group:first-child { .btn-group > .btn-group:first-child {
> .btn:last-child, > .btn:last-child,
> .dropdown-toggle { > .dropdown-toggle {
.border-right-radius(0); .border-right-radius(0);
} }
} }
.btn-group > .btn-group:last-child > .btn:first-child { .btn-group > .btn-group:last-child > .btn:first-child {
.border-left-radius(0); .border-left-radius(0);
} }
@@ -123,15 +130,21 @@
outline: 0; outline: 0;
} }
// Sizing // Sizing
// //
// Remix the default button sizing classes into new ones for easier manipulation. // Remix the default button sizing classes into new ones for easier manipulation.
.btn-group-xs > .btn { .btn-xs(); } .btn-group-xs > .btn {
.btn-group-sm > .btn { .btn-sm(); } .btn-xs();
.btn-group-lg > .btn { .btn-lg(); } }
.btn-group-sm > .btn {
.btn-sm();
}
.btn-group-lg > .btn {
.btn-lg();
}
// Split button dropdowns // Split button dropdowns
// ---------------------- // ----------------------
@@ -141,6 +154,7 @@
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
} }
.btn-group > .btn-lg + .dropdown-toggle { .btn-group > .btn-lg + .dropdown-toggle {
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
@@ -152,22 +166,22 @@
.box-shadow(inset 0 3px 5px rgba(0, 0, 0, .125)); .box-shadow(inset 0 3px 5px rgba(0, 0, 0, .125));
} }
// Reposition the caret // Reposition the caret
.btn .caret { .btn .caret {
margin-left: 0; margin-left: 0;
} }
// Carets in other button sizes // Carets in other button sizes
.btn-lg .caret { .btn-lg .caret {
border-width: @caret-width-large @caret-width-large 0; border-width: @caret-width-large @caret-width-large 0;
border-bottom-width: 0; border-bottom-width: 0;
} }
// Upside down carets for .dropup // Upside down carets for .dropup
.dropup .btn-lg .caret { .dropup .btn-lg .caret {
border-width: 0 @caret-width-large @caret-width-large; border-width: 0 @caret-width-large @caret-width-large;
} }
// Vertical button groups // Vertical button groups
// ---------------------- // ----------------------
@@ -210,21 +224,22 @@
.border-top-radius(0); .border-top-radius(0);
} }
} }
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
border-radius: 0; border-radius: 0;
} }
.btn-group-vertical > .btn-group:first-child { .btn-group-vertical > .btn-group:first-child {
> .btn:last-child, > .btn:last-child,
> .dropdown-toggle { > .dropdown-toggle {
.border-bottom-radius(0); .border-bottom-radius(0);
} }
} }
.btn-group-vertical > .btn-group:last-child > .btn:first-child { .btn-group-vertical > .btn-group:last-child > .btn:first-child {
.border-top-radius(0); .border-top-radius(0);
} }
// Justified button groups // Justified button groups
// ---------------------- // ----------------------
@@ -233,6 +248,7 @@
width: 100%; width: 100%;
table-layout: fixed; table-layout: fixed;
border-collapse: separate; border-collapse: separate;
.btn { .btn {
float: none; float: none;
display: table-cell; display: table-cell;
@@ -240,7 +256,6 @@
} }
} }
// Checkbox and radio options // Checkbox and radio options
[data-toggle="buttons"] > .btn > input[type="radio"], [data-toggle="buttons"] > .btn > input[type="radio"],
[data-toggle="buttons"] > .btn > input[type="checkbox"] { [data-toggle="buttons"] > .btn > input[type="checkbox"] {

View File

@@ -2,7 +2,6 @@
// Buttons // Buttons
// -------------------------------------------------- // --------------------------------------------------
// Base styles // Base styles
// -------------------------------------------------- // --------------------------------------------------
@@ -51,34 +50,37 @@
} }
// Alternate buttons // Alternate buttons
// -------------------------------------------------- // --------------------------------------------------
.btn-default { .btn-default {
.button-variant(@btn-default-color; @btn-default-bg; @btn-default-border); .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
} }
.btn-primary { .btn-primary {
.button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border); .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
} }
// Warning appears as orange // Warning appears as orange
.btn-warning { .btn-warning {
.button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border); .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
} }
// Danger and error appear as red // Danger and error appear as red
.btn-danger { .btn-danger {
.button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border); .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
} }
// Success appears as green // Success appears as green
.btn-success { .btn-success {
.button-variant(@btn-success-color; @btn-success-bg; @btn-success-border); .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
} }
// Info appears as blue-green // Info appears as blue-green
.btn-info { .btn-info {
.button-variant(@btn-info-color; @btn-info-bg; @btn-info-border); .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
} }
// Link buttons // Link buttons
// ------------------------- // -------------------------
@@ -118,7 +120,6 @@
} }
} }
// Button Sizes // Button Sizes
// -------------------------------------------------- // --------------------------------------------------
@@ -126,16 +127,17 @@
// line-height: ensure even-numbered height of button next to large input // line-height: ensure even-numbered height of button next to large input
.button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
} }
.btn-sm, .btn-sm,
.btn-xs { .btn-xs {
// line-height: ensure proper height of button next to small input // line-height: ensure proper height of button next to small input
.button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
} }
.btn-xs { .btn-xs {
padding: 1px 5px; padding: 1px 5px;
} }
// Block button // Block button
// -------------------------------------------------- // --------------------------------------------------

View File

@@ -2,7 +2,6 @@
// Carousel // Carousel
// -------------------------------------------------- // --------------------------------------------------
// Wrapper for the slide container and indicators // Wrapper for the slide container and indicators
.carousel { .carousel {
position: relative; position: relative;
@@ -28,7 +27,9 @@
> .active, > .active,
> .next, > .next,
> .prev { display: block; } > .prev {
display: block;
}
> .active { > .active {
left: 0; left: 0;
@@ -106,14 +107,17 @@
z-index: 5; z-index: 5;
display: inline-block; display: inline-block;
} }
.icon-prev, .icon-prev,
.glyphicon-chevron-left { .glyphicon-chevron-left {
left: 50%; left: 50%;
} }
.icon-next, .icon-next,
.glyphicon-chevron-right { .glyphicon-chevron-right {
right: 50%; right: 50%;
} }
.icon-prev, .icon-prev,
.icon-next { .icon-next {
width: 20px; width: 20px;
@@ -128,6 +132,7 @@
content: '\2039'; // SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039) content: '\2039'; // SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
} }
} }
.icon-next { .icon-next {
&:before { &:before {
content: '\203a'; // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A) content: '\203a'; // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)
@@ -161,6 +166,7 @@
border-radius: 10px; border-radius: 10px;
cursor: pointer; cursor: pointer;
} }
.active { .active {
margin: 0; margin: 0;
width: 12px; width: 12px;
@@ -183,15 +189,14 @@
color: @carousel-caption-color; color: @carousel-caption-color;
text-align: center; text-align: center;
text-shadow: @carousel-text-shadow; text-shadow: @carousel-text-shadow;
& .btn { & .btn {
text-shadow: none; // No shadow for button elements in carousel-caption text-shadow: none; // No shadow for button elements in carousel-caption
} }
} }
// Scale up controls for tablets and up // Scale up controls for tablets and up
@media screen and (min-width: @screen-sm-min) { @media screen and (min-width: @screen-sm-min) {
// Scale up the controls a smidge // Scale up the controls a smidge
.carousel-control { .carousel-control {
.glyphicons-chevron-left, .glyphicons-chevron-left,

View File

@@ -2,7 +2,6 @@
// Close icons // Close icons
// -------------------------------------------------- // --------------------------------------------------
.close { .close {
float: right; float: right;
font-size: (@font-size-base * 1.5); font-size: (@font-size-base * 1.5);

View File

@@ -2,7 +2,6 @@
// Code (inline and blocK) // Code (inline and blocK)
// -------------------------------------------------- // --------------------------------------------------
// Inline and block code styles // Inline and block code styles
code, code,
kdb, kdb,

View File

@@ -10,6 +10,7 @@
.fade { .fade {
opacity: 0; opacity: 0;
.transition(opacity .15s linear); .transition(opacity .15s linear);
&.in { &.in {
opacity: 1; opacity: 1;
} }
@@ -17,10 +18,12 @@
.collapse { .collapse {
display: none; display: none;
&.in { &.in {
display: block; display: block;
} }
} }
.collapsing { .collapsing {
position: relative; position: relative;
height: 0; height: 0;

View File

@@ -2,7 +2,6 @@
// Dropdown menus // Dropdown menus
// -------------------------------------------------- // --------------------------------------------------
// Dropdown arrow/caret // Dropdown arrow/caret
.caret { .caret {
display: inline-block; display: inline-block;
@@ -105,6 +104,7 @@
color: @dropdown-link-disabled-color; color: @dropdown-link-disabled-color;
} }
} }
// Nuke hover/focus effects // Nuke hover/focus effects
.dropdown-menu > .disabled > a { .dropdown-menu > .disabled > a {
&:hover, &:hover,
@@ -170,6 +170,7 @@
border-bottom: 4px solid @dropdown-caret-color; border-bottom: 4px solid @dropdown-caret-color;
content: ""; content: "";
} }
// Different positioning for bottom up menu // Different positioning for bottom up menu
.dropdown-menu { .dropdown-menu {
top: auto; top: auto;
@@ -178,7 +179,6 @@
} }
} }
// Component alignment // Component alignment
// //
// Reiterate per navbar.less and the modified component alignment there. // Reiterate per navbar.less and the modified component alignment there.

View File

@@ -2,7 +2,6 @@
// Forms // Forms
// -------------------------------------------------- // --------------------------------------------------
// Normalize non-controls // Normalize non-controls
// //
// Restyle and baseline non-control form elements. // Restyle and baseline non-control form elements.
@@ -31,7 +30,6 @@ label {
font-weight: bold; font-weight: bold;
} }
// Normalize form controls // Normalize form controls
// Override content-box in Normalize (* isn't specific enough) // Override content-box in Normalize (* isn't specific enough)
@@ -100,7 +98,6 @@ output {
.placeholder(); .placeholder();
} }
// Common form controls // Common form controls
// //
// Shared size and type resets for form controls. Apply `.form-control` to any // Shared size and type resets for form controls. Apply `.form-control` to any
@@ -159,7 +156,6 @@ output {
} }
} }
// Form groups // Form groups
// //
// Designed to help with the organization and spacing of vertical forms. For // Designed to help with the organization and spacing of vertical forms. For
@@ -169,7 +165,6 @@ output {
margin-bottom: 15px; margin-bottom: 15px;
} }
// Checkboxes and radios // Checkboxes and radios
// //
// Indent the labels to position radios/checkboxes as hanging controls. // Indent the labels to position radios/checkboxes as hanging controls.
@@ -182,6 +177,7 @@ output {
margin-bottom: 10px; margin-bottom: 10px;
padding-left: 20px; padding-left: 20px;
vertical-align: middle; vertical-align: middle;
label { label {
display: inline; display: inline;
margin-bottom: 0; margin-bottom: 0;
@@ -189,6 +185,7 @@ output {
cursor: pointer; cursor: pointer;
} }
} }
.radio input[type="radio"], .radio input[type="radio"],
.radio-inline input[type="radio"], .radio-inline input[type="radio"],
.checkbox input[type="checkbox"], .checkbox input[type="checkbox"],
@@ -196,6 +193,7 @@ output {
float: left; float: left;
margin-left: -20px; margin-left: -20px;
} }
.radio + .radio, .radio + .radio,
.checkbox + .checkbox { .checkbox + .checkbox {
margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing
@@ -211,6 +209,7 @@ output {
font-weight: normal; font-weight: normal;
cursor: pointer; cursor: pointer;
} }
.radio-inline + .radio-inline, .radio-inline + .radio-inline,
.checkbox-inline + .checkbox-inline { .checkbox-inline + .checkbox-inline {
margin-top: 0; margin-top: 0;
@@ -241,7 +240,6 @@ input[type="checkbox"],
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
} }
// Form control feedback states // Form control feedback states
// //
// Apply contextual and semantic states to individual form controls. // Apply contextual and semantic states to individual form controls.
@@ -250,16 +248,17 @@ input[type="checkbox"],
.has-warning { .has-warning {
.form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg); .form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg);
} }
// Error // Error
.has-error { .has-error {
.form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg); .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg);
} }
// Success // Success
.has-success { .has-success {
.form-control-validation(@state-success-text; @state-success-text; @state-success-bg); .form-control-validation(@state-success-text; @state-success-text; @state-success-bg);
} }
// Static form control text // Static form control text
// //
// Apply class to a `p` element to make any string of text align with labels in // Apply class to a `p` element to make any string of text align with labels in
@@ -270,7 +269,6 @@ input[type="checkbox"],
padding-top: (@padding-base-vertical + 1); padding-top: (@padding-base-vertical + 1);
} }
// Help text // Help text
// //
// Apply to any element you wish to create light text for placement immediately // Apply to any element you wish to create light text for placement immediately
@@ -283,8 +281,6 @@ input[type="checkbox"],
color: lighten(@text-color, 25%); // lighten the text some for contrast color: lighten(@text-color, 25%); // lighten the text some for contrast
} }
// Inline forms // Inline forms
// //
// Make forms appear inline(-block) by adding the `.form-inline` class. Inline // Make forms appear inline(-block) by adding the `.form-inline` class. Inline
@@ -297,7 +293,6 @@ input[type="checkbox"],
// Heads up! This is mixin-ed into `.navbar-form` in navbars.less. // Heads up! This is mixin-ed into `.navbar-form` in navbars.less.
.form-inline { .form-inline {
// Kick in the inline // Kick in the inline
@media (min-width: @screen-sm) { @media (min-width: @screen-sm) {
// Inline-block all the things for "inline" // Inline-block all the things for "inline"
@@ -322,6 +317,7 @@ input[type="checkbox"],
margin-bottom: 0; margin-bottom: 0;
padding-left: 0; padding-left: 0;
} }
.radio input[type="radio"], .radio input[type="radio"],
.checkbox input[type="checkbox"] { .checkbox input[type="checkbox"] {
float: none; float: none;
@@ -330,14 +326,12 @@ input[type="checkbox"],
} }
} }
// Horizontal forms // Horizontal forms
// //
// Horizontal forms are built on grid classes and allow you to create forms with // Horizontal forms are built on grid classes and allow you to create forms with
// labels on the left and inputs on the right. // labels on the left and inputs on the right.
.form-horizontal { .form-horizontal {
// Consistent vertical alignment of labels, radios, and checkboxes // Consistent vertical alignment of labels, radios, and checkboxes
.control-label, .control-label,
.radio, .radio,

File diff suppressed because it is too large Load Diff

View File

@@ -2,7 +2,6 @@
// Grid system // Grid system
// -------------------------------------------------- // --------------------------------------------------
// Set the container width, and override it for fixed navbars in media queries // Set the container width, and override it for fixed navbars in media queries
.container { .container {
.container-fixed(); .container-fixed();
@@ -70,7 +69,6 @@
padding-right: (@grid-gutter-width / 2); padding-right: (@grid-gutter-width / 2);
} }
// Extra small grid // Extra small grid
// //
// Grid classes for extra small devices like smartphones. No offset, push, or // Grid classes for extra small devices like smartphones. No offset, push, or
@@ -92,19 +90,54 @@
.col-xs-11 { .col-xs-11 {
float: left; float: left;
} }
.col-xs-1 { width: percentage((1 / @grid-columns)); }
.col-xs-2 { width: percentage((2 / @grid-columns)); }
.col-xs-3 { width: percentage((3 / @grid-columns)); }
.col-xs-4 { width: percentage((4 / @grid-columns)); }
.col-xs-5 { width: percentage((5 / @grid-columns)); }
.col-xs-6 { width: percentage((6 / @grid-columns)); }
.col-xs-7 { width: percentage((7 / @grid-columns)); }
.col-xs-8 { width: percentage((8 / @grid-columns)); }
.col-xs-9 { width: percentage((9 / @grid-columns)); }
.col-xs-10 { width: percentage((10/ @grid-columns)); }
.col-xs-11 { width: percentage((11/ @grid-columns)); }
.col-xs-12 { width: 100%; }
.col-xs-1 {
width: percentage((1 / @grid-columns));
}
.col-xs-2 {
width: percentage((2 / @grid-columns));
}
.col-xs-3 {
width: percentage((3 / @grid-columns));
}
.col-xs-4 {
width: percentage((4 / @grid-columns));
}
.col-xs-5 {
width: percentage((5 / @grid-columns));
}
.col-xs-6 {
width: percentage((6 / @grid-columns));
}
.col-xs-7 {
width: percentage((7 / @grid-columns));
}
.col-xs-8 {
width: percentage((8 / @grid-columns));
}
.col-xs-9 {
width: percentage((9 / @grid-columns));
}
.col-xs-10 {
width: percentage((10/ @grid-columns));
}
.col-xs-11 {
width: percentage((11/ @grid-columns));
}
.col-xs-12 {
width: 100%;
}
// Small grid // Small grid
// //
@@ -132,58 +165,189 @@
.col-sm-11 { .col-sm-11 {
float: left; float: left;
} }
.col-sm-1 { width: percentage((1 / @grid-columns)); }
.col-sm-2 { width: percentage((2 / @grid-columns)); }
.col-sm-3 { width: percentage((3 / @grid-columns)); }
.col-sm-4 { width: percentage((4 / @grid-columns)); }
.col-sm-5 { width: percentage((5 / @grid-columns)); }
.col-sm-6 { width: percentage((6 / @grid-columns)); }
.col-sm-7 { width: percentage((7 / @grid-columns)); }
.col-sm-8 { width: percentage((8 / @grid-columns)); }
.col-sm-9 { width: percentage((9 / @grid-columns)); }
.col-sm-10 { width: percentage((10/ @grid-columns)); }
.col-sm-11 { width: percentage((11/ @grid-columns)); }
.col-sm-12 { width: 100%; }
// Push and pull columns for source order changes .col-sm-1 {
.col-sm-push-1 { left: percentage((1 / @grid-columns)); } width: percentage((1 / @grid-columns));
.col-sm-push-2 { left: percentage((2 / @grid-columns)); }
.col-sm-push-3 { left: percentage((3 / @grid-columns)); }
.col-sm-push-4 { left: percentage((4 / @grid-columns)); }
.col-sm-push-5 { left: percentage((5 / @grid-columns)); }
.col-sm-push-6 { left: percentage((6 / @grid-columns)); }
.col-sm-push-7 { left: percentage((7 / @grid-columns)); }
.col-sm-push-8 { left: percentage((8 / @grid-columns)); }
.col-sm-push-9 { left: percentage((9 / @grid-columns)); }
.col-sm-push-10 { left: percentage((10/ @grid-columns)); }
.col-sm-push-11 { left: percentage((11/ @grid-columns)); }
.col-sm-pull-1 { right: percentage((1 / @grid-columns)); }
.col-sm-pull-2 { right: percentage((2 / @grid-columns)); }
.col-sm-pull-3 { right: percentage((3 / @grid-columns)); }
.col-sm-pull-4 { right: percentage((4 / @grid-columns)); }
.col-sm-pull-5 { right: percentage((5 / @grid-columns)); }
.col-sm-pull-6 { right: percentage((6 / @grid-columns)); }
.col-sm-pull-7 { right: percentage((7 / @grid-columns)); }
.col-sm-pull-8 { right: percentage((8 / @grid-columns)); }
.col-sm-pull-9 { right: percentage((9 / @grid-columns)); }
.col-sm-pull-10 { right: percentage((10/ @grid-columns)); }
.col-sm-pull-11 { right: percentage((11/ @grid-columns)); }
// Offsets
.col-sm-offset-1 { margin-left: percentage((1 / @grid-columns)); }
.col-sm-offset-2 { margin-left: percentage((2 / @grid-columns)); }
.col-sm-offset-3 { margin-left: percentage((3 / @grid-columns)); }
.col-sm-offset-4 { margin-left: percentage((4 / @grid-columns)); }
.col-sm-offset-5 { margin-left: percentage((5 / @grid-columns)); }
.col-sm-offset-6 { margin-left: percentage((6 / @grid-columns)); }
.col-sm-offset-7 { margin-left: percentage((7 / @grid-columns)); }
.col-sm-offset-8 { margin-left: percentage((8 / @grid-columns)); }
.col-sm-offset-9 { margin-left: percentage((9 / @grid-columns)); }
.col-sm-offset-10 { margin-left: percentage((10/ @grid-columns)); }
.col-sm-offset-11 { margin-left: percentage((11/ @grid-columns)); }
} }
.col-sm-2 {
width: percentage((2 / @grid-columns));
}
.col-sm-3 {
width: percentage((3 / @grid-columns));
}
.col-sm-4 {
width: percentage((4 / @grid-columns));
}
.col-sm-5 {
width: percentage((5 / @grid-columns));
}
.col-sm-6 {
width: percentage((6 / @grid-columns));
}
.col-sm-7 {
width: percentage((7 / @grid-columns));
}
.col-sm-8 {
width: percentage((8 / @grid-columns));
}
.col-sm-9 {
width: percentage((9 / @grid-columns));
}
.col-sm-10 {
width: percentage((10/ @grid-columns));
}
.col-sm-11 {
width: percentage((11/ @grid-columns));
}
.col-sm-12 {
width: 100%;
}
// Push and pull columns for source order changes
.col-sm-push-1 {
left: percentage((1 / @grid-columns));
}
.col-sm-push-2 {
left: percentage((2 / @grid-columns));
}
.col-sm-push-3 {
left: percentage((3 / @grid-columns));
}
.col-sm-push-4 {
left: percentage((4 / @grid-columns));
}
.col-sm-push-5 {
left: percentage((5 / @grid-columns));
}
.col-sm-push-6 {
left: percentage((6 / @grid-columns));
}
.col-sm-push-7 {
left: percentage((7 / @grid-columns));
}
.col-sm-push-8 {
left: percentage((8 / @grid-columns));
}
.col-sm-push-9 {
left: percentage((9 / @grid-columns));
}
.col-sm-push-10 {
left: percentage((10/ @grid-columns));
}
.col-sm-push-11 {
left: percentage((11/ @grid-columns));
}
.col-sm-pull-1 {
right: percentage((1 / @grid-columns));
}
.col-sm-pull-2 {
right: percentage((2 / @grid-columns));
}
.col-sm-pull-3 {
right: percentage((3 / @grid-columns));
}
.col-sm-pull-4 {
right: percentage((4 / @grid-columns));
}
.col-sm-pull-5 {
right: percentage((5 / @grid-columns));
}
.col-sm-pull-6 {
right: percentage((6 / @grid-columns));
}
.col-sm-pull-7 {
right: percentage((7 / @grid-columns));
}
.col-sm-pull-8 {
right: percentage((8 / @grid-columns));
}
.col-sm-pull-9 {
right: percentage((9 / @grid-columns));
}
.col-sm-pull-10 {
right: percentage((10/ @grid-columns));
}
.col-sm-pull-11 {
right: percentage((11/ @grid-columns));
}
// Offsets
.col-sm-offset-1 {
margin-left: percentage((1 / @grid-columns));
}
.col-sm-offset-2 {
margin-left: percentage((2 / @grid-columns));
}
.col-sm-offset-3 {
margin-left: percentage((3 / @grid-columns));
}
.col-sm-offset-4 {
margin-left: percentage((4 / @grid-columns));
}
.col-sm-offset-5 {
margin-left: percentage((5 / @grid-columns));
}
.col-sm-offset-6 {
margin-left: percentage((6 / @grid-columns));
}
.col-sm-offset-7 {
margin-left: percentage((7 / @grid-columns));
}
.col-sm-offset-8 {
margin-left: percentage((8 / @grid-columns));
}
.col-sm-offset-9 {
margin-left: percentage((9 / @grid-columns));
}
.col-sm-offset-10 {
margin-left: percentage((10/ @grid-columns));
}
.col-sm-offset-11 {
margin-left: percentage((11/ @grid-columns));
}
}
// Medium grid // Medium grid
// //
@@ -196,6 +360,7 @@
.container { .container {
width: @container-md; width: @container-md;
} }
.col-md-1, .col-md-1,
.col-md-2, .col-md-2,
.col-md-3, .col-md-3,
@@ -209,61 +374,201 @@
.col-md-11 { .col-md-11 {
float: left; float: left;
} }
.col-md-1 { width: percentage((1 / @grid-columns)); }
.col-md-2 { width: percentage((2 / @grid-columns)); }
.col-md-3 { width: percentage((3 / @grid-columns)); }
.col-md-4 { width: percentage((4 / @grid-columns)); }
.col-md-5 { width: percentage((5 / @grid-columns)); }
.col-md-6 { width: percentage((6 / @grid-columns)); }
.col-md-7 { width: percentage((7 / @grid-columns)); }
.col-md-8 { width: percentage((8 / @grid-columns)); }
.col-md-9 { width: percentage((9 / @grid-columns)); }
.col-md-10 { width: percentage((10/ @grid-columns)); }
.col-md-11 { width: percentage((11/ @grid-columns)); }
.col-md-12 { width: 100%; }
// Push and pull columns for source order changes .col-md-1 {
.col-md-push-0 { left: auto; } width: percentage((1 / @grid-columns));
.col-md-push-1 { left: percentage((1 / @grid-columns)); }
.col-md-push-2 { left: percentage((2 / @grid-columns)); }
.col-md-push-3 { left: percentage((3 / @grid-columns)); }
.col-md-push-4 { left: percentage((4 / @grid-columns)); }
.col-md-push-5 { left: percentage((5 / @grid-columns)); }
.col-md-push-6 { left: percentage((6 / @grid-columns)); }
.col-md-push-7 { left: percentage((7 / @grid-columns)); }
.col-md-push-8 { left: percentage((8 / @grid-columns)); }
.col-md-push-9 { left: percentage((9 / @grid-columns)); }
.col-md-push-10 { left: percentage((10/ @grid-columns)); }
.col-md-push-11 { left: percentage((11/ @grid-columns)); }
.col-md-pull-0 { right: auto; }
.col-md-pull-1 { right: percentage((1 / @grid-columns)); }
.col-md-pull-2 { right: percentage((2 / @grid-columns)); }
.col-md-pull-3 { right: percentage((3 / @grid-columns)); }
.col-md-pull-4 { right: percentage((4 / @grid-columns)); }
.col-md-pull-5 { right: percentage((5 / @grid-columns)); }
.col-md-pull-6 { right: percentage((6 / @grid-columns)); }
.col-md-pull-7 { right: percentage((7 / @grid-columns)); }
.col-md-pull-8 { right: percentage((8 / @grid-columns)); }
.col-md-pull-9 { right: percentage((9 / @grid-columns)); }
.col-md-pull-10 { right: percentage((10/ @grid-columns)); }
.col-md-pull-11 { right: percentage((11/ @grid-columns)); }
// Offsets
.col-md-offset-0 { margin-left: 0; }
.col-md-offset-1 { margin-left: percentage((1 / @grid-columns)); }
.col-md-offset-2 { margin-left: percentage((2 / @grid-columns)); }
.col-md-offset-3 { margin-left: percentage((3 / @grid-columns)); }
.col-md-offset-4 { margin-left: percentage((4 / @grid-columns)); }
.col-md-offset-5 { margin-left: percentage((5 / @grid-columns)); }
.col-md-offset-6 { margin-left: percentage((6 / @grid-columns)); }
.col-md-offset-7 { margin-left: percentage((7 / @grid-columns)); }
.col-md-offset-8 { margin-left: percentage((8 / @grid-columns)); }
.col-md-offset-9 { margin-left: percentage((9 / @grid-columns)); }
.col-md-offset-10 { margin-left: percentage((10/ @grid-columns)); }
.col-md-offset-11 { margin-left: percentage((11/ @grid-columns)); }
} }
.col-md-2 {
width: percentage((2 / @grid-columns));
}
.col-md-3 {
width: percentage((3 / @grid-columns));
}
.col-md-4 {
width: percentage((4 / @grid-columns));
}
.col-md-5 {
width: percentage((5 / @grid-columns));
}
.col-md-6 {
width: percentage((6 / @grid-columns));
}
.col-md-7 {
width: percentage((7 / @grid-columns));
}
.col-md-8 {
width: percentage((8 / @grid-columns));
}
.col-md-9 {
width: percentage((9 / @grid-columns));
}
.col-md-10 {
width: percentage((10/ @grid-columns));
}
.col-md-11 {
width: percentage((11/ @grid-columns));
}
.col-md-12 {
width: 100%;
}
// Push and pull columns for source order changes
.col-md-push-0 {
left: auto;
}
.col-md-push-1 {
left: percentage((1 / @grid-columns));
}
.col-md-push-2 {
left: percentage((2 / @grid-columns));
}
.col-md-push-3 {
left: percentage((3 / @grid-columns));
}
.col-md-push-4 {
left: percentage((4 / @grid-columns));
}
.col-md-push-5 {
left: percentage((5 / @grid-columns));
}
.col-md-push-6 {
left: percentage((6 / @grid-columns));
}
.col-md-push-7 {
left: percentage((7 / @grid-columns));
}
.col-md-push-8 {
left: percentage((8 / @grid-columns));
}
.col-md-push-9 {
left: percentage((9 / @grid-columns));
}
.col-md-push-10 {
left: percentage((10/ @grid-columns));
}
.col-md-push-11 {
left: percentage((11/ @grid-columns));
}
.col-md-pull-0 {
right: auto;
}
.col-md-pull-1 {
right: percentage((1 / @grid-columns));
}
.col-md-pull-2 {
right: percentage((2 / @grid-columns));
}
.col-md-pull-3 {
right: percentage((3 / @grid-columns));
}
.col-md-pull-4 {
right: percentage((4 / @grid-columns));
}
.col-md-pull-5 {
right: percentage((5 / @grid-columns));
}
.col-md-pull-6 {
right: percentage((6 / @grid-columns));
}
.col-md-pull-7 {
right: percentage((7 / @grid-columns));
}
.col-md-pull-8 {
right: percentage((8 / @grid-columns));
}
.col-md-pull-9 {
right: percentage((9 / @grid-columns));
}
.col-md-pull-10 {
right: percentage((10/ @grid-columns));
}
.col-md-pull-11 {
right: percentage((11/ @grid-columns));
}
// Offsets
.col-md-offset-0 {
margin-left: 0;
}
.col-md-offset-1 {
margin-left: percentage((1 / @grid-columns));
}
.col-md-offset-2 {
margin-left: percentage((2 / @grid-columns));
}
.col-md-offset-3 {
margin-left: percentage((3 / @grid-columns));
}
.col-md-offset-4 {
margin-left: percentage((4 / @grid-columns));
}
.col-md-offset-5 {
margin-left: percentage((5 / @grid-columns));
}
.col-md-offset-6 {
margin-left: percentage((6 / @grid-columns));
}
.col-md-offset-7 {
margin-left: percentage((7 / @grid-columns));
}
.col-md-offset-8 {
margin-left: percentage((8 / @grid-columns));
}
.col-md-offset-9 {
margin-left: percentage((9 / @grid-columns));
}
.col-md-offset-10 {
margin-left: percentage((10/ @grid-columns));
}
.col-md-offset-11 {
margin-left: percentage((11/ @grid-columns));
}
}
// Large grid // Large grid
// //
@@ -290,57 +595,198 @@
.col-lg-11 { .col-lg-11 {
float: left; float: left;
} }
.col-lg-1 { width: percentage((1 / @grid-columns)); }
.col-lg-2 { width: percentage((2 / @grid-columns)); } .col-lg-1 {
.col-lg-3 { width: percentage((3 / @grid-columns)); } width: percentage((1 / @grid-columns));
.col-lg-4 { width: percentage((4 / @grid-columns)); } }
.col-lg-5 { width: percentage((5 / @grid-columns)); }
.col-lg-6 { width: percentage((6 / @grid-columns)); } .col-lg-2 {
.col-lg-7 { width: percentage((7 / @grid-columns)); } width: percentage((2 / @grid-columns));
.col-lg-8 { width: percentage((8 / @grid-columns)); } }
.col-lg-9 { width: percentage((9 / @grid-columns)); }
.col-lg-10 { width: percentage((10/ @grid-columns)); } .col-lg-3 {
.col-lg-11 { width: percentage((11/ @grid-columns)); } width: percentage((3 / @grid-columns));
.col-lg-12 { width: 100%; } }
.col-lg-4 {
width: percentage((4 / @grid-columns));
}
.col-lg-5 {
width: percentage((5 / @grid-columns));
}
.col-lg-6 {
width: percentage((6 / @grid-columns));
}
.col-lg-7 {
width: percentage((7 / @grid-columns));
}
.col-lg-8 {
width: percentage((8 / @grid-columns));
}
.col-lg-9 {
width: percentage((9 / @grid-columns));
}
.col-lg-10 {
width: percentage((10/ @grid-columns));
}
.col-lg-11 {
width: percentage((11/ @grid-columns));
}
.col-lg-12 {
width: 100%;
}
// Push and pull columns for source order changes // Push and pull columns for source order changes
.col-lg-push-0 { left: auto; } .col-lg-push-0 {
.col-lg-push-1 { left: percentage((1 / @grid-columns)); } left: auto;
.col-lg-push-2 { left: percentage((2 / @grid-columns)); } }
.col-lg-push-3 { left: percentage((3 / @grid-columns)); }
.col-lg-push-4 { left: percentage((4 / @grid-columns)); }
.col-lg-push-5 { left: percentage((5 / @grid-columns)); }
.col-lg-push-6 { left: percentage((6 / @grid-columns)); }
.col-lg-push-7 { left: percentage((7 / @grid-columns)); }
.col-lg-push-8 { left: percentage((8 / @grid-columns)); }
.col-lg-push-9 { left: percentage((9 / @grid-columns)); }
.col-lg-push-10 { left: percentage((10/ @grid-columns)); }
.col-lg-push-11 { left: percentage((11/ @grid-columns)); }
.col-lg-pull-0 { right: auto; } .col-lg-push-1 {
.col-lg-pull-1 { right: percentage((1 / @grid-columns)); } left: percentage((1 / @grid-columns));
.col-lg-pull-2 { right: percentage((2 / @grid-columns)); } }
.col-lg-pull-3 { right: percentage((3 / @grid-columns)); }
.col-lg-pull-4 { right: percentage((4 / @grid-columns)); } .col-lg-push-2 {
.col-lg-pull-5 { right: percentage((5 / @grid-columns)); } left: percentage((2 / @grid-columns));
.col-lg-pull-6 { right: percentage((6 / @grid-columns)); } }
.col-lg-pull-7 { right: percentage((7 / @grid-columns)); }
.col-lg-pull-8 { right: percentage((8 / @grid-columns)); } .col-lg-push-3 {
.col-lg-pull-9 { right: percentage((9 / @grid-columns)); } left: percentage((3 / @grid-columns));
.col-lg-pull-10 { right: percentage((10/ @grid-columns)); } }
.col-lg-pull-11 { right: percentage((11/ @grid-columns)); }
.col-lg-push-4 {
left: percentage((4 / @grid-columns));
}
.col-lg-push-5 {
left: percentage((5 / @grid-columns));
}
.col-lg-push-6 {
left: percentage((6 / @grid-columns));
}
.col-lg-push-7 {
left: percentage((7 / @grid-columns));
}
.col-lg-push-8 {
left: percentage((8 / @grid-columns));
}
.col-lg-push-9 {
left: percentage((9 / @grid-columns));
}
.col-lg-push-10 {
left: percentage((10/ @grid-columns));
}
.col-lg-push-11 {
left: percentage((11/ @grid-columns));
}
.col-lg-pull-0 {
right: auto;
}
.col-lg-pull-1 {
right: percentage((1 / @grid-columns));
}
.col-lg-pull-2 {
right: percentage((2 / @grid-columns));
}
.col-lg-pull-3 {
right: percentage((3 / @grid-columns));
}
.col-lg-pull-4 {
right: percentage((4 / @grid-columns));
}
.col-lg-pull-5 {
right: percentage((5 / @grid-columns));
}
.col-lg-pull-6 {
right: percentage((6 / @grid-columns));
}
.col-lg-pull-7 {
right: percentage((7 / @grid-columns));
}
.col-lg-pull-8 {
right: percentage((8 / @grid-columns));
}
.col-lg-pull-9 {
right: percentage((9 / @grid-columns));
}
.col-lg-pull-10 {
right: percentage((10/ @grid-columns));
}
.col-lg-pull-11 {
right: percentage((11/ @grid-columns));
}
// Offsets // Offsets
.col-lg-offset-0 { margin-left: 0; } .col-lg-offset-0 {
.col-lg-offset-1 { margin-left: percentage((1 / @grid-columns)); } margin-left: 0;
.col-lg-offset-2 { margin-left: percentage((2 / @grid-columns)); } }
.col-lg-offset-3 { margin-left: percentage((3 / @grid-columns)); }
.col-lg-offset-4 { margin-left: percentage((4 / @grid-columns)); } .col-lg-offset-1 {
.col-lg-offset-5 { margin-left: percentage((5 / @grid-columns)); } margin-left: percentage((1 / @grid-columns));
.col-lg-offset-6 { margin-left: percentage((6 / @grid-columns)); } }
.col-lg-offset-7 { margin-left: percentage((7 / @grid-columns)); }
.col-lg-offset-8 { margin-left: percentage((8 / @grid-columns)); } .col-lg-offset-2 {
.col-lg-offset-9 { margin-left: percentage((9 / @grid-columns)); } margin-left: percentage((2 / @grid-columns));
.col-lg-offset-10 { margin-left: percentage((10/ @grid-columns)); } }
.col-lg-offset-11 { margin-left: percentage((11/ @grid-columns)); }
.col-lg-offset-3 {
margin-left: percentage((3 / @grid-columns));
}
.col-lg-offset-4 {
margin-left: percentage((4 / @grid-columns));
}
.col-lg-offset-5 {
margin-left: percentage((5 / @grid-columns));
}
.col-lg-offset-6 {
margin-left: percentage((6 / @grid-columns));
}
.col-lg-offset-7 {
margin-left: percentage((7 / @grid-columns));
}
.col-lg-offset-8 {
margin-left: percentage((8 / @grid-columns));
}
.col-lg-offset-9 {
margin-left: percentage((9 / @grid-columns));
}
.col-lg-offset-10 {
margin-left: percentage((10/ @grid-columns));
}
.col-lg-offset-11 {
margin-left: percentage((11/ @grid-columns));
}
} }

View File

@@ -3,15 +3,17 @@
// Amend the width of container if you want to here // Amend the width of container if you want to here
@container-md-ie8: @container-md; @container-md-ie8: @container-md;
@grid-adjustment: percentage(@grid-gutter-width / @container-md-ie8); @grid-adjustment: percentage((@grid-gutter-width / @container-md-ie8));
.ie7, .ie8 { .ie7, .ie8 {
* { * {
box-sizing: content-box; box-sizing: content-box;
} }
.clearfix { .clearfix {
*zoom: 1; *zoom: 1;
} }
ul, ol { ul, ol {
margin-left: 0; margin-left: 0;
} }
@@ -33,59 +35,167 @@
.col-md-11 { .col-md-11 {
float: left; float: left;
} }
.col-md-1 { width: percentage((1 / @grid-columns)) - @grid-adjustment; }
.col-md-2 { width: percentage((2 / @grid-columns)) - @grid-adjustment; } .col-md-1 {
.col-md-3 { width: percentage((3 / @grid-columns)) - @grid-adjustment; } width: percentage((1 / @grid-columns)) - @grid-adjustment;
.col-md-4 { width: percentage((4 / @grid-columns)) - @grid-adjustment; } }
.col-md-5 { width: percentage((5 / @grid-columns)) - @grid-adjustment; }
.col-md-6 { width: percentage((6 / @grid-columns)) - @grid-adjustment; } .col-md-2 {
.col-md-7 { width: percentage((7 / @grid-columns)) - @grid-adjustment; } width: percentage((2 / @grid-columns)) - @grid-adjustment;
.col-md-8 { width: percentage((8 / @grid-columns)) - @grid-adjustment; } }
.col-md-9 { width: percentage((9 / @grid-columns)) - @grid-adjustment; }
.col-md-10 { width: percentage((10/ @grid-columns)) - @grid-adjustment; } .col-md-3 {
.col-md-11 { width: percentage((11/ @grid-columns)) - @grid-adjustment; } width: percentage((3 / @grid-columns)) - @grid-adjustment;
.col-md-12 { width: 100% - @grid-adjustment; } }
.col-md-4 {
width: percentage((4 / @grid-columns)) - @grid-adjustment;
}
.col-md-5 {
width: percentage((5 / @grid-columns)) - @grid-adjustment;
}
.col-md-6 {
width: percentage((6 / @grid-columns)) - @grid-adjustment;
}
.col-md-7 {
width: percentage((7 / @grid-columns)) - @grid-adjustment;
}
.col-md-8 {
width: percentage((8 / @grid-columns)) - @grid-adjustment;
}
.col-md-9 {
width: percentage((9 / @grid-columns)) - @grid-adjustment;
}
.col-md-10 {
width: percentage((10/ @grid-columns)) - @grid-adjustment;
}
.col-md-11 {
width: percentage((11/ @grid-columns)) - @grid-adjustment;
}
.col-md-12 {
width: 100% - @grid-adjustment;
}
// Push and pull columns for source order changes // Push and pull columns for source order changes
.col-md-push-0 { left: auto; } .col-md-push-0 {
.col-md-push-1 { left: percentage((1 / @grid-columns)); } left: auto;
.col-md-push-2 { left: percentage((2 / @grid-columns)); } }
.col-md-push-3 { left: percentage((3 / @grid-columns)); } .col-md-push-1 {
.col-md-push-4 { left: percentage((4 / @grid-columns)); } left: percentage((1 / @grid-columns));
.col-md-push-5 { left: percentage((5 / @grid-columns)); } }
.col-md-push-6 { left: percentage((6 / @grid-columns)); } .col-md-push-2 {
.col-md-push-7 { left: percentage((7 / @grid-columns)); } left: percentage((2 / @grid-columns));
.col-md-push-8 { left: percentage((8 / @grid-columns)); } }
.col-md-push-9 { left: percentage((9 / @grid-columns)); } .col-md-push-3 {
.col-md-push-10 { left: percentage((10/ @grid-columns)); } left: percentage((3 / @grid-columns));
.col-md-push-11 { left: percentage((11/ @grid-columns)); } }
.col-md-push-4 {
left: percentage((4 / @grid-columns));
}
.col-md-push-5 {
left: percentage((5 / @grid-columns));
}
.col-md-push-6 {
left: percentage((6 / @grid-columns));
}
.col-md-push-7 {
left: percentage((7 / @grid-columns));
}
.col-md-push-8 {
left: percentage((8 / @grid-columns));
}
.col-md-push-9 {
left: percentage((9 / @grid-columns));
}
.col-md-push-10 {
left: percentage((10/ @grid-columns));
}
.col-md-push-11 {
left: percentage((11/ @grid-columns));
}
.col-md-pull-0 { right: auto; } .col-md-pull-0 {
.col-md-pull-1 { right: percentage((1 / @grid-columns)); } right: auto;
.col-md-pull-2 { right: percentage((2 / @grid-columns)); } }
.col-md-pull-3 { right: percentage((3 / @grid-columns)); } .col-md-pull-1 {
.col-md-pull-4 { right: percentage((4 / @grid-columns)); } right: percentage((1 / @grid-columns));
.col-md-pull-5 { right: percentage((5 / @grid-columns)); } }
.col-md-pull-6 { right: percentage((6 / @grid-columns)); } .col-md-pull-2 {
.col-md-pull-7 { right: percentage((7 / @grid-columns)); } right: percentage((2 / @grid-columns));
.col-md-pull-8 { right: percentage((8 / @grid-columns)); } }
.col-md-pull-9 { right: percentage((9 / @grid-columns)); } .col-md-pull-3 {
.col-md-pull-10 { right: percentage((10/ @grid-columns)); } right: percentage((3 / @grid-columns));
.col-md-pull-11 { right: percentage((11/ @grid-columns)); } }
.col-md-pull-4 {
right: percentage((4 / @grid-columns));
}
.col-md-pull-5 {
right: percentage((5 / @grid-columns));
}
.col-md-pull-6 {
right: percentage((6 / @grid-columns));
}
.col-md-pull-7 {
right: percentage((7 / @grid-columns));
}
.col-md-pull-8 {
right: percentage((8 / @grid-columns));
}
.col-md-pull-9 {
right: percentage((9 / @grid-columns));
}
.col-md-pull-10 {
right: percentage((10/ @grid-columns));
}
.col-md-pull-11 {
right: percentage((11/ @grid-columns));
}
// Offsets // Offsets
.col-md-offset-0 { margin-left: 0; } .col-md-offset-0 {
.col-md-offset-1 { margin-left: percentage((1 / @grid-columns)); } margin-left: 0;
.col-md-offset-2 { margin-left: percentage((2 / @grid-columns)); } }
.col-md-offset-3 { margin-left: percentage((3 / @grid-columns)); } .col-md-offset-1 {
.col-md-offset-4 { margin-left: percentage((4 / @grid-columns)); } margin-left: percentage((1 / @grid-columns));
.col-md-offset-5 { margin-left: percentage((5 / @grid-columns)); } }
.col-md-offset-6 { margin-left: percentage((6 / @grid-columns)); } .col-md-offset-2 {
.col-md-offset-7 { margin-left: percentage((7 / @grid-columns)); } margin-left: percentage((2 / @grid-columns));
.col-md-offset-8 { margin-left: percentage((8 / @grid-columns)); } }
.col-md-offset-9 { margin-left: percentage((9 / @grid-columns)); } .col-md-offset-3 {
.col-md-offset-10 { margin-left: percentage((10/ @grid-columns)); } margin-left: percentage((3 / @grid-columns));
.col-md-offset-11 { margin-left: percentage((11/ @grid-columns)); } }
.col-md-offset-4 {
margin-left: percentage((4 / @grid-columns));
}
.col-md-offset-5 {
margin-left: percentage((5 / @grid-columns));
}
.col-md-offset-6 {
margin-left: percentage((6 / @grid-columns));
}
.col-md-offset-7 {
margin-left: percentage((7 / @grid-columns));
}
.col-md-offset-8 {
margin-left: percentage((8 / @grid-columns));
}
.col-md-offset-9 {
margin-left: percentage((9 / @grid-columns));
}
.col-md-offset-10 {
margin-left: percentage((10/ @grid-columns));
}
.col-md-offset-11 {
margin-left: percentage((11/ @grid-columns));
}
.clearfix { .clearfix {
*zoom: 1; *zoom: 1;

View File

@@ -29,11 +29,15 @@
.input-group-lg > .form-control, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon, .input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-lg(); } .input-group-lg > .input-group-btn > .btn {
.input-lg();
}
.input-group-sm > .form-control, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon, .input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .btn { .input-sm(); } .input-group-sm > .input-group-btn > .btn {
.input-sm();
}
// Display as table-cell // Display as table-cell
// ------------------------- // -------------------------
@@ -46,6 +50,7 @@
border-radius: 0; border-radius: 0;
} }
} }
// Addon and addon wrapper for buttons // Addon and addon wrapper for buttons
.input-group-addon, .input-group-addon,
.input-group-btn { .input-group-btn {
@@ -94,9 +99,11 @@
.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) { .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
.border-right-radius(0); .border-right-radius(0);
} }
.input-group-addon:first-child { .input-group-addon:first-child {
border-right: 0; border-right: 0;
} }
.input-group .form-control:last-child, .input-group .form-control:last-child,
.input-group-addon:last-child, .input-group-addon:last-child,
.input-group-btn:last-child > .btn, .input-group-btn:last-child > .btn,
@@ -104,6 +111,7 @@
.input-group-btn:first-child > .btn:not(:first-child) { .input-group-btn:first-child > .btn:not(:first-child) {
.border-left-radius(0); .border-left-radius(0);
} }
.input-group-addon:last-child { .input-group-addon:last-child {
border-left: 0; border-left: 0;
} }
@@ -122,6 +130,7 @@
margin-left: -1px; margin-left: -1px;
} }
} }
.input-group-btn > .btn { .input-group-btn > .btn {
position: relative; position: relative;
// Jankily prevent input button groups from wrapping // Jankily prevent input button groups from wrapping

View File

@@ -2,7 +2,6 @@
// Jumbotron // Jumbotron
// -------------------------------------------------- // --------------------------------------------------
.jumbotron { .jumbotron {
padding: @jumbotron-padding; padding: @jumbotron-padding;
margin-bottom: @jumbotron-padding; margin-bottom: @jumbotron-padding;
@@ -16,6 +15,7 @@
line-height: 1; line-height: 1;
color: @jumbotron-heading-color; color: @jumbotron-heading-color;
} }
p { p {
line-height: 1.4; line-height: 1.4;
} }

View File

@@ -82,6 +82,7 @@
margin-top: 0; margin-top: 0;
margin-bottom: 5px; margin-bottom: 5px;
} }
.list-group-item-text { .list-group-item-text {
margin-bottom: 0; margin-bottom: 0;
line-height: 1.3; line-height: 1.3;

View File

@@ -1,12 +1,11 @@
// Core variables and mixins // Core variables and mixins
@import "variables.less"; @import "variables.less";
@import "variables-flatly.less"; /* Bootswatch Flatly theme variables */ @import "variables-flatly.less";
/* Bootswatch Flatly theme variables */
@import "mixins.less"; @import "mixins.less";
// Reset // Reset
@import "normalize.less"; @import "normalize.less";
@import "print.less"; @import "print.less";
// Core CSS // Core CSS
@import "scaffolding.less"; @import "scaffolding.less";
@import "type.less"; @import "type.less";
@@ -15,7 +14,6 @@
@import "tables.less"; @import "tables.less";
@import "forms.less"; @import "forms.less";
@import "buttons.less"; @import "buttons.less";
// Components // Components
@import "component-animations.less"; @import "component-animations.less";
@import "glyphicons.less"; @import "glyphicons.less";
@@ -38,25 +36,20 @@
@import "panels.less"; @import "panels.less";
@import "wells.less"; @import "wells.less";
@import "close.less"; @import "close.less";
// Components w/ JavaScript // Components w/ JavaScript
//@import "modals.less"; //@import "modals.less";
@import "tooltip.less"; @import "tooltip.less";
//@import "popovers.less"; @import "popovers.less";
//@import "carousel.less"; //@import "carousel.less";
// Utility classes // Utility classes
@import "utilities.less"; @import "utilities.less";
@import "responsive-utilities.less"; @import "responsive-utilities.less";
//Bootswatch overrides //Bootswatch overrides
@import "bootswatch.less"; @import "bootswatch.less";
// Site specific // Site specific
@import "site.less"; @import "site.less";
@import "site-nojavascript.less"; @import "site-nojavascript.less";
@import "site-responsive.less"; @import "site-responsive.less";
// Stupid ie // Stupid ie
@import "ie8and.less"; @import "ie8and.less";
@import "site-ie8and.less"; @import "site-ie8and.less";

View File

@@ -2,7 +2,6 @@
// Source: http://stubbornella.org/content/?p=497 // Source: http://stubbornella.org/content/?p=497
// -------------------------------------------------- // --------------------------------------------------
// Common styles // Common styles
// ------------------------- // -------------------------
@@ -18,6 +17,7 @@
.media .media { .media .media {
margin-top: 15px; margin-top: 15px;
} }
.media:first-child { .media:first-child {
margin-top: 0; margin-top: 0;
} }
@@ -32,7 +32,6 @@
margin: 0 0 5px; margin: 0 0 5px;
} }
// Media image alignment // Media image alignment
// ------------------------- // -------------------------
@@ -45,7 +44,6 @@
} }
} }
// Media list variation // Media list variation
// ------------------------- // -------------------------

View File

@@ -2,7 +2,6 @@
// Mixins // Mixins
// -------------------------------------------------- // --------------------------------------------------
// Utilities // Utilities
// ------------------------- // -------------------------
@@ -48,16 +47,29 @@
width: @width; width: @width;
height: @height; height: @height;
} }
.square(@size) { .square(@size) {
.size(@size; @size); .size(@size; @size);
} }
// Placeholder text // Placeholder text
.placeholder(@color: @input-color-placeholder) { .placeholder(@color: @input-color-placeholder) {
&:-moz-placeholder { color: @color; } // Firefox 4-18 &:-moz-placeholder {
&::-moz-placeholder { color: @color; } // Firefox 19+ color: @color;
&:-ms-input-placeholder { color: @color; } // Internet Explorer 10+ }
&::-webkit-input-placeholder { color: @color; } // Safari and Chrome // Firefox 4-18
&::-moz-placeholder {
color: @color;
}
// Firefox 19+
&:-ms-input-placeholder {
color: @color;
}
// Internet Explorer 10+
&::-webkit-input-placeholder {
color: @color;
}
// Safari and Chrome
} }
// Text overflow // Text overflow
@@ -85,6 +97,7 @@
background-color: transparent; background-color: transparent;
border: 0; border: 0;
} }
// New mixin to use as of v3.0.1 // New mixin to use as of v3.0.1
.text-hide() { .text-hide() {
font: ~"0/0" a; font: ~"0/0" a;
@@ -94,8 +107,6 @@
border: 0; border: 0;
} }
// CSS3 PROPERTIES // CSS3 PROPERTIES
// -------------------------------------------------- // --------------------------------------------------
@@ -104,14 +115,17 @@
border-top-right-radius: @radius; border-top-right-radius: @radius;
border-top-left-radius: @radius; border-top-left-radius: @radius;
} }
.border-right-radius(@radius) { .border-right-radius(@radius) {
border-bottom-right-radius: @radius; border-bottom-right-radius: @radius;
border-top-right-radius: @radius; border-top-right-radius: @radius;
} }
.border-bottom-radius(@radius) { .border-bottom-radius(@radius) {
border-bottom-right-radius: @radius; border-bottom-right-radius: @radius;
border-bottom-left-radius: @radius; border-bottom-left-radius: @radius;
} }
.border-left-radius(@radius) { .border-left-radius(@radius) {
border-bottom-left-radius: @radius; border-bottom-left-radius: @radius;
border-top-left-radius: @radius; border-top-left-radius: @radius;
@@ -128,18 +142,22 @@
-webkit-transition: @transition; -webkit-transition: @transition;
transition: @transition; transition: @transition;
} }
.transition-property(@transition-property) { .transition-property(@transition-property) {
-webkit-transition-property: @transition-property; -webkit-transition-property: @transition-property;
transition-property: @transition-property; transition-property: @transition-property;
} }
.transition-delay(@transition-delay) { .transition-delay(@transition-delay) {
-webkit-transition-delay: @transition-delay; -webkit-transition-delay: @transition-delay;
transition-delay: @transition-delay; transition-delay: @transition-delay;
} }
.transition-duration(@transition-duration) { .transition-duration(@transition-duration) {
-webkit-transition-duration: @transition-duration; -webkit-transition-duration: @transition-duration;
transition-duration: @transition-duration; transition-duration: @transition-duration;
} }
.transition-transform(@transition) { .transition-transform(@transition) {
-webkit-transition: -webkit-transform @transition; -webkit-transition: -webkit-transform @transition;
-moz-transition: -moz-transform @transition; -moz-transition: -moz-transform @transition;
@@ -153,21 +171,25 @@
-ms-transform: rotate(@degrees); // IE9+ -ms-transform: rotate(@degrees); // IE9+
transform: rotate(@degrees); transform: rotate(@degrees);
} }
.scale(@ratio) { .scale(@ratio) {
-webkit-transform: scale(@ratio); -webkit-transform: scale(@ratio);
-ms-transform: scale(@ratio); // IE9+ -ms-transform: scale(@ratio); // IE9+
transform: scale(@ratio); transform: scale(@ratio);
} }
.translate(@x; @y) { .translate(@x; @y) {
-webkit-transform: translate(@x, @y); -webkit-transform: translate(@x, @y);
-ms-transform: translate(@x, @y); // IE9+ -ms-transform: translate(@x, @y); // IE9+
transform: translate(@x, @y); transform: translate(@x, @y);
} }
.skew(@x; @y) { .skew(@x; @y) {
-webkit-transform: skew(@x, @y); -webkit-transform: skew(@x, @y);
-ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+ -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+
transform: skew(@x, @y); transform: skew(@x, @y);
} }
.translate3d(@x; @y; @z) { .translate3d(@x; @y; @z) {
-webkit-transform: translate3d(@x, @y, @z); -webkit-transform: translate3d(@x, @y, @z);
transform: translate3d(@x, @y, @z); transform: translate3d(@x, @y, @z);
@@ -178,28 +200,31 @@
-ms-transform: rotateX(@degrees); // IE9+ -ms-transform: rotateX(@degrees); // IE9+
transform: rotateX(@degrees); transform: rotateX(@degrees);
} }
.rotateY(@degrees) { .rotateY(@degrees) {
-webkit-transform: rotateY(@degrees); -webkit-transform: rotateY(@degrees);
-ms-transform: rotateY(@degrees); // IE9+ -ms-transform: rotateY(@degrees); // IE9+
transform: rotateY(@degrees); transform: rotateY(@degrees);
} }
.perspective(@perspective) { .perspective(@perspective) {
-webkit-perspective: @perspective; -webkit-perspective: @perspective;
-moz-perspective: @perspective; -moz-perspective: @perspective;
perspective: @perspective; perspective: @perspective;
} }
.perspective-origin(@perspective) { .perspective-origin(@perspective) {
-webkit-perspective-origin: @perspective; -webkit-perspective-origin: @perspective;
-moz-perspective-origin: @perspective; -moz-perspective-origin: @perspective;
perspective-origin: @perspective; perspective-origin: @perspective;
} }
.transform-origin(@origin) { .transform-origin(@origin) {
-webkit-transform-origin: @origin; -webkit-transform-origin: @origin;
-moz-transform-origin: @origin; -moz-transform-origin: @origin;
transform-origin: @origin; transform-origin: @origin;
} }
// Backface visibility // Backface visibility
// Prevent browsers from flickering when using CSS 3D transforms. // Prevent browsers from flickering when using CSS 3D transforms.
// Default value is `visible`, but can be changed to `hidden` // Default value is `visible`, but can be changed to `hidden`
@@ -261,8 +286,6 @@
filter: ~"alpha(opacity=@{opacity-ie})"; filter: ~"alpha(opacity=@{opacity-ie})";
} }
// GRADIENTS // GRADIENTS
// -------------------------------------------------- // --------------------------------------------------
@@ -339,8 +362,6 @@
filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)")); filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
} }
// Retina images // Retina images
// //
// Short retina mixin for setting background-image and -size // Short retina mixin for setting background-image and -size
@@ -348,19 +369,12 @@
.img-retina(@file-1x; @file-2x; @width-1x; @height-1x) { .img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {
background-image: url("@{file-1x}"); background-image: url("@{file-1x}");
@media @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and ( min--moz-device-pixel-ratio: 2), only screen and ( -o-min-device-pixel-ratio: 2/1), only screen and ( min-device-pixel-ratio: 2), only screen and ( min-resolution: 192dpi), only screen and ( min-resolution: 2dppx) {
only screen and (-webkit-min-device-pixel-ratio: 2),
only screen and ( min--moz-device-pixel-ratio: 2),
only screen and ( -o-min-device-pixel-ratio: 2/1),
only screen and ( min-device-pixel-ratio: 2),
only screen and ( min-resolution: 192dpi),
only screen and ( min-resolution: 2dppx) {
background-image: url("@{file-2x}"); background-image: url("@{file-2x}");
background-size: @width-1x @height-1x; background-size: @width-1x @height-1x;
} }
} }
// Responsive image // Responsive image
// //
// Keep images from scaling beyond the width of their parents. // Keep images from scaling beyond the width of their parents.
@@ -371,7 +385,6 @@
height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
} }
// COMPONENT MIXINS // COMPONENT MIXINS
// -------------------------------------------------- // --------------------------------------------------
@@ -553,16 +566,22 @@
// More easily include all the states for responsive-utilities.less. // More easily include all the states for responsive-utilities.less.
.responsive-visibility() { .responsive-visibility() {
display: block !important; display: block !important;
tr& { display: table-row !important; } tr& {
display: table-row !important;
}
th&, th&,
td& { display: table-cell !important; } td& {
display: table-cell !important;
}
} }
.responsive-invisibility() { .responsive-invisibility() {
&, &,
tr&, tr&,
th&, th&,
td& { display: none !important; } td& {
display: none !important;
}
} }
// Grid System // Grid System
@@ -618,11 +637,13 @@
margin-left: percentage((@columns / @grid-columns)); margin-left: percentage((@columns / @grid-columns));
} }
} }
.make-sm-column-push(@columns) { .make-sm-column-push(@columns) {
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
left: percentage((@columns / @grid-columns)); left: percentage((@columns / @grid-columns));
} }
} }
.make-sm-column-pull(@columns) { .make-sm-column-pull(@columns) {
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
right: percentage((@columns / @grid-columns)); right: percentage((@columns / @grid-columns));
@@ -651,11 +672,13 @@
margin-left: percentage((@columns / @grid-columns)); margin-left: percentage((@columns / @grid-columns));
} }
} }
.make-md-column-push(@columns) { .make-md-column-push(@columns) {
@media (min-width: @screen-md) { @media (min-width: @screen-md) {
left: percentage((@columns / @grid-columns)); left: percentage((@columns / @grid-columns));
} }
} }
.make-md-column-pull(@columns) { .make-md-column-pull(@columns) {
@media (min-width: @screen-md-min) { @media (min-width: @screen-md-min) {
right: percentage((@columns / @grid-columns)); right: percentage((@columns / @grid-columns));
@@ -684,18 +707,19 @@
margin-left: percentage((@columns / @grid-columns)); margin-left: percentage((@columns / @grid-columns));
} }
} }
.make-lg-column-push(@columns) { .make-lg-column-push(@columns) {
@media (min-width: @screen-lg-min) { @media (min-width: @screen-lg-min) {
left: percentage((@columns / @grid-columns)); left: percentage((@columns / @grid-columns));
} }
} }
.make-lg-column-pull(@columns) { .make-lg-column-pull(@columns) {
@media (min-width: @screen-lg-min) { @media (min-width: @screen-lg-min) {
right: percentage((@columns / @grid-columns)); right: percentage((@columns / @grid-columns));
} }
} }
// Form validation states // Form validation states
// //
// Used in forms.less to generate the form validation CSS for warnings, errors, // Used in forms.less to generate the form validation CSS for warnings, errors,

View File

@@ -11,7 +11,6 @@
.modal-open { .modal-open {
overflow: hidden; overflow: hidden;
// Account for hiding of scrollbar // Account for hiding of scrollbar
body&, body&,
.navbar-fixed-top, .navbar-fixed-top,
@@ -37,7 +36,9 @@
.translate(0, -25%); .translate(0, -25%);
.transition-transform(~"0.3s ease-out"); .transition-transform(~"0.3s ease-out");
} }
&.in .modal-dialog { .translate(0, 0)} &.in .modal-dialog {
.translate(0, 0)
}
} }
// Shell div to position the modal with bottom padding // Shell div to position the modal with bottom padding
@@ -72,8 +73,12 @@
z-index: (@zindex-modal-background - 10); z-index: (@zindex-modal-background - 10);
background-color: @modal-backdrop-bg; background-color: @modal-backdrop-bg;
// Fade for backdrop // Fade for backdrop
&.fade { .opacity(0); } &.fade {
&.in { .opacity(.5); } .opacity(0);
}
&.in {
.opacity(.5);
}
} }
// Modal header // Modal header
@@ -83,6 +88,7 @@
border-bottom: 1px solid @modal-header-border-color; border-bottom: 1px solid @modal-header-border-color;
min-height: (@modal-title-padding + @modal-title-line-height); min-height: (@modal-title-padding + @modal-title-line-height);
} }
// Close icon // Close icon
.modal-header .close { .modal-header .close {
margin-top: -2px; margin-top: -2px;
@@ -126,14 +132,13 @@
// Scale up the modal // Scale up the modal
@media screen and (min-width: @screen-sm-min) { @media screen and (min-width: @screen-sm-min) {
.modal-dialog { .modal-dialog {
width: 600px; width: 600px;
padding-top: 30px; padding-top: 30px;
padding-bottom: 30px; padding-bottom: 30px;
} }
.modal-content { .modal-content {
.box-shadow(0 5px 15px rgba(0, 0, 0, .5)); .box-shadow(0 5px 15px rgba(0, 0, 0, .5));
} }
} }

View File

@@ -2,7 +2,6 @@
// Navbars // Navbars
// -------------------------------------------------- // --------------------------------------------------
// Wrapper and base class // Wrapper and base class
// //
// Provide a static navbar from which we expand to create full-width, fixed, and // Provide a static navbar from which we expand to create full-width, fixed, and
@@ -23,7 +22,6 @@
} }
} }
// Navbar heading // Navbar heading
// //
// Groups `.navbar-brand` and `.navbar-toggle` into a single component for easy // Groups `.navbar-brand` and `.navbar-toggle` into a single component for easy
@@ -37,7 +35,6 @@
} }
} }
// Navbar collapse (body) // Navbar collapse (body)
// //
// Group your navbar content into this for easy collapsing and expanding across // Group your navbar content into this for easy collapsing and expanding across
@@ -82,16 +79,17 @@
.navbar-nav.navbar-left:first-child { .navbar-nav.navbar-left:first-child {
margin-left: -@navbar-padding-horizontal; margin-left: -@navbar-padding-horizontal;
} }
.navbar-nav.navbar-right:last-child { .navbar-nav.navbar-right:last-child {
margin-right: -@navbar-padding-horizontal; margin-right: -@navbar-padding-horizontal;
} }
.navbar-text:last-child { .navbar-text:last-child {
margin-right: 0; margin-right: 0;
} }
} }
} }
// Both navbar header and collapse // Both navbar header and collapse
// //
// When a container is present, change the behavior of the header and collapse. // When a container is present, change the behavior of the header and collapse.
@@ -107,7 +105,6 @@
} }
} }
// //
// Navbar alignment options // Navbar alignment options
// //
@@ -135,16 +132,17 @@
border-radius: 0; border-radius: 0;
} }
} }
.navbar-fixed-top { .navbar-fixed-top {
z-index: @zindex-navbar-fixed; z-index: @zindex-navbar-fixed;
top: 0; top: 0;
} }
.navbar-fixed-bottom { .navbar-fixed-bottom {
bottom: 0; bottom: 0;
margin-bottom: 0; // override .navbar defaults margin-bottom: 0; // override .navbar defaults
} }
// Brand/project name // Brand/project name
.navbar-brand { .navbar-brand {
@@ -164,7 +162,6 @@
} }
} }
// Navbar toggle // Navbar toggle
// //
// Custom button for toggling the `.navbar-collapse`, powered by the collapse // Custom button for toggling the `.navbar-collapse`, powered by the collapse
@@ -196,7 +193,6 @@
} }
} }
// Navbar nav links // Navbar nav links
// //
// Builds on top of the `.nav` components with it's own modifier class to make // Builds on top of the `.nav` components with it's own modifier class to make
@@ -251,7 +247,6 @@
} }
// Component alignment // Component alignment
// //
// Repurpose the pull utilities as their own navbar utilities to avoid specifity // Repurpose the pull utilities as their own navbar utilities to avoid specifity
@@ -259,10 +254,14 @@
// though so that navbar contents properly stack and align in mobile. // though so that navbar contents properly stack and align in mobile.
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
.navbar-left { .pull-left(); } .navbar-left {
.navbar-right { .pull-right(); } .pull-left();
} }
.navbar-right {
.pull-right();
}
}
// Navbar form // Navbar form
// //
@@ -302,7 +301,6 @@
} }
} }
// Dropdown menus // Dropdown menus
// Menu position and menu carets // Menu position and menu carets
@@ -310,6 +308,7 @@
margin-top: 0; margin-top: 0;
.border-top-radius(0); .border-top-radius(0);
} }
// Menu position and menu caret support for dropups via extra dropup class // Menu position and menu caret support for dropups via extra dropup class
.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
.border-bottom-radius(0); .border-bottom-radius(0);
@@ -322,7 +321,6 @@
right: 0; right: 0;
} }
// Buttons in navbars // Buttons in navbars
// //
// Vertically center a button within a navbar (when *not* in a form). // Vertically center a button within a navbar (when *not* in a form).
@@ -331,7 +329,6 @@
.navbar-vertical-align(@input-height-base); .navbar-vertical-align(@input-height-base);
} }
// Text in navbars // Text in navbars
// //
// Add a class to make any element properly align itself vertically within the navbars. // Add a class to make any element properly align itself vertically within the navbars.
@@ -438,7 +435,6 @@
border-bottom-color: @navbar-default-link-color; border-bottom-color: @navbar-default-link-color;
} }
@media (max-width: @screen-xs-max) { @media (max-width: @screen-xs-max) {
// Dropdowns get custom display when collapsed // Dropdowns get custom display when collapsed
.open .dropdown-menu { .open .dropdown-menu {
@@ -470,7 +466,6 @@
} }
} }
// Links in navbars // Links in navbars
// //
// Add a class to ensure links outside the navbar nav are colored correctly. // Add a class to ensure links outside the navbar nav are colored correctly.
@@ -617,5 +612,4 @@
color: @navbar-inverse-link-hover-color; color: @navbar-inverse-link-hover-color;
} }
} }
} }

View File

@@ -2,7 +2,6 @@
// Navs // Navs
// -------------------------------------------------- // --------------------------------------------------
// Base class // Base class
// -------------------------------------------------- // --------------------------------------------------
@@ -68,7 +67,6 @@
} }
} }
// Tabs // Tabs
// ------------------------- // -------------------------
@@ -111,7 +109,6 @@
} }
} }
// Pills // Pills
// ------------------------- // -------------------------
.nav-pills { .nav-pills {
@@ -138,7 +135,6 @@
} }
} }
// Stacked pills // Stacked pills
.nav-stacked { .nav-stacked {
> li { > li {
@@ -150,7 +146,6 @@
} }
} }
// Nav variations // Nav variations
// -------------------------------------------------- // --------------------------------------------------
@@ -200,6 +195,7 @@
border-bottom: 1px solid @nav-tabs-justified-link-border-color; border-bottom: 1px solid @nav-tabs-justified-link-border-color;
border-radius: @border-radius-base @border-radius-base 0 0; border-radius: @border-radius-base @border-radius-base 0 0;
} }
> .active > a, > .active > a,
> .active > a:hover, > .active > a:hover,
> .active > a:focus { > .active > a:focus {
@@ -208,7 +204,6 @@
} }
} }
// Tabbable tabs // Tabbable tabs
// ------------------------- // -------------------------
@@ -222,6 +217,7 @@
.pill-content > .pill-pane { .pill-content > .pill-pane {
display: none; display: none;
} }
.tab-content, .tab-content,
.pill-content { .pill-content {
> .active { > .active {
@@ -229,8 +225,6 @@
} }
} }
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
@@ -239,6 +233,7 @@
border-top-color: @link-color; border-top-color: @link-color;
border-bottom-color: @link-color; border-bottom-color: @link-color;
} }
.nav a:hover .caret { .nav a:hover .caret {
border-top-color: @link-hover-color; border-top-color: @link-hover-color;
border-bottom-color: @link-hover-color; border-bottom-color: @link-hover-color;

View File

@@ -2,13 +2,13 @@
// Pager pagination // Pager pagination
// -------------------------------------------------- // --------------------------------------------------
.pager { .pager {
padding-left: 0; padding-left: 0;
margin: @line-height-computed 0; margin: @line-height-computed 0;
list-style: none; list-style: none;
text-align: center; text-align: center;
.clearfix(); .clearfix();
li { li {
display: inline; display: inline;
> a, > a,
@@ -51,5 +51,4 @@
cursor: not-allowed; cursor: not-allowed;
} }
} }
} }

View File

@@ -2,7 +2,6 @@
// Panels // Panels
// -------------------------------------------------- // --------------------------------------------------
// Base class // Base class
.panel { .panel {
margin-bottom: @line-height-computed; margin-bottom: @line-height-computed;
@@ -18,7 +17,6 @@
.clearfix(); .clearfix();
} }
// List groups in panels // List groups in panels
// //
// By default, space out list group content from panel headings to account for // By default, space out list group content from panel headings to account for
@@ -42,6 +40,7 @@
} }
} }
} }
// Collapse space between when there's no additional content. // Collapse space between when there's no additional content.
.panel-heading + .list-group { .panel-heading + .list-group {
.list-group-item:first-child { .list-group-item:first-child {
@@ -49,7 +48,6 @@
} }
} }
// Tables in panels // Tables in panels
// //
// Place a non-bordered `.table` within a panel (not within a `.panel-body`) and // Place a non-bordered `.table` within a panel (not within a `.panel-body`) and
@@ -89,7 +87,6 @@
} }
} }
// Optional heading // Optional heading
.panel-heading { .panel-heading {
padding: 10px 15px; padding: 10px 15px;
@@ -115,7 +112,6 @@
.border-bottom-radius(@panel-border-radius - 1); .border-bottom-radius(@panel-border-radius - 1);
} }
// Collapsable panels (aka, accordion) // Collapsable panels (aka, accordion)
// //
// Wrap a series of panels in `.panel-group` to turn them into an accordion with // Wrap a series of panels in `.panel-group` to turn them into an accordion with
@@ -146,23 +142,27 @@
} }
} }
// Contextual variations // Contextual variations
.panel-default { .panel-default {
.panel-variant(@panel-default-border; @panel-default-text; @panel-default-heading-bg; @panel-default-border); .panel-variant(@panel-default-border; @panel-default-text; @panel-default-heading-bg; @panel-default-border);
} }
.panel-primary { .panel-primary {
.panel-variant(@panel-primary-border; @panel-primary-text; @panel-primary-heading-bg; @panel-primary-border); .panel-variant(@panel-primary-border; @panel-primary-text; @panel-primary-heading-bg; @panel-primary-border);
} }
.panel-success { .panel-success {
.panel-variant(@panel-success-border; @panel-success-text; @panel-success-heading-bg; @panel-success-border); .panel-variant(@panel-success-border; @panel-success-text; @panel-success-heading-bg; @panel-success-border);
} }
.panel-warning { .panel-warning {
.panel-variant(@panel-warning-border; @panel-warning-text; @panel-warning-heading-bg; @panel-warning-border); .panel-variant(@panel-warning-border; @panel-warning-text; @panel-warning-heading-bg; @panel-warning-border);
} }
.panel-danger { .panel-danger {
.panel-variant(@panel-danger-border; @panel-danger-text; @panel-danger-heading-bg; @panel-danger-border); .panel-variant(@panel-danger-border; @panel-danger-text; @panel-danger-heading-bg; @panel-danger-border);
} }
.panel-info { .panel-info {
.panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border); .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border);
} }

View File

@@ -2,7 +2,6 @@
// Popovers // Popovers
// -------------------------------------------------- // --------------------------------------------------
.popover { .popover {
position: absolute; position: absolute;
top: 0; top: 0;
@@ -23,10 +22,18 @@
white-space: normal; white-space: normal;
// Offset the popover to account for the popover arrow // Offset the popover to account for the popover arrow
&.top { margin-top: -10px; } &.top {
&.right { margin-left: 10px; } margin-top: -10px;
&.bottom { margin-top: 10px; } }
&.left { margin-left: -10px; } &.right {
margin-left: 10px;
}
&.bottom {
margin-top: 10px;
}
&.left {
margin-left: -10px;
}
} }
.popover-title { .popover-title {
@@ -59,9 +66,11 @@
border-style: solid; border-style: solid;
} }
} }
.popover .arrow { .popover .arrow {
border-width: @popover-arrow-outer-width; border-width: @popover-arrow-outer-width;
} }
.popover .arrow:after { .popover .arrow:after {
border-width: @popover-arrow-width; border-width: @popover-arrow-width;
content: ""; content: "";
@@ -129,5 +138,4 @@
bottom: -@popover-arrow-width; bottom: -@popover-arrow-width;
} }
} }
} }

View File

@@ -71,18 +71,21 @@
.navbar { .navbar {
display: none; display: none;
} }
.table { .table {
td, td,
th { th {
background-color: #fff !important; background-color: #fff !important;
} }
} }
.btn, .btn,
.dropup > .btn { .dropup > .btn {
> .caret { > .caret {
border-top-color: #000 !important; border-top-color: #000 !important;
} }
} }
.label { .label {
border: 1px solid #000; border: 1px solid #000;
} }
@@ -90,6 +93,7 @@
.table { .table {
border-collapse: collapse !important; border-collapse: collapse !important;
} }
.table-bordered { .table-bordered {
th, th,
td { td {

View File

@@ -2,35 +2,48 @@
// Progress bars // Progress bars
// -------------------------------------------------- // --------------------------------------------------
// Bar animations // Bar animations
// ------------------------- // -------------------------
// Webkit // Webkit
@-webkit-keyframes progress-bar-stripes { @-webkit-keyframes progress-bar-stripes {
from { background-position: 40px 0; } from {
to { background-position: 0 0; } background-position: 40px 0;
}
to {
background-position: 0 0;
}
} }
// Firefox // Firefox
@-moz-keyframes progress-bar-stripes { @-moz-keyframes progress-bar-stripes {
from { background-position: 40px 0; } from {
to { background-position: 0 0; } background-position: 40px 0;
}
to {
background-position: 0 0;
}
} }
// Opera // Opera
@-o-keyframes progress-bar-stripes { @-o-keyframes progress-bar-stripes {
from { background-position: 0 0; } from {
to { background-position: 40px 0; } background-position: 0 0;
}
to {
background-position: 40px 0;
}
} }
// Spec and IE10+ // Spec and IE10+
@keyframes progress-bar-stripes { @keyframes progress-bar-stripes {
from { background-position: 40px 0; } from {
to { background-position: 0 0; } background-position: 40px 0;
}
to {
background-position: 0 0;
}
} }
// Bar itself // Bar itself
// ------------------------- // -------------------------
@@ -74,8 +87,6 @@
animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite;
} }
// Variations // Variations
// ------------------------- // -------------------------

View File

@@ -2,7 +2,6 @@
// Responsive: Utility classes // Responsive: Utility classes
// -------------------------------------------------- // --------------------------------------------------
// IE10 in Windows (Phone) 8 // IE10 in Windows (Phone) 8
// //
// Support for responsive views via media queries is kind of borked in IE10, for // Support for responsive views via media queries is kind of borked in IE10, for
@@ -21,7 +20,6 @@
width: device-width; width: device-width;
} }
// Hide from screenreaders and browsers // Hide from screenreaders and browsers
// //
// Credit: HTML5 Boilerplate // Credit: HTML5 Boilerplate
@@ -31,7 +29,6 @@
visibility: hidden !important; visibility: hidden !important;
} }
// Visibility utilities // Visibility utilities
.visible-xs { .visible-xs {
@@ -55,6 +52,7 @@
} }
} }
} }
.visible-sm { .visible-sm {
.responsive-invisibility(); .responsive-invisibility();
&.visible-xs { &.visible-xs {
@@ -76,6 +74,7 @@
} }
} }
} }
.visible-md { .visible-md {
.responsive-invisibility(); .responsive-invisibility();
&.visible-xs { &.visible-xs {
@@ -97,6 +96,7 @@
} }
} }
} }
.visible-lg { .visible-lg {
.responsive-invisibility(); .responsive-invisibility();
&.visible-xs { &.visible-xs {
@@ -140,6 +140,7 @@
} }
} }
} }
.hidden-sm { .hidden-sm {
.responsive-visibility(); .responsive-visibility();
&.hidden-xs { &.hidden-xs {
@@ -161,6 +162,7 @@
} }
} }
} }
.hidden-md { .hidden-md {
.responsive-visibility(); .responsive-visibility();
&.hidden-xs { &.hidden-xs {
@@ -182,6 +184,7 @@
} }
} }
} }
.hidden-lg { .hidden-lg {
.responsive-visibility(); .responsive-visibility();
&.hidden-xs { &.hidden-xs {
@@ -213,6 +216,7 @@
.visible-print { .visible-print {
.responsive-visibility(); .responsive-visibility();
} }
.hidden-print { .hidden-print {
.responsive-invisibility(); .responsive-invisibility();
} }

View File

@@ -2,7 +2,6 @@
// Scaffolding // Scaffolding
// -------------------------------------------------- // --------------------------------------------------
// Reset the box-sizing // Reset the box-sizing
*, *,
@@ -11,7 +10,6 @@
.box-sizing(border-box); .box-sizing(border-box);
} }
// Body reset // Body reset
html { html {
@@ -37,7 +35,6 @@ textarea {
line-height: inherit; line-height: inherit;
} }
// Links // Links
a { a {
@@ -55,7 +52,6 @@ a {
} }
} }
// Images // Images
img { img {
@@ -92,7 +88,6 @@ img {
border-radius: 50%; // set radius in percents border-radius: 50%; // set radius in percents
} }
// Horizontal rules // Horizontal rules
hr { hr {
@@ -102,7 +97,6 @@ hr {
border-top: 1px solid @hr-border; border-top: 1px solid @hr-border;
} }
// Only display content to screen readers // Only display content to screen readers
// //
// See: http://a11yproject.com/posts/how-to-hide-content/ // See: http://a11yproject.com/posts/how-to-hide-content/

View File

@@ -25,33 +25,43 @@
border-bottom: 1px solid @legend-border-color; border-bottom: 1px solid @legend-border-color;
margin-bottom: 20px; margin-bottom: 20px;
} }
.tooltip-inner { .tooltip-inner {
background-color: #000000; background-color: #000;
} }
.date { .date {
font-size: 85%; font-size: 85%;
} }
.task-card-link { .task-card-link {
min-height: 160px; min-height: 160px;
} }
.series-checkboxes li { .series-checkboxes li {
margin-right: 1%; margin-right: 1%;
} }
.stat-type { .stat-type {
font-size: floor(@font-size-base * 0.65); // ~10px; font-size: floor(@font-size-base * 0.65); // ~10px;
} }
.aside .action-buttons .btn { .aside .action-buttons .btn {
width: 79%; width: 79%;
} }
.pull-right.dropdown-menu { .pull-right.dropdown-menu {
right: 134px; right: 134px;
} }
.run-details .pull-right.dropdown-menu { .run-details .pull-right.dropdown-menu {
right: 64px; right: 64px;
} }
.date-selector .btn-full-width { .date-selector .btn-full-width {
width: 90%; width: 90%;
} }
.filter-toggle { .filter-toggle {
&:before { &:before {
height: 110%; height: 110%;
@@ -59,9 +69,11 @@
left: 0; left: 0;
top: 0; top: 0;
} }
input { input {
width: 92%; width: 92%;
} }
.filter-trigger { .filter-trigger {
padding-bottom: 0; padding-bottom: 0;
} }
@@ -69,21 +81,21 @@
} }
.ie7 { .ie7 {
.aside .task-stats li {
width:31.5%;
}
.zfix { .zfix {
position: relative; position: relative;
z-index: 1001; z-index: 1001;
} }
.list-group li .list-group-item { .list-group li .list-group-item {
margin: 0; margin: 0;
position: static; position: static;
} }
.graph-spacer { .graph-spacer {
margin-bottom: 90px; margin-bottom: 90px;
padding-bottom: 90px; padding-bottom: 90px;
} }
.date-selector { .date-selector {
zoom: 1; zoom: 1;
@@ -91,24 +103,30 @@
width: 100%; width: 100%;
} }
} }
.sr-only { .sr-only {
position: relative; position: relative;
} }
.breadcrumb li { .breadcrumb li {
vertical-align: top; vertical-align: top;
zoom: 1; zoom: 1;
display: inline; display: inline;
margin-right: 10px; margin-right: 10px;
} }
.pull-right.dropdown-menu { .pull-right.dropdown-menu {
right:0px; right: 0;
} }
.run-details .pull-right.dropdown-menu { .run-details .pull-right.dropdown-menu {
right: 82px; right: 82px;
} }
.tasks-list li { .tasks-list li {
padding-right: 105px; padding-right: 105px;
} }
.filter-toggle { .filter-toggle {
width: 30%; width: 30%;
margin: 0 35%; margin: 0 35%;

View File

@@ -18,29 +18,37 @@
.graph-container, .expander { .graph-container, .expander {
display: none; display: none;
} }
.hidden { .hidden {
display: block !important; display: block !important;
visibility: visible !important; visibility: visible !important;
} }
.date-links.hidden { .date-links.hidden {
display: none !important; display: none !important;
} }
.btn-group:hover ul { .btn-group:hover ul {
display: block !important; display: block !important;
} }
table.hidden { table.hidden {
display: table !important; display: table !important;
} }
.collapse { .collapse {
display: block; display: block;
} }
.heading { .heading {
margin-top: 0; margin-top: 0;
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
} }
.show-class { .show-class {
display: block; display: block;
} }
.no-js-hide { .no-js-hide {
display: none; display: none;
} }

View File

@@ -18,47 +18,60 @@
.h1, h1 { .h1, h1 {
font-size: floor(@font-size-base * 2.15); // ~32px; font-size: floor(@font-size-base * 2.15); // ~32px;
} }
.h2, h2 { .h2, h2 {
font-size: floor(@font-size-base * 1.9); // ~28px; font-size: floor(@font-size-base * 1.9); // ~28px;
} }
.task-header .h4 { .task-header .h4 {
font-size: floor(@font-size-base * 1.15); // ~17px; font-size: floor(@font-size-base * 1.15); // ~17px;
} }
.header { .header {
margin-bottom: 2rem; margin-bottom: 2rem;
padding-bottom: 1rem; padding-bottom: 1rem;
} }
.task-header .btn { .task-header .btn {
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
line-height: 1.5rem; line-height: 1.5rem;
} }
.task-header h2 { .task-header h2 {
margin-bottom: 3px; margin-bottom: 3px;
} }
.date { .date {
margin-top: 10px; margin-top: 10px;
float: right; float: right;
} }
.other-tasks { .other-tasks {
.sr-only(); .sr-only();
} }
.task-stats, .task-stats,
.btn-full-width { .btn-full-width {
margin-bottom: 0; margin-bottom: 0;
} }
.task-card .task-stats { .task-card .task-stats {
margin-bottom: 10px; margin-bottom: 10px;
} }
.action-buttons { .action-buttons {
margin-bottom: 20px; margin-bottom: 20px;
} }
.aside { .aside {
margin-bottom: 15px; margin-bottom: 15px;
} }
.graph-spacer { .graph-spacer {
padding-bottom: 80px; padding-bottom: 80px;
} }
.footer { .footer {
text-align: center; text-align: center;
@@ -71,20 +84,24 @@
} }
} }
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.date-selector { .date-selector {
margin-top: 0; margin-top: 0;
margin-bottom: 25px; margin-bottom: 25px;
} }
.readonly-mode .date { .readonly-mode .date {
margin-top: 0; margin-top: 0;
margin-bottom: 5px; margin-bottom: 5px;
float: none; float: none;
} }
.graph-spacer { .graph-spacer {
padding-bottom: 20px; padding-bottom: 20px;
margin-bottom: 15px; margin-bottom: 15px;
} }
.action-buttons { .action-buttons {
margin-top: 10px; margin-top: 10px;
margin-bottom: 0; margin-bottom: 0;
@@ -93,43 +110,54 @@
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
.task-header { .task-header {
.run-details { .run-details {
text-align: left; text-align: left;
} }
} }
.task-card .task-card-link { .task-card .task-card-link {
min-height: 0; min-height: 0;
} }
} }
@media (max-width: 640px) { @media (max-width: 640px) {
body { body {
font-size: 14px; font-size: 14px;
} }
.h1, h1 { .h1, h1 {
font-size: floor(@font-size-base * 1.75); // ~26px; font-size: floor(@font-size-base * 1.75); // ~26px;
} }
.h2, h2 { .h2, h2 {
font-size: floor(@font-size-base * 1.6); // ~24px; font-size: floor(@font-size-base * 1.6); // ~24px;
} }
.task-header .h4 { .task-header .h4 {
font-size: floor(@font-size-base * 1.1); // ~16px; font-size: floor(@font-size-base * 1.1); // ~16px;
} }
.badge { .badge {
font-size: floor(@font-size-base * 0.75); // ~11px; font-size: floor(@font-size-base * 0.75); // ~11px;
padding: 7px; padding: 7px;
} }
.rule-name .badge { .rule-name .badge {
padding: 3px; padding: 3px;
} }
.graph { .graph {
margin-bottom: 3rem; margin-bottom: 3rem;
} }
.delete-button { .delete-button {
font-size: floor(@font-size-base * 1.35); // ~20px; font-size: floor(@font-size-base * 1.35); // ~20px;
top: 10px; top: 10px;
right: 25px; right: 25px;
} }
.standards-lists { .standards-lists {
.tooltip { .tooltip {
&.top .tooltip-inner { &.top .tooltip-inner {
@@ -137,35 +165,42 @@
} }
} }
} }
.tasks-list { .tasks-list {
li { .panel {
margin-bottom: 20px; margin-bottom: 20px;
} }
} }
.footer .nav { .footer .nav {
li { li {
width: 50%; width: 50%;
} }
} }
} }
@media (max-width: 479px) { @media (max-width: 479px) {
.graph { .graph {
height: 200px; height: 200px;
margin-bottom: 1.5rem; margin-bottom: 1.5rem;
} }
.series-checkboxes li { .series-checkboxes li {
font-size: floor(@font-size-base * 0.8); // ~12px; font-size: floor(@font-size-base * 0.8); // ~12px;
} }
.task-header .h3 { .task-header .h3 {
float: none !important; float: none !important;
text-align: center; text-align: center;
margin-bottom: 15px !important; margin-bottom: 15px !important;
padding: 10px; padding: 10px;
} }
.task-header h1 { .task-header h1 {
margin-bottom: 3px; margin-bottom: 3px;
} }
} }
@media (max-width: 360px) { @media (max-width: 360px) {
.delete-button { .delete-button {
display: block !important; display: block !important;
@@ -174,6 +209,7 @@
right: 20px; right: 20px;
.opacity(0.7) .opacity(0.7)
} }
.standards-lists { .standards-lists {
.checkbox { .checkbox {
font-size: floor(@font-size-base * 0.9); // ~13px; font-size: floor(@font-size-base * 0.9); // ~13px;
@@ -184,6 +220,7 @@
} }
} }
} }
.footer { .footer {
.nav { .nav {
a { a {

View File

@@ -19,21 +19,27 @@
.crunch { .crunch {
margin: 0 !important; margin: 0 !important;
} }
.crunch-top { .crunch-top {
margin-top: 0 !important; margin-top: 0 !important;
} }
.crunch-bottom { .crunch-bottom {
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
.block-level { .block-level {
display: block; display: block;
} }
.ruled { .ruled {
border-bottom: dotted 1px @gray; border-bottom: dotted 1px @gray;
} }
.ruled-sm { .ruled-sm {
margin-bottom: 15px; margin-bottom: 15px;
} }
.well-med { .well-med {
padding: 15px; padding: 15px;
} }
@@ -44,15 +50,18 @@
margin-bottom: 30px; margin-bottom: 30px;
background-color: lighten(@gray-lighter, 4%); background-color: lighten(@gray-lighter, 4%);
} }
.footer { .footer {
background-color: lighten(@gray-lighter, 4%); background-color: lighten(@gray-lighter, 4%);
padding: 40px 0 20px 0; padding: 40px 0 20px 0;
margin-top: 40px; margin-top: 40px;
} }
.nav { .nav {
list-style-type: none; list-style-type: none;
padding: 0; padding: 0;
} }
.footer .nav { .footer .nav {
float: right; float: right;
@@ -61,6 +70,7 @@
-webkit-transition: background 0.3s; -webkit-transition: background 0.3s;
} }
} }
.supersize-me { .supersize-me {
text-align: center; text-align: center;
font-size: 112px; font-size: 112px;
@@ -68,13 +78,16 @@
font-weight: bold; font-weight: bold;
color: @gray-light; color: @gray-light;
} }
.floated-list li { .floated-list li {
float: left; float: left;
} }
.btn-full-width { .btn-full-width {
width: 100%; width: 100%;
margin-bottom: 10px margin-bottom: 10px
} }
.dropdown-menu { .dropdown-menu {
width: 100%; width: 100%;
top: 40px; top: 40px;
@@ -83,10 +96,12 @@
text-indent: -20px; text-indent: -20px;
} }
} }
.dropdown-toggle { .dropdown-toggle {
margin-top: 0; margin-top: 0;
margin-bottom: 5px; margin-bottom: 5px;
} }
.list-group { .list-group {
li .list-group-item { li .list-group-item {
border-radius: 0; border-radius: 0;
@@ -102,19 +117,23 @@
margin-bottom: 0; margin-bottom: 0;
} }
} }
.options-button { .options-button {
position: absolute; position: absolute;
top: 5px; top: 5px;
right: 20px; right: 20px;
} }
.footer a, .breadcrumb a { .footer a, .breadcrumb a {
text-decoration: underline; text-decoration: underline;
} }
.breadcrumb a { .breadcrumb a {
&:hover, &:active, &:focus { &:hover, &:active, &:focus {
text-decoration: none; text-decoration: none;
} }
} }
.site-message { .site-message {
.glyphicon { .glyphicon {
margin-right: 6px; margin-right: 6px;
@@ -127,7 +146,6 @@
margin-bottom: (@line-height-computed / 2); margin-bottom: (@line-height-computed / 2);
} }
/* Task stats boxes */ /* Task stats boxes */
.task-stats { .task-stats {
margin-bottom: 10px; margin-bottom: 10px;
@@ -151,6 +169,7 @@
} }
} }
} }
.stat-type { .stat-type {
font-size: floor(@font-size-base * 0.75); // ~11px; font-size: floor(@font-size-base * 0.75); // ~11px;
text-transform: uppercase; text-transform: uppercase;
@@ -159,25 +178,17 @@
.opacity(.8); .opacity(.8);
} }
.aside .task-stats {
li:hover {
.opacity(.85);
a {
text-decoration:none;
}
}
}
// Stats box colours // Stats box colours
.danger, .error { .danger, .error {
background-color: @brand-danger; background-color: @brand-danger;
color: @btn-default-color; color: @btn-default-color;
} }
.warning { .warning {
background-color: @brand-warning; background-color: @brand-warning;
color: @btn-default-color; color: @btn-default-color;
} }
.info, .notice { .info, .notice {
background-color: @brand-info; background-color: @brand-info;
color: @btn-default-color; color: @btn-default-color;
@@ -206,17 +217,10 @@
display: block; display: block;
} }
.task-card-link:hover, .task-card-link:hover,
&:hover .task-card-link &:hover .task-card-link {
{
text-decoration: none; text-decoration: none;
background-color: darken(@gray-lighter, 2%); background-color: darken(@gray-lighter, 2%);
} }
.h3 {
text-overflow:ellipsis;
overflow:hidden;
width:100%;
white-space: nowrap;
}
.task-stats li { .task-stats li {
padding: 7px 0 6px 0; padding: 7px 0 6px 0;
text-align: center; text-align: center;
@@ -225,8 +229,24 @@
.dropdown-menu { .dropdown-menu {
top: 25px; top: 25px;
} }
.gridview {
.h3 {
text-overflow: ellipsis;
overflow: hidden;
width: 100%;
white-space: nowrap;
}
.h4 {
display: none;
}
}
.listview {
padding-left: 0;
}
.last-run {
clear: both;
}
} }
/* Badges */ /* Badges */
.badge { .badge {
@@ -236,8 +256,10 @@
font-size: ceil(@font-size-base * 0.85); // ~13px; font-size: ceil(@font-size-base * 0.85); // ~13px;
text-transform: uppercase; text-transform: uppercase;
} }
.rule-name .badge { .rule-name .badge {
padding: 6px; padding: 6px;
text-transform: none;
} }
/* Task details page*/ /* Task details page*/
@@ -255,61 +277,180 @@
margin-bottom: 6px; margin-bottom: 6px;
} }
} }
.date { .date {
margin-top: 5px; margin-top: 5px;
} }
.readonly-mode .date { .readonly-mode .date {
margin-top: 40px; margin-top: 40px;
} }
.category-list {
&__item {
font-size: 16px;
&_type_error,
&_type_error.active {
.category-list__link,
.category-list__link:hover,
.category-list__link:focus {
color: @brand-danger;
}
}
&_type_warning,
&_type_warning.active {
.category-list__link,
.category-list__link:hover,
.category-list__link:focus {
color: @brand-warning;
}
}
&_type_notice,
&_type_notice.active {
.category-list__link,
.category-list__link:hover,
.category-list__link:focus {
color: @brand-info;
}
}
&_type_ignore,
&_type_ignore.active {
.category-list__link,
.category-list__link:hover,
.category-list__link:focus {
color: @badge-bg;
}
}
}
}
.tasks-list { .tasks-list {
padding: 15px; padding: 15px;
margin-bottom: 30px; margin-bottom: 30px;
border-width:3px; border: 1px solid @gray-lighter;
border-style:solid; border-top: 0;
li {
margin-bottom:20px;
padding-right:90px;
position:relative;
.panel {
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
form { .ignore-form {
display:none; display: inline-block;
position:absolute; vertical-align: middle;
right:0;
top:0;
&:hover .btn { .btn {
color:@brand-primary; margin: 0;
padding: 0;
} }
} }
&:hover form {
display:block;
}
} }
.rule-name { .rule-name {
font-weight:bold; font-size: 16px;
font-style:italic;
word-wrap: break-word; word-wrap: break-word;
} }
.link {
color: #07c;
} }
.task-danger {
border-color:@brand-danger; .to-top {
text-align: center;
.glyphicon {
margin-right: 10px;
}
}
}
.task {
margin-bottom: 16px;
&_type_error {
.rule-name,
.ignore-form .link {
color: @brand-danger;
}
.badge {
background: @brand-danger;
}
}
&_type_warning {
.rule-name,
.ignore-form .link {
color: @brand-warning;
}
.badge {
background: @brand-warning;
}
}
&_type_notice {
.rule-name,
.ignore-form .link {
color: @brand-info;
}
.badge {
background: @brand-info;
}
}
&_type_ignore {
.ignore-form .link {
color: @badge-bg;
}
}
.subtitle {
font-size: 16px;
padding: 10px 0 5px;
}
.list-unstyled {
&__item {
padding: 5px 0;
}
}
&-actions {
position: relative;
text-align: right;
}
.code {
cursor: pointer;
outline: none;
}
.panel-body {
.text {
vertical-align: middle;
}
}
.btn-details {
padding: 0;
margin: 0 5px;
&:before {
content: 'Show ';
}
&.btn_state_collapsed {
&:before {
content: 'Hide ';
} }
.task-warning {
border-color:@brand-warning;
} }
.task-info {
border-color:@brand-info;
} }
.task-default {
border-color:@badge-bg;
} }
/* Task list heading */ /* Task list heading */
@@ -329,13 +470,6 @@
margin-top: 0; margin-top: 0;
} }
} }
.expander {
cursor:pointer;
padding:0 5px;
font-weight:bold;
font-size:floor(@font-size-base * @line-height-base); // ~20px
line-height:1;
}
/* Date selector */ /* Date selector */
ul.date-links { ul.date-links {
@@ -346,6 +480,7 @@ ul.date-links {
width: 100%; width: 100%;
z-index: 10; z-index: 10;
} }
.date-selector { .date-selector {
margin-bottom: 5px; margin-bottom: 5px;
@@ -374,6 +509,7 @@ ul.date-links {
text-decoration: underline; text-decoration: underline;
} }
} }
.single-result .date-selector-row { .single-result .date-selector-row {
display: none; display: none;
} }
@@ -383,10 +519,12 @@ ul.date-links {
height: 300px; height: 300px;
width: 100%; width: 100%;
} }
.graph-spacer { .graph-spacer {
margin-bottom:30px; margin-bottom: 40px;
padding-bottom: 30px; padding-bottom: 30px;
} }
.graph-table { .graph-table {
margin-bottom: 0; margin-bottom: 0;
@@ -394,29 +532,29 @@ ul.date-links {
width: 25%; width: 25%;
} }
} }
.series-checkboxes { .series-checkboxes {
margin-top:15px; padding: 0 15px;
margin-bottom: 16px;
li { li {
width: 32%; width: 32%;
margin-right: 2%; margin-right: 2%;
border-radius: @border-radius-base; border-radius: @border-radius-base;
label { .series-checkbox-container {
margin-bottom:0; padding: 4px 4px 5px 4px;
} }
.series-checkbox-container { label {
padding:2px 4px 3px 4px; margin: 0;
padding: 0 0 0 12px;
cursor: pointer;
} }
input { input {
margin:5px auto 3px auto; margin: 6px 0;
}
input, label {
cursor: pointer; cursor: pointer;
display:block;
} }
&:last-child { &:last-child {
@@ -428,23 +566,28 @@ ul.date-links {
} }
} }
} }
.btn-reset { .btn-reset {
margin-top:12px; margin: 12px 18px 0;
} }
.flot-x-axis { .flot-x-axis {
.flot-tick-label { .flot-tick-label {
max-width: 45px !important; max-width: 45px !important;
} }
} }
.tooltip-graph { .tooltip-graph {
font-size: 12px; font-size: 12px;
} }
.custom-legend .legend { .custom-legend .legend {
display: none !important; display: none !important;
} }
.dashedLegend { .dashedLegend {
position: absolute; position: absolute;
top:17px; top: 70px;
right: 40px; right: 40px;
font-size: smaller; font-size: smaller;
color: #545454; color: #545454;
@@ -452,51 +595,62 @@ ul.date-links {
background-color: rgba(255, 255, 255, 0.75); background-color: rgba(255, 255, 255, 0.75);
display: none; display: none;
} }
.dashedContainer { .dashedContainer {
background: #fff; background: #fff;
border: 1px solid #808080; border: 1px solid #808080;
margin: 5px; margin: 5px;
padding-top: 5px; padding-top: 5px;
} }
.dashedLegend tr { .dashedLegend tr {
display: none; display: none;
} }
.dashedLegend .legendColorBox > div:first-child { .dashedLegend .legendColorBox > div:first-child {
border: 1px solid rgb(204, 204, 204); border: 1px solid rgb(204, 204, 204);
padding: 3px; padding: 3px;
} }
.dashedLegend .legendIcon div { .dashedLegend .legendIcon div {
height: 0px; height: 0;
border-width: 3px 0px 0px; border-width: 3px 0 0;
border-top-style: solid; border-top-style: solid;
overflow: hidden; overflow: hidden;
} }
.dashedLegend .legendErrors div { .dashedLegend .legendErrors div {
width: 25px; width: 25px;
border-top-color: rgb(216, 61, 45); border-top-color: rgb(216, 61, 45);
} }
.dashedLegend .legendWarnings div { .dashedLegend .legendWarnings div {
width: 10px; width: 10px;
border-top-color: rgb(168, 103, 0); border-top-color: rgb(168, 103, 0);
float: left; float: left;
} }
.dashedLegend .legendWarnings div:first-child { .dashedLegend .legendWarnings div:first-child {
margin-right: 5px; margin-right: 5px;
} }
.dashedLegend .legendNotices div { .dashedLegend .legendNotices div {
width: 5px; width: 5px;
border-top-color: rgb(23, 123, 190); border-top-color: rgb(23, 123, 190);
float: left; float: left;
margin-left: 5px; margin-left: 5px;
} }
.dashedLegend .legendNotices div:first-child { .dashedLegend .legendNotices div:first-child {
margin-left: 0; margin-left: 0;
} }
.dashedLegend td.legendColorBox { .dashedLegend td.legendColorBox {
padding-right: 5px; padding-right: 5px;
padding-bottom: 5px; padding-bottom: 5px;
padding-left: 10px; padding-left: 10px;
} }
.dashedLegend td.legendLabel { .dashedLegend td.legendLabel {
padding-right: 10px; padding-right: 10px;
padding-bottom: 5px; padding-bottom: 5px;
@@ -508,7 +662,7 @@ ul.date-links {
overflow: hidden; overflow: hidden;
overflow-y: auto; overflow-y: auto;
margin-bottom: 15px; margin-bottom: 15px;
border-bottom:solid 1px @gray-lighter; border-bottom: 1px solid @gray-lighter;
.checkbox { .checkbox {
cursor: pointer; cursor: pointer;
@@ -543,7 +697,7 @@ ul.date-links {
&:before { &:before {
position: absolute; position: absolute;
content:""; content: '';
height: 90px; height: 90px;
width: 90px; width: 90px;
left: 50%; left: 50%;
@@ -563,6 +717,7 @@ ul.date-links {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.inline-list > li { .inline-list > li {
display: inline-block; display: inline-block;
border-right: 1px solid @dropdown-fallback-border; // IE8 fallback border-right: 1px solid @dropdown-fallback-border; // IE8 fallback
@@ -570,6 +725,31 @@ ul.date-links {
padding: 0 4px 0 0; padding: 0 4px 0 0;
margin: 0 4px 0 0; margin: 0 4px 0 0;
} }
.inline-list + div.date { .inline-list + div.date {
display: inline-block; display: inline-block;
} }
/* Popovers */
.popover-content {
overflow-x: auto;
}
/*list and grid view buttons */
.view-btn {
&.btn-default, &.btn-default:hover, &.btn-default:focus {
color: #ffffff;
}
&:hover {
color: #000000;
}
&:last-child:not(:first-child) {
border-bottom-left-radius: 0;
border-top-left-radius: 0;
margin-left: -3px;
}
&:first-child:not(:last-child) {
border-bottom-right-radius: 0;
border-top-right-radius: 0;
}
}

View File

@@ -2,16 +2,15 @@
// Tables // Tables
// -------------------------------------------------- // --------------------------------------------------
table { table {
max-width: 100%; max-width: 100%;
background-color: @table-bg; background-color: @table-bg;
} }
th { th {
text-align: left; text-align: left;
} }
// Baseline styles // Baseline styles
.table { .table {
@@ -58,7 +57,6 @@ th {
} }
} }
// Condensed table w/ half padding // Condensed table w/ half padding
.table-condensed { .table-condensed {
@@ -74,7 +72,6 @@ th {
} }
} }
// Bordered version // Bordered version
// //
// Add borders all around the table and between all the columns. // Add borders all around the table and between all the columns.
@@ -101,7 +98,6 @@ th {
} }
} }
// Zebra-striping // Zebra-striping
// //
// Default zebra-stripe styles (alternating gray and transparent backgrounds) // Default zebra-stripe styles (alternating gray and transparent backgrounds)
@@ -117,7 +113,6 @@ th {
} }
} }
// Hover effect // Hover effect
// //
// Placed here since it has to come after the potential zebra striping // Placed here since it has to come after the potential zebra striping
@@ -133,7 +128,6 @@ th {
} }
} }
// Table cell sizing // Table cell sizing
// //
// Reset default table behavior // Reset default table behavior
@@ -142,6 +136,7 @@ table col[class*="col-"] {
float: none; float: none;
display: table-column; display: table-column;
} }
table { table {
td, td,
th { th {
@@ -152,7 +147,6 @@ table {
} }
} }
// Table backgrounds // Table backgrounds
// //
// Exact selectors below required to override `.table-striped` and prevent // Exact selectors below required to override `.table-striped` and prevent
@@ -174,7 +168,6 @@ table {
.table-row-variant(danger; @state-danger-bg; @state-danger-border); .table-row-variant(danger; @state-danger-bg; @state-danger-border);
.table-row-variant(warning; @state-warning-bg; @state-warning-border); .table-row-variant(warning; @state-warning-bg; @state-warning-border);
// Responsive tables // Responsive tables
// //
// Wrap your tables in `.table-responsive` and we'll make them mobile friendly // Wrap your tables in `.table-responsive` and we'll make them mobile friendly
@@ -240,7 +233,6 @@ table {
} }
} }
} }
} }
} }
} }

View File

@@ -1,13 +1,9 @@
// //
// Load core variables and mixins // Load core variables and mixins
// -------------------------------------------------- // --------------------------------------------------
@import "variables.less"; @import "variables.less";
@import "mixins.less"; @import "mixins.less";
// //
// Buttons // Buttons
// -------------------------------------------------- // --------------------------------------------------
@@ -59,14 +55,31 @@
} }
// Apply the mixin to the buttons // Apply the mixin to the buttons
.btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; } .btn-default {
.btn-primary { .btn-styles(@btn-primary-bg); } .btn-styles(@btn-default-bg);
.btn-success { .btn-styles(@btn-success-bg); } text-shadow: 0 1px 0 #fff;
.btn-warning { .btn-styles(@btn-warning-bg); } border-color: #ccc;
.btn-danger { .btn-styles(@btn-danger-bg); } }
.btn-info { .btn-styles(@btn-info-bg); }
.btn-primary {
.btn-styles(@btn-primary-bg);
}
.btn-success {
.btn-styles(@btn-success-bg);
}
.btn-warning {
.btn-styles(@btn-warning-bg);
}
.btn-danger {
.btn-styles(@btn-danger-bg);
}
.btn-info {
.btn-styles(@btn-info-bg);
}
// //
// Images // Images
@@ -77,8 +90,6 @@
.box-shadow(0 1px 2px rgba(0, 0, 0, .075)); .box-shadow(0 1px 2px rgba(0, 0, 0, .075));
} }
// //
// Dropdowns // Dropdowns
// -------------------------------------------------- // --------------------------------------------------
@@ -88,6 +99,7 @@
#gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%)); #gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));
background-color: darken(@dropdown-link-hover-bg, 5%); background-color: darken(@dropdown-link-hover-bg, 5%);
} }
.dropdown-menu > .active > a, .dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus { .dropdown-menu > .active > a:focus {
@@ -95,8 +107,6 @@
background-color: darken(@dropdown-link-active-bg, 5%); background-color: darken(@dropdown-link-active-bg, 5%);
} }
// //
// Navbar // Navbar
// -------------------------------------------------- // --------------------------------------------------
@@ -113,6 +123,7 @@
.box-shadow(inset 0 3px 9px rgba(0, 0, 0, .075)); .box-shadow(inset 0 3px 9px rgba(0, 0, 0, .075));
} }
} }
.navbar-brand, .navbar-brand,
.navbar-nav > li > a { .navbar-nav > li > a {
text-shadow: 0 1px 0 rgba(255, 255, 255, .25); text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
@@ -140,8 +151,6 @@
border-radius: 0; border-radius: 0;
} }
// //
// Alerts // Alerts
// -------------------------------------------------- // --------------------------------------------------
@@ -160,12 +169,21 @@
} }
// Apply the mixin to the alerts // Apply the mixin to the alerts
.alert-success { .alert-styles(@alert-success-bg); } .alert-success {
.alert-info { .alert-styles(@alert-info-bg); } .alert-styles(@alert-success-bg);
.alert-warning { .alert-styles(@alert-warning-bg); } }
.alert-danger { .alert-styles(@alert-danger-bg); }
.alert-info {
.alert-styles(@alert-info-bg);
}
.alert-warning {
.alert-styles(@alert-warning-bg);
}
.alert-danger {
.alert-styles(@alert-danger-bg);
}
// //
// Progress bars // Progress bars
@@ -182,13 +200,25 @@
} }
// Apply the mixin to the progress bars // Apply the mixin to the progress bars
.progress-bar { .progress-bar-styles(@progress-bar-bg); } .progress-bar {
.progress-bar-success { .progress-bar-styles(@progress-bar-success-bg); } .progress-bar-styles(@progress-bar-bg);
.progress-bar-info { .progress-bar-styles(@progress-bar-info-bg); } }
.progress-bar-warning { .progress-bar-styles(@progress-bar-warning-bg); }
.progress-bar-danger { .progress-bar-styles(@progress-bar-danger-bg); }
.progress-bar-success {
.progress-bar-styles(@progress-bar-success-bg);
}
.progress-bar-info {
.progress-bar-styles(@progress-bar-info-bg);
}
.progress-bar-warning {
.progress-bar-styles(@progress-bar-warning-bg);
}
.progress-bar-danger {
.progress-bar-styles(@progress-bar-danger-bg);
}
// //
// List groups // List groups
@@ -198,6 +228,7 @@
border-radius: @border-radius-base; border-radius: @border-radius-base;
.box-shadow(0 1px 2px rgba(0, 0, 0, .075)); .box-shadow(0 1px 2px rgba(0, 0, 0, .075));
} }
.list-group-item.active, .list-group-item.active,
.list-group-item.active:hover, .list-group-item.active:hover,
.list-group-item.active:focus { .list-group-item.active:focus {
@@ -206,8 +237,6 @@
border-color: darken(@list-group-active-border, 7.5%); border-color: darken(@list-group-active-border, 7.5%);
} }
// //
// Panels // Panels
// -------------------------------------------------- // --------------------------------------------------
@@ -223,14 +252,29 @@
} }
// Apply the mixin to the panel headings only // Apply the mixin to the panel headings only
.panel-default > .panel-heading { .panel-heading-styles(@panel-default-heading-bg); } .panel-default > .panel-heading {
.panel-primary > .panel-heading { .panel-heading-styles(@panel-primary-heading-bg); } .panel-heading-styles(@panel-default-heading-bg);
.panel-success > .panel-heading { .panel-heading-styles(@panel-success-heading-bg); } }
.panel-info > .panel-heading { .panel-heading-styles(@panel-info-heading-bg); }
.panel-warning > .panel-heading { .panel-heading-styles(@panel-warning-heading-bg); }
.panel-danger > .panel-heading { .panel-heading-styles(@panel-danger-heading-bg); }
.panel-primary > .panel-heading {
.panel-heading-styles(@panel-primary-heading-bg);
}
.panel-success > .panel-heading {
.panel-heading-styles(@panel-success-heading-bg);
}
.panel-info > .panel-heading {
.panel-heading-styles(@panel-info-heading-bg);
}
.panel-warning > .panel-heading {
.panel-heading-styles(@panel-warning-heading-bg);
}
.panel-danger > .panel-heading {
.panel-heading-styles(@panel-danger-heading-bg);
}
// //
// Wells // Wells

View File

@@ -2,7 +2,6 @@
// Thumbnails // Thumbnails
// -------------------------------------------------- // --------------------------------------------------
// Mixin and adjust the regular image class // Mixin and adjust the regular image class
.thumbnail { .thumbnail {
.img-thumbnail(); .img-thumbnail();
@@ -14,7 +13,6 @@
} }
} }
// Add a hover state for linked versions only // Add a hover state for linked versions only
a.thumbnail:hover, a.thumbnail:hover,
a.thumbnail:focus { a.thumbnail:focus {
@@ -26,6 +24,7 @@ a.thumbnail:focus {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
.thumbnail .caption { .thumbnail .caption {
padding: @thumbnail-caption-padding; padding: @thumbnail-caption-padding;
color: @thumbnail-caption-color; color: @thumbnail-caption-color;

View File

@@ -2,7 +2,6 @@
// Tooltips // Tooltips
// -------------------------------------------------- // --------------------------------------------------
// Base class // Base class
.tooltip { .tooltip {
position: absolute; position: absolute;
@@ -13,11 +12,25 @@
line-height: 1.4; line-height: 1.4;
.opacity(0); .opacity(0);
&.in { .opacity(.9); } &.in {
&.top { margin-top: -3px; padding: @tooltip-arrow-width 0; } .opacity(.9);
&.right { margin-left: 3px; padding: 0 @tooltip-arrow-width; } }
&.bottom { margin-top: 3px; padding: @tooltip-arrow-width 0; } &.top {
&.left { margin-left: -3px; padding: 0 @tooltip-arrow-width; } margin-top: -3px;
padding: @tooltip-arrow-width 0;
}
&.right {
margin-left: 3px;
padding: 0 @tooltip-arrow-width;
}
&.bottom {
margin-top: 3px;
padding: @tooltip-arrow-width 0;
}
&.left {
margin-left: -3px;
padding: 0 @tooltip-arrow-width;
}
} }
// Wrapper for the tooltip content // Wrapper for the tooltip content
@@ -39,6 +52,7 @@
border-color: transparent; border-color: transparent;
border-style: solid; border-style: solid;
} }
.tooltip { .tooltip {
&.top .tooltip-arrow { &.top .tooltip-arrow {
bottom: 0; bottom: 0;

View File

@@ -2,13 +2,13 @@
// Typography // Typography
// -------------------------------------------------- // --------------------------------------------------
// Body text // Body text
// ------------------------- // -------------------------
p { p {
margin: 0 0 (@line-height-computed / 2); margin: 0 0 (@line-height-computed / 2);
} }
.lead { .lead {
margin-bottom: @line-height-computed; margin-bottom: @line-height-computed;
font-size: (@font-size-base * 1.15); font-size: (@font-size-base * 1.15);
@@ -20,45 +20,53 @@ p {
} }
} }
// Emphasis & misc // Emphasis & misc
// ------------------------- // -------------------------
// Ex: 14px base font * 85% = about 12px // Ex: 14px base font * 85% = about 12px
small, small,
.small { font-size: 85%; } .small {
font-size: 85%;
}
// Undo browser default styling // Undo browser default styling
cite { font-style: normal; } cite {
font-style: normal;
}
// Contextual emphasis // Contextual emphasis
.text-muted { .text-muted {
color: @text-muted; color: @text-muted;
} }
.text-primary { .text-primary {
color: @brand-primary; color: @brand-primary;
&:hover { &:hover {
color: darken(@brand-primary, 10%); color: darken(@brand-primary, 10%);
} }
} }
.text-warning { .text-warning {
color: @state-warning-text; color: @state-warning-text;
&:hover { &:hover {
color: darken(@state-warning-text, 10%); color: darken(@state-warning-text, 10%);
} }
} }
.text-danger { .text-danger {
color: @state-danger-text; color: @state-danger-text;
&:hover { &:hover {
color: darken(@state-danger-text, 10%); color: darken(@state-danger-text, 10%);
} }
} }
.text-success { .text-success {
color: @state-success-text; color: @state-success-text;
&:hover { &:hover {
color: darken(@state-success-text, 10%); color: darken(@state-success-text, 10%);
} }
} }
.text-info { .text-info {
color: @state-info-text; color: @state-info-text;
&:hover { &:hover {
@@ -67,10 +75,17 @@ cite { font-style: normal; }
} }
// Alignment // Alignment
.text-left { text-align: left; } .text-left {
.text-right { text-align: right; } text-align: left;
.text-center { text-align: center; } }
.text-right {
text-align: right;
}
.text-center {
text-align: center;
}
// Headings // Headings
// ------------------------- // -------------------------
@@ -99,6 +114,7 @@ h3 {
font-size: 65%; font-size: 65%;
} }
} }
h4, h4,
h5, h5,
h6 { h6 {
@@ -110,13 +126,29 @@ h6 {
} }
} }
h1, .h1 { font-size: @font-size-h1; } h1, .h1 {
h2, .h2 { font-size: @font-size-h2; } font-size: @font-size-h1;
h3, .h3 { font-size: @font-size-h3; } }
h4, .h4 { font-size: @font-size-h4; }
h5, .h5 { font-size: @font-size-h5; }
h6, .h6 { font-size: @font-size-h6; }
h2, .h2 {
font-size: @font-size-h2;
}
h3, .h3 {
font-size: @font-size-h3;
}
h4, .h4 {
font-size: @font-size-h4;
}
h5, .h5 {
font-size: @font-size-h5;
}
h6, .h6 {
font-size: @font-size-h6;
}
// Page header // Page header
// ------------------------- // -------------------------
@@ -127,8 +159,6 @@ h6, .h6 { font-size: @font-size-h6; }
border-bottom: 1px solid @page-header-border-color; border-bottom: 1px solid @page-header-border-color;
} }
// Lists // Lists
// -------------------------------------------------- // --------------------------------------------------
@@ -150,6 +180,7 @@ ol {
padding-left: 0; padding-left: 0;
list-style: none; list-style: none;
} }
// Inline turns list items into inline-block // Inline turns list items into inline-block
.list-inline { .list-inline {
.list-unstyled(); .list-unstyled();
@@ -164,13 +195,16 @@ ol {
dl { dl {
margin-bottom: @line-height-computed; margin-bottom: @line-height-computed;
} }
dt, dt,
dd { dd {
line-height: @line-height-base; line-height: @line-height-base;
} }
dt { dt {
font-weight: bold; font-weight: bold;
} }
dd { dd {
margin-left: 0; // Undo browser default margin-left: 0; // Undo browser default
} }
@@ -206,6 +240,7 @@ abbr[data-original-title] {
cursor: help; cursor: help;
border-bottom: 1px dotted @abbr-border-color; border-bottom: 1px dotted @abbr-border-color;
} }
abbr.initialism { abbr.initialism {
font-size: 90%; font-size: 90%;
text-transform: uppercase; text-transform: uppercase;

View File

@@ -2,41 +2,44 @@
// Utility classes // Utility classes
// -------------------------------------------------- // --------------------------------------------------
// Floats // Floats
// ------------------------- // -------------------------
.clearfix { .clearfix {
.clearfix(); .clearfix();
} }
.center-block { .center-block {
.center-block(); .center-block();
} }
.pull-right { .pull-right {
float: right !important; float: right !important;
} }
.pull-left { .pull-left {
float: left !important; float: left !important;
} }
// Toggling content // Toggling content
// ------------------------- // -------------------------
.hide { .hide {
display: none !important; display: none !important;
} }
.show { .show {
display: block !important; display: block !important;
} }
.invisible { .invisible {
visibility: hidden; visibility: hidden;
} }
.text-hide { .text-hide {
.text-hide(); .text-hide();
} }
// For Affix plugin // For Affix plugin
// ------------------------- // -------------------------
@@ -44,7 +47,6 @@
position: fixed; position: fixed;
} }
// Cursors // Cursors
// ------------------------- // -------------------------

View File

@@ -2,7 +2,6 @@
// Variables // Variables
// -------------------------------------------------- // --------------------------------------------------
// Global values // Global values
// -------------------------------------------------- // --------------------------------------------------
@@ -61,7 +60,6 @@
@icon-font-path: "../fonts/"; @icon-font-path: "../fonts/";
@icon-font-name: "glyphicons-halflings-regular"; @icon-font-name: "glyphicons-halflings-regular";
// Components // Components
// ------------------------- // -------------------------
// Based on 14px font-size and 1.428 line-height (~20px to start) // Based on 14px font-size and 1.428 line-height (~20px to start)
@@ -100,7 +98,6 @@
@table-border-color: @gray-lighter; // table and cell border @table-border-color: @gray-lighter; // table and cell border
// Buttons // Buttons
// ------------------------- // -------------------------
@@ -132,7 +129,6 @@
@btn-link-disabled-color: @gray-light; @btn-link-disabled-color: @gray-light;
// Forms // Forms
// ------------------------- // -------------------------
@@ -156,7 +152,6 @@
@input-group-addon-bg: @gray-lighter; @input-group-addon-bg: @gray-lighter;
@input-group-addon-border-color: @input-border; @input-group-addon-border-color: @input-border;
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
@@ -178,11 +173,9 @@
@dropdown-caret-color: #000; @dropdown-caret-color: #000;
// COMPONENT VARIABLES // COMPONENT VARIABLES
// -------------------------------------------------- // --------------------------------------------------
// Z-index master list // Z-index master list
// ------------------------- // -------------------------
// Used for a bird's eye view of components dependent on the z-axis // Used for a bird's eye view of components dependent on the z-axis
@@ -220,7 +213,6 @@
@screen-sm-max: (@screen-md - 1); @screen-sm-max: (@screen-md - 1);
@screen-md-max: (@screen-lg - 1); @screen-md-max: (@screen-lg - 1);
// Grid system // Grid system
// -------------------------------------------------- // --------------------------------------------------
@@ -231,7 +223,6 @@
// Point at which the navbar stops collapsing // Point at which the navbar stops collapsing
@grid-float-breakpoint: @screen-tablet; @grid-float-breakpoint: @screen-tablet;
// Navbar // Navbar
// ------------------------- // -------------------------
@@ -242,7 +233,7 @@
@navbar-default-bg: @brand-primary; @navbar-default-bg: @brand-primary;
@navbar-default-border: darken(@navbar-default-bg, 6.5%); @navbar-default-border: darken(@navbar-default-bg, 6.5%);
@navbar-border-radius: @border-radius-base; @navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor(@grid-gutter-width / 2); // ~15px @navbar-padding-horizontal: floor((@grid-gutter-width / 2)); // ~15px
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
// Navbar links // Navbar links
@@ -264,7 +255,6 @@
@navbar-default-toggle-icon-bar-bg: #fff; @navbar-default-toggle-icon-bar-bg: #fff;
@navbar-default-toggle-border-color: darken(@navbar-default-bg, 10%); @navbar-default-toggle-border-color: darken(@navbar-default-bg, 10%);
// Inverted navbar // Inverted navbar
// //
// Reset inverted navbar basics // Reset inverted navbar basics
@@ -298,7 +288,6 @@
@navbar-inverse-toggle-icon-bar-bg: #fff; @navbar-inverse-toggle-icon-bar-bg: #fff;
@navbar-inverse-toggle-border-color: darken(@navbar-inverse-bg, 10%); @navbar-inverse-toggle-border-color: darken(@navbar-inverse-bg, 10%);
// Navs // Navs
// ------------------------- // -------------------------
@@ -327,7 +316,6 @@
@nav-pills-active-link-hover-bg: @component-active-bg; @nav-pills-active-link-hover-bg: @component-active-bg;
@nav-pills-active-link-hover-color: #fff; @nav-pills-active-link-hover-color: #fff;
// Pagination // Pagination
// ------------------------- // -------------------------
@@ -341,14 +329,12 @@
@pagination-disabled-color: @gray-lighter; @pagination-disabled-color: @gray-lighter;
// Pager // Pager
// ------------------------- // -------------------------
@pager-border-radius: 15px; @pager-border-radius: 15px;
@pager-disabled-color: #fff; @pager-disabled-color: #fff;
// Jumbotron // Jumbotron
// ------------------------- // -------------------------
@@ -358,7 +344,6 @@
@jumbotron-heading-color: inherit; @jumbotron-heading-color: inherit;
// Form states and alerts // Form states and alerts
// ------------------------- // -------------------------
@@ -378,7 +363,6 @@
@state-info-bg: @brand-info; @state-info-bg: @brand-info;
@state-info-border: @brand-info; @state-info-border: @brand-info;
// Tooltips // Tooltips
// ------------------------- // -------------------------
@tooltip-max-width: 200px; @tooltip-max-width: 200px;
@@ -388,7 +372,6 @@
@tooltip-arrow-width: 5px; @tooltip-arrow-width: 5px;
@tooltip-arrow-color: @tooltip-bg; @tooltip-arrow-color: @tooltip-bg;
// Popovers // Popovers
// ------------------------- // -------------------------
@popover-bg: #fff; @popover-bg: #fff;
@@ -405,7 +388,6 @@
@popover-arrow-outer-color: rgba(0, 0, 0, .25); @popover-arrow-outer-color: rgba(0, 0, 0, .25);
@popover-arrow-outer-fallback-color: #999; @popover-arrow-outer-fallback-color: #999;
// Labels // Labels
// ------------------------- // -------------------------
@@ -419,7 +401,6 @@
@label-color: #fff; @label-color: #fff;
@label-link-hover-color: #fff; @label-link-hover-color: #fff;
// Modals // Modals
// ------------------------- // -------------------------
@modal-inner-padding: 20px; @modal-inner-padding: 20px;
@@ -435,7 +416,6 @@
@modal-header-border-color: #e5e5e5; @modal-header-border-color: #e5e5e5;
@modal-footer-border-color: @modal-header-border-color; @modal-footer-border-color: @modal-header-border-color;
// Alerts // Alerts
// ------------------------- // -------------------------
@alert-padding: 15px; @alert-padding: 15px;
@@ -458,7 +438,6 @@
@alert-danger-text: @state-danger-text; @alert-danger-text: @state-danger-text;
@alert-danger-border: @state-danger-border; @alert-danger-border: @state-danger-border;
// Progress bars // Progress bars
// ------------------------- // -------------------------
@progress-bg: @gray-lighter; @progress-bg: @gray-lighter;
@@ -470,7 +449,6 @@
@progress-bar-danger-bg: @brand-danger; @progress-bar-danger-bg: @brand-danger;
@progress-bar-info-bg: @brand-info; @progress-bar-info-bg: @brand-info;
// List group // List group
// ------------------------- // -------------------------
@list-group-bg: #fff; @list-group-bg: #fff;
@@ -485,7 +463,6 @@
@list-group-link-color: #555; @list-group-link-color: #555;
@list-group-link-heading-color: #333; @list-group-link-heading-color: #333;
// Panels // Panels
// ------------------------- // -------------------------
@panel-bg: #fff; @panel-bg: #fff;
@@ -517,7 +494,6 @@
@panel-info-border: @state-info-border; @panel-info-border: @state-info-border;
@panel-info-heading-bg: @state-info-bg; @panel-info-heading-bg: @state-info-bg;
// Thumbnails // Thumbnails
// ------------------------- // -------------------------
@thumbnail-padding: 4px; @thumbnail-padding: 4px;
@@ -528,12 +504,10 @@
@thumbnail-caption-color: @text-color; @thumbnail-caption-color: @text-color;
@thumbnail-caption-padding: 9px; @thumbnail-caption-padding: 9px;
// Wells // Wells
// ------------------------- // -------------------------
@well-bg: @gray-lighter; @well-bg: @gray-lighter;
// Badges // Badges
// ------------------------- // -------------------------
@badge-color: #fff; @badge-color: #fff;
@@ -547,14 +521,12 @@
@badge-line-height: 1; @badge-line-height: 1;
@badge-border-radius: 10px; @badge-border-radius: 10px;
// Breadcrumbs // Breadcrumbs
// ------------------------- // -------------------------
@breadcrumb-bg: lighten(@gray-lighter, 4%); @breadcrumb-bg: lighten(@gray-lighter, 4%);
@breadcrumb-color: @gray-dark; @breadcrumb-color: @gray-dark;
@breadcrumb-active-color: @breadcrumb-color; @breadcrumb-active-color: @breadcrumb-color;
// Carousel // Carousel
// ------------------------ // ------------------------
@@ -570,14 +542,12 @@
@carousel-caption-color: #fff; @carousel-caption-color: #fff;
// Close // Close
// ------------------------ // ------------------------
@close-color: #000; @close-color: #000;
@close-font-weight: bold; @close-font-weight: bold;
@close-text-shadow: 0 1px 0 #fff; @close-text-shadow: 0 1px 0 #fff;
// Code // Code
// ------------------------ // ------------------------
@code-color: #c7254e; @code-color: #c7254e;
@@ -606,7 +576,6 @@
// Horizontal forms & lists // Horizontal forms & lists
@component-offset-horizontal: 180px; @component-offset-horizontal: 180px;
// Container sizes // Container sizes
// -------------------------------------------------- // --------------------------------------------------

View File

@@ -2,7 +2,6 @@
// Variables // Variables
// -------------------------------------------------- // --------------------------------------------------
// Global values // Global values
// -------------------------------------------------- // --------------------------------------------------
@@ -63,14 +62,12 @@
@headings-line-height: 1.1; @headings-line-height: 1.1;
@headings-color: inherit; @headings-color: inherit;
// Iconography // Iconography
// ------------------------- // -------------------------
@icon-font-path: "../fonts/"; @icon-font-path: "../fonts/";
@icon-font-name: "glyphicons-halflings-regular"; @icon-font-name: "glyphicons-halflings-regular";
// Components // Components
// ------------------------- // -------------------------
// Based on 14px font-size and 1.428 line-height (~20px to start) // Based on 14px font-size and 1.428 line-height (~20px to start)
@@ -110,7 +107,6 @@
@table-border-color: #ddd; // table and cell border @table-border-color: #ddd; // table and cell border
// Buttons // Buttons
// ------------------------- // -------------------------
@@ -142,7 +138,6 @@
@btn-link-disabled-color: @gray-light; @btn-link-disabled-color: @gray-light;
// Forms // Forms
// ------------------------- // -------------------------
@@ -166,7 +161,6 @@
@input-group-addon-bg: @gray-lighter; @input-group-addon-bg: @gray-lighter;
@input-group-addon-border-color: @input-border; @input-group-addon-border-color: @input-border;
// Dropdowns // Dropdowns
// ------------------------- // -------------------------
@@ -188,11 +182,9 @@
@dropdown-caret-color: #000; @dropdown-caret-color: #000;
// COMPONENT VARIABLES // COMPONENT VARIABLES
// -------------------------------------------------- // --------------------------------------------------
// Z-index master list // Z-index master list
// ------------------------- // -------------------------
// Used for a bird's eye view of components dependent on the z-axis // Used for a bird's eye view of components dependent on the z-axis
@@ -238,7 +230,6 @@
@screen-sm-max: (@screen-md-min - 1); @screen-sm-max: (@screen-md-min - 1);
@screen-md-max: (@screen-lg-min - 1); @screen-md-max: (@screen-lg-min - 1);
// Grid system // Grid system
// -------------------------------------------------- // --------------------------------------------------
@@ -249,7 +240,6 @@
// Point at which the navbar stops collapsing // Point at which the navbar stops collapsing
@grid-float-breakpoint: @screen-sm-min; @grid-float-breakpoint: @screen-sm-min;
// Navbar // Navbar
// ------------------------- // -------------------------
@@ -257,7 +247,7 @@
@navbar-height: 50px; @navbar-height: 50px;
@navbar-margin-bottom: @line-height-computed; @navbar-margin-bottom: @line-height-computed;
@navbar-border-radius: @border-radius-base; @navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor(@grid-gutter-width / 2); @navbar-padding-horizontal: floor((@grid-gutter-width / 2));
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
@navbar-default-color: #777; @navbar-default-color: #777;
@@ -283,7 +273,6 @@
@navbar-default-toggle-icon-bar-bg: #ccc; @navbar-default-toggle-icon-bar-bg: #ccc;
@navbar-default-toggle-border-color: #ddd; @navbar-default-toggle-border-color: #ddd;
// Inverted navbar // Inverted navbar
// //
// Reset inverted navbar basics // Reset inverted navbar basics
@@ -310,7 +299,6 @@
@navbar-inverse-toggle-icon-bar-bg: #fff; @navbar-inverse-toggle-icon-bar-bg: #fff;
@navbar-inverse-toggle-border-color: #333; @navbar-inverse-toggle-border-color: #333;
// Navs // Navs
// ------------------------- // -------------------------
@@ -340,7 +328,6 @@
@nav-pills-active-link-hover-bg: @component-active-bg; @nav-pills-active-link-hover-bg: @component-active-bg;
@nav-pills-active-link-hover-color: @component-active-color; @nav-pills-active-link-hover-color: @component-active-color;
// Pagination // Pagination
// ------------------------- // -------------------------
@@ -354,14 +341,12 @@
@pagination-disabled-color: @gray-light; @pagination-disabled-color: @gray-light;
// Pager // Pager
// ------------------------- // -------------------------
@pager-border-radius: 15px; @pager-border-radius: 15px;
@pager-disabled-color: @gray-light; @pager-disabled-color: @gray-light;
// Jumbotron // Jumbotron
// ------------------------- // -------------------------
@@ -371,7 +356,6 @@
@jumbotron-heading-color: inherit; @jumbotron-heading-color: inherit;
// Form states and alerts // Form states and alerts
// ------------------------- // -------------------------
@@ -391,7 +375,6 @@
@state-danger-bg: #f2dede; @state-danger-bg: #f2dede;
@state-danger-border: darken(spin(@state-danger-bg, -10), 5%); @state-danger-border: darken(spin(@state-danger-bg, -10), 5%);
// Tooltips // Tooltips
// ------------------------- // -------------------------
@tooltip-max-width: 200px; @tooltip-max-width: 200px;
@@ -401,7 +384,6 @@
@tooltip-arrow-width: 5px; @tooltip-arrow-width: 5px;
@tooltip-arrow-color: @tooltip-bg; @tooltip-arrow-color: @tooltip-bg;
// Popovers // Popovers
// ------------------------- // -------------------------
@popover-bg: #fff; @popover-bg: #fff;
@@ -418,7 +400,6 @@
@popover-arrow-outer-color: rgba(0, 0, 0, .25); @popover-arrow-outer-color: rgba(0, 0, 0, .25);
@popover-arrow-outer-fallback-color: #999; @popover-arrow-outer-fallback-color: #999;
// Labels // Labels
// ------------------------- // -------------------------
@@ -432,7 +413,6 @@
@label-color: #fff; @label-color: #fff;
@label-link-hover-color: #fff; @label-link-hover-color: #fff;
// Modals // Modals
// ------------------------- // -------------------------
@modal-inner-padding: 20px; @modal-inner-padding: 20px;
@@ -448,7 +428,6 @@
@modal-header-border-color: #e5e5e5; @modal-header-border-color: #e5e5e5;
@modal-footer-border-color: @modal-header-border-color; @modal-footer-border-color: @modal-header-border-color;
// Alerts // Alerts
// ------------------------- // -------------------------
@alert-padding: 15px; @alert-padding: 15px;
@@ -471,7 +450,6 @@
@alert-danger-text: @state-danger-text; @alert-danger-text: @state-danger-text;
@alert-danger-border: @state-danger-border; @alert-danger-border: @state-danger-border;
// Progress bars // Progress bars
// ------------------------- // -------------------------
@progress-bg: #f5f5f5; @progress-bg: #f5f5f5;
@@ -483,7 +461,6 @@
@progress-bar-danger-bg: @brand-danger; @progress-bar-danger-bg: @brand-danger;
@progress-bar-info-bg: @brand-info; @progress-bar-info-bg: @brand-info;
// List group // List group
// ------------------------- // -------------------------
@list-group-bg: #fff; @list-group-bg: #fff;
@@ -498,7 +475,6 @@
@list-group-link-color: #555; @list-group-link-color: #555;
@list-group-link-heading-color: #333; @list-group-link-heading-color: #333;
// Panels // Panels
// ------------------------- // -------------------------
@panel-bg: #fff; @panel-bg: #fff;
@@ -530,7 +506,6 @@
@panel-info-border: @state-info-border; @panel-info-border: @state-info-border;
@panel-info-heading-bg: @state-info-bg; @panel-info-heading-bg: @state-info-bg;
// Thumbnails // Thumbnails
// ------------------------- // -------------------------
@thumbnail-padding: 4px; @thumbnail-padding: 4px;
@@ -541,13 +516,11 @@
@thumbnail-caption-color: @text-color; @thumbnail-caption-color: @text-color;
@thumbnail-caption-padding: 9px; @thumbnail-caption-padding: 9px;
// Wells // Wells
// ------------------------- // -------------------------
@well-bg: #f5f5f5; @well-bg: #f5f5f5;
@well-bg-drk: #2c3e50; @well-bg-drk: #2c3e50;
// Badges // Badges
// ------------------------- // -------------------------
@badge-color: #fff; @badge-color: #fff;
@@ -561,7 +534,6 @@
@badge-line-height: 1; @badge-line-height: 1;
@badge-border-radius: 10px; @badge-border-radius: 10px;
// Breadcrumbs // Breadcrumbs
// ------------------------- // -------------------------
@breadcrumb-bg: #f5f5f5; @breadcrumb-bg: #f5f5f5;
@@ -569,7 +541,6 @@
@breadcrumb-active-color: @gray-light; @breadcrumb-active-color: @gray-light;
@breadcrumb-separator: "/"; @breadcrumb-separator: "/";
// Carousel // Carousel
// ------------------------ // ------------------------
@@ -585,14 +556,12 @@
@carousel-caption-color: #fff; @carousel-caption-color: #fff;
// Close // Close
// ------------------------ // ------------------------
@close-font-weight: bold; @close-font-weight: bold;
@close-color: #000; @close-color: #000;
@close-text-shadow: 0 1px 0 #fff; @close-text-shadow: 0 1px 0 #fff;
// Code // Code
// ------------------------ // ------------------------
@code-color: #c7254e; @code-color: #c7254e;
@@ -621,7 +590,6 @@
// Horizontal forms & lists // Horizontal forms & lists
@component-offset-horizontal: 180px; @component-offset-horizontal: 180px;
// Container sizes // Container sizes
// -------------------------------------------------- // --------------------------------------------------

View File

@@ -2,7 +2,6 @@
// Wells // Wells
// -------------------------------------------------- // --------------------------------------------------
// Base class // Base class
.well { .well {
min-height: 20px; min-height: 20px;
@@ -12,6 +11,7 @@
border: 1px solid darken(@well-bg, 7%); border: 1px solid darken(@well-bg, 7%);
border-radius: @border-radius-base; border-radius: @border-radius-base;
.box-shadow(inset 0 1px 1px rgba(0, 0, 0, .05)); .box-shadow(inset 0 1px 1px rgba(0, 0, 0, .05));
blockquote { blockquote {
border-color: #ddd; border-color: #ddd;
border-color: rgba(0, 0, 0, .15); border-color: rgba(0, 0, 0, .15);
@@ -23,6 +23,7 @@
padding: 24px; padding: 24px;
border-radius: @border-radius-large; border-radius: @border-radius-large;
} }
.well-sm { .well-sm {
padding: 9px; padding: 9px;
border-radius: @border-radius-small; border-radius: @border-radius-small;

View File

@@ -12,7 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
const presentTask = require('../view/presenter/task'); const presentTask = require('../view/presenter/task');
@@ -21,14 +20,14 @@ module.exports = route;
// Route definition // Route definition
function route(app) { function route(app) {
app.express.get('/', (req, res, next) => { app.express.get('/', (request, response, next) => {
app.webservice.tasks.get({lastres: true}, (err, tasks) => { app.webservice.tasks.get({lastres: true}, (error, tasks) => {
if (err) { if (error) {
return next(err); return next(error);
} }
res.render('index', { response.render('index', {
tasks: tasks.map(presentTask), tasks: tasks.map(presentTask),
deleted: (typeof req.query.deleted !== 'undefined'), deleted: (typeof request.query.deleted !== 'undefined'),
isHomePage: true isHomePage: true
}); });
}); });

View File

@@ -12,9 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
/*jshint maxcomplexity:10*/
'use strict'; 'use strict';
const getStandards = require('../data/standards'); const getStandards = require('../data/standards');
@@ -25,24 +22,24 @@ module.exports = route;
// Route definition // Route definition
function route(app) { function route(app) {
app.express.get('/new', (req, res) => { app.express.get('/new', (request, response) => {
const standards = getStandards().map(standard => { const standards = getStandards().map(standard => {
if (standard.title === 'WCAG2AA') { if (standard.title === 'WCAG2AA') {
standard.selected = true; standard.selected = true;
} }
return standard; return standard;
}); });
res.render('new', { response.render('new', {
standards: standards, standards: standards,
isNewTaskPage: true isNewTaskPage: true
}); });
}); });
app.express.post('/new', (req, res) => { app.express.post('/new', (request, response) => {
let parsedActions; let parsedActions;
if (req.body.actions) { if (request.body.actions) {
parsedActions = req.body.actions.split(/[\r\n]+/) parsedActions = request.body.actions.split(/[\r\n]+/)
.map(action => { .map(action => {
return action.trim(); return action.trim();
}) })
@@ -52,26 +49,26 @@ function route(app) {
} }
let parsedHeaders; let parsedHeaders;
if (req.body.headers) { if (request.body.headers) {
parsedHeaders = httpHeaders(req.body.headers, true); parsedHeaders = httpHeaders(request.body.headers, true);
} }
const newTask = { const newTask = {
name: req.body.name, name: request.body.name,
url: req.body.url, url: request.body.url,
standard: req.body.standard, standard: request.body.standard,
ignore: req.body.ignore || [], ignore: request.body.ignore || [],
timeout: req.body.timeout || undefined, timeout: request.body.timeout || undefined,
wait: req.body.wait || undefined, wait: request.body.wait || undefined,
actions: parsedActions, actions: parsedActions,
username: req.body.username || undefined, username: request.body.username || undefined,
password: req.body.password || undefined, password: request.body.password || undefined,
headers: parsedHeaders, headers: parsedHeaders,
hideElements: req.body.hideElements || undefined hideElements: request.body.hideElements || undefined
}; };
app.webservice.tasks.create(newTask, (err, task) => { app.webservice.tasks.create(newTask, (error, task) => {
if (err) { if (error) {
const standards = getStandards().map(standard => { const standards = getStandards().map(standard => {
if (standard.title === newTask.standard) { if (standard.title === newTask.standard) {
standard.selected = true; standard.selected = true;
@@ -84,15 +81,15 @@ function route(app) {
}); });
return standard; return standard;
}); });
newTask.actions = req.body.actions; newTask.actions = request.body.actions;
newTask.headers = req.body.headers; newTask.headers = request.body.headers;
return res.render('new', { return response.render('new', {
error: err, error: error,
standards: standards, standards: standards,
task: newTask task: newTask
}); });
} }
res.redirect(`/${task.id}?added`); response.redirect(`/${task.id}?added`);
}); });
}); });

View File

@@ -12,7 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
const moment = require('moment'); const moment = require('moment');
@@ -22,20 +21,20 @@ module.exports = route;
// Route definition // Route definition
function route(app) { function route(app) {
function getTaskAndResult(req, res, next) { function getTaskAndResult(request, response, next) {
app.webservice.task(req.params.id).get({}, (err, task) => { app.webservice.task(request.params.id).get({}, (error, task) => {
if (err) { if (error) {
return next('route'); return next('route');
} }
app.webservice app.webservice
.task(req.params.id) .task(request.params.id)
.result(req.params.rid) .result(request.params.rid)
.get({full: true}, (err, result) => { .get({full: true}, (error, result) => {
if (err) { if (error) {
return next('route'); return next('route');
} }
res.locals.task = task; response.locals.task = task;
res.locals.result = result; response.locals.result = result;
next(); next();
}); });
}); });
@@ -48,7 +47,7 @@ function route(app) {
task.url task.url
.replace(/^https?:\/\//i, '') .replace(/^https?:\/\//i, '')
.replace(/\/$/, '') .replace(/\/$/, '')
.replace(/[^a-z0-9\.\-\_]+/gi, '-'), .replace(/[^a-z0-9.\-_]+/gi, '-'),
'--', '--',
task.standard.toLowerCase(), task.standard.toLowerCase(),
'--', '--',
@@ -58,9 +57,9 @@ function route(app) {
].join(''); ].join('');
} }
app.express.get('/:id/:rid.csv', getTaskAndResult, (req, res) => { app.express.get('/:id/:rid.csv', getTaskAndResult, (request, response) => {
const task = res.locals.task; const task = response.locals.task;
const result = res.locals.result; const result = response.locals.result;
const rows = ['"code","message","type","context","selector"']; const rows = ['"code","message","type","context","selector"'];
result.results.forEach(msg => { result.results.forEach(msg => {
rows.push([ rows.push([
@@ -71,18 +70,18 @@ function route(app) {
JSON.stringify(msg.selector) JSON.stringify(msg.selector)
].join(',')); ].join(','));
}); });
res.attachment(getDownloadFileName(task, result, 'csv')); response.attachment(getDownloadFileName(task, result, 'csv'));
res.send(rows.join('\n')); response.send(rows.join('\n'));
}); });
app.express.get('/:id/:rid.json', getTaskAndResult, (req, res) => { app.express.get('/:id/:rid.json', getTaskAndResult, (request, response) => {
const task = res.locals.task; const task = response.locals.task;
const result = res.locals.result; const result = response.locals.result;
res.attachment(getDownloadFileName(task, result, 'json')); response.attachment(getDownloadFileName(task, result, 'json'));
delete task.id; delete task.id;
delete result.id; delete result.id;
result.task = task; result.task = task;
res.send(result); response.send(result);
}); });
} }

View File

@@ -12,7 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
const presentTask = require('../../view/presenter/task'); const presentTask = require('../../view/presenter/task');
@@ -23,19 +22,19 @@ module.exports = route;
// Route definition // Route definition
function route(app) { function route(app) {
app.express.get('/:id/:rid', (req, res, next) => { app.express.get('/:id/:rid', (request, response, next) => {
app.webservice.task(req.params.id).get({}, (err, task) => { app.webservice.task(request.params.id).get({}, (error, task) => {
if (err) { if (error) {
return next(); return next();
} }
app.webservice app.webservice
.task(req.params.id) .task(request.params.id)
.result(req.params.rid) .result(request.params.rid)
.get({full: true}, (err, result) => { .get({full: true}, (error, result) => {
if (err) { if (error) {
return next(); return next();
} }
res.render('result', { response.render('result', {
task: presentTask(task), task: presentTask(task),
mainResult: presentResult(result), mainResult: presentResult(result),
isResultPage: true isResultPage: true

View File

@@ -12,7 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
const presentTask = require('../../view/presenter/task'); const presentTask = require('../../view/presenter/task');
@@ -22,24 +21,24 @@ module.exports = route;
// Route definition // Route definition
function route(app) { function route(app) {
app.express.get('/:id/delete', (req, res, next) => { app.express.get('/:id/delete', (request, response, next) => {
app.webservice.task(req.params.id).get({}, (err, task) => { app.webservice.task(request.params.id).get({}, (error, task) => {
if (err) { if (error) {
return next(); return next();
} }
res.render('task/delete', { response.render('task/delete', {
task: presentTask(task), task: presentTask(task),
isTaskSubPage: true isTaskSubPage: true
}); });
}); });
}); });
app.express.post('/:id/delete', (req, res, next) => { app.express.post('/:id/delete', (request, response, next) => {
app.webservice.task(req.params.id).remove(err => { app.webservice.task(request.params.id).remove(error => {
if (err) { if (error) {
return next(); return next();
} }
res.redirect('/?deleted'); response.redirect('/?deleted');
}); });
}); });

View File

@@ -12,9 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
/*jshint maxcomplexity:10*/
'use strict'; 'use strict';
const presentTask = require('../../view/presenter/task'); const presentTask = require('../../view/presenter/task');
@@ -26,9 +23,9 @@ module.exports = route;
// Route definition // Route definition
function route(app) { function route(app) {
app.express.get('/:id/edit', (req, res, next) => { app.express.get('/:id/edit', (request, response, next) => {
app.webservice.task(req.params.id).get({}, (err, task) => { app.webservice.task(request.params.id).get({}, (error, task) => {
if (err) { if (error) {
return next(); return next();
} }
const standards = getStandards().map(standard => { const standards = getStandards().map(standard => {
@@ -44,8 +41,8 @@ function route(app) {
return standard; return standard;
}); });
task.actions = (task.actions ? task.actions.join('\n') : ''); task.actions = (task.actions ? task.actions.join('\n') : '');
res.render('task/edit', { response.render('task/edit', {
edited: (typeof req.query.edited !== 'undefined'), edited: (typeof request.query.edited !== 'undefined'),
standards: standards, standards: standards,
task: presentTask(task), task: presentTask(task),
isTaskSubPage: true isTaskSubPage: true
@@ -53,18 +50,18 @@ function route(app) {
}); });
}); });
app.express.post('/:id/edit', (req, res, next) => { app.express.post('/:id/edit', (request, response, next) => {
app.webservice.task(req.params.id).get({}, (err, task) => { app.webservice.task(request.params.id).get({}, (error, task) => {
if (err) { if (error) {
return next(); return next();
} }
const originalActions = req.body.actions; const originalActions = request.body.actions;
const originalHeaders = req.body.headers; const originalHeaders = request.body.headers;
req.body.ignore = req.body.ignore || []; request.body.ignore = request.body.ignore || [];
req.body.timeout = req.body.timeout || undefined; request.body.timeout = request.body.timeout || undefined;
req.body.wait = req.body.wait || undefined; request.body.wait = request.body.wait || undefined;
if (req.body.actions) { if (request.body.actions) {
req.body.actions = req.body.actions.split(/[\r\n]+/) request.body.actions = request.body.actions.split(/[\r\n]+/)
.map(action => { .map(action => {
return action.trim(); return action.trim();
}) })
@@ -72,21 +69,24 @@ function route(app) {
return Boolean(action); return Boolean(action);
}); });
} }
req.body.username = req.body.username || undefined; if (!request.body.actions) {
req.body.password = req.body.password || undefined; request.body.actions = [];
req.body.hideElements = req.body.hideElements || undefined; }
req.body.headers = httpHeaders(req.body.headers || '', true); request.body.username = request.body.username || undefined;
app.webservice.task(req.params.id).edit(req.body, err => { request.body.password = request.body.password || undefined;
if (err) { request.body.hideElements = request.body.hideElements || undefined;
task.name = req.body.name; request.body.headers = httpHeaders(request.body.headers || '', true);
task.ignore = req.body.ignore; app.webservice.task(request.params.id).edit(request.body, error => {
task.timeout = req.body.timeout; if (error) {
task.wait = req.body.wait; task.name = request.body.name;
task.ignore = request.body.ignore;
task.timeout = request.body.timeout;
task.wait = request.body.wait;
task.actions = originalActions; task.actions = originalActions;
task.username = req.body.username; task.username = request.body.username;
task.password = req.body.password; task.password = request.body.password;
task.headers = originalHeaders; task.headers = originalHeaders;
task.hideElements = req.body.hideElements; task.hideElements = request.body.hideElements;
const standards = getStandards().map(standard => { const standards = getStandards().map(standard => {
if (standard.title === task.standard) { if (standard.title === task.standard) {
standard.selected = true; standard.selected = true;
@@ -99,14 +99,14 @@ function route(app) {
}); });
return standard; return standard;
}); });
return res.render('task/edit', { return response.render('task/edit', {
error: err, error: error,
standards: standards, standards: standards,
task: task, task: task,
isTaskSubPage: true isTaskSubPage: true
}); });
} }
res.redirect(`/${req.params.id}/edit?edited`); response.redirect(`/${request.params.id}/edit?edited`);
}); });
}); });
}); });

View File

@@ -5,20 +5,20 @@ module.exports = route;
// Route definition // Route definition
function route(app) { function route(app) {
app.express.post('/:id/ignore', (req, res, next) => { app.express.post('/:id/ignore', (request, response, next) => {
app.webservice.task(req.params.id).get({}, (err, task) => { app.webservice.task(request.params.id).get({}, (error, task) => {
if (err) { if (error) {
return next(); return next();
} }
const edit = { const edit = {
name: task.name, name: task.name,
ignore: task.ignore ignore: task.ignore
}; };
if (typeof req.body.rule === 'string') { if (typeof request.body.rule === 'string') {
edit.ignore.push(req.body.rule); edit.ignore.push(request.body.rule);
} }
app.webservice.task(req.params.id).edit(edit, () => { app.webservice.task(request.params.id).edit(edit, () => {
res.redirect(`/${req.params.id}?rule-ignored`); response.redirect(`/${request.params.id}?rule-ignored`);
}); });
}); });
}); });

View File

@@ -12,7 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
const presentTask = require('../../view/presenter/task'); const presentTask = require('../../view/presenter/task');
@@ -24,24 +23,24 @@ module.exports = route;
// Route definition // Route definition
function route(app) { function route(app) {
app.express.get('/:id', (req, res, next) => { app.express.get('/:id', (request, response, next) => {
app.webservice.task(req.params.id).get({lastres: true}, (err, task) => { app.webservice.task(request.params.id).get({lastres: true}, (error, task) => {
if (err) { if (error) {
return next(); return next();
} }
app.webservice.task(req.params.id).results({}, (err, results) => { app.webservice.task(request.params.id).results({}, (error, results) => {
if (err) { if (error) {
return next(err); return next(error);
} }
const presentedResults = presentResultList(results.map(presentResult)); const presentedResults = presentResultList(results.map(presentResult));
res.render('task', { response.render('task', {
task: presentTask(task), task: presentTask(task),
results: presentedResults, results: presentedResults,
mainResult: task.lastResult || null, mainResult: task.lastResult || null,
added: (typeof req.query.added !== 'undefined'), added: (typeof request.query.added !== 'undefined'),
running: (typeof req.query.running !== 'undefined'), running: (typeof request.query.running !== 'undefined'),
ruleIgnored: (typeof req.query['rule-ignored'] !== 'undefined'), ruleIgnored: (typeof request.query['rule-ignored'] !== 'undefined'),
ruleUnignored: (typeof req.query['rule-unignored'] !== 'undefined'), ruleUnignored: (typeof request.query['rule-unignored'] !== 'undefined'),
hasOneResult: (presentedResults.length < 2), hasOneResult: (presentedResults.length < 2),
isTaskPage: true isTaskPage: true
}); });

View File

@@ -12,7 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
module.exports = route; module.exports = route;
@@ -20,12 +19,12 @@ module.exports = route;
// Route definition // Route definition
function route(app) { function route(app) {
app.express.get('/:id/run', (req, res, next) => { app.express.get('/:id/run', (request, response, next) => {
app.webservice.task(req.params.id).run(err => { app.webservice.task(request.params.id).run(error => {
if (err) { if (error) {
return next(); return next();
} }
res.redirect(`/${req.params.id}?running`); response.redirect(`/${request.params.id}?running`);
}); });
}); });

View File

@@ -5,21 +5,21 @@ module.exports = route;
// Route definition // Route definition
function route(app) { function route(app) {
app.express.post('/:id/unignore', (req, res, next) => { app.express.post('/:id/unignore', (request, response, next) => {
app.webservice.task(req.params.id).get({}, (err, task) => { app.webservice.task(request.params.id).get({}, (error, task) => {
if (err) { if (error) {
return next(); return next();
} }
const edit = { const edit = {
name: task.name, name: task.name,
ignore: task.ignore ignore: task.ignore
}; };
const indexOfRule = edit.ignore.indexOf(req.body.rule); const indexOfRule = edit.ignore.indexOf(request.body.rule);
if (typeof req.body.rule === 'string' && indexOfRule !== -1) { if (typeof request.body.rule === 'string' && indexOfRule !== -1) {
edit.ignore.splice(indexOfRule, 1); edit.ignore.splice(indexOfRule, 1);
} }
app.webservice.task(req.params.id).edit(edit, () => { app.webservice.task(request.params.id).edit(edit, () => {
res.redirect(`/${req.params.id}?rule-unignored`); response.redirect(`/${request.params.id}?rule-unignored`);
}); });
}); });
}); });

15
test/.eslintrc.js Normal file
View File

@@ -0,0 +1,15 @@
'use strict';
// Clone the main config
var config = module.exports = JSON.parse(JSON.stringify(require('../.eslintrc')));
// We use `this` all over the integration tests
config.rules['no-invalid-this'] = 'off';
// Because of our use of `this`, arrow functions
// aren't really gonna work in the integration tests
config.rules['prefer-arrow-callback'] = 'off';
// Disable max line length/statements
config.rules['max-len'] = 'off';
config.rules['max-statements'] = 'off';

View File

@@ -38,12 +38,15 @@ function createNavigator(baseUrl, store) {
json: opts.json || false, json: opts.json || false,
qs: opts.query, qs: opts.query,
followAllRedirects: true followAllRedirects: true
}, function(err, res, body) { }, function(error, response, body) {
if (error) {
return callback(error);
}
store.body = body; store.body = body;
store.request = res.request; store.request = response.request;
store.response = res; store.response = response;
store.status = res.statusCode; store.status = response.statusCode;
if (opts.nonDom) { if (opts.nonDom) {
store.dom = null; store.dom = null;

View File

@@ -21,11 +21,11 @@ const assert = require('proclaim');
describe.only('GET /', function() { describe.only('GET /', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'GET', method: 'GET',
endpoint: '/' endpoint: '/'
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {
@@ -40,10 +40,19 @@ describe.only('GET /', function() {
it('should display all of the expected tasks', function() { it('should display all of the expected tasks', function() {
const tasks = this.last.dom('[data-test=task]'); const tasks = this.last.dom('[data-test=task]');
assert.strictEqual(tasks.length, 3); assert.strictEqual(tasks.length, 4);
assert.match(tasks.eq(0).text(), /npg home\s+\(wcag2aa\)/i); assert.equal(tasks.eq(0).find('.h3').text(), 'NPG Home');
assert.match(tasks.eq(1).text(), /npg home\s+\(wcag2aaa\)/i); assert.equal(tasks.eq(0).find('.h4').text(), 'nature.com');
assert.match(tasks.eq(2).text(), /nature news\s+\(section508\)/i); assert.equal(tasks.eq(0).find('.h5').text(), '(WCAG2AA)');
assert.equal(tasks.eq(1).find('.h3').text(), 'NPG Home');
assert.equal(tasks.eq(1).find('.h4').text(), 'nature.com');
assert.equal(tasks.eq(1).find('.h5').text(), '(WCAG2AAA)');
assert.equal(tasks.eq(2).find('.h3').text(), 'Nature News');
assert.equal(tasks.eq(2).find('.h4').text(), 'nature.com/news');
assert.equal(tasks.eq(2).find('.h5').text(), '(Section508)');
assert.equal(tasks.eq(3).find('.h3').text(), 'Z Integration Test');
assert.equal(tasks.eq(3).find('.h4').text(), 'localhost:8132');
assert.equal(tasks.eq(3).find('.h5').text(), '(WCAG2AA)');
}); });
it('should have links to each task', function() { it('should have links to each task', function() {
@@ -51,6 +60,7 @@ describe.only('GET /', function() {
assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001"]').length, 1); assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001"]').length, 1);
assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002"]').length, 1); assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002"]').length, 1);
assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003"]').length, 1); assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003"]').length, 1);
assert.strictEqual(tasks.eq(3).find('[href="/abc000000000000000000004"]').length, 1);
}); });
it('should display an "Edit" button for each task', function() { it('should display an "Edit" button for each task', function() {
@@ -58,6 +68,7 @@ describe.only('GET /', function() {
assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/edit"]').length, 1); assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/edit"]').length, 1);
assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/edit"]').length, 1); assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/edit"]').length, 1);
assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003/edit"]').length, 1); assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003/edit"]').length, 1);
assert.strictEqual(tasks.eq(3).find('[href="/abc000000000000000000004/edit"]').length, 1);
}); });
it('should display a "Delete" button for each task', function() { it('should display a "Delete" button for each task', function() {
@@ -65,6 +76,7 @@ describe.only('GET /', function() {
assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/delete"]').length, 1); assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/delete"]').length, 1);
assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/delete"]').length, 1); assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/delete"]').length, 1);
assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003/delete"]').length, 1); assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003/delete"]').length, 1);
assert.strictEqual(tasks.eq(3).find('[href="/abc000000000000000000004/delete"]').length, 1);
}); });
it('should display a "Run" button for each task', function() { it('should display a "Run" button for each task', function() {
@@ -72,6 +84,7 @@ describe.only('GET /', function() {
assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/run"]').length, 1); assert.strictEqual(tasks.eq(0).find('[href="/abc000000000000000000001/run"]').length, 1);
assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/run"]').length, 1); assert.strictEqual(tasks.eq(1).find('[href="/abc000000000000000000002/run"]').length, 1);
assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003/run"]').length, 1); assert.strictEqual(tasks.eq(2).find('[href="/abc000000000000000000003/run"]').length, 1);
assert.strictEqual(tasks.eq(3).find('[href="/abc000000000000000000004/run"]').length, 1);
}); });
it('should display the task result counts if the task has been run', function() { it('should display the task result counts if the task has been run', function() {

View File

@@ -21,11 +21,11 @@ const assert = require('proclaim');
describe('GET /new', function() { describe('GET /new', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'GET', method: 'GET',
endpoint: '/new' endpoint: '/new'
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {
@@ -122,7 +122,7 @@ describe('POST /new', function() {
describe('with invalid query', function() { describe('with invalid query', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'POST', method: 'POST',
endpoint: '/new', endpoint: '/new',
form: { form: {
@@ -130,7 +130,7 @@ describe('POST /new', function() {
url: '' url: ''
} }
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {
@@ -146,7 +146,7 @@ describe('POST /new', function() {
describe('with valid query', function() { describe('with valid query', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'POST', method: 'POST',
endpoint: '/new', endpoint: '/new',
form: { form: {
@@ -155,7 +155,7 @@ describe('POST /new', function() {
standard: 'WCAG2AA' standard: 'WCAG2AA'
} }
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {
@@ -163,9 +163,9 @@ describe('POST /new', function() {
}); });
it('should create the task', function(done) { it('should create the task', function(done) {
this.webservice.tasks.get({}, function(err, tasks) { this.webservice.tasks.get({}, function(error, tasks) {
assert.strictEqual(tasks.length, 4); assert.strictEqual(tasks.length, 4);
done(); done(error);
}); });
}); });

View File

@@ -21,12 +21,12 @@ const assert = require('proclaim');
describe('GET /<task-id>/<result-id>.csv', function() { describe('GET /<task-id>/<result-id>.csv', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001/def000000000000000000001.csv', endpoint: '/abc000000000000000000001/def000000000000000000001.csv',
nonDom: true nonDom: true
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {
@@ -42,13 +42,13 @@ describe('GET /<task-id>/<result-id>.csv', function() {
describe('GET /<task-id>/<result-id>.json', function() { describe('GET /<task-id>/<result-id>.json', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001/def000000000000000000001.json', endpoint: '/abc000000000000000000001/def000000000000000000001.json',
nonDom: true, nonDom: true,
json: true json: true
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {

View File

@@ -21,11 +21,11 @@ const assert = require('proclaim');
describe('GET /<task-id>/<result-id>', function() { describe('GET /<task-id>/<result-id>', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001/def000000000000000000001' endpoint: '/abc000000000000000000001/def000000000000000000001'
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {

View File

@@ -21,11 +21,11 @@ const assert = require('proclaim');
describe('GET /<task-id>/delete', function() { describe('GET /<task-id>/delete', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001/delete' endpoint: '/abc000000000000000000001/delete'
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {
@@ -48,11 +48,11 @@ describe('GET /<task-id>/delete', function() {
describe('POST /<task-id>/delete', function() { describe('POST /<task-id>/delete', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'POST', method: 'POST',
endpoint: '/abc000000000000000000001/delete' endpoint: '/abc000000000000000000001/delete'
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {
@@ -60,8 +60,8 @@ describe('POST /<task-id>/delete', function() {
}); });
it('should delete the task', function(done) { it('should delete the task', function(done) {
this.webservice.task('abc000000000000000000001').get({}, function(err) { this.webservice.task('abc000000000000000000001').get({}, function(error) {
assert.strictEqual(err.message, 'Error 404'); assert.strictEqual(error.message, 'Error 404');
done(); done();
}); });
}); });

View File

@@ -21,11 +21,11 @@ const assert = require('proclaim');
describe('GET /<task-id>/edit', function() { describe('GET /<task-id>/edit', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001/edit' endpoint: '/abc000000000000000000001/edit'
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {
@@ -121,7 +121,7 @@ describe('GET /<task-id>/edit', function() {
describe('POST /<task-id>/edit', function() { describe('POST /<task-id>/edit', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'POST', method: 'POST',
endpoint: '/abc000000000000000000001/edit', endpoint: '/abc000000000000000000001/edit',
form: { form: {
@@ -131,7 +131,7 @@ describe('POST /<task-id>/edit', function() {
ignore: ['bar', 'baz'] ignore: ['bar', 'baz']
} }
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {
@@ -139,12 +139,12 @@ describe('POST /<task-id>/edit', function() {
}); });
it('should edit the task', function(done) { it('should edit the task', function(done) {
this.webservice.task('abc000000000000000000001').get({}, function(err, task) { this.webservice.task('abc000000000000000000001').get({}, function(error, task) {
assert.strictEqual(task.name, 'foo'); assert.strictEqual(task.name, 'foo');
assert.strictEqual(task.username, 'newuser'); assert.strictEqual(task.username, 'newuser');
assert.strictEqual(task.password, 'secure'); assert.strictEqual(task.password, 'secure');
assert.deepEqual(task.ignore, ['bar', 'baz']); assert.deepEqual(task.ignore, ['bar', 'baz']);
done(); done(error);
}); });
}); });

View File

@@ -23,11 +23,11 @@ describe('GET /<task-id>', function() {
describe('when task has results', function() { describe('when task has results', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001' endpoint: '/abc000000000000000000001'
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {
@@ -82,11 +82,11 @@ describe('GET /<task-id>', function() {
describe('when task has no results', function() { describe('when task has no results', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000003' endpoint: '/abc000000000000000000003'
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {

View File

@@ -21,11 +21,11 @@ const assert = require('proclaim');
describe('GET /<task-id>/run', function() { describe('GET /<task-id>/run', function() {
beforeEach(function(done) { beforeEach(function(done) {
const req = { const request = {
method: 'GET', method: 'GET',
endpoint: '/abc000000000000000000001/run' endpoint: '/abc000000000000000000001/run'
}; };
this.navigate(req, done); this.navigate(request, done);
}); });
it('should send a 200 status', function() { it('should send a 200 status', function() {

View File

@@ -40,8 +40,8 @@ afterEach(function(done) {
// Check that the test application is running, and exit if not // Check that the test application is running, and exit if not
function assertTestAppIsRunning(url, done) { function assertTestAppIsRunning(url, done) {
request(url, err => { request(url, error => {
if (err) { if (error) {
console.error('Error: Test app not started; run with `NODE_ENV=test node index.js`'); console.error('Error: Test app not started; run with `NODE_ENV=test node index.js`');
process.exit(1); process.exit(1);
} }

View File

@@ -0,0 +1,27 @@
// This file is part of Pa11y Dashboard.
//
// Pa11y Dashboard is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Pa11y Dashboard is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict';
module.exports = helper;
function helper(hbs) {
// Compare if one value is greater than another
hbs.registerHelper('ifgtr', function(conditional, condition, options) {
if (conditional > condition) {
// eslint-disable-next-line no-invalid-this
return options.fn(this);
}
});
}

View File

@@ -12,7 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
const moment = require('moment'); const moment = require('moment');

View File

@@ -12,7 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
module.exports = helper; module.exports = helper;

View File

@@ -27,7 +27,7 @@ along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
{{#if noindex}}<meta name="robots" content="noindex"/>{{/if}} {{#if noindex}}<meta name="robots" content="noindex"/>{{/if}}
<link rel="icon" type="image/png" href="favicon.png" /> <link rel="icon" type="image/png" href="/favicon.png" />
<!-- For mobile devices. --> <!-- For mobile devices. -->
<meta name="viewport" content="width=device-width"/> <meta name="viewport" content="width=device-width"/>

View File

@@ -144,7 +144,7 @@ along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
{{#rules}} {{#rules}}
<li> <li>
<input class="pull-left" id="{{name}}" type="checkbox" name="ignore[]" value="{{name}}" {{#ignored}}checked{{/ignored}}/> <input class="pull-left" id="{{name}}" type="checkbox" name="ignore[]" value="{{name}}" {{#ignored}}checked{{/ignored}}/>
<label for="{{name}}" title="{{description}}" data-role="rules-tooltip" class="checkbox"> <label for="{{name}}" title="{{description}}" data-role="rule-tooltip" class="checkbox">
{{name}} {{name}}
</label> </label>
</li> </li>

View File

@@ -16,10 +16,16 @@ along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
}} }}
<div class="col-md-12 clearfix"> <div class="col-md-12 clearfix">
<div class="graph-container graph-spacer ruled clearfix"> <div class="graph-container graph-spacer ruled clearfix">
<div data-role="graph" class="graph"></div>
<div class="row"> <div class="row">
<ul class="list-unstyled floated-list series-checkboxes clearfix crunch-bottom col-md-3 col-sm-6 col-xs-12 pull-right" data-role="series-checkboxes"></ul> <div class="col-md-3 col-sm-4 col-xs-3">
<span class="btn btn-sm btn-default btn-full-width btn_action_export">Export graph</span>
</div> </div>
<div class="col-md-5 col-sm-6 col-xs-9 pull-right">
<ul class="list-unstyled floated-list series-checkboxes clearfix" data-role="series-checkboxes"></ul>
</div>
</div>
<div data-role="graph" class="graph"></div>
<div class="dashedLegend"> <div class="dashedLegend">
<div class="dashedContainer"> <div class="dashedContainer">
<table> <table>

View File

@@ -17,25 +17,16 @@ along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
<div class="col-md-3 aside"> <div class="col-md-3 aside">
<div class="row"> <div class="row">
<div class="col-md-12 col-sm-6 col-xs-12"> <div class="action-buttons col-md-12 col-sm-6">
<ul data-role="task-list" class="clearfix list-unstyled floated-list task-stats">
{{#mainResult}}
<li class="danger"><a href="#errors" title="See errors">{{count.error}}<span class="stat-type">Errors</span></a></li>
<li class="warning"><a href="#warnings" title="See warnings">{{count.warning}}<span class="stat-type">Warnings</span></a></li>
<li class="info last"><a href="#notices" title="See notices">{{count.notice}}<span class="stat-type">Notices</span></a></li>
{{/mainResult}}
</ul>
</div>
<div class="action-buttons col-md-12 col-sm-6 clearfix">
<div class="row"> <div class="row">
<div class="col-md-12 col-sm-6 col-xs-12"> <div class="col-md-12 col-sm-6 col-xs-12">
<a href="{{mainResult.hrefCsv}}" class="btn-full-width btn btn-default" data-test="download-csv"> <a href="{{mainResult.hrefCsv}}" class="btn-full-width btn btn-default" data-test="download-csv">
Download CSV <span class="glyphicon glyphicon-download"></span> Download CSV <span class="glyphicon glyphicon-download" aria-hidden="true"></span>
</a> </a>
</div> </div>
<div class="col-md-12 col-sm-6 col-xs-12"> <div class="col-md-12 col-sm-6 col-xs-12">
<a href="{{mainResult.hrefJson}}" class="btn-full-width btn btn-default" data-test="download-json"> <a href="{{mainResult.hrefJson}}" class="btn-full-width btn btn-default" data-test="download-json">
Download JSON <span class="glyphicon glyphicon-download"></span> Download JSON <span class="glyphicon glyphicon-download" aria-hidden="true"></span>
</a> </a>
</div> </div>
</div> </div>
@@ -47,7 +38,7 @@ along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
<div class="date-selector"> <div class="date-selector">
<div class="btn-group block-level clearfix"> <div class="btn-group block-level clearfix">
<h2 class="h4"> <h2 class="h4">
<span class="glyphicon glyphicon-calendar"></span>&nbsp;&nbsp;{{date-format task.lastResult.date format="DD MMM YYYY"}} <span class="glyphicon glyphicon-calendar" aria-hidden="true"></span>&nbsp;&nbsp;{{date-format task.lastResult.date format="DD MMM YYYY"}}
</h2> </h2>
<h3 class="h5 show-stats">Select a date to show stats for:</h3> <h3 class="h5 show-stats">Select a date to show stats for:</h3>
<ul role="navigation" class="dates-list"> <ul role="navigation" class="dates-list">
@@ -70,141 +61,264 @@ along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
</div> </div>
</div> </div>
<div class="col-md-9" data-role="expandable-results" role="main"> <div class="col-md-9" role="main">
{{#if mainResult.count.error}} <ul class="nav nav-tabs category-list" role="tablist">
<div class="heading label-danger pointer showing first" id="errors" data-test="task-errors" data-role="expander" role="button" tabindex="0" aria-expanded="true" aria-controls="errors-list"> <li class="category-list__item category-list__item_type_error active" role="presentation">
<span class="pull-right expander"><span class="hide">(close panel)</span></span> <a class="category-list__link" id="errors" href="#errors-list" aria-controls="errors-list" role="tab" data-toggle="tab" data-test="task-errors">
Errors ( {{mainResult.count.error}} ) Errors ( {{mainResult.count.error}} )
</div> </a>
<div class="task-danger tasks-list collapse clearfix in" id="errors-list">
<ul class="list-unstyled">
{{#mainResult.errors}}
<li>
<p class="crunch rule-name">{{code}} <span class="badge">{{count}}</span></p>
<p><em>First result:</em> {{message}}</p>
<p>
<b>Selector:</b>
<code style="text-wrap:pre-wrap">{{#if selector}}{{selector}}{{else}}-{{/if}}</code>
<br/>
<b>Context:</b>
<code style="text-wrap:pre-wrap">{{#if context}}{{context}}{{else}}-{{/if}}</code>
</p>
{{#unless readonly}}
{{#if ../../isTaskPage}}
<form action="{{../../../task.hrefIgnore}}" method="post">
<input type="hidden" name="rule" value="{{code}}"/>
<input type="submit" class="btn btn-sm" value="Ignore rule"/>
</form>
{{/if}}
{{/unless}}
</li> </li>
{{/mainResult.errors}} <li class="category-list__item category-list__item_type_warning" role="presentation">
</ul> <a class="category-list__link" id="warnings" href="#warnings-list" aria-controls="warnings-list" role="tab" data-toggle="tab" data-test="task-warnings">
<a class="pull-right" href="#top" data-role="top">Back to top</a>
</div>
{{else}}
<p class="heading label-danger" id="errors">Well done! You have 0 errors. <span class="glyphicon glyphicon-ok pull-right"></span></p>
{{/if}}
{{#if mainResult.count.warning}}
<div class="heading label-warning pointer" id="warnings" data-test="task-warnings" data-role="expander" role="button" tabindex="0" aria-expanded="false" aria-controls="warnings-list">
<span class="pull-right expander"><span class="hide">(open panel)</span></span>
Warnings ( {{mainResult.count.warning}} ) Warnings ( {{mainResult.count.warning}} )
</div> </a>
<div class="task-warning tasks-list collapse clearfix" id="warnings-list">
<ul class="list-unstyled">
{{#mainResult.warnings}}
<li>
<p class="crunch rule-name">{{code}} <span class="badge">{{count}}</span></p>
<p><em>First result:</em> {{message}}</p>
<p>
<b>Selector:</b>
<code style="text-wrap:pre-wrap">{{#if selector}}{{selector}}{{else}}-{{/if}}</code>
<br/>
<b>Context:</b>
<code style="text-wrap:pre-wrap">{{#if context}}{{context}}{{else}}-{{/if}}</code>
</p>
{{#unless readonly}}
{{#if ../../isTaskPage}}
<form action="{{../../../task.hrefIgnore}}" method="post">
<input type="hidden" name="rule" value="{{code}}"/>
<input type="submit" class="btn btn-sm" value="Ignore rule"/>
</form>
{{/if}}
{{/unless}}
</li> </li>
{{/mainResult.warnings}} <li class="category-list__item category-list__item_type_notice" role="presentation">
</ul> <a class="category-list__link" id="notices" href="#notices-list" aria-controls="notices-list" role="tab" data-toggle="tab" data-test="task-notices">
<a class="pull-right" href="#top" data-role="top">Back to top</a>
</div>
{{else}}
<p class="heading label-warning" id="warnings">Well done! You have 0 warnings. <span class="glyphicon glyphicon-ok pull-right"></span></p>
{{/if}}
{{#if mainResult.count.notice}}
<div class="heading label-info pointer" id="notices" data-test="task-notices" data-role="expander" role="button" tabindex="0" aria-expanded="false" aria-controls="notices-list">
<span class="pull-right expander"><span class="hide">(open panel)</span></span>
Notices ( {{mainResult.count.notice}} ) Notices ( {{mainResult.count.notice}} )
</a>
</li>
<li class="category-list__item category-list__item_type_ignore" role="presentation">
<a class="category-list__link" id="ignore" href="#ignore-list" aria-controls="ignore-list" role="tab" data-toggle="tab">
Ignored rules ( {{mainResult.ignore.length}} )
</a>
</li>
</ul>
<div class="tab-content">
<div id="errors-list" role="tabpanel" class="tab-pane tasks-list fade in active">
{{#if mainResult.count.error}}
{{#mainResult.errors}}
<div class="panel panel-default task task_type_error">
<div class="panel-heading">
<div class="row">
<div class="col-md-9 col-sm-9 col-xs-8">
<span class="rule-name">{{code}}&ensp;
<span class="badge" title="{{count}} selector(s)" data-toggle="tooltip" data-role="rule-tooltip">{{count}}</span>
</span>
</div> </div>
<div class="task-info tasks-list collapse clearfix" id="notices-list"> <div class="col-md-3 col-sm-3 col-xs-4 task-actions">
<ul class="list-unstyled">
{{#mainResult.notices}}
<li>
<p class="crunch rule-name">{{code}} <span class="badge">{{count}}</span></p>
<p><em>First result:</em> {{message}}</p>
<p>
<b>Selector:</b>
<code style="text-wrap:pre-wrap">{{#if selector}}{{selector}}{{else}}-{{/if}}</code>
<br/>
<b>Context:</b>
<code style="text-wrap:pre-wrap">{{#if context}}{{context}}{{else}}-{{/if}}</code>
</p>
{{#unless readonly}} {{#unless readonly}}
{{#if ../../isTaskPage}} {{#if ../../isTaskPage}}
<form action="{{../../../task.hrefIgnore}}" method="post"> <form class="ignore-form" action="{{../../../task.hrefIgnore}}" method="post">
<input type="hidden" name="rule" value="{{code}}"/> <input type="hidden" name="rule" value="{{code}}"/>
<input type="submit" class="btn btn-sm" value="Ignore rule"/> <input type="submit" role="link" class="btn btn-link btn-sm link" value="Ignore rule"/>
</form> </form>
{{/if}} {{/if}}
{{/unless}} {{/unless}}
</li>
{{/mainResult.notices}}
</ul>
<a class="pull-right" href="#top" data-role="top">Back to top</a>
</div> </div>
{{else}} </div>
<p class="heading label-info" id="notices">Well done! You have 0 notices. <span class="glyphicon glyphicon-ok pull-right"></span></p> </div>
<div class="panel-body">
<span class="text">{{message}}</span>
<span class="btn btn-xs btn-link link btn-details" data-role="details-collapse" data-toggle="collapse" data-target="#error-index-{{@index}}" aria-expanded="false" aria-controls="error-index-{{@index}}">details</span>
<div class="task-details collapse" id="error-index-{{@index}}">
{{#if solutions.length}}
<div class="subtitle" id="error-solutions">Solutions:</div>
<ul class="list-unstyled solutions-list" role="list" aria-labelledby="error-solutions">
{{#each solutions}}
<li class="list-unstyled__item" role="listitem">
<a class="link" href="{{url}}" target="_blank">
<span class="glyphicon glyphicon-share" aria-hidden="true"></span>&nbsp;{{title}}
</a>
</li>
{{/each}}
</ul>
{{/if}} {{/if}}
{{#if mainResult.ignore.length}} {{#if items.length}}
<div class="heading label-default pointer" id="ignore" data-role="expander" role="button" tabindex="0" aria-expanded="false" aria-controls="ignore-list"> <div class="subtitle" id="error-selectors">Selectors:</div>
<span class="pull-right expander"><span class="hide">(open panel)</span></span> <ul class="list-unstyled selectors-list" role="list" aria-labelledby="error-selectors">
Ignored Rules ( {{mainResult.ignore.length}} ) {{#each items}}
</div> <li class="list-unstyled__item" role="listitem">
<div class="task-default tasks-list collapse clearfix" id="ignore-list"> <span title="Context" data-role="context-popover" data-toggle="popover" data-content="{{context}}">
<ul class="list-unstyled"> <code class="code">{{selector}}</code>
{{#mainResult.ignore}} </span>
<li> </li>
<p class="crunch rule-name">{{name}}</p> {{/each}}
{{#if description}} </ul>
<p>{{description}}</p>
{{/if}} {{/if}}
</div>
</div>
</div>
{{/mainResult.errors}}
<div class="to-top">
<a class="link" href="#top" data-role="top"><span class="glyphicon glyphicon-chevron-up" aria-hidden="true"></span>Back to top</a>
</div>
{{else}}
<div class="text">Well done! You have 0 errors. <span class="glyphicon glyphicon-ok pull-right" aria-hidden="true"></span></div>
{{/if}}
</div>
<div id="warnings-list" role="tabpanel" class="tab-pane tasks-list fade">
{{#if mainResult.count.warning}}
{{#mainResult.warnings}}
<div class="panel panel-default task task_type_warning">
<div class="panel-heading">
<div class="row">
<div class="col-md-9 col-sm-9 col-xs-8">
<span class="rule-name">{{code}}&ensp;
<span class="badge" title="{{count}} selector(s)" data-toggle="tooltip" data-role="rule-tooltip">{{count}}</span>
</span>
</div>
<div class="col-md-3 col-sm-3 col-xs-4 task-actions">
{{#unless readonly}} {{#unless readonly}}
{{#if ../../isTaskPage}} {{#if ../../isTaskPage}}
<form action="{{../../../task.hrefUnignore}}" method="post"> <form class="ignore-form" action="{{../../../task.hrefIgnore}}" method="post">
<input type="hidden" name="rule" value="{{name}}"/> <input type="hidden" name="rule" value="{{code}}"/>
<input type="submit" class="btn btn-sm" value="Unignore rule"/> <input type="submit" role="link" class="btn btn-link btn-sm link" value="Ignore rule"/>
</form> </form>
{{/if}} {{/if}}
{{/unless}} {{/unless}}
</li>
{{/mainResult.ignore}}
</ul>
<a class="pull-right" href="#top" data-role="top">Back to top</a>
</div> </div>
{{else}} </div>
<p class="heading label-default">You have no ignored rules.</p> </div>
<div class="panel-body">
<span class="text">{{message}}</span>
<span class="btn btn-xs btn-link link btn-details" data-role="details-collapse" data-toggle="collapse" data-target="#warning-index-{{@index}}" aria-expanded="false" aria-controls="warning-index-{{@index}}">details</span>
<div class="task-details collapse" id="warning-index-{{@index}}">
{{#if solutions.length}}
<div class="subtitle" id="warning-solutions">Solutions:</div>
<ul class="list-unstyled solutions-list" role="list" aria-labelledby="warning-solutions">
{{#each solutions}}
<li class="list-unstyled__item" role="listitem">
<a class="link" href="{{url}}" target="_blank">
<span class="glyphicon glyphicon-share" aria-hidden="true"></span>&nbsp;{{title}}
</a>
</li>
{{/each}}
</ul>
{{/if}}
{{#if items.length}}
<div class="subtitle" id="warning-selectors">Selectors:</div>
<ul class="list-unstyled selectors-list" role="list" aria-labelledby="warning-selectors">
{{#each items}}
<li class="list-unstyled__item" role="listitem">
<span title="Context" data-role="context-popover" data-toggle="popover" data-content="{{context}}">
<code class="code">{{selector}}</code>
</span>
</li>
{{/each}}
</ul>
{{/if}} {{/if}}
</div> </div>
</div>
</div>
{{/mainResult.warnings}}
<div class="to-top">
<a class="link" href="#top" data-role="top"><span class="glyphicon glyphicon-chevron-up" aria-hidden="true"></span>Back to top</a>
</div>
{{else}}
<div class="text">Well done! You have 0 warnings. <span class="glyphicon glyphicon-ok pull-right" aria-hidden="true"></span></div>
{{/if}}
</div>
<div id="notices-list" role="tabpanel" class="tab-pane tasks-list fade">
{{#if mainResult.count.notice}}
{{#mainResult.notices}}
<div class="panel panel-default task task_type_notice">
<div class="panel-heading">
<div class="row">
<div class="col-md-9 col-sm-9 col-xs-8">
<span class="rule-name">{{code}}&ensp;
<span class="badge" title="{{count}} selector(s)" data-toggle="tooltip" data-role="rule-tooltip">{{count}}</span>
</span>
</div>
<div class="col-md-3 col-sm-3 col-xs-4 task-actions">
{{#unless readonly}}
{{#if ../../isTaskPage}}
<form class="ignore-form" action="{{../../../task.hrefIgnore}}" method="post">
<input type="hidden" name="rule" value="{{code}}"/>
<input type="submit" role="link" class="btn btn-link btn-sm link" value="Ignore rule"/>
</form>
{{/if}}
{{/unless}}
</div>
</div>
</div>
<div class="panel-body">
<span class="text">{{message}}</span>
<span class="btn btn-xs btn-link link btn-details" data-role="details-collapse" data-toggle="collapse" data-target="#notice-index-{{@index}}" aria-expanded="false" aria-controls="notice-index-{{@index}}">details</span>
<div class="task-details collapse" id="notice-index-{{@index}}">
{{#if solutions.length}}
<div class="subtitle" id="notice-solutions">Solutions:</div>
<ul class="list-unstyled solutions-list" role="list" aria-labelledby="notice-solutions">
{{#each solutions}}
<li class="list-unstyled__item" role="listitem">
<a class="link" href="{{url}}" target="_blank">
<span class="glyphicon glyphicon-share" aria-hidden="true"></span>&nbsp;{{title}}
</a>
</li>
{{/each}}
</ul>
{{/if}}
{{#if items.length}}
<div class="subtitle" id="notice-selectors">Selectors:</div>
<ul class="list-unstyled selectors-list" role="list" aria-labelledby="notice-selectors">
{{#each items}}
<li class="list-unstyled__item" role="listitem">
<span title="Context" data-role="context-popover" data-toggle="popover" data-content="{{context}}">
<code class="code">{{selector}}</code>
</span>
</li>
{{/each}}
</ul>
{{/if}}
</div>
</div>
</div>
{{/mainResult.notices}}
<div class="to-top">
<a class="link" href="#top" data-role="top"><span class="glyphicon glyphicon-chevron-up" aria-hidden="true"></span>Back to top</a>
</div>
{{else}}
<div class="text">Well done! You have 0 notices. <span class="glyphicon glyphicon-ok pull-right" aria-hidden="true"></span></div>
{{/if}}
</div>
<div id="ignore-list" role="tabpanel" class="tab-pane tasks-list fade">
{{#if mainResult.ignore.length}}
{{#mainResult.ignore}}
<div class="panel panel-default task task_type_ignore">
<div class="panel-heading">
<div class="row">
<div class="col-md-9 col-sm-9 col-xs-8">
<span class="rule-name">{{name}}</span>
</div>
<div class="col-md-3 col-sm-3 col-xs-4 task-actions">
{{#unless readonly}}
{{#if ../../isTaskPage}}
<form class="ignore-form" action="{{../../../task.hrefUnignore}}" method="post">
<input type="hidden" name="rule" value="{{name}}"/>
<input type="submit" role="link" class="btn btn-link btn-sm link" value="Unignore rule"/>
</form>
{{/if}}
{{/unless}}
</div>
</div>
</div>
<div class="panel-body">
{{#if description}}
<span class="text">{{description}}</span>
{{/if}}
</div>
</div>
{{/mainResult.ignore}}
<div class="to-top">
<a class="link" href="#top" data-role="top"><span class="glyphicon glyphicon-chevron-up" aria-hidden="true"></span>Back to top</a>
</div>
{{else}}
<div class="text">You have no ignored rules.</div>
{{/if}}
</div>
</div>
</div>

View File

@@ -14,8 +14,12 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
}} }}
<div class="col-md-12 task-card clearfix">
<button class="btn view-btn btn-grid btn-default"><i class="glyphicon glyphicon-th"></i> Grid</button>
<button class="btn view-btn btn-list"><i class="glyphicon glyphicon-align-justify "></i> List</button>
<ul class="list-unstyled clearfix crunch-bottom"> </div>
<ul class="list-unstyled clearfix crunch-bottom" id="grid-container">
{{#unless readonly}} {{#unless readonly}}
<li class="col-md-4 col-sm-6 task-card add-task"> <li class="col-md-4 col-sm-6 task-card add-task">
@@ -28,9 +32,14 @@ along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
{{#each tasks}} {{#each tasks}}
<li class="col-md-4 col-sm-6 task-card" data-test="task" data-role="task" data-keywords="{{lowercase name}} {{lowercase standard}} {{simplify-url url}}"> <li class="col-md-4 col-sm-6 task-card" data-test="task" data-role="task" data-keywords="{{lowercase name}} {{lowercase standard}} {{simplify-url url}}">
<a class="well task-card-link crunch-bottom" title="Details for URL {{simplify-url url}}" href="{{href}}"> <a class="well task-card-link crunch-bottom" title="Details for URL {{simplify-url url}}" href="{{href}}">
<div class="gridview">
<p class="h3">{{name}}</p> <p class="h3">{{name}}</p>
<p class="h4">{{simplify-url url}}</p>
<p class="h5">({{standard}})</p> <p class="h5">({{standard}})</p>
</div>
{{#if lastResult}} {{#if lastResult}}
<div class="gridview">
<ul class="clearfix list-unstyled floated-list task-stats"> <ul class="clearfix list-unstyled floated-list task-stats">
{{#lastResult}} {{#lastResult}}
<li class="danger" title="Number of errors ({{count.error}})">{{count.error}}<span class="stat-type">Errors</span></li> <li class="danger" title="Number of errors ({{count.error}})">{{count.error}}<span class="stat-type">Errors</span></li>
@@ -38,7 +47,8 @@ along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
<li class="info last" title="Number of notices ({{count.notice}})">{{count.notice}}<span class="stat-type">Notices</span></li> <li class="info last" title="Number of notices ({{count.notice}})">{{count.notice}}<span class="stat-type">Notices</span></li>
{{/lastResult}} {{/lastResult}}
</ul> </ul>
Last run {{date-format lastResult.date format="DD MMM YYYY"}} </div>
<div class="last-run">Last run {{date-format lastResult.date format="DD MMM YYYY"}}</div>
{{else}} {{else}}
<p class="no-results">No results</p> <p class="no-results">No results</p>
{{/if}} {{/if}}

View File

@@ -12,7 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
const standardsArray = require('../../data/standards')(); const standardsArray = require('../../data/standards')();

View File

@@ -12,7 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
const _ = require('underscore'); const _ = require('underscore');

View File

@@ -12,11 +12,11 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
'use strict'; 'use strict';
const _ = require('underscore'); const _ = require('underscore');
const presentIgnoreRules = require('./ignore'); const presentIgnoreRules = require('./ignore');
const techs = require('../../data/techniques')();
module.exports = presentResult; module.exports = presentResult;
@@ -41,9 +41,29 @@ function presentResult(result) {
const results = groupedByType[type] || []; const results = groupedByType[type] || [];
const groupedByCode = _.groupBy(results, 'code'); const groupedByCode = _.groupBy(results, 'code');
result[pluralType] = _.keys(groupedByCode).map(group => { result[pluralType] = _.keys(groupedByCode).map(group => {
const firstMessage = groupedByCode[group][0]; const groupMessage = groupedByCode[group][0];
firstMessage.count = groupedByCode[group].length; groupMessage.count = groupedByCode[group].length;
return firstMessage; groupMessage.items = groupedByCode[group].map(plural => ({
selector: plural.selector,
context: plural.context
}));
// Map standard to techniques
const data = groupMessage.code.split('.');
data.splice(0, 4);
const techniques = data.join('.').split(',').map(code => code.split('.')[0]);
groupMessage.solutions = techniques.reduce((prev, technique) => {
if (techs[technique] && techs[technique].title) {
prev.push({
title: techs[technique].title || null,
url: techs[technique].url || null
});
}
return prev;
}, []);
return groupMessage;
})
.sort((currentItem, nextItem) => {
return nextItem.count - currentItem.count;
}); });
}); });
} }

View File

@@ -12,8 +12,6 @@
// //
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>. // along with Pa11y Dashboard. If not, see <http://www.gnu.org/licenses/>.
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
'use strict'; 'use strict';
const presentIgnoreRules = require('./ignore'); const presentIgnoreRules = require('./ignore');

Some files were not shown because too many files have changed in this diff Show More