Use local bootstrap instead of CDN and bump bootstrap to 3.x branch

Dynalon · Jan 18, 2015 · e18ecaa · e18ecaa
1 parent fe78053
commit e18ecaa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Rainy.UI/Gruntfile.js b/Rainy.UI/Gruntfile.js
@@ -43,11 +43,18 @@ module.exports = function (grunt) {
             },
             css_client: {
                 src: [
+                    'bower_components/bootstrap/dist/css/bootstrap.min.css',
                     'bower_components/bootstrap-wysihtml5/dist/bootstrap-wysihtml5-0.0.2.css',
                     'bower_components/bootstrap-switch/static/stylesheets/bootstrap-switch.css'
                 ],
                 dest: 'dist/client.css'
             },
+            admin_client : {
+                src: [
+                    'bower_components/bootstrap/dist/css/bootstrap.min.css',
+                ],
+                dest: 'dist/admin/admin.css'
+            },
             admin_ui: {
                 src: ['app_admin/admin.html', 'app_admin/html/views_admin/*.html'],
                 dest: 'dist/admin/index.html'

diff --git a/Rainy.UI/app_admin/admin.html b/Rainy.UI/app_admin/admin.html
@@ -6,11 +6,7 @@
         <title>
             Rainy - Admin
         </title>
-        <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css"
-        rel="stylesheet"/>
-    <!--
         <link href="admin.css" rel="stylesheet"/>
-    -->
     </head>
 
     <body>

diff --git a/Rainy.UI/app_admin/client.html b/Rainy.UI/app_admin/client.html
@@ -6,8 +6,6 @@
     <title>
         Rainy - 2 GO
     </title>
-    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css"
-    rel="stylesheet"/>
     <link href="client.css" rel="stylesheet"/>
     <style>
         .mainContent {