diff options
80 files changed, 382 insertions, 810 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..bfc70fec1 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +# Disable the auto-CRLF normalization mess for all files to prevent +# them being checked out with CRLF line endings (on Windows), which +# breaks if they e.g. run vagrant up. + +* -text diff --git a/.gitignore b/.gitignore index ca3180604..1e03cda7f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ FixMyBarangay.po /web/css/core.css /web/css/main.css /web/cobrands/*/*.css +/web/cobrands/*/*.css.map /web/cobrands/seesomething # Photo upload cache diff --git a/Gemfile b/Gemfile deleted file mode 100644 index eca052933..000000000 --- a/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://rubygems.org" - -gem "compass", "0.12.7" diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index c86a5ca9a..000000000 --- a/Gemfile.lock +++ /dev/null @@ -1,16 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - chunky_png (1.3.3) - compass (0.12.7) - chunky_png (~> 1.2) - fssm (>= 0.2.7) - sass (~> 3.2.19) - fssm (0.2.10) - sass (3.2.19) - -PLATFORMS - ruby - -DEPENDENCIES - compass (= 0.12.7) @@ -38,8 +38,38 @@ add your own issue if not. We've extracted all of the mobile apps from this repository into the [fixmystreet-mobile repository](https://github.com/mysociety/fixmystreet-mobile). +## Acknowledgements + +Thanks to [Browserstack](https://www.browserstack.com/) who let us use their +web-based cross-browser testing tools for this project. + ## Releases +* v1.8.3 (3rd June 2016) + - Admin improvements + - Add search boxes to admin index page, and move stats. #1295 + - Allow change of email in admin to existing entry. #1207 + - Speed up photo removal. #1400 + - Improve in-place moderation UI. #1388 + - Front end improvements: + - Improve printing of report page in Firefox. #1394 + - Fallback if request to Gaze fails. #1286 + - Bugfixes: + - Fix non-working Google Maps layer. #1215 + - Fix map tap sensitivity on some devices. #911 and openlayers/ol2#1418 + - Fix lack of removal of cached update photos. #1405 + - Handle reports/updates by logged in abuse entries. + - Fix size of grey chevrons. + - Development improvements: + - Massive speed increase to CSS compilation. #1414 + - Use only one templating system for emails. #1410 + - Move summary string function to template. #694 + - Consolidate CSS clearfix handling. #1414 + - Disable auto-CRLF conversion on git checkout. + - Support for Debian Jessie/Ubuntu Xenial. + - UK only + - Add standard mySociety footer. #1385 + * v1.8.2 (3rd May 2016) - Security: - Fix vulnerability in image upload that allowed external diff --git a/bin/install-as-user b/bin/install-as-user index 297efc1f3..99eca0b82 100755 --- a/bin/install-as-user +++ b/bin/install-as-user @@ -71,32 +71,6 @@ if [ ! "$DEVELOPMENT_INSTALL" = true ]; then echo $DONE_MSG fi -# Install the compass gem locally - it's required for generating the -# CSS. Don't trust the bundled bundler in e.g. precise. -echo "Setting up CSS... " -gem1.9.1 install --user-install --no-ri --no-rdoc bundler -FMS_GEMPATH="$DIRECTORY/gem-bin" -FMS_GEMPATH="$FMS_GEMPATH:$(ruby1.9.1 -rubygems -e 'puts Gem.user_dir')/bin" -export PATH="$FMS_GEMPATH:$PATH" - -if ! grep -q 'Set up local PATH for FixMyStreet' $HOME/.bashrc; then - cat >>$HOME/.bashrc <<EOBRC - -# Set up local PATH for FixMyStreet -export PATH="$FMS_GEMPATH:\$PATH" -EOBRC -fi - -bundle install --deployment --path "$DIRECTORY/gems" --binstubs "$DIRECTORY/gem-bin" - -# Use compass to generate the CSS, if it doesn't seem to already -# exist: -if [ ! -f web/cobrands/default/base.css ] -then - bin/make_css -fi -echo $DONE_MSG - # Write sensible values into the config file, if it doesn't already exist if [ ! -f conf/general.yml ]; then echo -n "Setting up default conf/general.yml file... " @@ -117,6 +91,13 @@ cd "$REPOSITORY" bin/install_perl_modules echo $DONE_MSG +echo "Setting up CSS... " +if [ ! -f web/cobrands/default/base.css ] +then + bin/make_css +fi +echo $DONE_MSG + # Create the database if it doesn't exist: echo -n "Setting up database... " if ! psql -l | egrep "^ *$DB_NAME *\|" > /dev/null diff --git a/bin/make_css b/bin/make_css index 87126ef28..a98dc6bba 100755 --- a/bin/make_css +++ b/bin/make_css @@ -1,31 +1,151 @@ -#!/bin/bash -# -# make_css: -# Generate CSS files from SCSS files. -# -# Requires sass which you can get from http://sass-lang.com/ -# FixMyStreet cobrand requires compass -# -# Copyright (c) 2012 UK Citizens Online Democracy. All rights reserved. -# Email: matthew@mysociety.org. WWW: http://www.mysociety.org - -COMPASS=compass -SASS=sass -DIR=$(cd "$(dirname "$0")" >/dev/null && pwd -P) -PARENT=$(cd "$DIR"/../.. >/dev/null && pwd) -if [ -f "$PARENT/gem-bin/compass" ]; then - COMPASS=$PARENT/gem-bin/compass - SASS=$PARENT/gem-bin/sass -fi - -DIRECTORY=$(cd "$DIR"/../web >/dev/null && pwd) - -DIRS=${@:-`find -L $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq`} - -for dir in $DIRS; do - if [ -e "$dir/config.rb" ]; then - $COMPASS compile --output-style compressed $dir - else - $SASS --scss --update --style compressed $dir - fi -done +#!/usr/bin/env perl + +use strict; +use warnings; +use feature 'say'; + +BEGIN { + use File::Basename qw(dirname); + use File::Spec; + my $d = dirname(File::Spec->rel2abs($0)); + require "$d/../setenv.pl"; +} + +use CSS::Sass; +use File::ChangeNotify; +use File::Find::Rule; +use File::Slurp; +use Getopt::Long; +use MIME::Base64; +use MIME::Types; +use Path::Tiny; +use Pod::Usage; + +# Store ARGV in case we need to restart later. +my @ARGVorig = @ARGV; + +GetOptions( + 'verbose' => \my $verbose, + 'watch' => \my $watch, + 'help|?' => \my $help, +) or pod2usage(2); +pod2usage(1) if $help; + +my $mime_types = MIME::Types->new; + +my $sass = CSS::Sass->new( + output_style => SASS_STYLE_COMPRESSED, + dont_die => 1, + sass_functions => { + 'inline-image($url)' => sub { + my ($url) = @_; + die '$url should be a string' unless $url->isa("CSS::Sass::Value::String"); + # URL is given with reference to the file, which we don't have here. Assume. + my $data = encode_base64(path("web/cobrands/fixmystreet/$url")->slurp_raw, ""); + my $type = $mime_types->mimeTypeOf($url); + return "url('data:$type;base64,$data')"; + } + }, +); + +# Get directories from the command line, defaulting to 'web' if none. +# We need absolute paths so that the include files lookup works. +my @dirs = map { m{/} ? $_ : "web/cobrands/$_" } @ARGV; +@dirs = 'web' unless @dirs; +@dirs = map { path($_)->absolute->stringify } @dirs; + +# Initial compilation, to also discover all the included files. +my %includes; +my %include_to_main; +foreach my $file (File::Find::Rule->file->name(qr/^[^_].*\.scss$/)->in(@dirs)) { + my @includes = compile($file, $verbose); + $includes{$file} = \@includes; + map { push @{$include_to_main{$_}}, $file } @includes ? @includes : $file; +} + +# If we're not watching, we're done! +exit unless $watch; + +my $watcher = File::ChangeNotify->instantiate_watcher( + directories => [ @dirs, keys %include_to_main ], + filter => qr/\.scss$/, +); + +say "\033[34mWatching for changes\033[0m"; + +while ( my @events = $watcher->wait_for_events() ) { + for my $file (map { $_->path } @events) { + verbose($file, "%s was updated"); + for my $inc (@{$include_to_main{$file}}) { + my @includes = compile($inc, 1); + # From CSS::Sass::Watchdog test, we see includes are sorted + if (@includes && @{$includes{$inc}} && "@{$includes{$inc}}" ne "@includes") { + say "\033[34mRestarting to update includes\033[0m"; + exec( $^X, $0, @ARGVorig ) or die "Can't re-exec myself($^X,$0): $!\n"; + } + } + } +} + +# Given a SCSS file, compile it and generate a .map file, +# show an error if any, and return the list of includes. +sub compile { + my ($file, $verbose) = @_; + (my $output_file = $file) =~ s/scss$/css/; + my $source_map_file = "$output_file.map"; + + $sass->options->{source_map_file} = $source_map_file; + my ($css, $stats) = $sass->compile_file($file); + unless ($css) { + warn "\033[31m" . $sass->last_error . "\033[0m";; + return; + } + + my $written = write_if_different($output_file, $css); + if ($written) { + verbose($file, " \033[32mupdated\033[0m %s"); + } elsif ($verbose) { + verbose($file, " \033[33munchanged\033[0m %s"); + } + write_if_different($source_map_file, $stats->{source_map_string}); + return @{$stats->{included_files} || []}; +} + +# Write a file, only if it has changed. +sub write_if_different { + my ($fn, $data) = @_; + my $current = File::Slurp::read_file($fn, { binmode => ':utf8', err_mode => 'quiet' }); + if (!$current || $current ne $data) { + File::Slurp::write_file($fn, { binmode => ':utf8' }, $data); + return 1; + } + return 0; +} + +sub verbose { + my ($file, $format) = @_; + # Strip most of file path, keep dir/file + (my $pr = $file) =~ s{.*/(.*/.*)\.scss}{$1}; + say sprintf $format, $pr; +} + +__END__ + +=head1 NAME + +make_css - Generate CSS files from SCSS files, watch for changes. + +=head1 SYNOPSIS + +make_css [options] [dirs ...] + + Options: + --verbose display more information + --watch wait for file updates and compile automatically + --help this help message + +If no directories are specified, any .scss files under web/ that do not begin +with a "_" will be processed. "web/cobrands/" may be omitted from a given +directory. + +=cut diff --git a/bin/make_css_watch b/bin/make_css_watch deleted file mode 100755 index d15fa3a81..000000000 --- a/bin/make_css_watch +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use warnings; -use feature 'say'; - -BEGIN { - use File::Basename qw(dirname); - use File::Spec; - my $d = dirname(File::Spec->rel2abs($0)); - require "$d/../setenv.pl"; -} - -use Cwd qw(abs_path); -use File::ChangeNotify; -use File::Find::Rule; -use FindBin; -use Path::Tiny; - -my @exts = qw/ - scss -/; - -my @dirs = qw/ - web -/; - -my $filter = do { - my $exts = join '|', @exts; - qr/\.(?:$exts)$/ -}; - -my $watcher = File::ChangeNotify->instantiate_watcher( - directories => \@dirs, - filter => $filter, -); - -my $script_compass = 'compass'; -my $script_sass = 'sass'; -my $gem_bin = abs_path("$FindBin::Bin/../../gem-bin"); -if (-f "$gem_bin/compass") { - $script_compass = "$gem_bin/compass"; - $script_sass = "$gem_bin/sass"; -} - -sub title { - my $what = shift; - print "\033]2;$what\007\n"; -} - -say sprintf "Watching [%s] for %s", (join ',' => @dirs), $filter; -title 'watching'; - -while ( my @events = $watcher->wait_for_events() ) { - my %seen; - my @update_dirs; - title 'updating'; - for my $event (@events) { - my $file = path( $event->path ); - say "$file was updated..."; - my $dir = $file->dirname; - next if $seen{$dir}++; - - if ($dir eq 'web/cobrands/sass/') { - # contains only partials, so we don't need to update - # this directory, but we *do* need to update everything else - push @update_dirs, - grep { - ! ($seen{$_}++) - } - map { - path($_)->dirname - } - File::Find::Rule->file->name($filter)->in( @dirs ); - } - else { - push @update_dirs, $dir; - } - } - for my $dir (@update_dirs) { - if (-e "$dir/config.rb") { - system $script_compass, - 'compile', - '--output-style' => 'compressed', - $dir; - } - else { - system $script_sass, - '--scss', - '--update', - '--style' => 'compressed', - $dir; - } - title "$dir updated"; - } - title 'watching'; -} diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index 8cca28650..71bfc11ff 100644 --- a/bin/site-specific-install.sh +++ b/bin/site-specific-install.sh @@ -1,7 +1,7 @@ #!/bin/sh # Set this to the version we want to check out -VERSION=${VERSION_OVERRIDE:-v1.8.2} +VERSION=${VERSION_OVERRIDE:-v1.8.3} PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh diff --git a/conf/packages b/conf/packages index de2207f98..75794ee87 100644 --- a/conf/packages +++ b/conf/packages @@ -3,6 +3,7 @@ # mailing list if you want to change it. make +g++ jhead liblocale-gettext-perl libsoap-lite-perl @@ -11,8 +12,7 @@ perl perlmagick libmath-bigint-gmp-perl gettext -ruby-compass -postgresql-server-dev-9.1 | postgresql-server-dev-8.4 +postgresql-server-dev-all gnuplot ttf-bitstream-vera libexpat1-dev diff --git a/conf/packages.debian-squeeze b/conf/packages.debian-squeeze deleted file mode 100644 index c2f1f3f68..000000000 --- a/conf/packages.debian-squeeze +++ /dev/null @@ -1,14 +0,0 @@ -make -jhead -liblocale-gettext-perl -memcached -perl -perlmagick -libmath-bigint-gmp-perl -gettext -ruby1.9.1 -postgresql -postgresql-server-dev-8.4 -gnuplot -ttf-bitstream-vera -libexpat1-dev diff --git a/conf/packages.debian-wheezy b/conf/packages.generic index ef6921142..a0cd9fa16 100644 --- a/conf/packages.debian-wheezy +++ b/conf/packages.generic @@ -1,4 +1,5 @@ make +g++ jhead liblocale-gettext-perl memcached @@ -6,7 +7,6 @@ perl perlmagick libmath-bigint-gmp-perl gettext -ruby1.9.1 postgresql postgresql-server-dev-all gnuplot diff --git a/conf/packages.ubuntu-precise b/conf/packages.ubuntu-precise deleted file mode 100644 index ef6921142..000000000 --- a/conf/packages.ubuntu-precise +++ /dev/null @@ -1,14 +0,0 @@ -make -jhead -liblocale-gettext-perl -memcached -perl -perlmagick -libmath-bigint-gmp-perl -gettext -ruby1.9.1 -postgresql -postgresql-server-dev-all -gnuplot -ttf-bitstream-vera -libexpat1-dev @@ -117,7 +117,8 @@ feature 'zurich', 'Zueri wie neu specific requirements' => sub { # Moderation by from_body user requires 'Algorithm::Diff'; -# Modules used by css watcher +# Modules used by CSS & watcher +requires 'CSS::Sass'; requires 'File::ChangeNotify'; requires 'Path::Tiny'; requires 'File::Find::Rule'; diff --git a/cpanfile.snapshot b/cpanfile.snapshot index 591f3fcbd..c391e67ce 100644 --- a/cpanfile.snapshot +++ b/cpanfile.snapshot @@ -172,6 +172,37 @@ DISTRIBUTIONS strict 0 vars 0 warnings 0 + CSS-Sass-3.3.3 + pathname: O/OC/OCBNET/CSS-Sass-3.3.3.tar.gz + provides: + CSS::Sass 3.003003 + CSS::Sass::Value 3.003003 + CSS::Sass::Value::Boolean 3.003003 + CSS::Sass::Value::Color 3.003003 + CSS::Sass::Value::Error 3.003003 + CSS::Sass::Value::List 3.003003 + CSS::Sass::Value::List::Comma 3.003003 + CSS::Sass::Value::List::Space 3.003003 + CSS::Sass::Value::Map 3.003003 + CSS::Sass::Value::Null 3.003003 + CSS::Sass::Value::Number 3.003003 + CSS::Sass::Value::String 3.003003 + CSS::Sass::Value::String::Constant 3.003003 + CSS::Sass::Value::String::Quoted 3.003003 + CSS::Sass::Watchdog 3.003003 + CSS::Sass::Watchdog::Queue 3.003003 + requirements: + Carp 1.01 + Encode::Locale 0.01 + ExtUtils::CppGuess 0.09 + ExtUtils::MakeMaker 6.52 + File::Slurp 0.01 + Getopt::Long 0.01 + List::MoreUtils 0.01 + perl 5.008 + strict 0 + version 0 + warnings 0 Cache-Memcached-1.30 pathname: D/DO/DORMANDO/Cache-Memcached-1.30.tar.gz provides: @@ -193,6 +224,19 @@ DISTRIBUTIONS ExtUtils::MakeMaker 0 IPC::Open3 1.0103 Test::More 0 + Capture-Tiny-0.40 + pathname: D/DA/DAGOLDEN/Capture-Tiny-0.40.tar.gz + provides: + Capture::Tiny 0.40 + requirements: + Carp 0 + Exporter 0 + ExtUtils::MakeMaker 6.17 + File::Spec 0 + File::Temp 0 + IO::Handle 0 + Scalar::Util 0 + perl 5.006 strict 0 warnings 0 Carp-Assert-0.20 @@ -2774,6 +2818,14 @@ DISTRIBUTIONS ExtUtils::MakeMaker 6.30 strict 0 warnings 0 + ExtUtils-CppGuess-0.11 + pathname: D/DA/DAVIDO/ExtUtils-CppGuess-0.11.tar.gz + provides: + ExtUtils::CppGuess 0.11 + requirements: + Capture::Tiny 0 + ExtUtils::MakeMaker 0 + File::Basename 0 ExtUtils-Helpers-0.022 pathname: L/LE/LEONT/ExtUtils-Helpers-0.022.tar.gz provides: diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po index b68ef7cdf..4dee6dbcb 100644 --- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" "POT-Creation-Date: 2016-05-03 10:41+0100\n" -"PO-Revision-Date: 2016-04-29 13:21+0000\n" +"PO-Revision-Date: 2016-05-29 15:42+0000\n" "Last-Translator: Jon Kristensen <info@jonkri.com>\n" "Language-Team: Swedish (Sweden) (http://www.transifex.com/mysociety/fixmystreet/language/sv_SE/)\n" "Language: sv_SE\n" @@ -24,7 +24,7 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " -msgstr "eller" +msgstr " och " #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_none.html:12 @@ -33,7 +33,7 @@ msgstr "eller" #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " -msgstr "eller" +msgstr " eller " #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" @@ -294,8 +294,7 @@ msgstr "Alla rapporter som CSV" #: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 -#: templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alla rapporter" @@ -414,14 +413,13 @@ msgstr "Efter datum" #: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." -msgstr "Kan du inte hitta vÃ¥rt e-brev? Kolla din skräppostmapp –– det är lösningen 99% av tiden." +msgstr "Kan du inte hitta vÃ¥rt e-brev? Kolla din skräppostmapp – det är lösningen 99% av tiden." #: templates/web/base/around/_report_banner.html:5 msgid "Can't see the map? <em>Skip this step</em>" msgstr "Kan du inte se kartan? <em>Hoppa över det här steget</em>" -#: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:54 +#: templates/web/base/admin/body.html:68 templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -589,8 +587,7 @@ msgstr "Bekräfta via epost nedan genom att ange ett nytt lösenord. När du bek msgid "Confirmation" msgstr "Bekräftelse" -#: templates/web/base/admin/body.html:164 -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:164 templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/stats.html:40 @@ -715,8 +712,7 @@ msgid "Delete template" msgstr "Ta bort mall" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:175 -#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/body.html:175 templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" @@ -1387,10 +1383,9 @@ msgid "Loading..." msgstr "Laddar..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 -#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 -#: templates/web/base/alert/updates.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 +#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokala RSS-flöden och epostbevakningar" @@ -2094,9 +2089,8 @@ msgstr "Ange om problemet har lösts eller ej" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -#, fuzzy msgid "Please upload an image only" -msgstr "Ladda upp en JPEG-bild" +msgstr "Ladda upp endast en bild" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" @@ -2143,8 +2137,7 @@ msgstr "Personlig integritet" msgid "Privacy and cookies" msgstr "Integritetsskydd och kakor" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/body.html:200 templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 msgid "Private" @@ -2782,8 +2775,7 @@ msgstr "Prenumerera med epost" #: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/index.html:1 -#: templates/web/base/status/index.html:1 +#: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 @@ -3139,7 +3131,7 @@ msgstr "Den här rapporten skickades anonymt." #: perllib/FixMyStreet/Script/Reports.pm:85 msgid "This web page also contains a photo of the problem, provided by the user." -msgstr "Den här sidan innehÃ¥ller ocksÃ¥ ett foto av problemet" +msgstr "Länken ovan innehÃ¥ller ocksÃ¥ ett foto av problemet." #: templates/web/zurich/admin/report_edit-sdm.html:123 #: templates/web/zurich/admin/report_edit-sdm.html:76 @@ -3331,8 +3323,7 @@ msgstr "Användarsökningen matchar mot användares namn och e-postadresser." #: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 -#: templates/web/base/admin/flagged.html:29 -#: templates/web/zurich/header.html:69 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:69 msgid "Users" msgstr "Användare" @@ -3903,51 +3894,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "Vi har ännu <strong>ingen</strong> information om kommunen pÃ¥ den platsen" msgstr[1] "Kommunen pÃ¥ platsen har valt att inte ta emot rapporter frÃ¥n FixaMinGata." - -#~ msgid "%s, reported at %s" -#~ msgstr "%s, rapporterad %s" - -#~ msgid "About us" -#~ msgstr "Om oss" - -#~ msgid "Email me new local problems" -#~ msgstr "Eposta mig nya problem lokalt" - -#~ msgid "Empty flat or maisonette" -#~ msgstr "Tom lägenhet" - -#~ msgid "Empty house or bungalow" -#~ msgstr "Tomt hus" - -#~ msgid "Empty office or other commercial" -#~ msgstr "Tomt kontor eller annan kommersiell lokal" - -#~ msgid "Empty pub or bar" -#~ msgstr "Tom pub eller bar" - -#~ msgid "Empty public building - school, hospital, etc." -#~ msgstr "Tom publik byggnad - skola, sjukhus, etc." - -#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" -#~ msgstr "Ange ett närligande gatunamn och ort, postnummer och distrikt i Delhi" - -#~ msgid "FixMyStreet" -#~ msgstr "FixaMinGata" - -#~ msgid "I am afraid you cannot confirm unconfirmed reports." -#~ msgstr "Tyvärr kan du inte bekräfta obekräftade rapporter" - -#~ msgid "Problems in this area" -#~ msgstr "Problem i detta omrÃ¥de" - -#~ msgid "Property type:" -#~ msgstr "Fastighetstyp:" - -#~ msgid "RSS feed of problems in this %s" -#~ msgstr "RSS-flöde för problem i denna %s" - -#~ msgid "Sorry, you can not log in with Facebook. Please try again later." -#~ msgstr "Du kunde inte logga in med Facebook. Försök gärna igen." - -#~ msgid "Whole block of empty flats" -#~ msgstr "Hela block med tomma lägenheter" diff --git a/templates/email/fixamingata/submit.txt b/templates/email/fixamingata/submit.txt index eab487051..4704cbd56 100644 --- a/templates/email/fixamingata/submit.txt +++ b/templates/email/fixamingata/submit.txt @@ -12,17 +12,15 @@ tror medborgaren behöver er uppmärksamhet. [% url %] -[% has_photo %] - ** Uppgiftslämnare Namn: [% name %] Epost: [% email %] -[% phone_line %] +[% phone_line %]** Information om ärendet -** Information om ärendet +ID: [% id %] [% category_line %]Ärende: [% title %] @@ -34,7 +32,9 @@ Epost: [% email %] Longitude: [% longitude %] -[% closest_address %]---------- +** Övrigt + +[% has_photo %][% closest_address %]---------- Svar pÃ¥ det här brevet kommer att skickas till den person som lämnade rapporten. diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index c079b9ebd..aaa167108 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -1,6 +1,6 @@ [% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %] -<div class="problem-header cf" problem-id="[% problem.id %]"> +<div class="problem-header clearfix" problem-id="[% problem.id %]"> [% IF moderating %] [% original = problem_original %] diff --git a/templates/web/base/report/update-form.html b/templates/web/base/report/update-form.html index 29529e5a1..f6ce265bf 100644 --- a/templates/web/base/report/update-form.html +++ b/templates/web/base/report/update-form.html @@ -21,7 +21,7 @@ [% END %] [% IF c.user_exists %] [% INCLUDE 'report/update/form_name.html' %] - <div class="cf"><input class="final-submit green-btn" type="submit" id="update_post" value="[% loc('Post') %]"></div> + <div class="clearfix"><input class="final-submit green-btn" type="submit" id="update_post" value="[% loc('Post') %]"></div> [% ELSIF oauth_need_email %] [% INCLUDE 'report/update/form_user_loggedout_email.html' required = 1 %] <div id="form_sign_in"> diff --git a/templates/web/bromley/header_logo.html b/templates/web/bromley/header_logo.html index 92ff771f9..8c49d9145 100644 --- a/templates/web/bromley/header_logo.html +++ b/templates/web/bromley/header_logo.html @@ -1,4 +1,4 @@ - <div class="bromley-header cf"> + <div class="bromley-header clearfix"> <a href="http://www.bromley.gov.uk/" id="site-logo">[% site_name %]</a> <ul class="linear-links subtext float-right top-links"> diff --git a/templates/web/fixamingata/about/council.html b/templates/web/fixamingata/about/council.html index 8d968f695..3019f79ff 100755 --- a/templates/web/fixamingata/about/council.html +++ b/templates/web/fixamingata/about/council.html @@ -185,9 +185,7 @@ bäst. verksamhetssystem för att höra dig för. </p> <p> - Vi har ocksÃ¥ tagit fram en sida med - <a href="https://wiki.ffkp.se/index.php?title=Open311_och_annan_integration_mot_FixaMinGata">teknisk information om integration av FixaMinGata</a> som - kan vara lämplig att titta pÃ¥ för mer information. + Kontakta gärna oss för teknisk information kring integration av FixaMinGata. </p> <h2><a name="kostnader"></a>Kostnader för medverkan</h2> diff --git a/templates/web/fixamingata/about/faq-sv.html b/templates/web/fixamingata/about/faq-sv.html index 05ffdaddc..aea90743b 100755 --- a/templates/web/fixamingata/about/faq-sv.html +++ b/templates/web/fixamingata/about/faq-sv.html @@ -21,6 +21,8 @@ markera problemen pÃ¥ en karta. Tjänsten bygger pÃ¥ en förlaga frÃ¥n Storbrita där tjänsten lanserades i Februari 2007. I Norge lanserades den 2011 och i Sverige 2013. </dd> + <dt>Hur kan jag lämna ett förbättringsförslag kring FixaMinGata?</dt> + <dd>Lämna ditt förslag <a href="javascript:UserVoice.showPopupWidget();">här</a>.</dd> <dt>Hur kommer jag i kontakt med FixaMinGata?</dt> <dd>Använd vÃ¥rt <a href="/contact">kontaktformulär</a>.</dd> <dt>Vilken typ av problem ska jag rapportera i FixaMinGata?</dt> diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html index 64d39e622..5364c0b60 100644 --- a/templates/web/fixamingata/footer.html +++ b/templates/web/fixamingata/footer.html @@ -21,7 +21,7 @@ %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> - <li><a href="javascript:UserVoice.showPopupWidget();">Lämna förslag</a></li> + <!-- <li><a href="javascript:UserVoice.showPopupWidget();">Lämna förslag</a></li> --> </ul> </div> </div> @@ -39,21 +39,4 @@ </script> </body> -<!-- Piwik --> -<script type="text/javascript"> - var _paq = _paq || []; - _paq.push(['trackPageView']); - _paq.push(['enableLinkTracking']); - (function() { - var u=(("https:" == document.location.protocol) ? "https" : "http") + "://stats.jonkri.com/"; - _paq.push(['setTrackerUrl', u+'piwik.php']); - _paq.push(['setSiteId', 4]); - var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; - g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); - })(); -</script> -<noscript><p><img src="http://stats.jonkri.com/piwik.php?idsite=4" style="border:0;" alt="" /></p></noscript> -<!-- End Piwik Code --> -<!-- Note, Piwik really should be changed so that we have one for beta and one for www --> - </html> diff --git a/templates/web/fixamingata/front/recent.html b/templates/web/fixamingata/front/recent.html index 255882f41..f3126c6c3 100644 --- a/templates/web/fixamingata/front/recent.html +++ b/templates/web/fixamingata/front/recent.html @@ -13,7 +13,7 @@ }(document, 'script', 'facebook-jssdk'));</script> <link rel="canonical" href="https://plus.google.com/105025269316032228481" /> <div style="height: 50px; position: relative;"><div class="fb-like" data-href="https://www.facebook.com/fixamingata" data-layout="button_count" data-action="like" data-show-faces="true" data-share="true" style="float: left;"></div> <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script><div style="float: left; padding-left: 20px; padding-top: 2px;"><g:plusone></g:plusone></div></div> - <div style="padding-bottom: 14px;"><a href="https://play.google.com/store/apps/details?id=se.sambruk.fixamingata"><img alt="FixaMin Gata pÃ¥ Google Play" style="height: 45px; width: 129px;" src="/cobrands/fixmystreet/images/google_play_logo.png" /></a></div> + <div style="padding-bottom: 14px;"><a href="https://play.google.com/store/apps/details?id=se.sambruk.fixamingata"><img alt="FixaMin Gata pÃ¥ Google Play" src="/cobrands/fixmystreet/images/google_play_logo.png" style="height: 45px; width: 129px;" /></a><a href="http://appstore.com/fixamingata"><img alt="FixaMin Gata pÃ¥ App Store" src="/cobrands/fixmystreet/images/itunes_store_logo.png" style="height: 40px; padding-left: 19px; padding-top: 1px; vertical-align: top; width: 135px;" /></a></div> [% IF recent_photos.size %] <h2> [% loc('Recently reported problems') %] diff --git a/templates/web/fixamingata/report/new/inline-tips.html b/templates/web/fixamingata/report/new/inline-tips.html index 90bb4f975..4fab9c81c 100644 --- a/templates/web/fixamingata/report/new/inline-tips.html +++ b/templates/web/fixamingata/report/new/inline-tips.html @@ -4,8 +4,10 @@ <li>Var trevlig</li> <li>Ange platser noggrant</li> <li>Skriv hur gammalt problemet är</li> + <li>Fyll i tillräckligt med detaljer för att mottagaren skall kunna hjälpa till</li> </ul> <ul class="dont"> + <li>Vid akut situation används inte FixaMinGata (ex. vattenläckor)</li> <li>Använd inte FixaMinGata för rena synpunkter och förslag</li> <li>Inkludera inte privata kontaktdetaljer i beskrivningen</li> </ul> diff --git a/templates/web/fixamingata/report/new/notes.html b/templates/web/fixamingata/report/new/notes.html index 8f081f637..9ec6b0e29 100644 --- a/templates/web/fixamingata/report/new/notes.html +++ b/templates/web/fixamingata/report/new/notes.html @@ -1,14 +1,8 @@ -<p>[% loc("Please note:") %]</p> - <ul class="plain-list"> - <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li> - <li>[% loc("Please be polite, concise and to the point.") %]</li> - <li>[% loc("Please do not be abusive — abusing your council devalues the service for all users.") %]</li> - <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li> [% IF all_councils.items.first > 0 %] - <li>[% id = all_councils.items.first; + <li style="margin-bottom: 0em;">[% id = all_councils.items.first; tprintf("Kom ihÃ¥g att FixaMinGata primärt är avsett för att rapportera fysiska problem som kan Ã¥tgärdas. Om ditt problem inte lämpar sig för att rapportera via den här webbsidan kan du kontakta din kommun direkt via <a href='%s'>deras webbsida</a>.", all_body_urls.$id); %]</li> [% ELSE %] - <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li> + <li style="margin-bottom: 0em;">[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li> [% END %] </ul> diff --git a/templates/web/fixamingata/report/new/sidebar.html b/templates/web/fixamingata/report/new/sidebar.html new file mode 100644 index 000000000..972fccf53 --- /dev/null +++ b/templates/web/fixamingata/report/new/sidebar.html @@ -0,0 +1,5 @@ +<div id="report-a-problem-sidebar"> + <div class="sidebar-notes"> + [% INCLUDE 'report/new/notes.html' %] + </div> +</div> diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html index cac89763d..3cdf3d8c3 100644 --- a/templates/web/zurich/admin/report_edit-sdm.html +++ b/templates/web/zurich/admin/report_edit-sdm.html @@ -135,7 +135,7 @@ </script> </p> -<p class="cf screen-only"> +<p class="clearfix screen-only"> <input style="float:left" type="submit" name="Submit changes" value="[% loc('Submit changes') %]" > <input style="float:right" type="submit" name="no_more_updates" value="[% loc('No further updates') %]"> </p> diff --git a/templates/web/zurich/report/_main.html b/templates/web/zurich/report/_main.html index d80eeb9a4..34aa71590 100644 --- a/templates/web/zurich/report/_main.html +++ b/templates/web/zurich/report/_main.html @@ -1,4 +1,4 @@ -<div class="problem-header cf"> +<div class="problem-header clearfix"> <h1>[% tprintf( loc('Reported in the %s category'), problem.category ) %]</h1> <p class="sub"> [% prettify_dt( problem.created, 'zurich' ) %] diff --git a/web/cobrands/angus/base.scss b/web/cobrands/angus/base.scss index efe540630..50f207058 100644 --- a/web/cobrands/angus/base.scss +++ b/web/cobrands/angus/base.scss @@ -2,7 +2,6 @@ @import "./_colours"; @import "./_fonts"; @import "../sass/mixins"; -@import "compass"; @import "../sass/base"; diff --git a/web/cobrands/angus/config.rb b/web/cobrands/angus/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/angus/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/arreglamibarrio/base.scss b/web/cobrands/arreglamibarrio/base.scss index 28fc5a940..d85ff1b85 100644 --- a/web/cobrands/arreglamibarrio/base.scss +++ b/web/cobrands/arreglamibarrio/base.scss @@ -1,7 +1,6 @@ @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; -@import "compass"; @import "../sass/base"; diff --git a/web/cobrands/arreglamibarrio/config.rb b/web/cobrands/arreglamibarrio/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/arreglamibarrio/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss index 418958ab1..9f7c0e9ae 100644 --- a/web/cobrands/bromley/base.scss +++ b/web/cobrands/bromley/base.scss @@ -2,7 +2,6 @@ @import "./_colours"; @import "./_fonts"; @import "../sass/mixins"; -@import "compass"; @import "../sass/base"; diff --git a/web/cobrands/bromley/config.rb b/web/cobrands/bromley/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/bromley/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/default/base.scss b/web/cobrands/default/base.scss index 9fccf92db..84784d552 100644 --- a/web/cobrands/default/base.scss +++ b/web/cobrands/default/base.scss @@ -1,7 +1,6 @@ @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; -@import "compass"; @import "../sass/base"; diff --git a/web/cobrands/default/config.rb b/web/cobrands/default/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/default/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/eastsussex/base.scss b/web/cobrands/eastsussex/base.scss index dcf335824..30f3ba934 100644 --- a/web/cobrands/eastsussex/base.scss +++ b/web/cobrands/eastsussex/base.scss @@ -1,7 +1,6 @@ @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; -@import "compass"; $heading-font: Arial, "Helvetica Neue", Helvetica, sans-serif !default; diff --git a/web/cobrands/eastsussex/config.rb b/web/cobrands/eastsussex/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/eastsussex/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/eastsussex/layout.scss b/web/cobrands/eastsussex/layout.scss index ec35f0082..f8836bd1f 100644 --- a/web/cobrands/eastsussex/layout.scss +++ b/web/cobrands/eastsussex/layout.scss @@ -3,12 +3,6 @@ $mappage-header-height: 16em; @import "_colours"; @import "../sass/layout"; -// from http://nicolasgallagher.com/micro-clearfix-hack/ -.clearfix:before, -.clearfix:after { content: " "; display: table; } -.clearfix:after { clear: both; } -.clearfix { *zoom: 1; } - #front-main { // Undo the top margin added in base.scss margin-top: 0; diff --git a/web/cobrands/fiksgatami/base.scss b/web/cobrands/fiksgatami/base.scss index 9fccf92db..84784d552 100644 --- a/web/cobrands/fiksgatami/base.scss +++ b/web/cobrands/fiksgatami/base.scss @@ -1,7 +1,6 @@ @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; -@import "compass"; @import "../sass/base"; diff --git a/web/cobrands/fiksgatami/config.rb b/web/cobrands/fiksgatami/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/fiksgatami/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/fixamingata/base.scss b/web/cobrands/fixamingata/base.scss index 6b8add5d7..99d1e99db 100644 --- a/web/cobrands/fixamingata/base.scss +++ b/web/cobrands/fixamingata/base.scss @@ -9,12 +9,11 @@ $image-sprite: '/cobrands/fixamingata/images/sprite.png'; @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; -@import "compass"; @import "../sass/base"; #site-header { - @include background(linear-gradient(#000, #ccc 10%, #ccc 90%, #000)); + @include linear-gradient(#000, #ccc 10%, #ccc 90%, #000); } #site-logo { diff --git a/web/cobrands/fixamingata/config.rb b/web/cobrands/fixamingata/config.rb deleted file mode 100644 index 471b4b008..000000000 --- a/web/cobrands/fixamingata/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app
\ No newline at end of file diff --git a/web/cobrands/fixamingata/images/itunes_store_logo.png b/web/cobrands/fixamingata/images/itunes_store_logo.png Binary files differnew file mode 100644 index 000000000..b37f4c230 --- /dev/null +++ b/web/cobrands/fixamingata/images/itunes_store_logo.png diff --git a/web/cobrands/fixmindelo/base.scss b/web/cobrands/fixmindelo/base.scss index 9a8ca9021..5fa4bb2d1 100644 --- a/web/cobrands/fixmindelo/base.scss +++ b/web/cobrands/fixmindelo/base.scss @@ -1,7 +1,6 @@ @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; -@import "compass"; $image-sprite: 'images/sprite.png'; diff --git a/web/cobrands/fixmindelo/config.rb b/web/cobrands/fixmindelo/config.rb deleted file mode 100644 index 471b4b008..000000000 --- a/web/cobrands/fixmindelo/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app
\ No newline at end of file diff --git a/web/cobrands/fixmystreet.com/base.scss b/web/cobrands/fixmystreet.com/base.scss index 223669b6d..366ebc451 100644 --- a/web/cobrands/fixmystreet.com/base.scss +++ b/web/cobrands/fixmystreet.com/base.scss @@ -6,7 +6,6 @@ @import "../sass/h5bp"; @import "_colours"; -@import "compass"; @import "../sass/base"; .top_banner { @@ -74,7 +73,7 @@ } .next-steps__step__cta { - @include pie-clearfix; + @include clearfix; padding-top: 0.4em; // extra padding between buttons and previous paragraph a { @@ -98,7 +97,7 @@ } .next-steps__step--goodies { - @include pie-clearfix; + @include clearfix; .goodies-preview { float: $right; @@ -218,10 +217,10 @@ background: rgba(255,255,255,0.3); input#sub { - @include background(linear-gradient(#49c0ff, #1091d5)); + @include linear-gradient(#49c0ff, #1091d5); &:hover, &:focus { - @include background(linear-gradient(darken(#49c0ff, 10%), darken(#1091d5, 10%))); + @include linear-gradient(darken(#49c0ff, 10%), darken(#1091d5, 10%)); } } } @@ -287,7 +286,7 @@ $grid-breakpoint-sm: $mysoc-footer-breakpoint-sm; } .row { - @include clearfix(); + @include clearfix; margin-left: $grid-gutter / -2; margin-right: $grid-gutter / -2; } diff --git a/web/cobrands/fixmystreet.com/config.rb b/web/cobrands/fixmystreet.com/config.rb deleted file mode 100644 index 471b4b008..000000000 --- a/web/cobrands/fixmystreet.com/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app
\ No newline at end of file diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss index 0ee21ecc7..848490e7a 100644 --- a/web/cobrands/fixmystreet.com/layout.scss +++ b/web/cobrands/fixmystreet.com/layout.scss @@ -74,7 +74,7 @@ h3, h4, .nav-menu--main { a:hover { - @include background(linear-gradient(#000, #444 10%, #444 95%, #111)); + @include linear-gradient(#000, #444 10%, #444 95%, #111); } } @@ -88,7 +88,7 @@ h3, h4, body.mappage { .nav-wrapper { .nav-wrapper-2 { - @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); + @include linear-gradient(#000, #222 10%, #222 90%, #000); } } } diff --git a/web/cobrands/fixmystreet/images/chevron-grey-left.svg b/web/cobrands/fixmystreet/images/chevron-grey-left.svg index 78d2f8cd2..522a6f920 100644 --- a/web/cobrands/fixmystreet/images/chevron-grey-left.svg +++ b/web/cobrands/fixmystreet/images/chevron-grey-left.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="63" height="33"><path fill="#d1d1d1" d="M62 0H49L36 16l13 16h13L49 16"/></svg>
\ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" width="27" height="33"><path fill="#d1d1d1" d="M26 0H13L0 16l13 16h13L13 16"/></svg> diff --git a/web/cobrands/fixmystreet/images/chevron-grey-right.svg b/web/cobrands/fixmystreet/images/chevron-grey-right.svg index f94d49b75..4715a03f8 100644 --- a/web/cobrands/fixmystreet/images/chevron-grey-right.svg +++ b/web/cobrands/fixmystreet/images/chevron-grey-right.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="63" height="33"><path fill="#d1d1d1" d="M0 0h13l13 16-13 16H0l13-16"/></svg>
\ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" width="27" height="33"><path fill="#d1d1d1" d="M0 0h13l13 16-13 16H0l13-16"/></svg> diff --git a/web/cobrands/greenwich/base.scss b/web/cobrands/greenwich/base.scss index 8b665501c..517b16471 100644 --- a/web/cobrands/greenwich/base.scss +++ b/web/cobrands/greenwich/base.scss @@ -2,7 +2,6 @@ @import "./_colours"; @import "./_fonts"; @import "../sass/mixins"; -@import "compass"; @import "../sass/base"; diff --git a/web/cobrands/greenwich/config.rb b/web/cobrands/greenwich/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/greenwich/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/greenwich/layout.scss b/web/cobrands/greenwich/layout.scss index df572341e..ad31941f6 100644 --- a/web/cobrands/greenwich/layout.scss +++ b/web/cobrands/greenwich/layout.scss @@ -5,13 +5,6 @@ $fixed_page_width: 990px; -/* from http://nicolasgallagher.com/micro-clearfix-hack/ */ -.clearfix:before, .clearfix:after { content: " "; display: table; } -.clearfix:after { clear: both; } -/* For IE 6/7 only */ -.clearfix { *zoom: 1; } - - #site-logo, .ie6 #site-logo, body.frontpage #site-logo, diff --git a/web/cobrands/harrogate/base.scss b/web/cobrands/harrogate/base.scss index b546ae060..6c4a906f7 100644 --- a/web/cobrands/harrogate/base.scss +++ b/web/cobrands/harrogate/base.scss @@ -1,7 +1,6 @@ @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; -@import "compass"; @import "../sass/base"; diff --git a/web/cobrands/harrogate/config.rb b/web/cobrands/harrogate/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/harrogate/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/hart/base.scss b/web/cobrands/hart/base.scss index 306098056..7f7f7bd35 100644 --- a/web/cobrands/hart/base.scss +++ b/web/cobrands/hart/base.scss @@ -1,7 +1,6 @@ @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; -@import "compass"; @import "../sass/base"; diff --git a/web/cobrands/hart/config.rb b/web/cobrands/hart/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/hart/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/hart/hart.scss b/web/cobrands/hart/hart.scss index 039567f32..95607242c 100644 --- a/web/cobrands/hart/hart.scss +++ b/web/cobrands/hart/hart.scss @@ -4,17 +4,9 @@ */ -@import "compass"; +@import "../sass/mixins"; @import "_colours"; -/* from http://nicolasgallagher.com/micro-clearfix-hack/ */ -.clearfix:before, -.clearfix:after { content: " "; display: table; } -.clearfix:after { clear: both; } -/* For IE 6/7 only */ -.clearfix { *zoom: 1; } - - // Taken from Bromley's form css input[type=text], input[type=password], diff --git a/web/cobrands/oxfordshire/oxfordshire.scss b/web/cobrands/oxfordshire/_oxon.scss index 20a38ac7f..20a38ac7f 100644 --- a/web/cobrands/oxfordshire/oxfordshire.scss +++ b/web/cobrands/oxfordshire/_oxon.scss diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss index 8f28905e2..7d4809ecd 100644 --- a/web/cobrands/oxfordshire/base.scss +++ b/web/cobrands/oxfordshire/base.scss @@ -1,7 +1,6 @@ @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; -@import "compass"; @import "../sass/base"; diff --git a/web/cobrands/oxfordshire/config.rb b/web/cobrands/oxfordshire/config.rb deleted file mode 100644 index 471b4b008..000000000 --- a/web/cobrands/oxfordshire/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app
\ No newline at end of file diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss index bc78a8681..62b2598e8 100644 --- a/web/cobrands/oxfordshire/layout.scss +++ b/web/cobrands/oxfordshire/layout.scss @@ -367,4 +367,4 @@ input.green-btn{ margin-right: 1em; } -@import "oxfordshire"; +@import "oxon"; diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 822739cda..15abd823f 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -444,7 +444,7 @@ p.label-valid { #site-header{ border-top: 0.25em solid $primary; height: 3em; - @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); + @include linear-gradient(#000, #222 10%, #222 90%, #000); .container { min-height:4em; } diff --git a/web/cobrands/sass/_dropzone.scss b/web/cobrands/sass/_dropzone.scss index 8c482d0cf..3e5fc8058 100644 --- a/web/cobrands/sass/_dropzone.scss +++ b/web/cobrands/sass/_dropzone.scss @@ -9,7 +9,7 @@ $dropzone-background-color--awakened: mix($dropzone-link-color, $dropzone-backgr $dropzone-background-color--full: mix($dropzone-border-color--full, $dropzone-background-color, 10%); .dropzone { - @include clearfix(); + @include clearfix; border: 0.125em solid $dropzone-border-color; background-color: $dropzone-background-color; border-radius: $dropzone-border-radius; diff --git a/web/cobrands/sass/_h5bp.scss b/web/cobrands/sass/_h5bp.scss index f2074532c..b41effa1b 100644 --- a/web/cobrands/sass/_h5bp.scss +++ b/web/cobrands/sass/_h5bp.scss @@ -247,11 +247,9 @@ td { vertical-align: top; } .invisible { visibility: hidden; } /* Contain floats: h5bp.com/q */ -/* mySociety change: rename to cf */ -.cf:before, .cf:after { content: ""; display: table; } -.cf:after { clear: both; } -.cf { *zoom: 1; } - +.clearfix:before, .clearfix:after { content: " "; display: table; } +.clearfix:after { clear: both; } +.clearfix { *zoom: 1; } /* ==|== print styles ======================================================= diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index c0c213be1..99e6d7761 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -1,4 +1,3 @@ -@import "compass"; @import "_mixins"; $image-sprite: '/cobrands/fixmystreet/images/sprite.png' !default; diff --git a/web/cobrands/sass/_mixins.scss b/web/cobrands/sass/_mixins.scss index 541ff0a33..71f9b95a3 100644 --- a/web/cobrands/sass/_mixins.scss +++ b/web/cobrands/sass/_mixins.scss @@ -16,12 +16,12 @@ $direction: 'left' !default; height: auto; @include border-radius(4px); background: $c1; - @include background (linear-gradient($c1, $c2)) ; + @include linear-gradient($c1, $c2); border:1px solid $c3; color:$c4; &:hover:enabled { background:$c5; - @include background (linear-gradient($c6, $c5)); + @include linear-gradient($c6, $c5); text-decoration: none; border:1px solid $c7; color:$c8; @@ -59,3 +59,68 @@ $right: right; @return $rtl; } } + +// Compass-like mixins + +@mixin box-sizing($bs) { + $bs: unquote($bs); + @include experimental(box-sizing, $bs, -moz, -webkit, not -o, not -ms, official); +} + +@mixin border-radius($radius: 5px) { + @include experimental(border-radius, $radius, -moz, -webkit, not -o, not -ms, official); +} + +@mixin box-shadow($shadow) { + @include experimental(box-shadow, $shadow, -moz, -webkit, not -o, not -ms, official); +} + +@mixin experimental($property, $value, $moz: true, $webkit: true, $o: true, $ms: true, $official: true) { + @if $webkit { -webkit-#{$property} : $value; } + @if $moz { -moz-#{$property} : $value; } + @if $ms { -ms-#{$property} : $value; } + @if $o { -o-#{$property} : $value; } + @if $official { #{$property} : $value; } +} + +@mixin inline-block($alignment: middle) { + display: inline-block; + vertical-align: middle; + *vertical-align: auto; + zoom: 1; + *display: inline; +} + +@mixin clearfix { + &:before, &:after { content: " "; display: table; } + &:after { clear: both; } + & { *zoom: 1; } +} + +@mixin linear-gradient($stops...) { + $webkit-gradient-stops: (); + $webkit-end-point: 100%; + @each $stop in $stops { + $pos: none; + @if length($stop) > 1 { + @if length($stops) == 2 && unit(nth($stop, 2)) == 'px' { + $webkit-end-point: nth($stop, 2); + $pos: 100%; + } @else { + $pos: nth($stop, 2); + } + } @else if (length($stop) == 1 && index($stops, $stop) == 1) { + $pos: 0%; + } @else { + $pos: 100%; + } + $webkit-gradient-stops: append($webkit-gradient-stops, + color-stop($pos, nth($stop, 1)), + comma); + } + + background: -webkit-gradient(linear, 0% 0%, 0% $webkit-end-point, $webkit-gradient-stops); + @each $prefix in -moz-, -o-, -webkit-, "" { + background: #{$prefix}linear-gradient($stops); + } +} diff --git a/web/cobrands/stevenage/_council_header_responsive.scss b/web/cobrands/stevenage/_council_header_responsive.scss index 60885f65f..e65f097d9 100644 --- a/web/cobrands/stevenage/_council_header_responsive.scss +++ b/web/cobrands/stevenage/_council_header_responsive.scss @@ -30,7 +30,7 @@ // Clear the floated search and "PARF" elements. .stv-inner { - @include clearfix(); + @include clearfix; } // Menu items should be one sixth of menu width. diff --git a/web/cobrands/stevenage/base.scss b/web/cobrands/stevenage/base.scss index ba08815ae..2bccdc377 100644 --- a/web/cobrands/stevenage/base.scss +++ b/web/cobrands/stevenage/base.scss @@ -1,7 +1,6 @@ @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; -@import "compass"; $body-font: 'PTSansRegular', "PT Sans", Verdana, Arial, sans-serif; $meta-font: $body-font; diff --git a/web/cobrands/stevenage/config.rb b/web/cobrands/stevenage/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/stevenage/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss index a2170f214..63de06652 100644 --- a/web/cobrands/stevenage/layout.scss +++ b/web/cobrands/stevenage/layout.scss @@ -11,7 +11,7 @@ padding-top: 0.5em; padding-bottom: 0.25em; background-color: #6b6969; - @include background(linear-gradient(#6b6969, #555454)); + @include linear-gradient(#6b6969, #555454); .iel8 & { background-color: #6b6969; @@ -40,7 +40,7 @@ } #main-nav { - @include clearfix(); + @include clearfix; width: auto; max-width: 984px; // match the Stevenage header width float: none; diff --git a/web/cobrands/trinidadtobago/base.scss b/web/cobrands/trinidadtobago/base.scss index c171e8333..f1fa7d659 100644 --- a/web/cobrands/trinidadtobago/base.scss +++ b/web/cobrands/trinidadtobago/base.scss @@ -1,7 +1,6 @@ @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; -@import "compass"; @import "../sass/base"; diff --git a/web/cobrands/trinidadtobago/config.rb b/web/cobrands/trinidadtobago/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/trinidadtobago/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/warwickshire/base.scss b/web/cobrands/warwickshire/base.scss index 682738a5e..0dcd85f53 100644 --- a/web/cobrands/warwickshire/base.scss +++ b/web/cobrands/warwickshire/base.scss @@ -1,7 +1,6 @@ @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; -@import "compass"; @import "../sass/base"; diff --git a/web/cobrands/warwickshire/config.rb b/web/cobrands/warwickshire/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/warwickshire/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/zurich/base.scss b/web/cobrands/zurich/base.scss index e607f80a3..0308f5b43 100644 --- a/web/cobrands/zurich/base.scss +++ b/web/cobrands/zurich/base.scss @@ -1,7 +1,6 @@ @import "../sass/h5bp"; @import "./_colours"; @import "../sass/mixins"; -@import "compass"; @import "../sass/base"; @@ -128,7 +127,7 @@ h4.static-with-rule { .admin-nav { background: #f4f4f4; - @include background(linear-gradient(#fbfbfb, #efefef)); + @include linear-gradient(#fbfbfb, #efefef); border-bottom: 2px solid $table_border_color; ul { overflow:auto; diff --git a/web/cobrands/zurich/config.rb b/web/cobrands/zurich/config.rb deleted file mode 100644 index cab97b18f..000000000 --- a/web/cobrands/zurich/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "" -sass_dir = "" -images_dir = "" -javascripts_dir = "" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass - -line_comments = false # by Compass.app diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss index e80cdb468..7bb44c231 100644 --- a/web/cobrands/zurich/layout.scss +++ b/web/cobrands/zurich/layout.scss @@ -223,7 +223,7 @@ body.twothirdswidthpage { &#fixed { padding-top: 2em; background: $col_fixed_label; - @include background(linear-gradient(#769643, $col_fixed_label 4px)); + @include linear-gradient(#769643, $col_fixed_label 4px); } &#closed { padding-top: 2em; @@ -332,7 +332,7 @@ body.mappage.admin { margin: 2em 0; &:hover { - @include background(linear-gradient(#fcc, #daa 50%)); + @include linear-gradient(#fcc, #daa 50%); }; } } |
