Skip to content

CIRCLE / cloud

Go to a project

A prog2-höz tartozó friss repo anyagok itt elérhetőek: https://git.iit.bme.hu/

Commit f2f4b945 by Kálmán Viktor
Options

dashboard: help format fixes

parent fee9c1a3
Showing with 24 additions and 49 deletions
circle/dashboard/static/dashboard/dashboard.less
...@@ -1320,48 +1320,25 @@ textarea[name="new_members"] { ...@@ -1320,48 +1320,25 @@ textarea[name="new_members"] {
} }
} }
.help-tabs li {
/* help page */
.help-tabs li {
width: 50%; width: 50%;
text-align: center; text-align: center;
} }
// note: padding-margin hack to skip banner on anchor // note: padding-margin hack to skip banner on anchor
#help-tab-content h1 { #help-tab-content {
font-weight: bold; h1, h2, h3, h4, h5 {
padding-top: 55px; margin-top: -55px;
}
#help-tab-content h2 {
font-weight: bold;
padding-top: 55px; margin-top: -55px;
}
#help-tab-content h3 {
font-weight: bold;
padding-top: 55px; margin-top: -55px;
}
#help-tab-content h4 {
font-weight: bold; font-weight: bold;
padding-top: 55px; margin-top: -55px; padding-top: 55px; margin-top: -55px;
} }
#help-tab-content h5 {
font-weight: bold;
padding-top: 55px; margin-top: -55px;
}
#help-tab-content blockquote { blockquote {
background-color:#dfe4e4; background-color:#dfe4e4;
}
} }
.row{
margin-left:0px;
margin-right:0px;
}
#wrapper { #wrapper {
position: fixed; position: fixed;
padding-left: 0px; padding-left: 0px;
...@@ -1371,14 +1348,14 @@ textarea[name="new_members"] { ...@@ -1371,14 +1348,14 @@ textarea[name="new_members"] {
height: 100%; height: 100%;
width: 210px; width: 210px;
transition: all .4s ease 0s; transition: all .4s ease 0s;
/* Firefox */ /* Firefox */
height: -moz-calc(100% - 130px); height: -moz-calc(100% - 130px);
/* WebKit */ /* WebKit */
height: -webkit-calc(100% - 120px); height: -webkit-calc(100% - 120px);
/* Opera */ /* Opera */
height: -o-calc(100% - 110px); height: -o-calc(100% - 110px);
/* Standard */ /* Standard */
height: calc(100% - 130px); height: calc(100% - 130px);
} }
#sidebar-wrapper { #sidebar-wrapper {
...@@ -1470,7 +1447,6 @@ height: calc(100% - 130px); ...@@ -1470,7 +1447,6 @@ height: calc(100% - 130px);
transform: translateX(-250px); transform: translateX(-250px);
} }
#page-content { #page-content {
margin-left: 0px; margin-left: 0px;
-webkit-transition: background .5s; -webkit-transition: background .5s;
...@@ -1489,7 +1465,6 @@ height: calc(100% - 130px); ...@@ -1489,7 +1465,6 @@ height: calc(100% - 130px);
form { form {
display: inline; display: inline;
} }
textarea { textarea {
resize: none; resize: none;
min-height: 80px; min-height: 80px;
......
circle/templates/info/help.html
{% extends "dashboard/base.html" %} {% extends "dashboard/base.html" %}
{% load i18n %} {% load i18n %}
{% load compressed %}
{% block title-page %}{% trans "Help" %}{% endblock %} {% block title-page %}{% trans "Help" %}{% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div id="wrapper"> <div id="wrapper">
...@@ -16,17 +17,18 @@ ...@@ -16,17 +17,18 @@
</div> </div>
</div> </div>
</div> </div>
<div id="page-content" class="col-lg-8"> <div id="page-content" class="col-lg-8">
<div class="page-header"> <div class="page-header">
<h1>{% trans "Help" %} <small>{% trans "user guide in short" %}</small></h1> <h1>{% trans "Help" %} <small>{% trans "user guide in short" %}</small></h1>
</div> </div>
<div class="content"> <div class="content">
<ul class="help-tabs nav nav-tabs"> <ul class="help-tabs nav nav-tabs">
<li class="active"> <li class="active">
<a id="faq_menu" href="#" data-toggle="pill" data-target="._faq" class="text-center" > <a id="faq_menu" href="#" data-toggle="pill" data-target="._faq" class="text-center" >
<i class="fa fa-comments-o fa-2x"></i><br> <i class="fa fa-comments-o fa-2x"></i>
{% trans "FAQ" %}</a> <br>
{% trans "FAQ" %}
</a>
</li> </li>
<li> <li>
<a id="overview_menu" href="#" data-toggle="pill" data-target="._overview" class="text-center" > <a id="overview_menu" href="#" data-toggle="pill" data-target="._overview" class="text-center" >
...@@ -34,7 +36,6 @@ ...@@ -34,7 +36,6 @@
{% trans "Overview" %}</a> {% trans "Overview" %}</a>
</li> </li>
</ul> </ul>
<div id="help-tab-content" class="tab-content"> <div id="help-tab-content" class="tab-content">
<div class="tab-pane active _faq"> <div class="tab-pane active _faq">
{% include "info/help/faq.html" %} {% include "info/help/faq.html" %}
...@@ -43,8 +44,7 @@ ...@@ -43,8 +44,7 @@
{% include "info/help/overview.html" %} {% include "info/help/overview.html" %}
</div> </div>
</div> </div>
</div> <!-- .content -->
</div> <!-- content --> </div> <!-- #page-content .col-lg-8 -->
</div> <!-- col-lg -->
</div> </div>
{% endblock %} {% endblock %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment