summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParth Buch2012-07-27 15:56:33 +0530
committerParth Buch2012-07-27 15:56:33 +0530
commitfcd1d73d9ce5e7509250e814020a63713b0b9c38 (patch)
treebb352ea3603ca5f0fbf179eb93990664e91034bb
parent0e03aed7a5f6a99905484f9f940cb5483f170a0a (diff)
downloadstproject-fcd1d73d9ce5e7509250e814020a63713b0b9c38.tar.gz
stproject-fcd1d73d9ce5e7509250e814020a63713b0b9c38.tar.bz2
stproject-fcd1d73d9ce5e7509250e814020a63713b0b9c38.zip
UI Changes
Changed style.css and base.html to bring the ground work up for popcornjs framework
-rw-r--r--stapp/static/video/css/style.css33
-rw-r--r--stapp/static/video/img/fossee.jpgbin0 -> 32868 bytes
-rw-r--r--stapp/templates/base.html19
3 files changed, 30 insertions, 22 deletions
diff --git a/stapp/static/video/css/style.css b/stapp/static/video/css/style.css
index 4e23946..da6ce4b 100644
--- a/stapp/static/video/css/style.css
+++ b/stapp/static/video/css/style.css
@@ -1,21 +1,18 @@
body{
+ background : #D9D9D9;
padding-top:40px;
}
.top-row{
- background-color:#3c8fc9;
- background:-moz-linear-gradient(top,#3c8fc9,#ffffff);
- background:-webkit-linear-gradient(top,#3c8fc9,#ffffff);
- margin-left:-20px;
- padding-right:40px;
+ background:none repeat scroll 0 0 #8E8E8E;
margin-bottom:40px;
+ margin-top : 40px;
}
.main-video{
- padding-top:30px;
- padding-left:20px;
- padding-bottom:20px;
+ padding: 30px 20px 20px;
+ height : 495px;
}
.module-list{
@@ -27,6 +24,26 @@ body{
height:150px;
}
+video{
+ box-shadow:1px 1px 5px 1px #373634;
+}
+
+footer{
+ background: none repeat scroll 0 0 #333333;
+ border-top: 3px solid #222222;
+ margin: 50px 0 0;
+ padding: 30px 0 50px;
+ color: #666666;
+}
+#video-panel{
+ background: none repeat scroll 0 0 #F8F7F6;
+ border: 5px solid #5a5a5a;
+ height: 100%;
+ padding: 5px;
+}
+
#videodescription{
font-size:14px;
}
+
+
diff --git a/stapp/static/video/img/fossee.jpg b/stapp/static/video/img/fossee.jpg
new file mode 100644
index 0000000..a3c786a
--- /dev/null
+++ b/stapp/static/video/img/fossee.jpg
Binary files differ
diff --git a/stapp/templates/base.html b/stapp/templates/base.html
index 7bea035..59bea6c 100644
--- a/stapp/templates/base.html
+++ b/stapp/templates/base.html
@@ -12,15 +12,6 @@
<meta name="author" content="">
{% endblock %}
- <style>
-body {
-padding-top: 60px;
-padding-bottom: 40px;
-}
-.sidebar-nav {
-padding: 9px 0;
-}
-</style>
<link rel="stylesheet" href="{{ STATIC_URL }}video/css/base.css" type="text/css" />
<link rel="stylesheet" href="{{ STATIC_URL }}video/css/style.css" type="text/css" />
{% block css %}
@@ -70,7 +61,7 @@ padding: 9px 0;
{% block video %}
{% endblock %}
</div>
- <div class="span6">
+ <div class="span6" id="video-panel">
{% block video_description%}
{% endblock %}
</div>
@@ -79,10 +70,10 @@ padding: 9px 0;
{% block module_list %}
{% endblock %}
-<hr>
- <footer>
- <p>&copy; FOSSEE, IIT-BOMBAY 2012</p>
- </footer>
</div><!--/.fluid-container-->
+ <footer>
+ <center>STApp is brought to you by FOSSEE<br/>
+ <a href="http://www.fossee.in" title="fossee" target="_blank"><img src="{{ STATIC_URL }}video/img/fossee.jpg" height="50px"></a></center>
+ </footer>
</body>
</html>