aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * Merge branch 'develop'Louise Crow2014-10-09-10/+10
| |\ | |/ |/|
* | Merge branch 'sidebar-url-helpers' into developLouise Crow2014-10-09-10/+10
|\ \
| * | Use url helpers in the sidebar.Louise Crow2014-09-09-10/+10
| | | | | | | | | | | | Generally good practice.
| | * Merge branch 'develop'Louise Crow2014-09-24-19/+10
| |/| | |/ |/|
* | Merge branch 'update-installation-instructions' into developLouise Crow2014-09-24-10/+7
|\ \
| * | Code formatting, link to config section of docsLouise Crow2014-09-24-1/+1
| | |
| * | Update installation instructions.Louise Crow2014-08-22-10/+7
| | |
* | | Merge branch 'add_example_template' into developLouise Crow2014-09-19-0/+3
|\ \ \
| * | | Add example template to indicate that this needs to be customized/translated.Louise Crow2014-09-02-0/+3
| |/ /
* | | Merge branch 'remove-old-template' into developLouise Crow2014-09-19-9/+0
|\ \ \ | |/ / |/| |
| * | Remove old template for help page.Louise Crow2014-08-26-9/+0
|/ / | | | | | | Superceded by help_out.html.erb
| * Merge branch 'develop'Louise Crow2014-09-09-8/+8
| |\ | |/ |/|
* | Merge remote-tracking branch 'zarino_github/master' into developLouise Crow2014-08-11-8/+8
|\ \ | |/ |/|
| * use placeholder selectors for base menu stylesZarino Zappia2014-08-08-8/+8
|/
* Merge branch 'issues/20-fix-hyphenated-theme-name'Louise Crow2014-08-05-1/+3
|\
| * Handle theme names that include a hyphenLouise Crow2014-08-05-1/+3
| | | | | | | | | | Ruby doesn't allow method names with hyphens, which it interprets as a minus sign. Fixes #20.
| * Merge branch 'basic-responsive-stylesheet' into developLouise Crow2014-06-09-3/+566
| |\
* | \ Merge branch 'basic-responsive-stylesheet'Louise Crow2014-06-09-2/+559
|\ \ \ | | |/ | |/|
| * | Preserve old logoLouise Crow2014-06-04-1/+1
| | | | | | | | | | | | Used when RESPONSIVE_STYLING set to false
| * | Adjust large button height for IE 7Louise Crow2014-06-04-0/+3
| | |
| * | More padding under the logo for IE7Louise Crow2014-06-04-1/+1
| | |
| * | Add some spacing under the logo for IE7Louise Crow2014-06-04-6/+11
| | | | | | | | | | | | To prevent the login block getting pushed down.
| * | Sharper logoLouise Crow2014-06-04-0/+0
| | |
| * | Add locale switcherLouise Crow2014-06-04-1/+4
| | |
| * | Add link iconLouise Crow2014-06-04-0/+3
| | |
| * | Add new link iconsLouise Crow2014-06-04-1/+1
| | |
| * | Update icons, set colour constants for success/failure to match.Louise Crow2014-06-04-118/+18
| | |
| * | Use a protocol-less link for font loadingLouise Crow2014-06-02-1/+1
| | |
| * | Get rid of Bitter, get normal and bold and extended charsets for RobotoLouise Crow2014-06-02-3/+2
| | | | | | | | | | | | Bitter doesn't handle latin-ext or cyrillic so isn't much use to us here.
| * | Add Google fonts with some basic fallbacks.Louise Crow2014-06-02-2/+7
| | |
| * | Make sure custom sass file has the right extensionLouise Crow2014-05-15-0/+0
| | |
| * | Temporary status icons and coloursLouise Crow2014-05-15-3/+128
| | |
| * | Remove top border on small screens, fix logo size.Louise Crow2014-05-15-1/+6
| | |
| * | Remove before_head_endLouise Crow2014-05-15-1/+0
| | |
| * | Base responsive stylesheet for alavetelithemeLouise Crow2014-05-15-0/+510
|/ /
* | Update links to point to public body change request form.Louise Crow2014-03-04-1/+7
| |
* | Merge branch 'develop'Louise Crow2014-03-04-0/+0
|\|
| * Merge branch 'master' into developLouise Crow2014-01-29-1/+1
| |\ | |/ |/|
* | Merge remote-tracking branch 'origin/no-logo-rename'Louise Crow2014-01-24-1/+1
|\ \
| * | Revert renaming of the logo.png fileno-logo-renameMark Longair2013-11-25-1/+1
| | |
* | | Merge branch 'develop'Louise Crow2014-01-24-37/+23
|\ \ \ | | |/ | |/|
| * | Restore logo.pngdevelopLouise Crow2013-12-10-0/+0
| | | | | | | | | | | | See discussion at https://github.com/mysociety/alavetelitheme/commit/0d2a72017779ba0cd7c7d40e0fa32713129333c5
| * | Add .css suffix before .scss for consistency.Louise Crow2013-12-05-0/+0
| | | | | | | | | | | | Doesn't seem to make any difference to preprocessing behaviour.
| * | No need to create or destroy symlinks nowLouise Crow2013-12-04-23/+0
| | | | | | | | | | | | Handled by asset pipeline.
| * | Merge branch 'switch-to-asset-pipeline' into developLouise Crow2013-11-29-14/+23
| |\|
| | * Move images out of /public and into the asset pipelineMark Longair2013-11-20-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An oddity here is that I had to rename logo.png to alaveteli-logo.png, or the version from the alaveteli repository was used after precompiling the assets. (This suggests that generation of precompiled assets with "rake assets:precompile" is picking the wrong version; i.e. not going through the asset path in reverse order.)
| | * Refer to the precompiled application.css, which includes custom.cssMark Longair2013-11-20-1/+1
| | |
| | * Switch to work with the feature/wip-switch-to-asset-pipeline branchMark Longair2013-11-11-13/+22
| | |
* | | Merge branch 'develop'use-with-alaveteli-0.15use-with-alaveteli-0.14Louise Crow2013-09-24-15/+11
|\| |
| * | Merge branch 'improve-development-performance' into developLouise Crow2013-09-16-15/+11
| |\|