Mercurial > hg > soundsoftware-site

changeset 1048:0655dd267a29 live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Thu, 15 Nov 2012 10:20:23 +0000
parents 26a835cb14f9 (current diff) d8a8f6c99b26 (diff)
children 7529d85a20ea
files
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/config/locales/en.yml	Tue Nov 13 15:39:30 2012 +0000
+++ b/config/locales/en.yml	Thu Nov 15 10:20:23 2012 +0000
@@ -548,7 +548,7 @@
   label_home: Home
   label_home_heading: Welcome!
   label_my_page: My page
-  label_my_account: My account
+  label_my_account: Account
   label_my_projects: My projects
   label_my_page_block: My page block
   label_administration: Administration
@@ -893,7 +893,7 @@
   button_expand_all: Expand all
   button_delete: Delete
   button_create: Create
-  button_create_and_continue: Create and continue
+  button_create_and_continue: Create and Add Another
   button_test: Test
   button_edit: Edit
   button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"
--- a/public/themes/soundsoftware/stylesheets/fonts-generic.css	Tue Nov 13 15:39:30 2012 +0000
+++ b/public/themes/soundsoftware/stylesheets/fonts-generic.css	Thu Nov 15 10:20:23 2012 +0000
@@ -1,4 +1,4 @@
-@import url(fonts.css);
+@import url(fonts.css?2);
 
 h1, #project-ancestors-title, #top-menu a {
   font-family: Insider, 'Gill Sans', Tahoma, sans-serif;
--- a/public/themes/soundsoftware/stylesheets/fonts-mac.css	Tue Nov 13 15:39:30 2012 +0000
+++ b/public/themes/soundsoftware/stylesheets/fonts-mac.css	Thu Nov 15 10:20:23 2012 +0000
@@ -1,4 +1,4 @@
-@import url(fonts.css);
+@import url(fonts.css?2);
 
 h1, #project-ancestors-title, #top-menu a {
   font-family: Insider, "Lucida Grande", sans-serif;
--- a/public/themes/soundsoftware/stylesheets/fonts-ms.css	Tue Nov 13 15:39:30 2012 +0000
+++ b/public/themes/soundsoftware/stylesheets/fonts-ms.css	Thu Nov 15 10:20:23 2012 +0000
@@ -1,4 +1,4 @@
-@import url(fonts.css);
+@import url(fonts.css?2);
 
 /* IE likes us to separate out normal & bold into different fonts
    rather than use the selectors on the same font */