Permalink
Browse files

Remove tight css scoping around organisation_small_logos

It's more flexible to be able to add an organisation logo anywhere, not just in tightly scoped lists on specific pages.
  • Loading branch information...
1 parent e60d77e commit 7fd1e4dc921ebeea04b4ef860419eae789211c80 @tomafro tomafro committed Feb 28, 2012
@@ -67,19 +67,31 @@ $organisation_brands:
}
}
- .document_page, .ministerial_role_page {
- #document_organisations {
- .ministerial-department {
- &.#{$org_class} {
- span.organisation_logo_small {
- @if $colour {
- border-color: $colour;
- }
- @if $logo_image_url_small {
- background: url($logo_image_url_small) no-repeat 8px -1px;
- padding-top: 24px;
- }
- }
+ .ministerial-department {
+ .organisation_logo_small {
+ @include type-16;
+ line-height:1.125em;
+ display:block;
+ border-left: 2px solid #000;
+ padding-left: 4%;
+ margin-bottom: 0;
+
+ a {
+ position: relative;
+ bottom: -0.2em;
+ text-decoration:none;
+ }
+ }
+
+ &.#{$org_class} {
+ .organisation_logo_small {
+ @if $colour {
+ border-color: $colour;
+ }
+
+ @if $logo_image_url_small {
+ background: url($logo_image_url_small) no-repeat 8px -1px;
+ padding-top: 24px;
}
}
}
@@ -95,17 +107,6 @@ $organisation_brands:
}
}
- .document_page, .ministerial_role_page {
- #document_organisations {
- .ministerial-department {
- span.organisation_logo_small {
- border-left: 2px solid #000;
- padding-left: 4%;
- }
- }
- }
- }
-
// define styles for different organisation types
@include add_styles_for_org('ministerial-department', false, "/government/assets/coa-default-48.gif", "/government/assets/coa-default-24.gif");
@include add_styles_for_org('ministry-of-defence', false, "/government/assets/coa-ministry-of-defence-48.gif", "/government/assets/coa-ministry-of-defence-24.gif");
@@ -161,27 +161,6 @@
}
}
- section#document_organisations .organisations .organisation {
- span.organisation_logo_small {
- @include type-16;
- display:block;
- /* padding:0.12em 0 0 0.575em;*/
- line-height:1.125em;
- }
-
- &.ministerial-department {
- span.organisation_logo_small {
- margin-bottom: 0;
-
- a {
- position: relative;
- bottom: -0.2em;
- text-decoration:none;
- }
- }
- }
- }
-
section#document_topics {
margin-bottom: 3em;
@@ -114,26 +114,5 @@
display: none;
}
}
-
- section#document_organisations .organisations .organisation {
- span.organisation_logo_small {
- @include type-16;
- display:block;
- /* padding:0.12em 0 0 0.575em;*/
- line-height:1.125em;
- }
-
- &.ministerial-department {
- span.organisation_logo_small {
- margin-bottom: 0;
-
- a {
- position: relative;
- bottom: -0.2em;
- text-decoration:none;
- }
- }
- }
- }
}
}

0 comments on commit 7fd1e4d

Please sign in to comment.