Merge branch 'release/2.5.0'

Author: zufrieden

CHANGELOG.md

@@ -3,6 +3,29 @@ CHANGELOG
 
 This changelog references the relevant changes and bug fixes.
 
+* 2.5.1 (2015-01-21) 
+ * #325 [CONTRAST] fix contrast in carets
+ * #279 [CONTRAST] fix input placeholders color
+ * #324 [CONTRAST] fix tabs background contrast
+ * #280 [CONTRAST] fix badge color bin nav-page-list
+ * #321 [CONTRAST] fix color and weight in active link from main navbar
+ * #241 Update Bootstrap to 3.3.1
+ * #235 Fix `bower.json`
+ * #266 Fix headings `font-size` on small devices
+ * #268 Display version number on homepage of styleguide
+ * #287 Implement better collapsibles examples
+ * #322 Fix the font-face mess (faux-bold when setting `font-weight`, etc..)
+ * #288 Remove link on active link in nav-page-list
+ * #297 Treecrumb uses nested lists now
+ * #299 Fix collapsible row in table
+ * #323 Update README file
+ * #340 #301 #275 #274 #276 Update loads of aria-tags
+ * #302 Fix Nav page list with nested lists
+ * #337 Fix global navigation error in some examples
+ * Switch all template examples to `.twig` files
+ * #350 Add rows in footer to avoid wrong behavior
+ * Update README with info for Windows contribution config
+
 * 2.4.1 (2015-01-16)
  * #327 responsive adjustment
  * #264 add comment about carousel accessibility

README.md

@@ -14,9 +14,9 @@ The Confederation Web Guidelines are aimed at both internal Federal project mana
 The design specifications described for use on the Internet or in intranets can also be used for other digital channels, such as for the creation of apps.
 
 
-The latest release of the styleguide is available here: http://adminch.antistatique.net
+The latest release of the styleguide is available here: http://swiss.github.io/styleguide/
 
-If you want to collaborate or review the next release, go to the gh-pages here: http://antistatique.github.io/Swiss-Admin-web-guidelines
+If you want to collaborate on the repo, go to this URL: https://github.com/swiss/styleguide
 
 
 ## The Swiss Federal Administration on the Internet
@@ -25,21 +25,20 @@ If you want to collaborate or review the next release, go to the gh-pages here:
 
 The styleguide is located in the `/styleguide` directory. You can open `/styleguide/index.html` directly in your browser. (If you can't find it, you have to build all the assets).
 
-#### How to use it in your project
+#### Installation
 
 There are several ways to get started:
 
+  - **Install with bower `bower install swiss-styleguide`**
   - Use the provided build. Download the [latest release](https://github.com/antistatique/Swiss-Admin-web-guidelines/releases/latest) and include all the built assets in your project.
-  - Use the Github Pages generated styleguide only. Just download the [gh-pages branch](https://github.com/antistatique/Swiss-Admin-web-guidelines/archive/gh-pages.zip).
   - Clone the repo `git clone https://github.com/antistatique/Swiss-Admin-web-guidelines.git`
-  - Install with bower `bower install Swiss-Admin-web-guidelines`
 
 
-#### Installation (development tools)
+## Contribution (development tools)
 This is not needed to use the styleguide, only if you want to modify it to fix some bugs and contribute.
 
 
-#### Installation on OSX/Unix
+### Installation on OSX/Unix
 
 > We use [Gulp.js](http://gulpjs.com) to run tasks and build our styleguide with [Hologram](https://github.com/trulia/hologram).
 
@@ -62,9 +61,9 @@ $ bundle
 
 [Browser-sync](http://www.browsersync.io) is automatically set up and will allow you to make changes and see them in real time.
 
-#### Installation on Windows
+### Installation on Windows
 
-This is the not the recommended OS. If you have a choice, use OSX.
+This is the not the recommended OS. If you have a choice, use OS X. We are therefore not perfectly sure of the process below, please report or make a PR to make this better.
 
 *Warning: This was tested on the [Windows PowerShell](http://en.wikipedia.org/wiki/Windows_PowerShell) but should work on any shell that support UTF8.*
 
@@ -78,7 +77,7 @@ This is the not the recommended OS. If you have a choice, use OSX.
 
 - Download and install [Node.js](http://nodejs.org)
 
-- Install [Git for Windows](http://msysgit.github.io/) (recommended) or alternatively [Github for Windows](https://windows.github.com)`
+- Install [Git for Windows](http://msysgit.github.io/) (recommended) or alternatively [Github for Windows](https://windows.github.com)
 
 Then install SASS, Hologram & Bundle
 
@@ -145,7 +144,7 @@ documentation_assets: ./path/to/theme
 
 ## Build the Styleguide Theme
 
-The theme has his own gulpfile (for the moment). So you have to do the following command to build the assets to then generate the styleguide with `$ hologram`:
+The theme has his own gulpfile (for the moment). So you have to do the following command to build the assets then generate the styleguide with `$ hologram`:
 
 ```shell
 $ cd styleguide-theme
@@ -158,9 +157,9 @@ $ gulp
 
 The theme is used only to present all the styles. It's not part of the styleguide. All the `!important`s were added to avoid conflict with other styles, for a better presentation.
 
-### When I try to build with gulp I have the following error: `Syntax error: Invalid US-ASCII character "\xC3"`
+### When I try to build with `$ gulp` I have the following error: `Syntax error: Invalid US-ASCII character "\xC3"`
 
-This bug is caused by Hologram and should be fixed in the next release. The workaround is to force UTF8 by running:
+The workaround is to force UTF8 by running:
 
 ```shell
 $ LC_ALL="en_US.UTF-8" gulp
@@ -174,3 +173,19 @@ export LANG=en_US.UTF-8
 export LANGUAGE=en_US.UTF-8
 ````
 
+### Error encoding ruby 2.1.0 with Windows 7 x64
+
+Edit file : C:\Ruby21-64\lib\ruby\2.1.0\registry.rb
+
+````
+Add line 70 == LOCALE = Encoding::UTF_8
+````
+
+### Error SSL certificates rubygems 2.2.2 with Windows 7 x64
+
+Download [rubygems 2.2.3](https://github.com/rubygems/rubygems/releases/tag/v2.2.3)
+
+```shell
+C:\>gem install --local C:\rubygems-update-2.2.3.gem
+C:\>update_rubygems --no-ri --no-rdoc
+```

VERSION

@@ -1 +1 @@
-2.4.1
+2.5.0

assets/img/chosen-sprite.png

@@ -41,4 +41,8 @@
     $(this).siblings('.search-field').focus().val('');
   });
 
+  $('body').on('click', function () {
+    $('#search-field').val('');
+  });
+
 }) (jQuery, (typeof searchData === 'undefined' ? false : searchData));

assets/img/chosen-sprite@2x.png

@@ -12,7 +12,7 @@
 (function($) {
 
   // Normal Collapse
-  $('.collapse').on('show.bs.collapse', function () {
+  $('.collapse:not(tbody)').on('show.bs.collapse', function () {
     $(this)
       .prev()
       .addClass('active icon--root')
@@ -22,7 +22,7 @@
         'aria-expanded': 'true'
       });
   });
-  $('.collapse').on('hide.bs.collapse', function () {
+  $('.collapse:not(tbody)').on('hide.bs.collapse', function () {
     $(this)
       .prev()
       .removeClass('active icon--root')
@@ -35,24 +35,23 @@
 
   // Table Collapse
 
-  var $tableToggle = $('th[data-toggle="collapse"], td[data-toggle="collapse"]');
-
-  checkCollapseTableStatus();
-
-  $tableToggle.click(function () {
-    setTimeout(function(){
-      checkCollapseTableStatus();
-    }, 360);
+  $('tbody.collapse').on('show.bs.collapse', function () {
+    $(this)
+      .prev().find('[data-toggle=collapse]')
+      .addClass('active')
+      .attr({
+        'aria-selected': 'true',
+        'aria-expanded': 'true'
+      });
+  });
+  $('tbody.collapse').on('hide.bs.collapse', function () {
+    $(this)
+      .prev().find('[data-toggle=collapse]')
+      .removeClass('active')
+      .attr({
+        'aria-selected': 'false',
+        'aria-expanded': 'false'
+      });
   });
-
-  function checkCollapseTableStatus() {
-    $tableToggle.each(function () {
-      var $collapseTarget = $(this).data('target');
-      $(this).removeClass('icon--bottom').addClass('icon--right');
-      if($($collapseTarget).hasClass('in')){
-        $(this).addClass('icon--bottom').removeClass('icon--right');
-      }
-    });
-  }
 
 }) (jQuery);