diff options
| author | hardythe1 | 2014-11-28 16:31:09 +0530 |
|---|---|---|
| committer | hardythe1 | 2014-11-28 16:31:09 +0530 |
| commit | b3df0a4c7d7334998134f961b203d9239fe38410 (patch) | |
| tree | b362993dc1988b572bc42dd40096d9a320642389 | |
| parent | 1f6cc053b933e6d237f882beccaa3ff02bbb696d (diff) | |
| parent | bf6666a1a0e965d2dfb1be775b0e773db9f5e05b (diff) | |
| download | scipy2014-b3df0a4c7d7334998134f961b203d9239fe38410.tar.gz scipy2014-b3df0a4c7d7334998134f961b203d9239fe38410.tar.bz2 scipy2014-b3df0a4c7d7334998134f961b203d9239fe38410.zip | |
resolved conflicts
| -rw-r--r-- | static/website/css/main.css | 9 | ||||
| -rw-r--r-- | static/website/templates/call-for-proposals.html | 7 |
2 files changed, 12 insertions, 4 deletions
diff --git a/static/website/css/main.css b/static/website/css/main.css index cd6dae2..c816257 100644 --- a/static/website/css/main.css +++ b/static/website/css/main.css @@ -339,3 +339,12 @@ body { color: green!important; font-family: -webkit-body; } + + + +.table-bordered tr:nth-child(odd){ + background: #D3D3D3; + } +.table-bordered tr:nth-child(even){ + background: #EDEDED; + } diff --git a/static/website/templates/call-for-proposals.html b/static/website/templates/call-for-proposals.html index 5f17e71..ea9bdf3 100644 --- a/static/website/templates/call-for-proposals.html +++ b/static/website/templates/call-for-proposals.html @@ -36,16 +36,15 @@ Call for Proposals <td>Neethu N J </tr> <tr> - <td>Efficiency Model Based On Response Surface Methodology for A 3 Phase Induction Motor Using Python - <td>Rakesh Hirur - </tr> - <tr> <td>Python Powered Scientific Instrumentation Tool <td>Jithin Bhagavathi </tr> <tr> <td>Closed loop Control of A DC Motor using expEYES with Python <td>Melvin Chelli + <tr> + <td>Efficiency Model Based On Response Surface Methodology for A 3 Phase Induction Motor Using Python + <td>Rakesh Hirur </tr> </table> <p> |