aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Remove duplication of action bar button stylesHEADmasterGareth Rees2017-01-19-26/+26
|
* Style action menu buttonsGareth Rees2017-01-19-9/+38
|
* Add extra default coloursGareth Rees2017-01-19-0/+4
|
* Remove example overrideGareth Rees2017-01-19-3/+3
| | | | | | Just provides an example rather than actually overriding. Fixes https://github.com/mysociety/alavetelitheme/issues/30
* Rspec uses expect, not assertGareth Rees2017-01-19-2/+2
|
* 2-space indentGareth Rees2017-01-19-3/+3
|
* Add encoding line to Ruby filesGareth Rees2017-01-19-0/+12
| | | | Fixes https://github.com/mysociety/alavetelitheme/issues/69.
* Merge branch 'develop'Gareth Rees2016-12-14-17/+42
|\
| * Style request page action barGareth Rees2016-12-14-0/+17
| |
| * Fix incorrect conflict resolutionGareth Rees2016-12-14-2/+2
| | | | | | | | Missed including the <dt> in the conditional when resolving a merge conflict.
| * Fix unclosed <dd> tagGareth Rees2016-12-14-1/+1
| | | | | | | | | | - Added a closing slash - Fixed indentation
| * Merge remote-tracking branch 'origin/master' into developGareth Rees2016-12-14-1090/+1319
| |\ | |/ |/|
* | Merge branch '83-request-status-text-colour'Gareth Rees2016-12-14-0/+4
|\ \
| * | Make request status text blackGareth Rees2016-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 Rees2016-12-14-23/+31
|\ \ \
| * | | Style sidebar CTA buttonGareth Rees2016-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 scopeGareth Rees2016-12-12-23/+23
| |/ / | | | | | | | | | Shouldn't be setting the sidebar CTA text to white.
* / / Add request reporting sections to the help/about pagelizconlan2016-12-13-1/+29
|/ /
* | Merge remote-tracking branch 'origin/add-text-on-request-closure'Gareth Rees2016-12-12-0/+9
|\ \
| * | Add text on request closure.Louise Crow2016-11-24-0/+9
| | |
* | | Merge branch '85-correspondence-date-link-colour'Gareth Rees2016-12-12-1/+6
|\ \ \
| * | | Tweak scope of incoming correspondence link colourGareth Rees2016-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 greyGareth Rees2016-12-06-0/+5
|/ / / | | | | | | | | | General link colour was overriding this.
* / / Update model patch example to include the default_letter param overridelizconlan2016-12-05-0/+4
|/ /
* | Merge branch 'settings-file'lizconlan2016-09-16-53/+51
|\ \
| * | Remove #logo_wrapper from stylesheetlizconlan2016-08-22-17/+0
| | |
| * | Move scss settings to _settings.scsslizconlan2016-08-22-36/+51
|/ /
* | Green used for status text now meets AA requirements for contrast ratioMartin Wright2016-05-04-4/+4
| |
* | Merge branch 'remove-examples'Louise Crow2016-04-26-1005/+1178
|\ \
| * | Add generic example version of each required help page.Louise Crow2016-04-26-875/+1080
| | |
| * | Convert to two-space indentation.Louise Crow2016-04-06-94/+94
| | |
| * | Remove unused test directoryLouise Crow2016-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 Crow2016-04-06-74/+54
|/ / | | | | | | Rather than having them be live code.
| * Merge remote-tracking branch 'origin/enable-annotations' into developGareth Rees2016-04-01-25/+33
| |\
| | * Update templates to match new ENABLE_ANNOTATIONS settingSteven Day2016-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 developGareth Rees2016-03-16-0/+0
| |\ | |/ |/|
* | Merge branch 'develop'Gareth Rees2016-03-16-2/+5
|\|
| * Use new version of law_used_full methodGareth Rees2016-03-08-1/+1
| |
| * Merge remote-tracking branch 'origin/master' into developGareth Rees2016-03-08-1/+1
| |\ | |/ |/|
* | Merge remote-tracking branch 'origin/2989-language-switcher-width'Gareth Rees2016-01-22-1/+1
|\ \
| * | Allow language switcher dropdown to expand horizontallyZarino Zappia2016-01-22-1/+1
|/ / | | | | | | | | | | Handy for displaying languages with very long names! Part of mysociety/alaveteli#2989.
| * Merge remote-tracking branch 'origin/2989-header-styling-i18n' into developGareth Rees2016-01-22-1/+4
| |\
| | * Update for compatibility with new core user nav stylesZarino Zappia2016-01-21-1/+4
| |/ |/| | | | | | | | | | | | | | | | | The "logged_in_bar" in the core theme now has a set width, and uses absolute positioning to vertically align its children. Since Alavetelitheme moves the language picker to the left, we no longer need to leave 2em of vertical space for it in this theme. Part of mysociety/alaveteli#2989.
* | Merge remote-tracking branch 'origin/2946-opengraph-image'Gareth Rees2015-12-17-0/+0
|\ \
| * | Add 256px "logo here" image for opengraphZarino Zappia2015-12-16-0/+0
| |/
* | Merge branch 'develop'Louise Crow2015-11-17-212/+517
|\|
| * Base language switcher position on $logo-widthZarino Zappia2015-10-27-4/+3
| | | | | | | | | | Now, when you define a wide logo, the language switcher will move to accommodate it.
| * Smaller logo on narrow screensZarino Zappia2015-10-23-3/+22
| |
| * Include pictorial element in logoZarino Zappia2015-10-23-0/+0
| | | | | | | | | | | | | | Part of mysociety/alaveteli#2699. Adding an icon to the logo makes it clear that it should be replaced when you customise the theme.
| * Use https for google fontsGareth Rees2015-09-07-1/+1
| |