Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
* | | | | Merge branch 'add-widget' | Gareth Rees | 2015-07-07 | -0/+214 | |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | updated theme with all button states | Martin Wright | 2015-07-07 | -2/+23 | |
| | | | | |||||
| * | | | add widget styles for our theme | Martin Wright | 2015-07-07 | -3/+1 | |
| | | | | |||||
| * | | | Move css for widget to widget.css. | Louise Crow | 2015-07-07 | -52/+3 | |
| | | | | | | | | | | | | | | | | | | | | Imports seem to be too complicated for what needs to be a simple and small bit of css to sit on someone else's site. | ||||
| * | | | Latest style and bg from @martinwright | Louise Crow | 2015-07-07 | -1/+30 | |
| | | | | |||||
| * | | | Widget styles and image from @martinwright | Louise Crow | 2015-07-07 | -0/+17 | |
| | | | | |||||
| * | | | Move css for widget to widget.css. | Louise Crow | 2015-07-07 | -46/+196 | |
| | | | | | | | | | | | | | | | | | | | | Imports seem to be too complicated for what needs to be a simple and small bit of css to sit on someone else's site. | ||||
| * | | | Widget styles and image from @martinwright | Louise Crow | 2015-07-07 | -0/+48 | |
|/ / / | |||||
* | | | Merge remote-tracking branch 'origin/remove-courier-in-responses' | Gareth Rees | 2015-07-07 | -5/+0 | |
|\ \ \ | |||||
* \ \ \ | Merge remote-tracking branch 'origin/box-style' | Gareth Rees | 2015-07-07 | -4/+0 | |
|\ \ \ \ | |||||
* \ \ \ \ | Merge branch 'use-colour-variables' | Gareth Rees | 2015-06-29 | -35/+60 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Add colour variables, replace absolute declarations with references to variables | Martin Wright | 2015-06-29 | -35/+60 | |
| | | | | | |||||
* | | | | | Merge branch 'garethrees-patch-2' | Gareth Rees | 2015-04-28 | -3/+4 | |
|\| | | | | |||||
| * | | | | Don't tie form input background to nav text | Gareth Rees | 2015-04-28 | -3/+4 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Usually want input fields to be white. Nav colours tend to vary and be the most vivid of the site, which is not ideal for the inputs. | ||||
* | | | | Merge remote-tracking branch 'github/garethrees-patch-1' | Gareth Rees | 2015-04-28 | -7/+10 | |
|\ \ \ \ | |||||
| * | | | | More logical grouping of custom variables | Gareth Rees | 2015-04-27 | -7/+10 | |
|/ / / / | | | | | | | | | Helps after initial forking of the theme | ||||
| | | * | Merge branch 'add-widget' into develop | Louise Crow | 2015-04-28 | -0/+151 | |
| | | |\ | |||||
| | | | * | Move css for widget to widget.css. | Louise Crow | 2015-04-10 | -46/+151 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Imports seem to be too complicated for what needs to be a simple and small bit of css to sit on someone else's site. | ||||
| | | | * | Latest style and bg from @martinwright | Louise Crow | 2015-03-10 | -1/+30 | |
| | | | | | |||||
| | | | * | Widget styles and image from @martinwright | Louise Crow | 2015-03-10 | -0/+19 | |
| | | | | | |||||
| | | * | | Merge branch 'box-style' into develop | Louise Crow | 2015-04-27 | -4/+0 | |
| | | |\ \ | | |_|/ / | |/| | | | |||||
| * | | | | Corresponding changes for new 'box' style. | Louise Crow | 2015-04-14 | -4/+0 | |
|/ / / / | |||||
| | * | | Merge branch 'remove-courier-in-responses' into develop | Louise Crow | 2015-04-10 | -5/+0 | |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Don't use Courier for responses - people found it hard to read. | Louise Crow | 2015-04-07 | -5/+0 | |
|/ / / | |||||
* | | | Merge branch 'develop' | Louise Crow | 2015-03-30 | -0/+5 | |
|\ \ \ | |_|/ |/| | | |||||
| | * | New icons from @wrightmartin. | Louise Crow | 2015-04-10 | -0/+4 | |
| |/ | |||||
| * | Merge branch 'new-request-process' into develop | Louise Crow | 2015-03-05 | -0/+5 | |
| |\ | |||||
| | * | Align follower count and subscription/request buttons on authority page. | Louise Crow | 2015-02-27 | -0/+5 | |
| |/ |/| | |||||
* | | Merge branch 'runnable-tests' | Louise Crow | 2015-02-26 | -3/+22 | |
|\ \ | |||||
| | * | Merge branch 'runnable-tests' into develop | Louise Crow | 2015-02-26 | -21/+24 | |
| | |\ | | |/ | |/| | |||||
| * | | Use spec format for consistency with Alaveteli. | Louise Crow | 2015-02-24 | -0/+18 | |
| | | | | | | | | | | | | This is also more easily runnable from the Alaveteli dir. | ||||
| * | | Add autorunner to make tests runnable with rake. | Louise Crow | 2015-02-24 | -1/+2 | |
| | | | |||||
| * | | Fix require so that tests can be run from alaveteli Rails.root. | Louise Crow | 2015-02-24 | -2/+2 | |
|/ / | |||||
* | | Add styling for a warning class. | Louise Crow | 2015-01-23 | -2/+2 | |
| | | | | | | | | Works with https://github.com/mysociety/alaveteli/pull/2114 | ||||
* | | Remove public body categories. | Louise Crow | 2014-12-05 | -16/+0 | |
| | | | | | | | | Fixes #31. | ||||
* | | Merge branch 'develop' | Louise Crow | 2014-10-09 | -10/+10 | |
|\| | |||||
| * | Merge branch 'sidebar-url-helpers' into develop | Louise Crow | 2014-10-09 | -10/+10 | |
| |\ | |||||
| | * | Use url helpers in the sidebar. | Louise Crow | 2014-09-09 | -10/+10 | |
| | | | | | | | | | | | | Generally good practice. | ||||
* | | | Merge branch 'develop' | Louise Crow | 2014-09-24 | -19/+10 | |
|\| | | |/ |/| | |||||
| * | Merge branch 'update-installation-instructions' into develop | Louise Crow | 2014-09-24 | -10/+7 | |
| |\ | |||||
| | * | Code formatting, link to config section of docs | Louise Crow | 2014-09-24 | -1/+1 | |
| | | | |||||
| | * | Update installation instructions. | Louise Crow | 2014-08-22 | -10/+7 | |
| | | | |||||
| * | | Merge branch 'add_example_template' into develop | Louise Crow | 2014-09-19 | -0/+3 | |
| |\ \ | |||||
| | * | | Add example template to indicate that this needs to be customized/translated. | Louise Crow | 2014-09-02 | -0/+3 | |
| | |/ | |||||
| * | | Merge branch 'remove-old-template' into develop | Louise Crow | 2014-09-19 | -9/+0 | |
| |\ \ | | |/ | |/| | |||||
| | * | Remove old template for help page. | Louise Crow | 2014-08-26 | -9/+0 | |
| |/ | | | | | | | Superceded by help_out.html.erb | ||||
* | | Merge branch 'develop' | Louise Crow | 2014-09-09 | -8/+8 | |
|\| | |||||
| * | Merge remote-tracking branch 'zarino_github/master' into develop | Louise Crow | 2014-08-11 | -8/+8 | |
|/| | |||||
| * | use placeholder selectors for base menu styles | Zarino Zappia | 2014-08-08 | -8/+8 | |
|/ | |||||
* | Merge branch 'issues/20-fix-hyphenated-theme-name' | Louise Crow | 2014-08-05 | -1/+3 | |
|\ |