Commits (9)
......@@ -8,8 +8,8 @@
class="btn" translate>Preview</button>-->
</div>
<div class="row">
<div class="col-lg-12" style="position:relative">
<textarea id="wmd-input-{{id}}" class="col-lg-12 form-control"
<div class="col-xs-12" style="position:relative">
<textarea id="wmd-input-{{id}}" class="col-xs-12 form-control"
style="overflow-y:scroll;height:22em"
ng-show="!preview"
ng-disabled="textarea_disabled"
......
......@@ -14,8 +14,8 @@
<div class="col-lg-12" id="wmd-button-bar-{{id}}"></div>
</div>
<div class="row">
<div class="col-lg-12 form-group">
<textarea id="wmd-input-{{id}}" class="col-lg-12 form-control" ng-model="content" rows="15"></textarea>
<div class="col-xs-12 form-group">
<textarea id="wmd-input-{{id}}" class="col-xs-12 form-control" ng-model="content" rows="15"></textarea>
</div>
</div>
</div>
......
......@@ -14,8 +14,8 @@
<div class="col-lg-12" id="wmd-button-bar-{{id}}"></div>
</div>
<div class="row">
<div class="col-lg-12 form-group">
<textarea id="wmd-input-{{id}}" class="col-lg-12 form-control" ng-model="content" rows="15"></textarea>
<div class="col-xs-12 form-group">
<textarea id="wmd-input-{{id}}" class="col-xs-12 form-control" ng-model="content" rows="15"></textarea>
</div>
</div>
</div>
......
......@@ -25,9 +25,9 @@
(function generateMarkdownDirectives(app) {
var templates = {
// directive name -> template path
'markdowneditor': '/static/templates/directive.markdowneditor.html',
'modalmarkdowneditor': '/static/templates/directive.modalmarkdowneditor.html',
'modalmarkdowneditorwithtitle': '/static/templates/directive.modalmarkdowneditorwithtitle.html'
'markdowneditor': '/static/js/admin/templates/directive.markdowneditor.html',
'modalmarkdowneditor': '/static/js/admin/templates/directive.modalmarkdowneditor.html',
'modalmarkdowneditorwithtitle': '/static/js/admin/templates/directive.modalmarkdowneditorwithtitle.html'
};
function controller ($scope, $element, MarkdownDirective) {
......
......@@ -6,11 +6,10 @@
}
}
.header {
border-bottom: 1px solid #000;
border-bottom: 1px solid #ddd;
margin-bottom: 6px;
padding: 6px 0;
.course-title {
color: #000;
font-size: 4.4vmax;
margin: 0;
@media screen and (min-width: $screen-xs-min) {
......
......@@ -14,7 +14,6 @@
h1, h2, h3, h4, h5, h6 {
color: $brand-primary;
font-size: 5.9vmax;
font-weight: bold;
line-height: 0.9;
margin: 0;
@media screen and (min-width: $screen-xs-min) {
......
......@@ -133,7 +133,7 @@
// --------------------------------------------------
.forums-widget {
@include card(rgba(#fff,0.5));
@include card(transparent);
.widget-filter {
@include icon(after, search);
......
......@@ -73,7 +73,7 @@ body {
//## Set shared styles for all pages
//##
.page {
@include card(rgba($gray,0.5));
padding: 17px;
}
//## Minor layout adjusts on form controls styles
......
......@@ -220,7 +220,7 @@
}
span {
margin-left: 15px;
margin-left: 25px;
&.icons {
margin: 0 auto;
span {
......
......@@ -271,7 +271,7 @@
}
.page-header {
h1, h2, h3, h4, h5, h6 {
color: #000;
color: #555;
@media screen and (min-width: $screen-xs-min) {
font-size: 36px;
}
......
......@@ -152,7 +152,7 @@ a {
.forums-widget {
.btn {
&.list-all, &.see-stats {
@include button-hover(#fff,#fff,rgba($orange,0.6),$orange);
@include button-hover(#fff,#fff,$brand-primary,darken($brand-primary, 10%));
}
}
}
......
......@@ -4,8 +4,6 @@
//## Set shared styles for all pages
//##
.page {
@include card(rgba($light-blue,0.6));
@media screen and (min-width: $screen-sm-min) {
padding: 30px !important;
}
......
......@@ -3,7 +3,6 @@
.page-header {
h1, h2, h3, h4, h5, h6 {
color: $purple;
i {
display: none;
}
......@@ -15,7 +14,7 @@
.primary-page-header, .secondary-page-header {
h1, h2, h3, h4, h5, h6 {
color: #000;
color: #555;
i {
display: none;
}
......
......@@ -18,7 +18,7 @@
data-placement="bottom"
data-original-title="{% blocktrans with start_date=course.start_date|date:"d/m/Y" %} This course starts on {{ start_date }} and you are already subscribed{% endblocktrans %}."
title="{% blocktrans with start_date=course.start_date|date:"d/m/Y" %} This course starts on {{ start_date }} and you are already subscribed{% endblocktrans %}.">
<button class="btn btn-lg btn-block btn-default" ng-disabled="true">Ir para o Curso</button>
<button class="btn btn-success" ng-disabled="true">Ir para o Curso</button>
</div>
{% else %} {# user is not enrolled #}
{% if course.has_started %}
......
......@@ -104,10 +104,10 @@ wrapper-course-lesson
</div>
</div>
<div class="filter-keyword col-md-3 col-sm-4">
<input type="text" ng-model="filters.textsearch" placeholder="Palavra-chave" class="form-control">
<input type="text" ng-model="filters.textsearch" placeholder="Palavra-chave">
</div>
<div class="filter-ordering col-md-3 col-sm-4">
<select ng-model="ordering" class="form-control">
<select ng-model="ordering">
<option value="start_date">Data de início</option>
<option value="status">Status</option>
<option value="name">Nome</option>
......@@ -179,7 +179,7 @@ wrapper-course-lesson
<span class="label label-warning" ng-if="lesson.status!='published'">Rascunho</span>
{% verbatim %}
<a ng-href="legacy/admin/courses/{{ course.id }}/lessons/{{lesson.id}}" ng-bind="lesson.name" class="lesson-name"></a>
<a ng-href="/legacy/admin/courses/{{ course.id }}/lessons/{{lesson.id}}" ng-bind="lesson.name" class="lesson-name"></a>
{% endverbatim %}
</div>
</div>
......
......@@ -27,7 +27,7 @@
<script type="text/javascript" src="{% static 'js/pagedown/Markdown.Sanitizer.js' %}" ></script>
<script type="text/javascript" src="{% static 'js/markdown/app.js' %}"></script>
<script type="text/javascript" src="{% static 'js/markdown/filters.js' %}"></script>
{% endcompress %}
<script>
......@@ -203,7 +203,7 @@ wrapper-course-intro
<div class="embed-responsive-item" id="youtube-player" youtube-player></div>
</div>
<div class="row">
<div class="col-lg-10">
<div class="col-xs-12 col-lg-10">
<p class="video-title editable-content" ng-model="course.intro_video.name" placeholder="Nome do vídeo" contenteditable><p>
</div>
<div class="col-lg-2 textcenter">
......
{% extends 'base.html' %}
{% load i18n %}
{% load staticfiles %}
{% load compress %}
{% block js %}
{{ block.super }}
<script src="https://unpkg.com/ng-file-upload@12.0.4/dist/ng-file-upload.min.js"></script>
<script src="https://unpkg.com/angular-scroll@1.0.2/angular-scroll.min.js"></script>
<script src="https://unpkg.com/ui-select@0.19.8/dist/select.min.js"></script>
<script src="https://unpkg.com/tinymce@4.5.10/tinymce.min.js"></script>
<script src="https://unpkg.com/angular-ui-tinymce@0.0.19/dist/tinymce.min.js"></script>
<script src="{% static 'js/ui.tinymce.courses-legacy.config.js' %}"></script>
{% compress js %}
<script type="text/javascript" src="{% static 'js/discussion-app.js' %}"></script>
<script type="text/javascript" src="{% static 'js/discussion-controllers.js' %}"></script>
<script type="text/javascript" src="{% static 'js/discussion-services.js' %}"></script>
<script type="text/javascript" src="{% static 'js/discussion-directives.js' %}"></script>
<script type="text/javascript" src="{% static 'js/discussion-filters.js' %}"></script>
{% endcompress %}
{% endblock %}
{% block body_attrs %}
ng-app="discussion"
{% endblock %}
{% block content %}
<ng-view></ng-view>
{% verbatim %}
<script type="text/ng-template" id="forum-embed.html">
<section class="widget forums forums-widget container-fluid forum-embed">
<header class="widget-header line one-column">
<div class="column">
<div class="pull-left">
<h2 class="widget-title">Fóruns</h2>
</div>
<div class="pull-right hidden-xs">
<a class="btn btn-success list-all" target="_parent" href="/forum">mostrar todos</a>
<a class="btn btn-success new-topic" target="_parent" href="/forum/topic/new">criar novo tópico</a>
</div>
<div class="pull-right dropdown visible-xs">
<button class="btn btn-default list-all dropdown-toggle" type="button" id="dropdownOptions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
opções
</button>
<ul class="dropdown-menu dropdown-options" aria-labelledby="dropdownOptions">
<li><a target="_parent" href="/forum">mostrar todos</a></li>
<li><a target="_parent" href="/forum/topic/new">criar novo tópico</a></li>
</ul>
</div>
</div>
</header>
<div class="line one-column">
<div class="column">
<h3 class="section-title">Últimas Postagens</h3>
</div>
</div>
<div class="line two-column fifty-fifty">
<div class="user-update column" ng-repeat="topic in latest_topics">
<div class="user-icon">
<img ng-src="{{topic.author.picture}}" alt="{{topic.author.first_name}}" />
</div>
<div class="info">
<a ng-href="/profile/{{ topic.author.username }}"><b>{{topic.author.first_name}}</b></a> comentou no tópico <a ng-href="/discussion/topic/#!/topic/{{topic.id}}/" class="thread-name">{{topic.title | charLimiter:50}}</a>
no fórum <a ng-href="/discussion/#!/forum/{{ topic.forum }}">{{topic.forum_info.title}}</a></span>
</div>
<div class="actions">
<span class="action last-update">Última atividade <b>{{ topic.last_activity_at | dateFilter }}</b></span>
<span class="action liked"
ng-class="{ 'active': topic.count_likes }">{{topic.count_likes}} {{topic.count_likes > 1 || topic.count_likes == 0? 'gostaram':'gostou'}}</span>
<span class="action replies"
ng-class="{ 'active': topic.count_replies }">{{topic.count_replies}} {{topic.count_replies > 1 || topic.count_replies == 0? 'comentários':'comentário'}}</span>
</div>
</div>
</div>
</section>
</script>
{% endverbatim %}
{% endblock %}
\ No newline at end of file