Skip to content

Commit

Permalink
Item12192: update form elements in line with buttons; simpler login s…
Browse files Browse the repository at this point in the history 
…creen

git-svn-id: http://svn.foswiki.org/branches/Release01x01@15801 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
ArthurClemens authored and ArthurClemens committed Oct 30, 2012
1 parent 65214d7 commit 0110275
Show file tree
Hide file tree
Showing 5 changed files with 847 additions and 447 deletions.
65 changes: 43 additions & 22 deletions PatternSkin/pub/System/PatternSkin/pattern_src.js
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,51 @@
jQuery(document).ready(function ($) {
var pattern;
if (!pattern) {
pattern = {};
}

pattern.base = (function ($) {

"use strict";

return {

removeYellowFromInputs: function() {
if (navigator.userAgent.toLowerCase().indexOf('chrome') >= 0) {
var chromechk_watchdog = 0,
chromechk;
chromechk = setInterval(function() {
if ($('input:-webkit-autofill').length > 0) {
clearInterval(chromechk);
$('input:-webkit-autofill').each(function () {
var value = $(this).val(),
name = $(this).attr('name');
$(this).after(this.outerHTML).remove();
$('input[name=' + name + ']').val(value);
});
} else if (chromechk_watchdog > 20) {
clearInterval(chromechk);
}
chromechk_watchdog++;
}, 50);
}
}

var searchResultsCount = 0;
};
}(jQuery));

/*
Only for Foswiki 1.0.
*/
/*
// Create an attachment counter in the attachment table twisty.
$('.foswikiAttachments').livequery(function () {
var rows, count, countStr;
rows = $(this).find('table.foswikiTable tr');
if (!rows) {
return;
}
count = rows.length - 1;
countStr = " <span class='foswikiSmall'>" + count + "<\/span>";
$(this).find('.patternAttachmentHeader').livequery(function () {
$(this).append(countStr);
});
jQuery(document).ready(function ($) {

"use strict";

pattern.base.removeYellowFromInputs();

// add focus to elements with class foswikiFocus
$('input.foswikiFocus').each(function () {
$(this).focus();
});
*/

// Search page handling
var searchResultsCount = 0;
$('.foswikiSearchResultCount span').livequery(function () {
searchResultsCount += parseInt($(this).html(), 10);
});
Expand All @@ -39,16 +61,15 @@ jQuery(document).ready(function ($) {
$(this).focus();
});

$('input.foswikiChangeFormButton').live('click', function () {
$('input.foswikiChangeFormButton').on('click', function () {
if (foswiki.Edit) {
foswiki.Edit.validateSuppressed = true;
}
});

$('body.patternEditPage input').live('keydown', function (event) {
$('body.patternEditPage input').on('keydown', function (event) {
if (event.keyCode === 13) {
return false;
}
});

});
161 changes: 0 additions & 161 deletions PatternSkin/pub/System/PatternSkinTheme/colors_src.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,53 +93,9 @@ a:hover {

/* Form elements */

textarea,
input,
select {
border-color:#aaa;
color:#000;
background-color:#fff;
}
.foswikiTextarea,
.foswikiInputField,
.foswikiInputFieldDisabled,
.foswikiInputFieldReadOnly,
.foswikiSelect {
border-color:#bbb #f2f2f2 #f2f2f2 #bbb;
}
.foswikiTextarea,
.foswikiInputField,
.foswikiSelect {
color:#000;
background-color:#fff;
}
.foswikiInputField:active,
.foswikiInputField:focus,
.foswikiInputFieldFocus {
background-color:#ebf5fa;
}

.foswikiTextareaRawView {
color:#000;
}
.foswikiInputFieldDisabled {
color:#aaa;
background-color:#fafaf8;
}
.foswikiInputFieldReadOnly {
color:#797979;
}
.foswikiSelect {
border-color:#bbb #f2f2f2 #f2f2f2 #bbb;
color:#000;
background-color:#fff;
}
.foswikiInputFieldDisabled,
.foswikiSelectDisabled {
color:#aaa;
border-color:#bbb #f2f2f2 #f2f2f2 #bbb;
background-color:#fafaf8;
}
.foswikiInputFieldBeforeFocus {
color:#797979;
}
Expand Down Expand Up @@ -628,120 +584,3 @@ li.patternLogIn {
margin-right:3px;
}

/* PATTERNTOOLBAR */

.patternToolBar > a:link,
.patternToolBar > a:visited,
.patternToolBar > .foswikiRequiresChangePermission > a:link,
.patternToolBar > .foswikiRequiresChangePermission > a:visited,
.patternToolBar > a:link:link,
.patternToolBar > a:visited:link,
.patternToolBar > .foswikiRequiresChangePermission > a:link:link,
.patternToolBar > .foswikiRequiresChangePermission > a:visited:link,
.patternToolBar > a:link:visited,
.patternToolBar > a:visited:visited,
.patternToolBar > .foswikiRequiresChangePermission > a:link:visited,
.patternToolBar > .foswikiRequiresChangePermission > a:visited:visited {
color: #555555;
background-color: #f6f6f6;
background-image: -moz-linear-gradient(top, #fbfbfb, #eeeeee);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbfbfb), to(#eeeeee));
background-image: -webkit-linear-gradient(top, #fbfbfb, #eeeeee);
background-image: -o-linear-gradient(top, #fbfbfb, #eeeeee);
background-image: linear-gradient(to bottom, #fbfbfb, #eeeeee);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbfbfb', endColorstr='#ffeeeeee', GradientType=0);
border-color: #eeeeee #eeeeee #c8c8c8;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
*background-color: #eeeeee;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */

filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
border: 1px solid #e1e1e1;
}
.patternToolBar > a:link .foswikiIcon,
.patternToolBar > a:visited .foswikiIcon,
.patternToolBar > .foswikiRequiresChangePermission > a:link .foswikiIcon,
.patternToolBar > .foswikiRequiresChangePermission > a:visited .foswikiIcon,
.patternToolBar > a:link:link .foswikiIcon,
.patternToolBar > a:visited:link .foswikiIcon,
.patternToolBar > .foswikiRequiresChangePermission > a:link:link .foswikiIcon,
.patternToolBar > .foswikiRequiresChangePermission > a:visited:link .foswikiIcon,
.patternToolBar > a:link:visited .foswikiIcon,
.patternToolBar > a:visited:visited .foswikiIcon,
.patternToolBar > .foswikiRequiresChangePermission > a:link:visited .foswikiIcon,
.patternToolBar > .foswikiRequiresChangePermission > a:visited:visited .foswikiIcon {
color: #555555;
}
.patternToolBar > a:link .foswikiCaret,
.patternToolBar > a:visited .foswikiCaret,
.patternToolBar > .foswikiRequiresChangePermission > a:link .foswikiCaret,
.patternToolBar > .foswikiRequiresChangePermission > a:visited .foswikiCaret,
.patternToolBar > a:link:link .foswikiCaret,
.patternToolBar > a:visited:link .foswikiCaret,
.patternToolBar > .foswikiRequiresChangePermission > a:link:link .foswikiCaret,
.patternToolBar > .foswikiRequiresChangePermission > a:visited:link .foswikiCaret,
.patternToolBar > a:link:visited .foswikiCaret,
.patternToolBar > a:visited:visited .foswikiCaret,
.patternToolBar > .foswikiRequiresChangePermission > a:link:visited .foswikiCaret,
.patternToolBar > .foswikiRequiresChangePermission > a:visited:visited .foswikiCaret {
border-top-color: rgba(85, 85, 85, 0.4);
}
.patternToolBar > a:link:hover,
.patternToolBar > a:visited:hover,
.patternToolBar > .foswikiRequiresChangePermission > a:link:hover,
.patternToolBar > .foswikiRequiresChangePermission > a:visited:hover,
.patternToolBar > a:link.foswikiActive,
.patternToolBar > a:visited.foswikiActive,
.patternToolBar > .foswikiRequiresChangePermission > a:link.foswikiActive,
.patternToolBar > .foswikiRequiresChangePermission > a:visited.foswikiActive,
.patternToolBar > a:link > .foswikiRequiresChangePermission a:hover,
.patternToolBar > a:visited > .foswikiRequiresChangePermission a:hover,
.patternToolBar > .foswikiRequiresChangePermission > a:link > .foswikiRequiresChangePermission a:hover,
.patternToolBar > .foswikiRequiresChangePermission > a:visited > .foswikiRequiresChangePermission a:hover {
color: #4d4d4d;
background-color: #eeeeee;
background-image: -moz-linear-gradient(top, #f3f3f3, #e6e6e6);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3f3f3), to(#e6e6e6));
background-image: -webkit-linear-gradient(top, #f3f3f3, #e6e6e6);
background-image: -o-linear-gradient(top, #f3f3f3, #e6e6e6);
background-image: linear-gradient(to bottom, #f3f3f3, #e6e6e6);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff3f3f3', endColorstr='#ffe6e6e6', GradientType=0);
border-color: #e6e6e6 #e6e6e6 #c0c0c0;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
*background-color: #e6e6e6;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */

filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
border: 1px solid #dadada;
text-decoration: none;
}
.patternToolBar > a:link:hover .foswikiIcon,
.patternToolBar > a:visited:hover .foswikiIcon,
.patternToolBar > .foswikiRequiresChangePermission > a:link:hover .foswikiIcon,
.patternToolBar > .foswikiRequiresChangePermission > a:visited:hover .foswikiIcon,
.patternToolBar > a:link.foswikiActive .foswikiIcon,
.patternToolBar > a:visited.foswikiActive .foswikiIcon,
.patternToolBar > .foswikiRequiresChangePermission > a:link.foswikiActive .foswikiIcon,
.patternToolBar > .foswikiRequiresChangePermission > a:visited.foswikiActive .foswikiIcon,
.patternToolBar > a:link > .foswikiRequiresChangePermission a:hover .foswikiIcon,
.patternToolBar > a:visited > .foswikiRequiresChangePermission a:hover .foswikiIcon,
.patternToolBar > .foswikiRequiresChangePermission > a:link > .foswikiRequiresChangePermission a:hover .foswikiIcon,
.patternToolBar > .foswikiRequiresChangePermission > a:visited > .foswikiRequiresChangePermission a:hover .foswikiIcon {
color: #4d4d4d;
}
.patternToolBar > a:link:hover .foswikiCaret,
.patternToolBar > a:visited:hover .foswikiCaret,
.patternToolBar > .foswikiRequiresChangePermission > a:link:hover .foswikiCaret,
.patternToolBar > .foswikiRequiresChangePermission > a:visited:hover .foswikiCaret,
.patternToolBar > a:link.foswikiActive .foswikiCaret,
.patternToolBar > a:visited.foswikiActive .foswikiCaret,
.patternToolBar > .foswikiRequiresChangePermission > a:link.foswikiActive .foswikiCaret,
.patternToolBar > .foswikiRequiresChangePermission > a:visited.foswikiActive .foswikiCaret,
.patternToolBar > a:link > .foswikiRequiresChangePermission a:hover .foswikiCaret,
.patternToolBar > a:visited > .foswikiRequiresChangePermission a:hover .foswikiCaret,
.patternToolBar > .foswikiRequiresChangePermission > a:link > .foswikiRequiresChangePermission a:hover .foswikiCaret,
.patternToolBar > .foswikiRequiresChangePermission > a:visited > .foswikiRequiresChangePermission a:hover .foswikiCaret {
border-top-color: rgba(77, 77, 77, 0.4);
}
Loading

0 comments on commit 0110275

Please sign in to comment.