From 60b3b19ede03c286a0a094e2e00a1c70f489fcdf Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 12 Mar 2015 17:25:15 -0500 Subject: [PATCH] another small bs3 fix --- applications/admin/views/default/edit.html | 24 +++++++++---------- .../welcome3/static/css/web2py-bootstrap3.css | 6 ++++- gluon/packages/dal | 2 +- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/applications/admin/views/default/edit.html b/applications/admin/views/default/edit.html index 54bc43ac..9178daa0 100644 --- a/applications/admin/views/default/edit.html +++ b/applications/admin/views/default/edit.html @@ -230,20 +230,20 @@ $(document).on('click', 'a.font_button', function (e) { diff --git a/applications/welcome3/static/css/web2py-bootstrap3.css b/applications/welcome3/static/css/web2py-bootstrap3.css index 25840159..c9e4e961 100644 --- a/applications/welcome3/static/css/web2py-bootstrap3.css +++ b/applications/welcome3/static/css/web2py-bootstrap3.css @@ -317,8 +317,12 @@ body { color: #428bca; } +form { + max-width: 600px; +} ul.w2p_list { - margin-left: 0px; + margin-left: 0; + padding-left: 0; } .background { background: url(../images/background.jpg) no-repeat center center; diff --git a/gluon/packages/dal b/gluon/packages/dal index d74d2682..e24da842 160000 --- a/gluon/packages/dal +++ b/gluon/packages/dal @@ -1 +1 @@ -Subproject commit d74d2682388015a6c0d59262e5991a376bf7275d +Subproject commit e24da8422f83192c6d0add60477822ab3f932238