Remove static folder and rename static_media to static

We never needed two static folders to begin with.
HCDigitalScholarship · Sep 25, 2017 · 2784d7e · 2784d7e
1 parent 473580a
commit 2784d7e
Show file tree

Hide file tree

Showing 38 changed files with 619 additions and 41,394 deletions.
diff --git a/QI/settings.py b/QI/settings.py
@@ -19,11 +19,7 @@
 
 STATIC_URL = '/static/'
 
-STATIC_ROOT = '/srv/QI/static_media/'
-
-STATICFILES_DIRS = (
-    os.path.join(BASE_DIR, 'static/'),
-)
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/

diff --git a/sample.txt b/sample.txt
diff --git a/static_media/.gitignore → static/.gitignore b/static_media/.gitignore → static/.gitignore
diff --git a/static/AutoModels/.gitignore b/static/AutoModels/.gitignore
diff --git a/static/AutoModels/SW_GH1804.xml b/static/AutoModels/SW_GH1804.xml
diff --git a/static/css/.DS_Store b/static/css/.DS_Store
diff --git a/static/css/app.css b/static/css/app.css
@@ -9998,7 +9998,7 @@ text-align: center;
   transform: rotate(-90deg);
   top: 0;
   left: -34px;
-  margin-top: 100px;
+  margin-top: 80px;
   padding: 5px;
   background-color: #f2f2f2;
   border-bottom-left-radius: 5px;

diff --git a/static/css/font-awesome/.DS_Store b/static/css/font-awesome/.DS_Store
diff --git a/static/css/sftp-config.json b/static/css/sftp-config.json
diff --git a/static/img/get_img.py b/static/img/get_img.py
diff --git a/static/img/get_pics b/static/img/get_pics
diff --git a/static/js/.gitignore b/static/js/.gitignore
diff --git a/static/js/api.js b/static/js/api.js
@@ -171,10 +171,9 @@ $(document).ready(function() {
 
    }
 
+
 
 
 
 
 });
-
-
diff --git a/static/js/app.js b/static/js/app.js
@@ -1,17 +1,3 @@
 // Foundation JavaScript
 // Documentation can be found at: http://foundation.zurb.com/docs
-$(document).foundation();
-
-$(document).ready(function(){
-
-    function reHeight() {
-        $('.my-grid > li').each(function() {
-                $(this).height($(this).width() * 0.65);
-        });
-    }
-
-    reHeight();
-
-    $(window).resize(reHeight);
-
-});
+$(document).foundation();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -171,10 +171,9 @@ $(document).ready(function() {

		}






		});