govuk_admin_template 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.1.1
+
+* Fix active visited link styles on bootstrap components
+* Fix visited link styles on nested bootstrap components
+
 # 0.1.0
 
 * Environment indicators

data/app/assets/stylesheets/govuk_admin_template/base.css.scss

@@ -205,20 +205,31 @@ main a {
 
 /* Navigation pills */
 
-.nav-pills a:visited {
+.nav-pills > li > a:visited {
   color: $link-color;
 }
 
-.nav-pills a:visited:hover {
+.nav-pills > li > a:visited:hover {
   color: $link-hover-color;
 }
 
+.nav-pills > li.active > a:visited,
+.nav-pills > li.active > a:visited:hover {
+  color: $component-active-color;
+}
+
 /* Dropdown menu */
 
-.dropdown-menu a:visited {
+.dropdown-menu > li > a:visited,
+.dropdown-menu > li > a:hover:visited {
   color: $text-color;
 }
 
+.dropdown-menu > li.active > a:visited,
+.dropdown-menu > li.active > a:hover:visited {
+  color: $component-active-color
+}
+
 /* List groups */
 
 .list-group a.list-group-item:visited {
@@ -229,12 +240,9 @@ main a {
   color: $list-group-link-color;
 }
 
-.list-group a.list-group-item.active:visited {
-  color: $list-group-active-text-color;
-}
-
+.list-group a.list-group-item.active:visited,
 .list-group a.list-group-item.active:visited:hover {
-  color: $list-group-active-text-color;
+  color: $component-active-color;
 }
 
 /* List groups with content  */

data/app/views/govuk_admin_template/style_guide/index.html.erb

@@ -193,6 +193,10 @@
         <h4 class="list-group-item-heading">Active visited link</h4>
         <p class="list-group-item-text">Active visited link</p>
       </a>
+      <a href="/style-guide#<%= "#{Time.now.utc.to_i}" %>" class="list-group-item active">
+        <h4 class="list-group-item-heading">Active normal link</h4>
+        <p class="list-group-item-text">Active normal link</p>
+      </a>
       <a href="/style-guide" class="list-group-item">
         <h4 class="list-group-item-heading">Visited link</h4>
         <p class="list-group-item-text">Visited link</p>
@@ -209,6 +213,9 @@
       <a href="/style-guide" class="list-group-item active">
         Active visited link style
       </a>
+      <a href="/style-guide#<%= "#{Time.now.utc.to_i}" %>" class="list-group-item active">
+        Active normal link style
+      </a>
       <a href="/style-guide" class="list-group-item">Visited link</a>
       <a href="/style-guide#<%= "#{Time.now.utc.to_i}" %>" class="list-group-item">Normal link</a>
     </div>
@@ -217,8 +224,20 @@
     <h4 class="add-bottom-margin">Navigation pills</h4>
     <ul class="nav nav-pills nav-stacked">
       <li class="active"><a href="/style-guide">Active visited link</a></li>
+      <li class="active"><a href="/style-guide#<%= "#{Time.now.utc.to_i}" %>">Active normal link</a></li>
       <li><a href="/style-guide">Visited link</a></li>
       <li><a href="/style-guide#<%= "#{Time.now.utc.to_i}" %>">Normal link</a></li>
+      <li>
+        <div class="btn-group open">
+          <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+            Dropdown in navigation pill <span class="caret"></span>
+          </button>
+          <ul class="dropdown-menu" role="menu">
+            <li><a href="/style-guide">Visited link</a></li>
+            <li><a href="/style-guide#<%= "#{Time.now.utc.to_i}" %>">Normal link</a></li>
+          </ul>
+        </div>
+      </li>
     </ul>
   </div>
   <div class="col-md-3">
@@ -229,6 +248,8 @@
         Action <span class="caret"></span>
       </button>
       <ul class="dropdown-menu" role="menu">
+        <li class="active"><a href="/style-guide">Active visited link</a></li>
+        <li class="active"><a href="/style-guide#<%= "#{Time.now.utc.to_i}" %>">Active normal link</a></li>
         <li><a href="/style-guide">Visited link</a></li>
         <li><a href="/style-guide#<%= "#{Time.now.utc.to_i}" %>">Normal link</a></li>
       </ul>

data/lib/govuk_admin_template/version.rb

@@ -1,3 +1,3 @@
 module GovukAdminTemplate
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_admin_template
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4107083059303013324
+      hash: 1090496159895250270
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4107083059303013324
+      hash: 1090496159895250270
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23