Merge pull request #207 from plone/thet-placeholder--2.x

Fix generation of source map links when using grunt. Make input color darker to better distinguish from placeholder text.
plone · Jul 14, 2020 · d747a5c · d747a5c
2 parents bc6800c + 8c4b4ac
commit d747a5c
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 10 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -14,7 +14,7 @@ module.exports = function (grunt) {
                     strictMath: false,
                     sourceMap: true,
                     outputSourceFiles: true,
-                    sourceMapURL: '++theme++barceloneta/less/barceloneta-compiled.css.map',
+                    sourceMapBasepath: 'plonetheme/barceloneta/theme/less/',
                     sourceMapFilename: 'plonetheme/barceloneta/theme/less/barceloneta-compiled.css.map',
                     modifyVars: {
                         "isPlone": "false"

diff --git a/news/207.bugfix b/news/207.bugfix
@@ -0,0 +1,3 @@
+Fix generation of source map links when using grunt.
+Make input color darker to better distinguish from placeholder text.
+[thet]
diff --git a/plonetheme/barceloneta/theme/less/barceloneta-compiled.css b/plonetheme/barceloneta/theme/less/barceloneta-compiled.css
diff --git a/plonetheme/barceloneta/theme/less/barceloneta-compiled.css.map b/plonetheme/barceloneta/theme/less/barceloneta-compiled.css.map
diff --git a/plonetheme/barceloneta/theme/less/mixin.tabfocus.plone.less b/plonetheme/barceloneta/theme/less/mixin.tabfocus.plone.less
@@ -9,8 +9,9 @@
 }
 
 .placeholder(@plone-color: @plone-input-color-placeholder) {
-  &::-moz-placeholder           { color: @plone-color;   // Firefox
+  ::placeholder                 { color: @plone-color; } // Almost any modern browser.
+  &::-moz-placeholder           { color: @plone-color;   // Firefox < 51
                                   opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
-  &:-ms-input-placeholder       { color: @plone-color; } // Internet Explorer 10+
-  &::-webkit-input-placeholder  { color: @plone-color; } // Safari and Chrome
-}
+  &:-ms-input-placeholder       { color: @plone-color; } // Internet Explorer 10+, old Edge
+  &::-webkit-input-placeholder  { color: @plone-color; } // Safari < 10.1, Chrome < 57
+}
diff --git a/plonetheme/barceloneta/theme/less/variables.plone.less b/plonetheme/barceloneta/theme/less/variables.plone.less
@@ -3,7 +3,7 @@
 //*// COLORS
 //grays
 @plone-gray-darker:							lighten(#000, 20%);   // #333
-@plone-gray-dark:							lighten(#000, 30%);   // #4c4c4c
+@plone-gray-dark:							lighten(#000, 30%);   // #4d4d4d
 @plone-gray:								lighten(#000, 41%);   // #696969
 @plone-gray-light:							lighten(#000, 46.5%); // #767676 //discreet
 @plone-gray-lighter:						lighten(#000, 80%);   // #ccc //disableds like
@@ -173,7 +173,7 @@
 //** `<input disabled>` background color
 @plone-input-bg-disabled:              @plone-table-border-color;
 //** Text color for `<input>`s
-@plone-input-color:                    @plone-gray;
+@plone-input-color:                    @plone-gray-dark;
 //** `<input>` border color
 @plone-input-border:                   #ccc;
 //** `<input>` border radius
@@ -326,3 +326,4 @@
 
 
 //*// END
+