Browse Source

Merge branch 'master' of github.com:jlukic/Semantic-UI

pull/381/head
jlukic 11 years ago
parent
commit
fe2c10a883
2 changed files with 6 additions and 3 deletions
  1. 2
      src/modules/behavior/form.js
  2. 7
      src/modules/sidebar.less

2
src/modules/behavior/form.js

@ -638,7 +638,7 @@ $.fn.form.settings = {
},
email: function(value){
var
emailRegExp = new RegExp("[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?")
emailRegExp = new RegExp("[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?", "i")
;
return emailRegExp.test(value);
},

7
src/modules/sidebar.less

@ -88,8 +88,11 @@ body {
Direction
--------------------*/
.ui.right.sidebar {
.ui.right.very.thin.sidebar,
.ui.right.thin.sidebar,
.ui.right.sidebar,
.ui.right.wide.sidebar,
.ui.right.very.wide.sidebar {
left: 100%;
margin: 0px !important;
}

Loading…
Cancel
Save