renamed bootswatch*.css as web2py_bootstrap*.css

This commit is contained in:
Massimo Di Pierro
2012-08-24 09:53:57 -05:00
parent b351f1515f
commit d2c94933f5
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-08-24 09:43:38) dev
Version 2.00.0 (2012-08-24 09:53:17) dev
+3 -3
View File
@@ -43,11 +43,11 @@
response.files.append(URL('static','css/bootstrap.min.css'))
response.files.append(URL('static','css/bootstrap-responsive.min.css'))
response.files.append(URL('static','css/web2py.css'))
response.files.append(URL('static','css/bootswatch.css'))
response.files.append(URL('static','css/web2py_bootsrap.css'))
}}
<!-- Makes bootswatch working on IE 7/8 -->
<!--[if (lt IE 9)]>
<link rel="stylesheet" href="{{=URL('static','css/bootswatch_ie.css')}}">
<link rel="stylesheet" href="{{=URL('static','css/web2py_bootstrap_ie.css')}}">
<![endif]-->
{{include 'web2py_ajax.html'}}
@@ -64,7 +64,7 @@
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/base/jquery-ui.css" type="text/css" media="all" />
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
uncomment to load jquery-ui //-->
<noscript><link href="{{=URL('static', 'css/bootswatch_nojs.css')}}" rel="stylesheet" type="text/css" /></noscript>
<noscript><link href="{{=URL('static', 'css/web2py_bootstrap_nojs.css')}}" rel="stylesheet" type="text/css" /></noscript>
{{block head}}{{end}}
</head>