11:55 a.m.
On 03/14/2016 04:45 PM, sguimaraes943(a)gmail.com wrote:
From: Samuel Guimarães <sguimaraes943(a)gmail.com>
Signed-off-by: Samuel Guimarães <sguimaraes943(a)gmail.com>
---
ui/css/bootstrap.custom.css | 6 +++---
ui/css/src/modules/_login.scss | 5 ++---
ui/css/wok.css | 7 +++----
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ui/css/bootstrap.custom.css b/ui/css/bootstrap.custom.css
index 13869da..469872f 100644
--- a/ui/css/bootstrap.custom.css
+++ b/ui/css/bootstrap.custom.css
@@ -3460,9 +3460,9 @@ tbody.collapse.in {
display: table-cell;
}
-.input-group-addon:not(:first-child):not(:last-child),
-.input-group-btn:not(:first-child):not(:last-child),
-.input-group .form-control:not(:first-child):not(:last-child) {
+.input-group-addon:not(:first-child, :first-child, :first-child):not(:last-child,
:last-child, :last-child),
+.input-group-btn:not(:first-child, :first-child, :first-child):not(:last-child,
:last-child, :last-child),
+.input-group .form-control:not(:first-child, :first-child,
:first-child):not(:last-child, :last-child, :last-child) {
When I run "make -C ui/css css" with this patch applied, the above
change are reverted.
Don't you need to do the changes in ./ui/css/src/bootstrap.custom.scss
and run "make -C ui/css css" to have them applied to the CSS file?
border-radius: 0;
}
diff --git a/ui/css/src/modules/_login.scss b/ui/css/src/modules/_login.scss
index 24f10c8..648a488 100644
--- a/ui/css/src/modules/_login.scss
+++ b/ui/css/src/modules/_login.scss
@@ -22,8 +22,7 @@
padding-right: 0 !important;
.col-lg-4 {
- width: 45.714em;
- width: 64rem;
+ width: 670px;
text-align: center;
float: none;
margin: 90px auto 0 auto;
@@ -36,7 +35,7 @@
ul#wok-logos li > img {
width: 120px;
- display: block;
+ display: inline-block;
}
ul#wok-logos > li {
diff --git a/ui/css/wok.css b/ui/css/wok.css
index 6f45d39..12b6736 100644
--- a/ui/css/wok.css
+++ b/ui/css/wok.css
@@ -120,8 +120,7 @@ body {
}
.login .content .container .col-lg-4 {
- width: 45.714em;
- width: 64rem;
+ width: 670px;
text-align: center;
float: none;
margin: 90px auto 0 auto;
@@ -134,7 +133,7 @@ body {
.login .content .container ul#wok-logos li > img {
width: 120px;
- display: block;
+ display: inline-block;
}
.login .content .container ul#wok-logos > li {
@@ -1098,7 +1097,7 @@ input[type=radio].wok-radio + label {
/*
* Project Wok
*
-* Copyright IBM Corp, 2015-2016
+* Copyright IBM Corp, 2016
*
* Code derived from Project Kimchi
*