removing the assets/project_key/images from gitignore

zooniverse · Aug 11, 2015 · 13b3d8b · 13b3d8b
1 parent e63625c
commit 13b3d8b
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,11 +24,6 @@ db/*.sqlite3
 /log/*
 /tmp/*
 
-#project images
-/app/assets/images/anzac/*
-/app/assets/images/whale_tales/*
-/app/assets/images/emigrant/*
-
 # various artifacts
 **.war
 *.rbc

diff --git a/app/assets/images/anzac/att_q_ex.gif b/app/assets/images/anzac/att_q_ex.gif
diff --git a/app/assets/images/anzac/background.png b/app/assets/images/anzac/background.png
diff --git a/app/assets/images/anzac/hs_example_marking.gif b/app/assets/images/anzac/hs_example_marking.gif
diff --git a/app/assets/images/anzac/hs_transfer_ex.gif b/app/assets/images/anzac/hs_transfer_ex.gif
diff --git a/app/assets/images/anzac/two_part_att_ex.png b/app/assets/images/anzac/two_part_att_ex.png
diff --git a/app/assets/images/emigrant/background.jpg b/app/assets/images/emigrant/background.jpg
diff --git a/app/assets/images/emigrant/hero.jpg b/app/assets/images/emigrant/hero.jpg
diff --git a/app/assets/javascripts/components/app-router.cjsx b/app/assets/javascripts/components/app-router.cjsx
@@ -94,6 +94,14 @@ class AppRouter
   controllerForPage: (page) ->
     React.createClass
       displayName: "#{page.name}Page"
+
+      componentDidMount: ->
+        # value = $(@refs.inputs.getDOMNode()).find('select')[0].value
+        el = $(React.findDOMNode(this)).find("#accordion")
+        el.accordion
+          collapsible: true
+
+
       render: ->
         formatted_name = page.name.replace("_", " ")
         <div className="page-content">

diff --git a/app/assets/javascripts/components/app.cjsx b/app/assets/javascripts/components/app.cjsx
@@ -21,6 +21,11 @@ App = React.createClass
         project = result[0]
         @setState project: project #, => console.log ' PROJECT: ', @state.project
 
+  # componentDidUpdate: ->
+  #   # value = $(@refs.inputs.getDOMNode()).find('select')[0].value
+  #   console.log "findDOMnode", $(React.findDOMNode(this))
+  #   console.log "@refs", $(@refs)
+
   render: ->
     return null if ! @state.project?
 

diff --git a/app/assets/stylesheets/light-box.styl b/app/assets/stylesheets/light-box.styl
@@ -93,7 +93,7 @@
 
       span
         border-bottom-right-radius: 8px;
-        border-top-left-radius: 4px
+        border-top-left-radius: 3px
         border-style: solid;
         border-width: 3px;
         border-color:  #ffffff;