From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com&gt; Fixes to allow make check-local to pass after adding the whitespace verification. Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com&gt; --- ui/css/src/modules/_login.scss | 4 ++-- ui/css/src/modules/_modal-flat.scss | 10 +++++----- ui/css/src/modules/_navbar-flat.scss | 6 +++--- ui/css/src/modules/_wok-confirm.scss | 4 ++-- ui/css/src/modules/_wok-grid.scss | 6 +++--- ui/css/src/modules/_wok-variables.scss | 6 +++--- ui/images/theme-default/edit-alt.svg | 4 ++-- ui/js/src/wok.grid.js | 4 ++-- ui/js/src/wok.line-chart.js | 10 +++++----- ui/js/src/wok.list.js | 6 +++--- ui/js/src/wok.login.js | 6 +++--- ui/js/src/wok.main.js | 6 +++--- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ui/css/src/modules/_login.scss b/ui/css/src/modules/_login.scss index 1d64893..b350640 100644 --- a/ui/css/src/modules/_login.scss +++ b/ui/css/src/modules/_login.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM, Corp. 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ display: block; position: static; float: none; - margin-bottom: 50px; + margin-bottom: 50px; } .col-md-12, .col-lg-12 { diff --git a/ui/css/src/modules/_modal-flat.scss b/ui/css/src/modules/_modal-flat.scss index a6528cc..efe55df 100644 --- a/ui/css/src/modules/_modal-flat.scss +++ b/ui/css/src/modules/_modal-flat.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM, Corp. 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -66,7 +66,7 @@ border: 6px solid $modal-content-fallback-border-color; //old browsers fallback (ie8 etc) border: 6px solid $modal-content-border-color; border-radius: 5px; - background-clip: padding-box; + background-clip: padding-box; } // Actual modal @@ -74,7 +74,7 @@ position: relative; background-color: $modal-content-bg; border-radius: 0; - border: 3px solid #999; + border: 3px solid #999; background-clip: padding-box; box-shadow: none !important; border-radius: 0; @@ -185,7 +185,7 @@ text-align: center; } -@media screen and (min-width: 768px) { +@media screen and (min-width: 768px) { .modal:before { display: inline-block; vertical-align: middle; @@ -250,4 +250,4 @@ .modal-body .nav-tabs > li > a:hover { background-color: transparent; -} \ No newline at end of file +} diff --git a/ui/css/src/modules/_navbar-flat.scss b/ui/css/src/modules/_navbar-flat.scss index 0e11269..10e06f2 100644 --- a/ui/css/src/modules/_navbar-flat.scss +++ b/ui/css/src/modules/_navbar-flat.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM, Corp. 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -464,7 +464,7 @@ border-radius: 4px; background: #797979; border-left: 1px solid #B3B3B3; - @include box-shadow(inset 6px 1px 6px #9e9e9e); + @include box-shadow(inset 6px 1px 6px #9e9e9e); } .navbar-nav > li > .dropdown-menu::-webkit-scrollbar-thumb:window-inactive { @@ -891,4 +891,4 @@ } } } -} \ No newline at end of file +} diff --git a/ui/css/src/modules/_wok-confirm.scss b/ui/css/src/modules/_wok-confirm.scss index 21693ac..c447b88 100644 --- a/ui/css/src/modules/_wok-confirm.scss +++ b/ui/css/src/modules/_wok-confirm.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM, Corp. 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -39,4 +39,4 @@ padding: 19px 0 0 0; } -} \ No newline at end of file +} diff --git a/ui/css/src/modules/_wok-grid.scss b/ui/css/src/modules/_wok-grid.scss index 23fc0fd..acdaf2b 100644 --- a/ui/css/src/modules/_wok-grid.scss +++ b/ui/css/src/modules/_wok-grid.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015 +// Copyright IBM, Corp. 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -103,11 +103,11 @@ span.wok-repository-status.disabled { } .generating .wok-list-loading-icon-inline { - background: transparent url('#{$wok-icon-path}/spin5.svg') no-repeat 50% 50%; + background: transparent url('#{$wok-icon-path}/spin5.svg') no-repeat 50% 50%; @include animation(spin 3s infinite linear); height: 16px; width: 16px; background-size: 100%; display: block; position: absolute; -} \ No newline at end of file +} diff --git a/ui/css/src/modules/_wok-variables.scss b/ui/css/src/modules/_wok-variables.scss index c7880c4..e262fe9 100644 --- a/ui/css/src/modules/_wok-variables.scss +++ b/ui/css/src/modules/_wok-variables.scss @@ -1,7 +1,7 @@ // // Project Wok // -// Copyright IBM, Corp. 2015// +// Copyright IBM, Corp. 2015-2016 // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -720,7 +720,7 @@ $alert-padding: 8px 15px !default; $alert-border-radius: 0 !default; $alert-link-font-weight: bold !default; $alert-border-width: 0 0 0 5px !default; -$alert-font-size: 10.5pt !default; +$alert-font-size: 10.5pt !default; $alert-success-bg: $state-success-bg !default; $alert-success-text: $state-success-text !default; @@ -964,7 +964,7 @@ $dl-horizontal-offset: $component-offset-horizontal !default; //** Horizontal line color. $hr-border: $gray-lighter !default; -//* +//* // The MIT License (MIT) // Copyright (c) 2013-2015 bootstrap-select diff --git a/ui/images/theme-default/edit-alt.svg b/ui/images/theme-default/edit-alt.svg index c7ea499..ce10a74 100644 --- a/ui/images/theme-default/edit-alt.svg +++ b/ui/images/theme-default/edit-alt.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- +<!-- Copyright (c) 2014-2015, Team Redux (http://reduxframework.com), with Elusive Icons. Copyright (c) 2014-2015, Dave Gandy (http://elusiveicons.com), @@ -23,7 +23,7 @@ with others. The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, +fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The diff --git a/ui/js/src/wok.grid.js b/ui/js/src/wok.grid.js index 48bdfad..39eac81 100644 --- a/ui/js/src/wok.grid.js +++ b/ui/js/src/wok.grid.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM, Corp. 2013-2016 * * Code derived from Project Kimchi * @@ -261,7 +261,7 @@ wok.widget.Grid.prototype = (function() { var btnNode = $(btnHTML).appendTo(toolbarNode); button['onClick'] && btnNode.on('click', button['onClick']); - }); + }); } } diff --git a/ui/js/src/wok.line-chart.js b/ui/js/src/wok.line-chart.js index d6fca9c..8aff98a 100644 --- a/ui/js/src/wok.line-chart.js +++ b/ui/js/src/wok.line-chart.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM, Corp. 2013-2016 * * Code derived from Project Kimchi * @@ -25,8 +25,8 @@ * type: 'value' * }); */ - - + + wok.widget.LineChart = function(params) { var container = $('#' + params['node']); container.addClass('chart-container'); @@ -84,7 +84,7 @@ wok.widget.LineChart = function(params) { } }); } - + var defs = [ '<defs>', '<pattern id="patternbg" x="0" y="0" width="6" height="6" patternUnits="userSpaceOnUse">', @@ -204,7 +204,7 @@ wok.widget.LineChart = function(params) { formatSettings ); } - else { + else { latestValue = { v: latestValue, s: '%' }; } $('<div class="latest-value"><span class="number">' + latestValue.v + '</span></div>').appendTo(wrapper); diff --git a/ui/js/src/wok.list.js b/ui/js/src/wok.list.js index a7c43d6..6451822 100644 --- a/ui/js/src/wok.list.js +++ b/ui/js/src/wok.list.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2013-2015 + * Copyright IBM, Corp. 2013-2016 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -159,8 +159,8 @@ wok.widget.List.prototype = (function() { var btnNode = $(btnHTML).appendTo($('.dropdown-menu', rowNode)); button.onClick && btnNode.on('click', button.onClick); }); - }); - } + }); + } }; var stylingRow = function(row, className, add) { diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index 13a1da0..bda64ca 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -1,7 +1,7 @@ /* * Project Wok * - * Copyright IBM, Corp. 2014-2015 + * Copyright IBM, Corp. 2014-2016 * * Code derived from Project Kimchi * @@ -21,8 +21,8 @@ wok.login_main = function() { "use strict"; var selectedLanguage = wok.lang.get(); $('#userLang').val(selectedLanguage); - $('#userLang option[value="'+selectedLanguage+'"]').attr("selected", "selected"); - $('#userLang').next().find('.selectpicker').attr('title',$('#userLang option[value="'+selectedLanguage+'"]').text()); + $('#userLang option[value="'+selectedLanguage+'"]').attr("selected", "selected"); + $('#userLang').next().find('.selectpicker').attr('title',$('#userLang option[value="'+selectedLanguage+'"]').text()); $('#userLang').next().children().find('.filter-option').text($('#userLang option[value="'+selectedLanguage+'"]').text()); $('#userLang').on('change', function() { diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index 736001f..c9cf28b 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -17,7 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + wok.tabMode = {}; wok.config = undefined; @@ -411,7 +411,7 @@ wok.main = function() { wok.user.showUser(true); initListeners(); updatePage(); - + // Overriding Bootstrap Modal windows to allow a stack of modal windows and backdrops $(document).on({ 'show.bs.modal': function () { @@ -430,7 +430,7 @@ wok.main = function() { }, 0); } } - }, '.modal'); + }, '.modal'); }; -- 2.5.0