dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

welcome more bootstrap3 compliant, thanks Paolo Caruccio

Browse Source
This commit is contained in:
mdipierro
2014-02-27 09:33:26 -06:00
parent 0d24d1e0d2
commit 1e9872c015
11 changed files with 64 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/welcome/static/css/web2py-bootstrap3.css
+10 -1
View File
@@ -2,7 +2,7 @@
* part of the package to convert web2py elements to bootstrap3 theme
* Developed by Paolo Caruccio ( paolo.caruccio66@gmail.com )
* Released under MIT license
* version 1 rev.201312222030
* version 1 rev.201402261600
*
* Supported version of bootstrap framework: 3.0.2+
@@ -73,10 +73,16 @@ div.flash.alert {
display: none;
position: fixed;
top: 70px;
right: 75px;
cursor: pointer;
z-index: 1000000;
background-color: #f9edbe;
border-color: #f0c36d; }
div.flash.alert.centered {
right: auto; }
div.flash.alert.leftside {
right: auto;
left: 75px; }
div.flash.alert #closeflash {
display: inline-block;
position: relative;
@@ -280,3 +286,6 @@ body {
#footer p {
margin-left: -15px;
margin-right: -15px; }
.dropdown .highlighted {
color: #428bca;
}
applications/welcome/static/js/modernizr.js
+4
View File
File diff suppressed because one or more lines are too long
applications/welcome/static/js/web2py-bootstrap3.js
+3 -3
View File
@@ -2,7 +2,7 @@
* part of the package to convert web2py elements to bootstrap3 theme
* Developed by Paolo Caruccio ( paolo.caruccio66@gmail.com )
* Released under MIT license
* version 1 rev.201312222030
* version 1 rev.201402261600
*
* Supported version of bootstrap framework: 3.0.2+
@@ -69,7 +69,7 @@
};
// alert centering
$('.flash.alert').center({'mode': "horizontally"});
$('.flash.alert.centered').center({'mode': "horizontally"});
// navs
$(".nav ul.dropdown-menu").not("#w2p-auth-bar").each(function() {
@@ -139,7 +139,7 @@
var mode;
var hasError = false;
if ($this.parent().hasClass('form-horizontal')) {
mode = 'horizontal'
mode = 'horizontal';
labelClass = fh_label_class+' control-label';
};
if ($this.parent().hasClass('form-inline')) {
applications/welcome/static/js/web2py.js
+2 -2
View File
@@ -75,8 +75,8 @@
* this over and over... all will be bound to the document
*/
/*adds btn class to buttons*/
$('button', target).addClass('btn');
$('form input[type="submit"], form input[type="button"]', target).addClass('btn');
$('button', target).addClass('btn').addClass('btn-default');
$('form input[type="submit"], form input[type="button"]', target).addClass('btn').addClass('btn-default');
/* javascript for PasswordWidget*/
$('input[type=password][data-w2p_entropy]', target).each(function () {
web2py.validate_entropy($(this));