Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Bootstrap to 3.3.2 #57

Merged
merged 3 commits into from
Jan 29, 2015
Merged

Upgrade Bootstrap to 3.3.2 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
532e254
Upgrade Bootstrap to 3.3.2
fofr Jan 25, 2015
0d196d6
Use lighter grey for navbar text links
fofr Jan 25, 2015
a251e92
Update Bootstrap references in style guide
fofr Jan 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion app/assets/stylesheets/govuk_admin_template/_navbar.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,16 @@ header .navbar-header {
}

.navbar-text a {
color: $gray-light;
color: $navbar-inverse-link-color;
text-decoration: underline;

&:hover {
color: $navbar-inverse-link-hover-color;
}

&:active {
color: $navbar-inverse-link-active-color;
}
}

// Let's make these more specific to add the intended white colour
Expand Down
2 changes: 1 addition & 1 deletion app/views/govuk_admin_template/style_guide/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</h1>
</div>

<p class="lead">Admin app UIs are powered by <a href="http://getbootstrap.com/css/">bootstrap 3.2</a>, using <a href="https://github.com/twbs/bootstrap-sass/tree/v3.2.0">bootstrap SASS</a> v3.2.0 (<a href="https://github.com/twbs/bootstrap-sass/blob/v3.2.0/assets/stylesheets/bootstrap/_mixins.scss">mixins</a>), but maintaining bootstrap 2 button styles. This guide documents how we use bootstrap, where the apps have diverged from default styles and any custom styles needed to fill in the gaps.</p>
<p class="lead">Admin app UIs are powered by <a href="http://getbootstrap.com/css/">bootstrap 3.3.2</a>, using <a href="https://github.com/twbs/bootstrap-sass/tree/v3.3.3">bootstrap SASS</a> v3.3.3 (<a href="https://github.com/twbs/bootstrap-sass/blob/v3.3.3/assets/stylesheets/bootstrap/_mixins.scss">mixins</a>), but maintaining bootstrap 2 button styles. This guide documents how we use bootstrap, where the apps have diverged from default styles and any custom styles needed to fill in the gaps.</p>

<h2>Grid</h2>
<p class="lead">Apps use the <a href="http://getbootstrap.com/css/#grid">default bootstrap</a> <strong>12 column scaleable responsive grid</strong>.</p>
Expand Down
2 changes: 1 addition & 1 deletion govuk_admin_template.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
gem.required_ruby_version = '>= 1.9.3'

gem.add_dependency 'rails', '>= 3.2.0'
gem.add_dependency 'bootstrap-sass', '~> 3.3.1'
gem.add_dependency 'bootstrap-sass', '~> 3.3.3'
gem.add_dependency 'jquery-rails', '~> 3.1.1'

gem.add_development_dependency 'sass-rails', '3.2.6'
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<a href="#">navbar_item</a>
</li>
<% end %>
<% content_for :navbar_right do %>navbar_right<% end %>
<% content_for :navbar_right do %><a href="/">navbar_right</a><% end %>

<% content_for :footer_top do %>footer_top<% end %>
<% content_for :footer_version do %>footer_version<% end %>
Expand Down