Merge pull request shanil-puri#1 from Druotic/experiment_0

Gitignore and Branding
Druotic · Sep 20, 2014 · 1a187ef · 1a187ef
2 parents 69effc3 + c811ed7
commit 1a187ef
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15,747 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,19 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp
+
+
+# Add non-default ignores below
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
@@ -1,6 +1,6 @@
 <footer class="footer">
   <small>
-    StudyPad Site by Shanil Puri
+    DireWolf Site by Shanil Puri, James Beavers, and Karthik Bhupalam
   </small>
   <nav>
     <ul>

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -2,7 +2,7 @@
 <header class="navbar navbar-fixed-top">
   <div class="navbar-inner">
     <div class="container">
-      <%= link_to "StudyPad", "#", id: "logo" %>
+      <%= link_to "DireWolf", "#", id: "logo" %>
       <nav>
         <ul class="nav pull-right">
           <li><%= link_to "Home", home_path %></li>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Blogger</title>
+    <title>DireWolf</title>
     <%= stylesheet_link_tag    "application", :media => "all" %>
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>