Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Remove obsolete partial | Louise Crow | 2017-09-22 | -1/+0 |
| | | | | No longer needed after core commit d80e0ec0bc2bf81a0714cd44750da46faad44c06 | |||
* | Add menu styling | Louise Crow | 2017-09-22 | -0/+46 |
| | ||||
* | Move file content type icons to subdirectory | Louise Crow | 2017-09-22 | -0/+0 |
| | | | | Corresponds to 54fe619532c6368f301d in core. | |||
* | Use HTTP methods for custom routes | Louise Crow | 2017-09-22 | -2/+2 |
| | ||||
* | Add extra theme assets to the asset path | Louise Crow | 2017-09-22 | -0/+14 |
| | | | | | | | The new version of Sprockets for Rails 4.2 only adds assets from the base path so we need to add this ourselves. https://github.com/rails/sprockets-rails/blob/v3.2.0/lib/sprockets/railtie.rb#L84-L87 | |||
* | Merge branch 'master' into develop | Gareth Rees | 2017-03-22 | -18/+75 |
|\ | ||||
| * | Remove deprecated disable_with button option | Gareth Rees | 2017-03-22 | -2/+2 |
| | | | | | | | | Now a subkey of the :data option | |||
| * | Move assets to app/assets | Gareth Rees | 2017-03-22 | -0/+1 |
| | | | | | | | | | | | | | | Latest version of assets:precompile task requires path to match app/assets: https://github.com/rails/sprockets-rails/blob/v2.3.3/lib/sprockets/railtie.rb#L60-L62 | |||
| * | Merge branch 'pro-beta-release-tweaks' | Louise Crow | 2017-02-14 | -0/+11 |
| |\ | ||||
| | * | make user menu links visible | Martin Wright | 2017-02-08 | -0/+11 |
| |/ |/| | ||||
| * | Remove duplication of action bar button stylesHEADmaster | Gareth Rees | 2017-01-19 | -26/+26 |
| | | ||||
| * | Style action menu buttons | Gareth Rees | 2017-01-19 | -9/+38 |
| | | ||||
| * | Add extra default colours | Gareth Rees | 2017-01-19 | -0/+4 |
| | | ||||
| * | Remove example override | Gareth Rees | 2017-01-19 | -3/+3 |
| | | | | | | | | | | | | Just provides an example rather than actually overriding. Fixes https://github.com/mysociety/alavetelitheme/issues/30 | |||
| * | Rspec uses expect, not assert | Gareth Rees | 2017-01-19 | -2/+2 |
| | | ||||
| * | 2-space indent | Gareth Rees | 2017-01-19 | -3/+3 |
| | | ||||
| * | Add encoding line to Ruby files | Gareth Rees | 2017-01-19 | -0/+12 |
| | | | | | | | | Fixes https://github.com/mysociety/alavetelitheme/issues/69. | |||
| * | Merge branch 'develop' | Gareth Rees | 2016-12-14 | -17/+42 |
| |\ | |/ |/| | ||||
* | | Style request page action bar | Gareth Rees | 2016-12-14 | -0/+17 |
| | | ||||
* | | Fix incorrect conflict resolution | Gareth Rees | 2016-12-14 | -2/+2 |
| | | | | | | | | Missed including the <dt> in the conditional when resolving a merge conflict. | |||
* | | Fix unclosed <dd> tag | Gareth Rees | 2016-12-14 | -1/+1 |
| | | | | | | | | | | - Added a closing slash - Fixed indentation | |||
* | | Merge remote-tracking branch 'origin/master' into develop | Gareth Rees | 2016-12-14 | -1090/+1319 |
|\| | ||||
| * | Merge branch '83-request-status-text-colour' | Gareth Rees | 2016-12-14 | -0/+4 |
| |\ | ||||
| | * | Make request status text black | Gareth Rees | 2016-12-14 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | Otherwise there's not enough contrast between it and the new colour background. Fixes https://github.com/mysociety/alavetelitheme/issues/83. | |||
| * | | Merge branch '84-sidebar-make-request' | Gareth Rees | 2016-12-14 | -23/+31 |
| |\ \ | ||||
| | * | | Style sidebar CTA button | Gareth Rees | 2016-12-12 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | Minimum viable styles – didn't add a background to the element as I think it would conflict with the new status bar. | |||
| | * | | Move hero CTA to homepage-hero scope | Gareth Rees | 2016-12-12 | -23/+23 |
| | |/ | | | | | | | | | | Shouldn't be setting the sidebar CTA text to white. | |||
| * / | Add request reporting sections to the help/about page | lizconlan | 2016-12-13 | -1/+29 |
| |/ | ||||
| * | Merge remote-tracking branch 'origin/add-text-on-request-closure' | Gareth Rees | 2016-12-12 | -0/+9 |
| |\ | ||||
| | * | Add text on request closure. | Louise Crow | 2016-11-24 | -0/+9 |
| | | | ||||
| * | | Merge branch '85-correspondence-date-link-colour' | Gareth Rees | 2016-12-12 | -1/+6 |
| |\ \ | ||||
| | * | | Tweak scope of incoming correspondence link colour | Gareth Rees | 2016-12-06 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Should only apply to links in the correspondence, not e.g. the "Admin" link. | |||
| | * | | Force correspondence date links to always be grey | Gareth Rees | 2016-12-06 | -0/+5 |
| |/ / | | | | | | | | | | General link colour was overriding this. | |||
| * / | Update model patch example to include the default_letter param override | lizconlan | 2016-12-05 | -0/+4 |
| |/ | ||||
| * | Merge branch 'settings-file' | lizconlan | 2016-09-16 | -53/+51 |
| |\ | ||||
| | * | Remove #logo_wrapper from stylesheet | lizconlan | 2016-08-22 | -17/+0 |
| | | | ||||
| | * | Move scss settings to _settings.scss | lizconlan | 2016-08-22 | -36/+51 |
| |/ | ||||
| * | Green used for status text now meets AA requirements for contrast ratio | Martin Wright | 2016-05-04 | -4/+4 |
| | | ||||
| * | Merge branch 'remove-examples' | Louise Crow | 2016-04-26 | -1005/+1178 |
| |\ | ||||
| | * | Add generic example version of each required help page. | Louise Crow | 2016-04-26 | -875/+1080 |
| | | | ||||
| | * | Convert to two-space indentation. | Louise Crow | 2016-04-06 | -94/+94 |
| | | | ||||
| | * | Remove unused test directory | Louise Crow | 2016-04-06 | -12/+0 |
| | | | | | | | | | | | | | | | There is already a spec directory, which is what we actually use when writing tests for themes. | |||
| | * | Make code customization commented out examples. | Louise Crow | 2016-04-06 | -74/+54 |
| |/ | | | | | | | Rather than having them be live code. | |||
* | | Merge remote-tracking branch 'origin/enable-annotations' into develop | Gareth Rees | 2016-04-01 | -25/+33 |
|\ \ | ||||
| * | | Update templates to match new ENABLE_ANNOTATIONS setting | Steven Day | 2016-03-31 | -25/+33 |
| |/ | | | | | | | | | | | Alaveteli has added a feature to turn off annotations and some of the views use this to hide certain bits of text, so this makes the theme do the same. | |||
* | | Merge branch 'master' into develop | Gareth Rees | 2016-03-16 | -0/+0 |
|\| | ||||
| * | Merge branch 'develop' | Gareth Rees | 2016-03-16 | -2/+5 |
| |\ | |/ |/| | ||||
* | | Use new version of law_used_full method | Gareth Rees | 2016-03-08 | -1/+1 |
| | | ||||
* | | Merge remote-tracking branch 'origin/master' into develop | Gareth Rees | 2016-03-08 | -1/+1 |
|\| | ||||
| * | Merge remote-tracking branch 'origin/2989-language-switcher-width' | Gareth Rees | 2016-01-22 | -1/+1 |
| |\ |