diff --git a/app/templates/home.html b/app/templates/home.html new file mode 100644 index 0000000..b1416af --- /dev/null +++ b/app/templates/home.html @@ -0,0 +1 @@ +{% load static i18n %} \ No newline at end of file diff --git a/app/templates/home_app.html b/app/templates/home_app.html deleted file mode 100644 index f17b600..0000000 --- a/app/templates/home_app.html +++ /dev/null @@ -1,69 +0,0 @@ -{% extends 'base.html' %} - -{% load i18n %} - -{% block breadcrumbs %} - - {% clear_breadcrumbs %} - {% breadcrumb 'Home' '/' %} - -{% endblock %} - -{% block render_breadcrumbs %} - {% render_breadcrumbs %} -{% endblock %} - -{% block sidebar %} -
- {% trans 'Pending tasks' %} - {% trans 'Users Online (1)' %} - - -
-{% endblock %} - -{% block content %} -

- -
{% trans 'Courses' %}
- -

- - {% if courses|length > 0 %} - {% for course in courses %} - - - {% endfor %} - {% else %} -

{% trans "You didn't create any course yet." %}

- {% endif %} -{% endblock %} - -{% block rightbar %} -
-

- -
{% trans 'Goals' %}
- -

- - - - - - - - - -
70% de Presenca nas aulas
30/11 - Entrega das notas finais
-
-{% endblock rightbar %} diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css index 411d47c..64b487d 100644 --- a/core/static/css/base/amadeus.css +++ b/core/static/css/base/amadeus.css @@ -1,3 +1,7 @@ +.logoLogin{ + padding-bottom: 1%; + width: 15%; +} .navigation{ margin: 10% 10% 5% 5%; } @@ -30,22 +34,219 @@ padding-bottom: 200px; } .panel-info{ - padding-bottom: 50px; } -h3{ - text-align: center; +.panel-default{ +} +.panel-primary .panel-body{ + padding: 0% 0% 0% 0%; +} +.end{ + text-align: right; } h5{ text-align: center; } +#img { + + display: block; + margin: auto; + width: 50%; -#logo{ - max-width: 30%; - margin-top: 2em; - margin-bottom: 2em; } +ul { + list-style-type:none +} + + +/*CSS TIMELINE*/ + +.bubble { + width: 100%; + padding: .5em 1em; + line-height: 1.4em; + padding: 20px; + background-color: #ecf0f1; + position: relative; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + -ms-border-radius: 8px; + -o-border-radius: 8px; + border-radius: 8px; + text-align: left; + display: inline-block; } + .bubble:hover > .over-bubble { + opacity: 1; } + +.bubble-container { + width: 75%; + display: block; + position: relative; + padding-left: 20px; + vertical-align: top; + display: inline-block; } + +.arrow { + content: ''; + display: block; + position: absolute; + left: 12px; + bottom: 25%; + height: 0; + width: 0; + border-top: 20px solid transparent; + border-bottom: 20px solid transparent; + border-right: 20px solid #ecf0f1; } + +.timeline { + width: 560px; + display: block; + margin: auto; + background-color: #dde1e2; + padding-bottom: 2em; + -webkit-box-shadow: #bdc3c7 0 5px 5px; + -moz-box-shadow: #bdc3c7 0 5px 5px; + box-shadow: #bdc3c7 0 5px 5px; + -moz-border-radius-bottomleft: 8px; + -webkit-border-bottom-left-radius: 8px; + border-bottom-left-radius: 8px; + -moz-border-radius-bottomright: 8px; + -webkit-border-bottom-right-radius: 8px; + border-bottom-right-radius: 8px; + margin-bottom: 2em; } + .timeline li { + padding: 1em 0; } + .timeline li:nth-child(even) { + background-color: #d3d7d8; } -/*========= Subscrib default divide breadcrumb*/ -.divider{ - display: none; -} \ No newline at end of file +.avatar { + width: 18%; + display: inline-block; + vertical-align: top; + position: relative; + overflow: hidden; + margin-left: 2%; } + .avatar img { + width: 100%; + -webkit-border-radius: 50%; + -moz-border-radius: 50%; + -ms-border-radius: 50%; + -o-border-radius: 50%; + border-radius: 50%; + border: 5px solid #ecf0f1; + position: relative; } + + + +.first { + width: 560px; + display: block; + margin: auto; + background-color: #3498db; + text-shadow: #2084c7 1px 1px 0; + padding: 1em 0 !important; + color: white; + text-align: center; + margin-top: 1em; + font-family: "Lato"; + font-size: 1.6em; + -moz-border-radius-topleft: 8px; + -webkit-border-top-left-radius: 8px; + border-top-left-radius: 8px; + -moz-border-radius-topright: 8px; + -webkit-border-top-right-radius: 8px; + border-top-right-radius: 8px; + position: relative; } + + +.over-bubble { + line-height: 1.4em; + padding-top: 10%; + background-color: rgba(236, 240, 241, 0.8); + position: relative; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + -ms-border-radius: 8px; + -o-border-radius: 8px; + border-radius: 8px; + text-align: center; + display: inline-block; + position: absolute !important; + height: 100%; + width: 100%; + opacity: 0; + top: 0; + left: 0; + z-index: 999; + -webkit-transition-property: all; + -moz-transition-property: all; + -o-transition-property: all; + transition-property: all; + -webkit-transition-duration: 0.3s; + -moz-transition-duration: 0.3s; + -o-transition-duration: 0.3s; + transition-duration: 0.3s; + -webkit-transition-timing-function: ease-in; + -moz-transition-timing-function: ease-in; + -o-transition-timing-function: ease-in; + transition-timing-function: ease-in; + font-size: 2.8em; + text-shadow: white 1px 1px 0; } + +.action { + margin-right: .3em; + -webkit-transition-property: all; + -moz-transition-property: all; + -o-transition-property: all; + transition-property: all; + -webkit-transition-duration: 0.2s; + -moz-transition-duration: 0.2s; + -o-transition-duration: 0.2s; + transition-duration: 0.2s; + -webkit-transition-timing-function: ease-in; + -moz-transition-timing-function: ease-in; + -o-transition-timing-function: ease-in; + transition-timing-function: ease-in; } + + +h3 { + font-size: 1.2em; + font-weight: bold; + font-family: 'Lato'; + display: inline-block; + margin-bottom: .2em; + color: #95a5a6; } + +.retweet { + position: absolute; + opacity: 1; + top: 0; + right: 1em; + display: block; + background-color: #16a085; + padding: 4px; + -moz-border-radius-bottomleft: 5px; + -webkit-border-bottom-left-radius: 5px; + border-bottom-left-radius: 5px; + -moz-border-radius-bottomright: 5px; + -webkit-border-bottom-right-radius: 5px; + border-bottom-right-radius: 5px; } + .retweet .icon-retweet { + color: white; + margin: auto; + width: 100%; + display: block; + font-size: 1.2em; } + +/*CSS NOTIFICACIONS*/ + +.alert_list{font-size: 11px; color:grey} +li.alert_li { + font-size: 11px; + color:grey; + padding:10px 0px 2px 0px; + border-bottom: thin solid #c0c0c0; +} +li.alert_li:hover{background-color:#eee} +.turn_off_alert{float:right;margin-bottom :1px} +a.alert_message{color : grey} +a.alert_message:hover{color : grey} diff --git a/core/static/css/base/header.css b/core/static/css/base/header.css index 0b2c650..a7e2099 100644 --- a/core/static/css/base/header.css +++ b/core/static/css/base/header.css @@ -1,31 +1,30 @@ -/* Classes */ - -.header-bg{ - background-color: green; -} - -.header-div{ - margin-top: 1%; -} - -.logo{ - height:100%; - margin-left: 30%; -} - -.link{ - transition-duration: 0.5s; /*Slow down the transformation*/ -} - -.link:hover{ - transform:scale(1.1); -} - -.notifications{ - font-size: 20px; - -} - -/* ID */ - - +/* Classes */ + +.header-bg{ + background-color: green; +} + +.header-div{ + margin-top: 1%; +} + +.logo{ + height:100%; + margin-left: 30%; +} + +.link{ + transition-duration: 0.5s; +} + +.link:hover{ + transform:scale(1.1); +} + +/* ID */ + +.notifications{ + font-size: 20px; + +} + diff --git a/core/templates/base.html b/core/templates/base.html index 7b09181..cee5976 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -37,95 +37,110 @@ {% endblock %} - {% block nav %}
+ {% block nav %} +
+
+
+
+
+
+ + +
+
+ +
+
+
+
+
+
+ {% endblock %} +
-
-
-
- - -
-
- -
-
-
-
-
- {% endblock %} +
+
+
+ {% block sidebar %} -
- {% block breadcrumbs %} + {% endblock %} +
- {% endblock %} - - {% block render_breadcrumbs %} +
+ {% block breadcrumbs %} - {% endblock %} -
-
- {% block sidebar %} + {% endblock %} + + {% block render_breadcrumbs %} - {% endblock %} -
-
- {% block content %} + {% endblock %} - {% endblock %} -
-
- {% block rightbar %} +
+
+
+ {% block content %} + + {% endblock %} +
+ +
+ {% block rightbar %} - {% endblock rightbar %} + {% endblock rightbar %} +
+
+
+
+
-- libgit2 0.21.2