aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* [Oxfordshire] Custom pin images with iconsZarino Zappia2017-06-09-4/+21
| | | | | | | Oxfordshire map pins now have icons on, and some use different colours, to better communicate the status of reports. Fixes mysociety/fixmystreetforcouncils#170
* Double resolution pin icons in coreZarino Zappia2017-06-09-0/+0
|
* Allow cobrands to define pin colour for new reportsZarino Zappia2017-06-09-8/+20
| | | | | | Previously, a green marker would be used for reports as they were being created. Now, cobrands can override `pin_new_report_colour` to show a different pin image when users are creating a new report.
* Add MAPIT_API_KEY supportDave Arter2017-06-08-0/+4
|
* Merge branch 'csssss'Matthew Somerville2017-06-08-1154/+648
|\
| * [fixmystreet.com] Fix report a problem bg hover.Matthew Somerville2017-06-08-0/+3
| | | | | | | | | | The change to background-colour in 35bf6ddb2e meant the normal hover linear-gradient was overriding.
| * Prevent #map_sidebar shadow from overlapping #site-headerZarino Zappia2017-06-08-1/+1
| |
| * Basic white label cobrand.Dave Arter2017-06-08-0/+61
| | | | | | | | | | | | This removes most of the FMS/mySociety branding, but uses the same logic as the fixmystreet.com cobrand wrt problem restrictions, handling, etc. Suitable for UK council demos.
| * Simplify .container width calculationsZarino Zappia2017-06-08-240/+107
| | | | | | | | | | | | Removing the explicit width lets .container scale down nicely to the "middle" 48-60em screen width range without its contents hitting the sides of the window (as previously happened).
| * Remove background overrides from sass core.Matthew Somerville2017-06-08-62/+23
| | | | | | | | | | | | Most cobrands have the same header at mobile and desktop, so it is easier and simpler for the default to have this and override where necessary.
| * Update all cobrands for new core styles.Zarino Zappia2017-06-08-595/+408
| | | | | | | | Adjustments necessary due to the preceding commits.
| * Tidy up .content width/margin/padding.Matthew Somerville2017-06-08-17/+3
| | | | | | | | | | There was no need for the default .content width to be fixed and require overriding.
| * Add Sass variable for header top border.Matthew Somerville2017-06-08-3/+16
| | | | | | | | | | This makes it easier to change/remove the default top border, with subsequent measurements adjusting accordingly.
| * Simplify navigation HTML/CSS (larger widths).Zarino Zappia2017-06-08-177/+44
| | | | | | | | | | | | | | This commit removes the caption-side handling, which wasn't actually used. It gets rid of .nav-wrapper-2, and uses site-header for header display (e.g. top border). It does not update any cobrands with what needs changing.
| * Reduce complexity of header CSS.Zarino Zappia2017-06-08-131/+54
| | | | | | | | | | | | Rely upon the site logo for the header height, rather than use absolute positioning/height. This commit only alters the base styling, including cobrands; layout styling comes later.
* | Merge branch 'csssss-part-i'Matthew Somerville2017-06-07-138/+75
|\|
| * Default to same-size logo on front page.Matthew Somerville2017-06-07-9/+25
| | | | | | | | | | This means that only cobrands that want a different/bigger logo have to override it.
| * No need for display:inline on floated nav items.Zarino Zappia2017-06-06-5/+2
| |
| * Remove mySociety logo from default header.Zarino Zappia2017-06-06-80/+38
| |
| * [fixmystreet.com] Better .content homepage layout.Matthew Somerville2017-06-06-44/+10
| | | | | | | | Remove unused .tablewrapper footer CSS.
* | [fixmystreet.com] Rework pro marketing pageMartin Wright2017-06-02-182/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | Reorder structure of the page Remove icons from features text Add screenshot of theme examples Remove compatibility information Recolour clients section Pricing table - Move prices to bottom - Ditch 'show more' functionality - Add revised tier names
* | [fixmystreet.com] Show admin back-end in the pro page screenshotsMartin Wright2017-06-02-0/+0
| |
* | [fixmystreet.com] Replace screenshotMartin Wright2017-06-02-0/+0
|/ | | | | | https://github.com/mysociety/FixMyStreet-Commercial/issues/850 The image previously had FMS in a windowed browser on the laptop, this replaces it with one in full screen
* [fixmystreet.com] No need for this to be here.Matthew Somerville2017-05-31-102/+0
| | | | This is mySociety deploy specific.
* Allow users to hide their name on reports/updates.Zarino Zappia2017-05-31-18/+160
|
* Add update URL model method.Matthew Somerville2017-05-31-7/+12
|
* Auto-add strict/warnings/Test::More with TestMech.Matthew Somerville2017-05-31-233/+21
|
* [fixmystreet.com] Few more Professional renames.Matthew Somerville2017-05-31-7/+7
|
* [Oxfordshire] Lighter box-warning background.Matthew Somerville2017-05-31-1/+5
| | | | Standardise with a "darker green" sidebar colour.
* Consistent styling for buttons in .box-warningZarino Zappia2017-05-31-13/+10
|
* Linting fixes to jquery.multi-select.jsZarino Zappia2017-05-31-4/+2
|
* [Bromley] Restore staff update functionDave Arter2017-05-30-11/+5
| | | | | | The Bromley update form needed to be updated to use the new <select> template. This also fixes a situation where staff users (on all cobrands) wouldn't be able to leave updates on problems with state 'fixed - user'.
* Merge branch 'issues/forcouncils/191-action-scheduled-instruct'Matthew Somerville2017-05-26-29/+50
|\
| * Make sure existing state is included in drop-down.Matthew Somerville2017-05-26-2/+21
| | | | | | | | | | It is possible the report's state isn't one that the user can access, but in that case we should still show it to avoid confusion.
| * [Oxfordshire] Use instruct perm to filter state.Matthew Somerville2017-05-26-3/+16
| | | | | | | | | | Without the report_instruct permission, the 'action scheduled' state is not an option in the dropdown.
| * Use same state input in update form as elsewhere.Matthew Somerville2017-05-26-25/+14
| | | | | | | | This lets it look the same as admin/inspect uses, with optgroups.
* | [Travis] Stop requiring 'sudo' mode.Matthew Somerville2017-05-25-4/+9
| | | | | | | | The tests do not need English or Welsh installed any more.
* | Remove need for sv_SE in tests.Matthew Somerville2017-05-25-4/+4
| |
* | Fix test that would not run offline.Matthew Somerville2017-05-25-7/+2
|/ | | | | Switch it to use our mock MapIt. Also remove other unused overrides to external services.
* [Hart] Restyle footerpezholio2017-05-23-156/+170
|
* Fix linting errorspezholio2017-05-23-59/+58
|
* [fixmystreet.com] Update Councils pageMartin Wright2017-05-23-432/+907
| | | | | Includes a new feature/benefit grid, a shorter contact form, and a nifty pricing table that switches into vertical mode on narrow screens.
* [fixmystreet.com] FMS Pro banner on homepageZarino Zappia2017-05-23-34/+53
| | | | | Includes a new, brighter tile.jpg, to improve text contrast and to match the $primary colour of #FFD000.
* Simplify `footer-marketing.html` for most cobrandsZarino Zappia2017-05-23-21/+22
|
* Merge branch '1704-to-vend-or-not-to-vend'Matthew Somerville2017-05-23-5021/+36
|\
| * Move third party libraries into vendor directoriesMatthew Somerville2017-05-23-5021/+36
| | | | | | | | | | | | | | | | This makes the git hook that lints our own JavaScript easier, and keeps things more cleanly separated. We also remove unused third party libraries (select2 and jquery.placeholder).
| * Remove superfluous quote in HTML script element.Matthew Somerville2017-05-23-1/+1
| |
* | Merge branch '1695-scientific-no-tation'Matthew Somerville2017-05-23-18/+57
|\ \
| * | [UK] Stop nearest request with scientific notationMatthew Somerville2017-05-18-18/+57
| |/ | | | | | | | | | | If the longitude was very close to 0, it was being sent as e.g. 1e-6 in the request to MapIt. Mock out the Bing query so that this can be tested (the closest.t tests were previously always being skipped).
* / [Bristol] Switch warn threshold to five failures.Matthew Somerville2017-05-19-7/+25
|/