From 7f6c94b5d641feb6a9e3e865410b0216c4ce81f7 Mon Sep 17 00:00:00 2001 From: Zarino Zappia Date: Tue, 22 May 2018 15:19:10 +0100 Subject: =?UTF-8?q?Reintroduce=20=E2=80=9Cnicetable=E2=80=9D=20class=20for?= =?UTF-8?q?=20simple=20table=20styling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Useful for simple tables like the cookie lists on Privacy Policy pages. --- templates/web/base/about/privacy.html | 14 ++++-- templates/web/fixamingata/about/privacy.html | 14 ++++-- .../web/fixmystreet-uk-councils/about/privacy.html | 50 +++++++++++++-------- templates/web/fixmystreet.com/about/privacy.html | 24 +++++----- web/cobrands/fixmystreet.com/_colours.scss | 2 + web/cobrands/sass/_base.scss | 52 ++++++++++++++++++++++ 6 files changed, 119 insertions(+), 37 deletions(-) diff --git a/templates/web/base/about/privacy.html b/templates/web/base/about/privacy.html index a794cfadf..de0fee32c 100755 --- a/templates/web/base/about/privacy.html +++ b/templates/web/base/about/privacy.html @@ -31,9 +31,17 @@ this. We use this information to, for example, remember you have logged in so you don't need to do that on every page. Below, we list the cookies and services that this site can use. - - - +
NameTypical ContentExpires
fixmystreet_app_sessionA random unique identifierWhen browser is closed, or four weeks if “Keep me signed in” is ticked
+ + + + + + + + + +
NameTypical ContentExpires
fixmystreet_app_sessionA random unique identifierWhen browser is closed, or four weeks if “Keep me signed in” is ticked
[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixamingata/about/privacy.html b/templates/web/fixamingata/about/privacy.html index 805ca5f00..134e494f2 100755 --- a/templates/web/fixamingata/about/privacy.html +++ b/templates/web/fixamingata/about/privacy.html @@ -41,9 +41,17 @@

Kakor används för att ge en besökare tillgång till olika funktioner. För att göra tjänsten lättare och mer användbara skickas små datafiler till din dator eller mobiltelefon. Dessa kallas för kakor och de flesta webbplatser använder dem. Informationen används för att, till exempel, komma ihåg tidigare inloggning, och för att mäta hur tjänsten används som underlag för förbättringar.

Om kakor och hur du kan hantera dem, Post- och telestyrelsen

Nedan visas en lista med kakor som tjänsten använder.

- - - +
NamnInnehållGiltighet
fixmystreet_app_sessionA slumpvis strängRaderas när webbläsaren stängs, eller efter fyra veckor om “Håll mig inloggad” är valt
+ + + + + + + + + +
NamnInnehållGiltighet
fixmystreet_app_sessionA slumpvis strängRaderas när webbläsaren stängs, eller efter fyra veckor om “Håll mig inloggad” är valt
[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet-uk-councils/about/privacy.html b/templates/web/fixmystreet-uk-councils/about/privacy.html index 3b077d29e..45735f062 100644 --- a/templates/web/fixmystreet-uk-councils/about/privacy.html +++ b/templates/web/fixmystreet-uk-councils/about/privacy.html @@ -64,19 +64,17 @@ you don't need to do that on every page, or to measure how people use the website so we can improve it and make sure it works properly. Below, we list the cookies and services that this site can use. - - - - - - - - - - - - - +
NameTypical ContentExpires
fixmystreet_app_sessionA random unique identifierWhen browser is closed, or four weeks if “Keep me signed in” is ticked
+ + + + + + + + + +
NameTypical ContentExpires
fixmystreet_app_sessionA random unique identifierWhen browser is closed, or four weeks if “Keep me signed in” is ticked

Measuring website usage (Google Analytics)

@@ -97,11 +95,27 @@ plugin for blocking Google Analytics.

The cookies set by Google Analytics are as follows: - - - -Used to throtle request rate - +
NameTypical ContentExpires
_gaUsed to distinguish users2 years
_gat10 minutes
__utmx / __utmxxWhich variation of a page you are seeing if we are testing different versions to see which is best2 years
+ + + + + + + + + + + + + + + + + + + +
NameTypical ContentExpires
_gaUsed to distinguish users2 years
_gatUsed to throttle request rate10 minutes
__utmx / __utmxxWhich variation of a page you are seeing if we are testing different versions to see which is best2 years

Google’s Official Statement about Analytics Data

diff --git a/templates/web/fixmystreet.com/about/privacy.html b/templates/web/fixmystreet.com/about/privacy.html index 24bf47ec8..8ed953cc9 100755 --- a/templates/web/fixmystreet.com/about/privacy.html +++ b/templates/web/fixmystreet.com/about/privacy.html @@ -374,19 +374,17 @@ you don’t need to do that on every page, or to measure how people use the website so we can improve it and make sure it works properly. Below, we list the cookies and services that this site can use. - - - - - - - - - - - - - +
NameTypical ContentExpires
fixmystreet_app_sessionA random unique identifierWhen browser is closed, or four weeks if “Keep me signed in” is ticked
+ + + + + + + + + +
NameTypical ContentExpires
fixmystreet_app_sessionA random unique identifierWhen browser is closed, or four weeks if “Keep me signed in” is ticked

Measuring website usage (Google Analytics)

diff --git a/web/cobrands/fixmystreet.com/_colours.scss b/web/cobrands/fixmystreet.com/_colours.scss index 523d7b95d..b43c96791 100644 --- a/web/cobrands/fixmystreet.com/_colours.scss +++ b/web/cobrands/fixmystreet.com/_colours.scss @@ -24,4 +24,6 @@ $itemlist_item_background_hover: mix(#fff, $primary, 70%); $layout_front_stats_color: #222; +$nicetable-stripe-background: #f3f3f3; + $high-dpi-screen: '-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi'; diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index ac7210c74..b6a20517c 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -2392,6 +2392,58 @@ a#geolocate_link.loading, .btn--geolocate.loading { vertical-align: -2px; } +$nicetable-cell-padding: 0.6em 1.5em !default; +$nicetable-border-color: #ccc !default; +$nicetable-stripe-background: rgba($primary, 0.05) !default; +$nicetable-hover-background: rgba($primary, 0.15) !default; + +.nicetable { + width: 100%; + margin-bottom: 1.5em; + + td, th { + padding: $nicetable-cell-padding; + padding-#{$left}: 0; + border-bottom: 1px solid $nicetable-border-color; + text-align: $left; + + &:last-child { + padding-#{$right}: 0; + } + } + + // Give your .nicetable an extra .stripe class to stripe alternate rows. + &.stripe { + td, th { + padding: $nicetable-cell-padding; + } + + tr:nth-child(even) { + background: $nicetable-stripe-background; + } + } + + // Give your .nicetable an extra .hover class to enable row hover effect. + &.hover { + td, th { + padding: $nicetable-cell-padding; + } + + tr:hover { + background: $nicetable-hover-background; + } + + thead tr { + background: transparent; + } + } + + // For table cells containing numbers (and their associated header cells). + .data { + text-align: $right; + } +} + @import "_admin"; @import "_dropzone"; @import "_multiselect"; -- cgit v1.2.3