Skip to content
Browse files

Merged in changes.

  • Loading branch information...
2 parents e4c4594 + cfbff96 commit d35bf0d2ce5104b405f86e8846c545fc97abf0b6 @keokilee keokilee committed
Showing with 520 additions and 152 deletions.
  1. 0 {bootstrap-cam → caminator}/css/main.css
  2. 0 {bootstrap-cam → caminator}/images/ipad-landscape.png
  3. 0 {bootstrap-cam → caminator}/images/ipad-portrait.png
  4. 0 {bootstrap-cam → caminator}/images/iphone-landscape.png
  5. 0 {bootstrap-cam → caminator}/images/iphone-portrait.png
  6. 0 {bootstrap-cam → caminator}/images/kindle-landscape.png
  7. 0 {bootstrap-cam → caminator}/images/kindle-portrait.png
  8. +4 −0 {bootstrap-cam → caminator}/iphone-ipad.html
  9. +4 −4 makahiki/apps/pages/templates/energy.html
  10. +4 −4 makahiki/apps/pages/templates/help.html
  11. +3 −1 makahiki/apps/pages/templates/home.html
  12. +4 −4 makahiki/apps/pages/templates/learn.html
  13. +4 −4 makahiki/apps/pages/templates/news.html
  14. +5 −4 makahiki/apps/pages/templates/profile.html
  15. +2 −18 makahiki/apps/widgets/badges/templates/badge-catalog.html
  16. +48 −39 makahiki/apps/widgets/badges/templates/index.html
  17. +3 −2 makahiki/apps/widgets/my_commitments/templates/index.html
  18. +1 −1 makahiki/apps/widgets/notifications/templates/index.html
  19. +2 −3 makahiki/apps/widgets/notifications/templates/notifications/list-item.html
  20. +5 −5 makahiki/apps/widgets/quests/templates/index.html
  21. +1 −1 makahiki/apps/widgets/quests/templates/quest_list.html
  22. +13 −9 makahiki/apps/widgets/smartgrid/templates/task.html
  23. +1 −0 makahiki/apps/widgets/smartgrid/views.py
  24. +5 −0 makahiki/media/css/bootstrap-override.css
  25. +1 −1 makahiki/media/css/default/pages/help.css
  26. +20 −14 makahiki/media/css/default/pages/home.css
  27. +9 −9 makahiki/media/css/default/pages/learn.css
  28. +53 −9 makahiki/media/css/default/pages/profile.css
  29. +9 −0 makahiki/media/css/makahiki-override.less
  30. +299 −0 makahiki/media/css/makahiki.less
  31. +4 −0 makahiki/media/css/theme.less
  32. +1 −3 makahiki/templates/base.html
  33. +3 −3 makahiki/templates/components/RIB.html
  34. +1 −1 makahiki/templates/components/navbar.html
  35. +7 −7 makahiki/templates/components/user_points.html
  36. +4 −6 makahiki/templates/logged_in_base.html
View
0 bootstrap-cam/css/main.css → caminator/css/main.css
File renamed without changes.
View
0 bootstrap-cam/images/ipad-landscape.png → caminator/images/ipad-landscape.png
File renamed without changes
View
0 bootstrap-cam/images/ipad-portrait.png → caminator/images/ipad-portrait.png
File renamed without changes
View
0 bootstrap-cam/images/iphone-landscape.png → caminator/images/iphone-landscape.png
File renamed without changes
View
0 bootstrap-cam/images/iphone-portrait.png → caminator/images/iphone-portrait.png
File renamed without changes
View
0 bootstrap-cam/images/kindle-landscape.png → caminator/images/kindle-landscape.png
File renamed without changes
View
0 bootstrap-cam/images/kindle-portrait.png → caminator/images/kindle-portrait.png
File renamed without changes
View
4 bootstrap-cam/iphone-ipad.html → caminator/iphone-ipad.html
@@ -1,6 +1,10 @@
<!doctype html>
<html lang="en-us">
<head>
+<!--
+ Borrowed from http://www.responsinator.com/ written by @andyhovey
+ and @tamapugsley. Modified to test Makahiki2.
+-->
<meta charset="utf-8">
<title>Test Sizes</title>
<link rel="stylesheet" media="screen" href="css/main.css">
View
8 makahiki/apps/pages/templates/energy.html
@@ -14,10 +14,10 @@
{% endblock %}
{% block body %}
- <div {% get_id_and_classes "energy-body" "responsive" %}>
- <div {% get_id_and_classes "base-row" "responsive" %}>
+ <div class="container-fluid">
+ <div class="row-fluid">
<!-- left column -->
- <div {% get_id_and_classes "narrow-col" "responsive" %}>
+ <div class="span5">
<div id='energy_power_meter'>
{% include "widgets/energy_power_meter/templates/index.html" %}
</div>
@@ -26,7 +26,7 @@
</div>
</div>
<!-- right column -->
- <div {% get_id_and_classes "wide-col" "responsive" %}>
+ <div class="span7">
<div id='energy_goal'>
{% include "widgets/energy_goal/templates/index.html" %}
</div>
View
8 makahiki/apps/pages/templates/help.html
@@ -13,10 +13,10 @@
{% endblock %}
{% block body %}
- <div {% get_id_and_classes "help-body" "responsive" %}>
- <div {% get_id_and_classes "base-row" "responsive" %}>
+ <div class="container-fluid">
+ <div class="row-fluid">
<!-- left column -->
- <div {% get_id_and_classes "even-col" "responsive" %}>
+ <div class="span6">
<div id='help_intro'>
{% include "widgets/help/intro/templates/index.html" %}
</div>
@@ -25,7 +25,7 @@
</div>
</div>
<!-- right column -->
- <div {% get_id_and_classes "even-col" "responsive" %}>
+ <div class="span6">
<div id='help_rule'>
{% include "widgets/help/rule/templates/index.html" %}
</div>
View
4 makahiki/apps/pages/templates/home.html
@@ -13,7 +13,9 @@
{% endblock %}
{% block body %}
- <div id="home" class="container-fluid">
+<div class="content">
+ <div id="home" class="container">
{% include "widgets/home/templates/index.html" %}
</div>
+</div>
{% endblock %}
View
8 makahiki/apps/pages/templates/learn.html
@@ -13,10 +13,10 @@
{% endblock %}
{% block body %}
- <div {% get_id_and_classes "activity-body" "responsive" %}>
- <div {% get_id_and_classes "base-row" "responsive" %}>
+ <div class="container-fluid">
+ <div class="row-fluid">
<!-- left column -->
- <div {% get_id_and_classes "narrow-col" "responsive" %}>
+ <div class="span5">
<div id='upcoming_events'>
{% include "widgets/upcoming_events/templates/index.html" %}
</div>
@@ -25,7 +25,7 @@
</div>
</div>
<!-- right column -->
- <div {% get_id_and_classes "wide-col" "responsive" %}>
+ <div class="span7">
<div id='smartgrid'>
{% include "widgets/smartgrid/templates/index.html" %}
</div>
View
8 makahiki/apps/pages/templates/news.html
@@ -13,10 +13,10 @@
{% endblock %}
{% block body %}
- <div {% get_id_and_classes "news-body" "responsive" %}>
- <div {% get_id_and_classes "base-row" "responsive" %}>
+ <div class="container-fluid">
+ <div class="row-fluid">
<!-- left column -->
- <div {% get_id_and_classes "even-col" "responsive" %}>
+ <div class="span6">
<div id='team_members'>
{% include "widgets/team_members/templates/index.html" %}
</div>
@@ -25,7 +25,7 @@
</div>
</div>
<!-- right column -->
- <div {% get_id_and_classes "even-col" "responsive" %}>
+ <div class="span6">
<div id='upcomping_events'>
{% include "widgets/upcoming_events/templates/index.html" %}
</div>
View
9 makahiki/apps/pages/templates/profile.html
@@ -21,15 +21,16 @@
<!-- My Info -->
<div class="content-box">
{% include "widgets/my_info/templates/index.html" %}
- </div>
+ </div>
+ </div>
+
+ <!-- right column -->
+ <div class="span6">
<!-- My Badges -->
<div class="content-box">
{% include "widgets/badges/templates/index.html" %}
</div>
- </div>
- <!-- right column -->
- <div class="span6">
<!-- My Public Commitment-->
<div class="content-box">
View
20 makahiki/apps/widgets/badges/templates/badge-catalog.html
@@ -1,19 +1,4 @@
-{% extends "logged_in_base.html" %}
-
-{% load class_tags %}
-
-{% block page_title %}
- Badge Catalog
-{% endblock %}
-
-{% block selected_icon %}selected-profile{% endblock %}
-
-{% block extra_head %}
- {% import_page_css "profile" STATIC_URL CSS_THEME %}
-{% endblock %}
-
-{% block body %}
- <div class="content-box">
+
<div class="content-box-title">
Badge Catalog
</div>
@@ -43,5 +28,4 @@
<a href="{% url profile_index %}">Back to profile</a>
</div>
- </div>
-{% endblock %}
+
View
87 makahiki/apps/widgets/badges/templates/index.html
@@ -1,41 +1,50 @@
{% load class_tags %}
-<div class="content-box">
- <div class="content-box-title">
- My Badges
- <a href="#" style="float: right">
- <img src="{{ STATIC_URL}}/css/default/images/icon-help-sm.png" width="20"
- align="center"
- title="Click to get help about this window"
- onclick="toggleHelp('widget', 'my-badges'); return false;"
- /></a>
- </div>
- <div class="content-box">
- {# <h5>Individual Badges</h5> #}
- <table>
- <tr>
- <th id="profile-user-badge-image-header"></th>
- <th>Badge</th>
- <th>
- Achievement
- </th>
- </tr>
- {% if user.badges_earned.count > 0 %}
- {% for awarded in user.badges_earned.all %}
- <tr>
- <td><img src="{{STATIC_URL}}{{awarded.badge.image}}"/></td>
- <td>{{ awarded.badge.name }}</td>
- <td>{{ awarded.badge.description.0 }}</td>
- </tr>
- {% endfor %}
- {% else %}
- <tr>
- <td colspan="3">You don't have any badges yet!</td>
- </tr>
- {% endif %}
- </table>
- <div >
- <a href="{% url profile_badges %}">See Badge Catalog</a>
- </div>
- </div>
-</div>
+ <div class="content-box-title">
+ My Badges
+ <a href="#" style="float: right">
+ <img src="{{ STATIC_URL}}/css/default/images/icon-help-sm.png" width="20"
+ align="center"
+ title="Click to get help about this window"
+ onclick="toggleHelp('widget', 'my-badges'); return false;"
+ /></a>
+ </div>
+ {# <h5>Individual Badges</h5> #}
+ <table>
+ <tr>
+ <th class="width-ten-percent"></th>
+ <th>Badge</th>
+ <th>
+ Achievement
+ </th>
+ </tr>
+ {% if user.badges_earned.count > 0 %}
+ {% for awarded in user.badges_earned.all %}
+ <tr>
+ <td><img src="{{STATIC_URL}}{{awarded.badge.image}}"/></td>
+ <td>{{ awarded.badge.name }}</td>
+ <td>{{ awarded.badge.description.0 }}</td>
+ </tr>
+ {% endfor %}
+ {% else %}
+ <tr>
+ <td colspan="3">You don't have any badges yet!</td>
+ </tr>
+ {% endif %}
+ </table>
+ <div >
+
+<!--Bootstrap modal dialog-->
+<a data-toggle="modal" href="#badge-catalog"> See Badge Catalog </a>
+ <div id="badge-catalog" class="modal hide">
+ <div class="modal-body">
+ {% include "badge-catalog.html" %}
+ </div>
+ <div class="modal-footer">
+ <a href="#" class="btn" data-dismiss="modal">Close</a>
+ </div>
+ </div>
+
+<!--end modal-->
+ <!-- <a href="{% url profile_badges %}" class="margin-one-third">See Badge Catalog</a>-->
+ </div>
View
5 makahiki/apps/widgets/my_commitments/templates/index.html
@@ -1,6 +1,6 @@
{% load class_tags %}
{% load avatar_tags %}
-
+ <div class="content-box">
<div class="content-box-title">
My Public Commitments
<a href="#" style="float: right">
@@ -10,6 +10,7 @@
onclick="toggleHelp('widget', 'my-public-commitments'); return false;" />
</a>
</div>
- <div >
+ <div>
{% include "user_commitments.html" %}
</div>
+</div>
View
2 makahiki/apps/widgets/notifications/templates/index.html
@@ -1,6 +1,6 @@
{% if view_objects.notifications %}
{% if view_objects.notifications.unread %}
- <ul id="notification-list">
+ <ul class="notification-list">
{% for notification in view_objects.notifications.unread %}
{% include "widgets/notifications/templates/notifications/list-item.html" %}
{% endfor %}
View
5 makahiki/apps/widgets/notifications/templates/notifications/list-item.html
@@ -3,12 +3,11 @@
<li id="notification-item-{{notification.id}}"
class="{{notification.style_class}} notification-item">
<!-- FIXME: don't like the width 700px CAM -->
- <div class="notification-contents"
- {% if notification.is_success %}style='width: 700px'{% endif %}>
+ <div class="notification-contents">
<div class='notice-icon'>
<span class="ui-icon {{notification.icon_class}}"></span>
</div>
- <div class='notice-content' {% if notification.is_success %}style='width: 650px'{% endif %}>
+ <div class='notice-content'>
{{ notification.contents|safe }}
</div>
</div>
View
10 makahiki/apps/widgets/quests/templates/index.html
@@ -2,10 +2,10 @@
{% load class_tags %}
-<div id="quest-box" style="clear: both">
- <div id="quest-header">
- <h3 id="quest-title">Your Quests</h3>
- <a href="#" style="float: right">
+<div id="quest-box">
+ <div id="quest-header" class="makahiki-box-title">
+ <h3 id="quest-title" class="makahiki-box-title">Your Quests</h3>
+ <a href="#">
<img src="{{ STATIC_URL}}/css/default/images/icon-help-sm.png" width="20" align="center"
title="Click to get help about this window"
onclick="toggleHelp('widget', 'quests'); return false;"
@@ -20,7 +20,7 @@ <h3 id="quest-title">Your Quests</h3>
{% endif %}
<div id="quest-details" style="margin: 0px 10px; display: none">
- <div id="quest-contents" style="clear:both"></div>
+ <div id="quest-contents" class="quest-description" style="clear:both"></div>
<a href="javascript:void(0)" id="quest-hide">Close</a>
<div style="clear:both"></div>
View
2 makahiki/apps/widgets/quests/templates/quest_list.html
@@ -1,6 +1,6 @@
{% load class_tags %}
-<ul id="quest-list">
+<ul class="quest-list">
{# set variable to indicate that these are user quests. #}
{% with "true" as user_quest %}
{% for quest in view_objects.quests.user_quests %}
View
22 makahiki/apps/widgets/smartgrid/templates/task.html
@@ -18,12 +18,14 @@
{% endblock %}
{% block body %}
- <div {% get_id_and_classes "activity-task-stats" %}>
- <div {% get_id_and_classes "activity-task-stats-box" %}>
- <div {% get_id_and_classes "activity-task-stats-title" %}>
+<div class="container-fluid">
+ <div class="row-fluid">
+ <div class="span6">
+ <div class="content-box">
+ <div class="content-box-title">
{{ task.type|capfirst }} : {{ task.name }}
</div>
- <div {% get_id_and_classes "activity-task-stats-content" %}>
+ <div class="content-box-contents">
{% if task.is_canopy %}
<p/> This is a Canopy {{ task.type|capfirst }}.
{% endif %}
@@ -112,7 +114,7 @@
</button>
</a>
{% else %}
- <a href="/actions">
+ <a href="/learn/">
<button style="cursor:pointer;">
<img src="{{ STATIC_URL}}/css/default/images/left.png" width="50"
align="top">
@@ -125,9 +127,9 @@
</div>
</div>
- <div {% get_id_and_classes "activity-task-details" %}>
- <div {% get_id_and_classes "activity-task-details-box" %}>
- <div {% get_id_and_classes "activity-task-details-title" %}>
+ <div class="span6">
+ <div class="content-box">
+ <div class="content-box-title">
<table>
<tr>
<td>About the {{ task.type }}</td>
@@ -142,7 +144,7 @@
</tr>
</table>
</div>
- <div {% get_id_and_classes "activity-task-details-content" %}>
+ <div class="content-box-contents">
{% if pau %}
{% if approval.approval_status == "approved" or approval.award_date %}
<div {% get_id_and_classes "activity-task-details-info" %}>
@@ -356,6 +358,8 @@
</div>
</div>
</div>
+ </div>
+</div>
{% endblock %}
{% block extra_body %}
View
1 makahiki/apps/widgets/smartgrid/views.py
@@ -595,6 +595,7 @@ def _calculate_task_duration(task):
def _create_activity_request_form(request, task, user, approval, pau):
""" Create activity request form """
form_title = "Get your points"
+ question = "?"
social_email = None
social_email2 = None
View
5 makahiki/media/css/bootstrap-override.css
@@ -7,6 +7,11 @@
padding: 1px 15px;
}
+.container-fluid {
+ padding-left: 0px;
+ padding-right: 0px;
+}
+
.navbar-inner {
background-color: transparent;
background-image: none;
View
2 makahiki/media/css/default/pages/help.css
@@ -7,7 +7,7 @@
padding-top: 10px;
}
-#help-video .content-box{
+#help-video-box {
text-align: center;
}
View
34 makahiki/media/css/default/pages/home.css
@@ -26,18 +26,22 @@ div.home-item {
width: 210px;
display: block;
padding-bottom: 2px;
- margin: 20px 15px 0px 15px;
+ margin: 10px 10px 0px 10px;
float: left;
}
-.content .tile {
-/* background: #E3E3E3; */
+.content .container-fluid {
+ padding-left: 20;
+ padding-right: 20;
+}
+
+.content .tile { /* background: #E3E3E3; */
padding: 1px;
border: 3px outset #DDD;
-/* margin-top: -.7em; */
-/* background-image: -moz-linear-gradient(100% 50% 90deg, #E3E3E3, #A1A1A1); */
-/* background-image: -webkit-gradient(linear, 0% 0%, 0% 90%, from(#E3E3E3), */
-/* to(#BBB) ); */
+ /* margin-top: -.7em; */
+ /* background-image: -moz-linear-gradient(100% 50% 90deg, #E3E3E3, #A1A1A1); */
+ /* background-image: -webkit-gradient(linear, 0% 0%, 0% 90%, from(#E3E3E3), */
+ /* to(#BBB) ); */
border-radius: 3px;
box-shadow: 3px 3px 5px #000;
-moz-box-shadow: 3px 3px 5px #000;
@@ -53,6 +57,8 @@ div.home-item {
background: none;
background-color: rgba(255, 255, 255, 0.65);
border: 2px solid #167000;
+ padding-left: 20px;
+ padding-right: 20px;
}
#home-prizes {
@@ -303,7 +309,7 @@ div.home-item {
left no-repeat;
width: 54px;
height: 56px;
-}
+ }
#home-energy-icon:hover {
background: transparent
url(/site_media/static/images/icons/icon-go-low-over.png)
@@ -315,7 +321,7 @@ div.home-item {
left no-repeat;
width: 54px;
height: 56px;
-}
+ }
#home-activities-icon:hover {
background: transparent
url(/site_media/static/images/icons/icon-scoreboard-over.png)
@@ -327,7 +333,7 @@ div.home-item {
no-repeat;
width: 54px;
height: 56px;
-}
+ }
#home-news-icon:hover {
background: transparent
url(/site_media/static/images/icons/icon-news-over.png) top
@@ -339,7 +345,7 @@ div.home-item {
left no-repeat;
width: 54px;
height: 56px;
-}
+ }
#home-prizes-icon:hover {
background: transparent
url(/site_media/static/images/icons/icon-prizes-over.png)
@@ -351,7 +357,7 @@ div.home-item {
no-repeat;
width: 54px;
height: 56px;
-}
+ }
#home-help-icon:hover {
background: transparent
url(/site_media/static/images/icons/icon-help-over.png) top
@@ -363,7 +369,7 @@ div.home-item {
left no-repeat;
width: 54px;
height: 56px;
-}
+ }
#home-profile-icon:hover {
background: transparent
url(/site_media/static/images/icons/icon-profile-over.png)
@@ -375,7 +381,7 @@ div.home-item {
no-repeat;
width: 54px;
height: 56px;
-}
+ }
#home-water-icon:hover {
background: transparent
url(/site_media/static/images/icons/icon-water-over.png) top
View
18 makahiki/media/css/default/pages/learn.css
@@ -4,10 +4,10 @@
/********************** activities styles ******************************/
-.content {
- clear: both;
- padding: 0 15px 0 15px;
-}
+/* .content { */
+/* clear: both; */
+/* padding: 0 15px 0 15px; */
+/* } */
#activity-events-scoreboard {
clear: both;
@@ -174,7 +174,7 @@ table#activities-grid {
table#activities-grid td {
padding: 1px;
- width: 53px;
+ width: 12.5%;
vertical-align: top;
}
@@ -215,7 +215,7 @@ table#activities-grid td table td{
}
#activity-category .get-started, #activity-category .basic-energy, #activity-category .lights-out, #activity-category .make-watts, #activity-category .moving-on, #activity-category .opala, #activity-category .wet-wild, #activity-category .potpourri {
- width: 55px;
+ width: 12.5%;
height: 40px;
display: table-cell;
vertical-align: middle;
@@ -233,13 +233,13 @@ table#activities-grid td table td{
#activity-category .get-started div, #activity-category .basic-energy div, #activity-category .lights-out div, #activity-category .make-watts div, #activity-category .moving-on div, #activity-category .opala div, #activity-category .wet-wild div, #activity-category .potpourri div {
position: relative;
font-size: 9pt;
- top: 35%;
- margin: -50% auto 0 auto;
+/* top: 35%; */
+ margin: 0 auto 0 auto;
padding: 2px;
}
.activity, .commitment, .event, .survey, .excursion, .yellow-green {
- width: 55px;
+/* width: 12.5%; */
height: 48px;
border: 1px solid #000;
border-radius: 8px;
View
62 makahiki/media/css/default/pages/profile.css
@@ -7,15 +7,30 @@ table, tr {
width:100%;
}
+input, select {
+ width: 80%;
+}
td, h5 {
padding: 4px;
vertical-align: middle;
}
+.content-box,.content-box-title {
+ opacity: 1;
+}
+
form {
margin: 0px;
}
+.width-ten-percent {
+ width: 10%;
+}
+
+.margin-one-third {
+ margin-left: 35%;
+ margin-right: 35%
+}
.Empty-List {
width: 100%;
text-align: left;
@@ -33,10 +48,40 @@ form {
.container-fluid {
padding: 0px;
}
+
+.modal {
+ float:left;
+ position: fixed;
+ margin-top: -200px;
+ top: 230px;
+ margin-left: -49%;
+ left: 50%;
+ margin-right: -10%;
+ width: 97.5%;
+ min-width: 20px;
+ border-radius: 8px;
+}
+
+.modal-body {
+ max-height: 280px;
+ overflow-y: auto;
+ margin-bottom: -20px;
+}
+
+.modal-body, .modal-footer {
+ padding: 0px;
+}
-.content-box {
- text-align: left;
- opacity: .99;
+.modal-footer {
+ background-color: gray;
+}
+
+.badge-catalog {
+ position: fixed;
+ left:10%;
+ top: 200px;
+ margin-top: 50px;
+ width: 80%;
}
#profile-form-message {
@@ -47,7 +92,7 @@ form {
#profile-form-table td {
text-align: left;
vertical-align: top;
- padding: 5px 10px 5px 15px;
+ padding: 1%;
margin: 0;
}
@@ -67,11 +112,7 @@ td#profile-form-fb-profile-label, td#profile-form-fb-can-post-fields {
#profile-form-table textarea {
height: 60px
-}
-
-#profile-form-table td.profile-form-label {
- padding-left: 30px;
-}
+}
#profile-form-table #profile-form-fb-login-button {
padding-left: 30px;
@@ -81,6 +122,9 @@ td#profile-form-fb-profile-label, td#profile-form-fb-can-post-fields {
text-align: center;
}
+.profile-form-label {
+ margin: 0px;
+}
#profile-notifications {
width: 100%;
float: left;
View
9 makahiki/media/css/makahiki-override.less
@@ -0,0 +1,9 @@
+@navbarBackground: fadeout(#7093DB, 55%);
+@navbarLinkBackgroundActive: darken(@navbarBackground, 15%);
+@gridGutterWidth: 20px;
+
+.container-fluid {
+ padding-left: 0;
+ padding-right: 0;
+ .clearfix();
+}
View
299 makahiki/media/css/makahiki.less
@@ -0,0 +1,299 @@
+/*
+ * Makahiki2 style.
+ *
+ * Copyright 2012 CSDL.
+ *
+ * Uses Twitter Bootstrap v2.
+ */
+
+
+ // Bootstrap
+ @import "bootstrap.less";
+
+// @import "cerulean-var.less";
+
+// @import "bootswatch.less";
+
+ // Responsiveness
+ @import "responsive.less";
+
+ // Overrides for bootstrap variables
+ @import "makahiki-override.less";
+
+@makahikiBorderRadius: 8px;
+
+.top-border-radius (@radius: 5px) {
+ -webkit-border-top-left-radius: @radius;
+ -moz-border-radius-topleft: @radius;
+ border-top-left-radius: @radius;
+ -webkit-border-top-right-radius: @radius;
+ -moz-border-radius-topright: @radius;
+ border-top-right-radius: @radius;
+}
+
+.makahiki-box {
+ .border-radius(@makahikiBorderRadius);
+ .box-shadow(3px 3px @makahikiBorderRadius @black);
+ margin-bottom: @gridGutterWidth;
+}
+
+.content-box {
+ text-align: left;
+ .makahiki-box;
+ margin-bottom: 15px;
+}
+
+.content-box-contents {
+ padding-left: @gridGutterWidth;
+ padding-right: @gridGutterWidth;
+}
+
+.content-box-title {
+ text-align: center;
+ height: 29px;
+ line-height: 29px;
+ font-weight: bold;
+ .top-border-radius(@makahikiBorderRadius);
+}
+.info-bar h4 {
+ .pagination-centered;
+}
+
+.info-bar ul {
+ list-style: none outside none;
+}
+
+.info-bar li {
+ .show;
+}
+
+.makahiki-box-title {
+ display: inline;
+ margin-left: auto;
+ margin-right: auto;
+ .pagination-centered;
+}
+
+.makahiki-box-title a {
+ float: right;
+}
+
+.notifications {
+ .makahiki-box;
+}
+.notification-item {
+ margin: 5px auto;
+ padding: 5px;
+ clear:both;
+ text-align: left;
+}
+
+.notification-list, .messages {
+ list-style: none;
+}
+
+.quest-description {
+ text-align: left;
+}
+
+.quest-list {
+ list-style: none;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+.quest-list li {
+ margin: 0px;
+ padding: 0 2px;
+ display: inline;
+}
+
+.quest-list a {
+ color: @white;
+}
+/* ====================
+ * Navbar icons.
+ * ==================== */
+a.activities img {
+ background: transparent url(../images/icons/icon-scoreboard.png) top left
+ no-repeat;
+ .show
+}
+a.activities:hover img {
+ background: transparent url(../images/icons/icon-scoreboard-over.png) top left
+ no-repeat;
+ .show
+}
+
+a.advanced img {
+ background: transparent url(../images/icons/icon-advanced.png) top left
+ no-repeat;
+ .show
+}
+
+a.advanced:hover img {
+ background: transparent url(../images/icons/icon-advanced-over.png) top left
+ no-repeat;
+ .show
+}
+
+a.energy img {
+ background: transparent url(../images/icons/icon-go-low.png) top left
+ no-repeat;
+ .show
+}
+
+a.energy:hover img {
+ background: transparent url(../images/icons/icon-go-low-over.png) top left
+ no-repeat;
+ .show
+}
+
+a.help img {
+ background: transparent url(../images/icons/icon-help.png) top left no-repeat;
+ .show
+}
+
+a.help:hover img {
+ background: transparent url(../images/icons/icon-help-over.png) top left
+ no-repeat;
+ .show
+}
+
+a.home img {
+ background: transparent url(../images/icons/icon-home.png) top left no-repeat;
+ .show
+}
+
+a.home:hover img {
+ background: transparent url(../images/icons/icon-home-over.png) top left
+ no-repeat;
+ .show
+}
+
+a.news img {
+ background: transparent url(../images/icons/icon-news.png) top left no-repeat;
+ .show
+}
+
+a.news:hover img {
+ background: transparent url(../images/icons/icon-news-over.png) top left
+ no-repeat;
+ .show
+}
+
+a.prizes img {
+ background: transparent url(../images/icons/icon-prizes.png) top left
+ no-repeat;
+ .show
+}
+
+a.prizes:hover img {
+ background: transparent url(../images/icons/icon-prizes-over.png) top left
+ no-repeat;
+ .show
+}
+
+a.profile img {
+ background: transparent url(../images/icons/icon-profile.png) top left
+ no-repeat;
+ .show
+}
+
+a.profile:hover img {
+ background: transparent url(../images/icons/icon-profile-over.png) top left
+ no-repeat;
+ .show
+}
+
+a.water img {
+ background: transparent url(../images/icons/icon-water.png) top left no-repeat;
+ .show
+}
+
+a.water:hover img {
+ background: transparent url(../images/icons/icon-water-over.png) top left
+ no-repeat;
+ .show
+}
+
+body {
+ margin: 0;
+ padding-left: 20px;
+ padding-right: 20px;
+ .pagination-centered;
+}
+
+#activities-grid {
+ line-height: 12px;
+}
+
+#info-bar-single {
+ .hidden;
+}
+
+#info-bar-single a {
+ float: right;
+ text-align: right;
+}
+
+#info-bar-single button {
+ float: left;
+}
+
+@media ( min-width : 641px) and (max-width: 979px) {
+ /* hide icons from nav bar */
+ .nav img {
+ display: none;
+ }
+}
+
+/* Query to remove images up to tablet width.*/
+@media ( min-width : 480px) and (max-width: 821px) {
+ .nav li a img {
+ display: none;
+ }
+ .nav li a:hover img {
+ display: none;
+ }
+}
+
+/* for small screen widths hide the wide info-bar */
+@media ( max-width : 640px) {
+ a.activities img,a.activities:hover img,a.advanced img,a.advanced:hover img,a.energy img,a.energy:hover img,a.help img,a.help:hover img,a.home img,a.home:hover img,a.news img,a.news:hover img,a.prizes img,a.prizes:hover img,a.profile img,a.profile:hover img,a.water img,a.water:hover img
+ {
+ .hidden;
+ }
+ body {
+ padding-left: 0;
+ padding-right: 0;
+ }
+ .container-fluid {
+ padding-left: 0px;
+ padding-right: 0px;
+ }
+ .makahiki-box {
+ margin-bottom: 5px;
+ }
+ .navbar {
+ margin-bottom: 5px;
+ }
+ #info-bar-wide {
+ .hidden;
+ }
+ #info-bar-single {
+ .show;
+ visibility: visible;
+ }
+ #quest-list {
+ padding: 0px;
+ }
+ #quest-list li {
+ display: block; /* make them vertical */
+ margin: 5px;
+ padding: 0px;
+ }
+ #quest-title {
+ margin: 0px;
+ }
+}
View
4 makahiki/media/css/theme.less
@@ -16,6 +16,7 @@
@quest-box: fadeout(#468250, 55%);
@quest-list-sel: #282A2A;
@news: #A2C0D2;
+@notifications: fadeout(#adff2f, 45%);
// logo
/* set the logo */
@@ -129,6 +130,9 @@ body {
background: @nav-inner;
}
+.notifications {
+ background: @notifications;
+}
.prize a {
color: #000000;
}
View
4 makahiki/templates/base.html
@@ -13,9 +13,7 @@
{% block header %}{% endblock %}
{# This is where the contents of the page will be inserted #}
- <div class="content">
- {% block body %}{% endblock %}
- </div>
+ {% block body %}{% endblock %}
{% block footer %}{% endblock %}
View
6 makahiki/templates/components/RIB.html
@@ -1,13 +1,13 @@
{% load avatar_tags %}
{% load class_tags %}
{% if user.is_authenticated %}
-<div id="info-bar-wide" class="container-fluid">
+<div id="info-bar-wide" class="container-fluid makahiki-box info-bar">
<div class="row-fluid">
<div class="span12">
<div class="span1">
<img src="{% avatar_url user 60 %}" />
</div>
- <div class="span3">
+ <div class="span3 carousel">
{% with user.get_profile as profile %}
<h4>{{profile.name}}</h4>
<div id="user-cycle">
@@ -34,7 +34,7 @@
</div>
</div>
</div>
-<div id="info-bar-single" class="container">
+<div id="info-bar-single" class="container makahiki-box info-bar">
<div class="row">
<div id="feedback-single" class="span2">
<button id="header-feedback" href="javascript:void(0);">Send Feedback</button>
View
2 makahiki/templates/components/navbar.html
@@ -1,7 +1,7 @@
{% load class_tags %}
<!-- Navbar
================================================== -->
- <div class="navbar">
+ <div class="navbar makahiki-box">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse"
View
14 makahiki/templates/components/user_points.html
@@ -4,26 +4,26 @@
{% cache 600 infobar request.user.username %}
{% if CURRENT_ROUND_INFO and CURRENT_ROUND_INFO.name != 'Overall' %}
<!-- First slideshow element -->
-<div id="header-user-overall-rank1">
+<div id="header-user-overall-rank1" class="item active">
<ul>
<li>{{CURRENT_ROUND_INFO.name}}: {{profile.current_round_points}} {{COMPETITION_POINT_LABEL}}s #{{profile.current_round_team_rank}}/{{TEAM_MEMBER_COUNT}} in {{profile.team.name}}.</li>
</ul>
</div>
<!-- Second slideshow element -->
-<div id="header-user-overall-rank2">
+<div id="header-user-overall-rank2" class="item">
<ul>
<li>{{CURRENT_ROUND_INFO.name}}: {{profile.current_round_points}} {{COMPETITION_POINT_LABEL}}s #{{profile.current_round_overall_rank}}/{{OVERALL_MEMBER_COUNT}} overall.</li>
</ul>
</div>
{% endif %}
<!-- Third slideshow element -->
-<div id="header-user-team-rank3">
+<div id="header-user-team-rank3" class="item">
<ul>
<li>Overall: {{profile.points}} {{COMPETITION_POINT_LABEL}}s #{{profile.team_rank}}/{{TEAM_MEMBER_COUNT}} in {{profile.team.name}}</li>
</ul>
</div>
<!-- Fourth slideshow element -->
-<div id="header-user-overall-rank4">
+<div id="header-user-overall-rank4" class="item">
<ul>
<li>Overall: {{profile.points}} {{COMPETITION_POINT_LABEL}}s #{{profile.overall_rank}}/{{OVERALL_MEMBER_COUNT}}</li>
</ul>
@@ -32,12 +32,12 @@
{% if profile.canopy_member %}
<!-- Fifth slideshow element -->
{% with canopy_info=profile.canopy_karma_info %}
-<div id="header-user-overall-rank5" style="display:none">
- <div id="header-user-points">
+<div id="header-user-overall-rank5" >
+ <div id="header-user-points" class="item">
<h3>{{profile.canopy_karma}}</h3>
<div id="header-text">Canopy Karma points</div>
</div>
- <div id="header-user-rank">
+ <div id="header-user-rank" class="item">
<h3>#{{canopy_info.rank}}</h3>
<div id="header-text">out of {{canopy_info.total}} overall</div>
</div>
View
10 makahiki/templates/logged_in_base.html
@@ -4,10 +4,7 @@
{% load markup %}
{% block extra_head_base %}
- <link rel="stylesheet/less" type="text/css" href="{{STATIC_URL}}css/bootstrap.less">
- <link rel="stylesheet/less" type="text/css" href="{{STATIC_URL}}css/responsive.less">
- <link href="{{STATIC_URL}}css/bootstrap-override.css" rel="stylesheet">
- <link href="{{STATIC_URL}}css/makahiki-structure.css" rel="stylesheet">
+ <link rel="stylesheet/less" type="text/css" href="{{STATIC_URL}}css/makahiki.less">
<link rel="stylesheet/less" type="text/css" href="{{STATIC_URL}}css/theme.less">
<script src="{{STATIC_URL}}js/less-1.3.0.min.js" type="text/javascript"></script>
@@ -21,10 +18,10 @@
{% block header %}
{% include "components/RIB.html" %}
{% include "components/navbar.html" %}
- <div id="notifications">
+ <div class="notifications">
{% include "widgets/notifications/templates/index.html" %}
</div>
- <div id="quests">
+ <div id="quests" class="makahiki-box">
{% include "widgets/quests/templates/index.html" %}
</div>
{% if messages %}
@@ -98,6 +95,7 @@
<script type="text/javascript">
$(document).ready(function() {
$('#sngle-cycle').carousel()
+ $('#usr-cycle').carousel()
});
</script>
{% block page_cycles %}{% endblock page_cycles %}

0 comments on commit d35bf0d

Please sign in to comment.
Something went wrong with that request. Please try again.