Merge pull request #48 from alphagov/bump-jasmine-gem

Tweak CSS helpers
alphagov · Nov 6, 2014 · 0167e0d · 0167e0d
2 parents 48ed7aa + 8104ddd
commit 0167e0d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/CSS.md b/CSS.md
@@ -97,6 +97,13 @@ Class   | Purpose
 `link-muted` | Like Bootstrap’s `text-muted`, but for links. Makes them a matching grey and underlined.
 `link-inherit` | Inherits its colour from surrounding text, gains an underline
 
+### Display helpers
+
+Class   | Purpose
+------  |--------
+`inline` | Display inline, useful if the semantic element has the wrong display style by default
+`inline-block` | Display inline-block
+
 ### Tables
 [tables.css.scss](app/assets/stylesheets/govuk_admin_template/_tables.css.scss)
 

diff --git a/app/assets/stylesheets/govuk_admin_template/_base.css.scss b/app/assets/stylesheets/govuk_admin_template/_base.css.scss
@@ -21,6 +21,14 @@ label {
   position: relative;
 }
 
+.inline {
+  display: inline;
+}
+
+.inline-block {
+  display: inline-block;
+}
+
 .bold {
   font-weight: bold;
 }

diff --git a/app/assets/stylesheets/govuk_admin_template/_bootstrap_overrides.css.scss b/app/assets/stylesheets/govuk_admin_template/_bootstrap_overrides.css.scss
@@ -19,4 +19,8 @@
 .lead {
   font-weight: normal;
   color: #555;
+
+  &.text-muted {
+    color: $gray-light;
+  }
 }
diff --git a/govuk_admin_template.gemspec b/govuk_admin_template.gemspec
@@ -25,5 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-rails', '2.14.2'
   gem.add_development_dependency 'capybara', '2.2.1'
   gem.add_development_dependency 'gem_publisher', '1.3.1'
-  gem.add_development_dependency 'jasmine', '2.0.2'
+  gem.add_development_dependency 'jasmine', '2.0.3'
 end