Merge pull request moqui#39 from sssonline/master

2016-07-12
rovnanik-sk · Jul 12, 2016 · 62c9ab0 · 62c9ab0
2 parents 64e472b + b6abf3f
commit 62c9ab0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/base-component/webroot/screen/webroot/Login.xml b/base-component/webroot/screen/webroot/Login.xml
@@ -30,7 +30,6 @@ along with this software (see the LICENSE.md file). If not, see
  html_scripts.add('/lib/jquery/jquery.min.js')
  // Bootstrap
  html_scripts.add('/lib/bootstrap/bootstrap.min.js')
- html_stylesheets.add('/lib/bootstrap/bootstrap.min.css')
  // Moqui webroot layout
  html_stylesheets.add('/css/webroot-layout.css')
  </script></pre-actions>

diff --git a/base-component/webroot/screen/webroot/css/webroot-layout.css b/base-component/webroot/screen/webroot/css/webroot-layout.css
@@ -115,6 +115,7 @@ input[type="text"].ui-autocomplete-input { width: auto; }
 /* Similar styles to Bootstrap .form-control-static, applied more specifically and without explicit class */
 .form-group>div>p, .form-group>div>span:not(.select2-container,.form-text-find,.input-group-addon), .form-group>div>a:not(.btn) {
  display:inline-block; min-height: 34px; padding-top: 7px; padding-bottom: 7px; margin-bottom: 0; }
+form-header-field>button.btn,.form-group>div>a.btn { margin-top: 2px !important; }
 
 .nav.nav-tabs { margin-bottom: 8px; }
 
@@ -150,7 +151,7 @@ nav.form-list-nav>span.select2-container { float: left; margin: 6px 0 6px 0; min
 
 input[type=radio], input[type=checkbox] { height: auto; }
 
-.select2-container { display: inline-block; min-width: 60px; }
+.select2-container { display: inline-block; min-width: 60px; margin-top: -2px; }
 .date-period .select2-container--bootstrap { display: inline-block; }
 .select2-container--bootstrap .select2-selection--single { padding: 6px 12px 6px 12px; }