[PATCH] [Wok 0/2] SCSS and CSS updates
From: Samuel Guimarães <sguimaraes943@gmail.com> This patchset includes two commits that are required for existing and new features. -First patch adds compact() function to our mixins since it was removed from python-libsass. This was generating wrong CSS outputs from different distros and rendering wrong styles (specially box-shadow effects). -Second patch adds support for .wok-mask class with a relative position inside a panel-group, allowing us to display a "loading" text with spinning icon inside collapsible panels seen in Ginger and Gingerbase. Both patches are required for "OVS Bridges front-end" support in Ginger and "Delete multiple Debug Reports at once" in Gingerbase. Samuel Guimarães (2): Added compact Sass function that was removed from libsass Fixed .wok-mask class and loaders inside collapsable panels ui/css/src/modules/_compact.scss | 46 ++++++++++++++++++++++++++++++++++++++++ ui/css/src/modules/_loaders.scss | 4 ++++ ui/css/src/wok.scss | 6 ++++++ ui/css/wok.css | 8 +++++++ 4 files changed, 64 insertions(+) create mode 100644 ui/css/src/modules/_compact.scss -- 1.9.3
From: Samuel Guimarães <sguimaraes943@gmail.com> More info: https://github.com/Igosuki/compass-mixins/issues/34 Signed-off-by: Samuel Guimarães <sguimaraes943@gmail.com> --- ui/css/src/modules/_compact.scss | 46 ++++++++++++++++++++++++++++++++++++++++ ui/css/src/wok.scss | 2 ++ 2 files changed, 48 insertions(+) create mode 100644 ui/css/src/modules/_compact.scss diff --git a/ui/css/src/modules/_compact.scss b/ui/css/src/modules/_compact.scss new file mode 100644 index 0000000..dc3fa4c --- /dev/null +++ b/ui/css/src/modules/_compact.scss @@ -0,0 +1,46 @@ +// +// Project Wok +// +// Copyright IBM Corp, 2016 +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +// The MIT License (MIT) + +// Copyright © 2011 thoughtbot, inc. + +// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +// THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +// This function adds compact function that was removed from Libsass and python-libsass. It contains original code from Bourbon, https://github.com/thoughtbot/bourbon + +@function compact($var-1, $var-2: false, +$var-3: false, $var-4: false, +$var-5: false, $var-6: false, +$var-7: false, $var-8: false, +$var-9: false, $var-10: false) { + $full: $var-1; + $vars: $var-2, $var-3, $var-4, $var-5, + $var-6, $var-7, $var-8, $var-9, $var-10; + + @each $var in $vars { + @if $var { + $full: $full, $var; + } + } + @return $full; +} \ No newline at end of file diff --git a/ui/css/src/wok.scss b/ui/css/src/wok.scss index 17626e4..3e18483 100755 --- a/ui/css/src/wok.scss +++ b/ui/css/src/wok.scss @@ -20,6 +20,8 @@ // Core variables @import "modules/wok-variables"; +// Core functions +@import "modules/compact"; // Compass Mixins @import "vendor/compass-mixins/lib/compass"; -- 1.9.3
From: Samuel Guimarães <sguimaraes943@gmail.com> Signed-off-by: Samuel Guimarães <sguimaraes943@gmail.com> --- ui/css/src/modules/_loaders.scss | 4 ++++ ui/css/src/wok.scss | 4 ++++ ui/css/wok.css | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/ui/css/src/modules/_loaders.scss b/ui/css/src/modules/_loaders.scss index d8667f0..f7ef4c9 100644 --- a/ui/css/src/modules/_loaders.scss +++ b/ui/css/src/modules/_loaders.scss @@ -38,6 +38,10 @@ } } +.panel-group .wok-mask { + top: 0 !important; +} + .wok-mask-loading, .wok-grid-loading, .wok-list-loading { width: 100%; white-space: nowrap; diff --git a/ui/css/src/wok.scss b/ui/css/src/wok.scss index 3e18483..4b706ae 100755 --- a/ui/css/src/wok.scss +++ b/ui/css/src/wok.scss @@ -113,6 +113,10 @@ body { font-size: 21.5pt; } +.panel-group { + position: relative; +} + // Login @import "modules/login"; // Topbar and navigation diff --git a/ui/css/wok.css b/ui/css/wok.css index cf79af4..615cdea 100644 --- a/ui/css/wok.css +++ b/ui/css/wok.css @@ -113,6 +113,10 @@ body { font-size: 21.5pt; } +.panel-group { + position: relative; +} + .login .content .container { width: 100% !important; padding-left: 0 !important; @@ -861,6 +865,10 @@ span.wok-repository-status.disabled { } } +.panel-group .wok-mask { + top: 0 !important; +} + .wok-mask-loading, .wok-grid-loading, .wok-list-loading { width: 100%; white-space: nowrap; -- 1.9.3
participants (2)
-
Aline Manera -
sguimaraes943＠gmail.com