Commit f2ece574ae9c7624541b97304847dd5dccb3e7d7
1 parent
4ba4aa8d
Exists in
master
and in
3 other branches
fixing category card alignment and added wsgi editor for description in createform
Showing
2 changed files
with
19 additions
and
3 deletions
Show diff stats
amadeus/static/css/base/amadeus.css
... | ... | @@ -27,6 +27,8 @@ |
27 | 27 | |
28 | 28 | .category-header > h4{ |
29 | 29 | float:left; |
30 | + | |
31 | + margin-top: 0.5%; | |
30 | 32 | } |
31 | 33 | |
32 | 34 | .category-header i{ |
... | ... | @@ -465,10 +467,21 @@ ul, li { |
465 | 467 | -webkit-animation-timing-function: ease-in-out; |
466 | 468 | } |
467 | 469 | /* Icon Topic */ |
468 | -.divMoreActions {text-align: right; height: 59px; float: right;} | |
469 | -.moreAccordion {height: 59px;} | |
470 | +.divMoreActions { | |
471 | + text-align: right; height: 37px; float: right; | |
472 | +} | |
473 | + | |
474 | +.divMoreActions > .btn-group { | |
475 | + margin: 0px !important; | |
476 | +} | |
477 | + | |
478 | +.moreAccordion { | |
479 | + height: 37px; | |
480 | +} | |
470 | 481 | /*.divMoreActions div button {padding-left: 10px; padding-right: 10px; padding-bottom: 10px; margin-bottom: 4px; height: 31px;}*/ |
471 | -.divMoreActions , .moreAccordion{padding-top: 5px; padding-bottom: 1%;} | |
482 | +.divMoreActions , .moreAccordion{ | |
483 | + padding-top: 3px; | |
484 | +} | |
472 | 485 | .moreAccordion button{margin-bottom: 0px; margin-top: 8px;} |
473 | 486 | .titleTopic {padding-top: 10px; padding-bottom: 10px;} |
474 | 487 | .titleTopic a h4, .titleTopic h4{color: white;} | ... | ... |
categories/templates/categories/create.html
... | ... | @@ -25,6 +25,9 @@ |
25 | 25 | <input type="checkbox" name="{{field.name}}" {% if field.value %}checked="checked"{% endif %}><span class="checkbox-material"></span> {{field.name}} |
26 | 26 | </label> |
27 | 27 | </div> |
28 | + | |
29 | + {% elif field.auto_id == 'id_description' %} | |
30 | + {% render_field field class='form-control text_wysiwyg' %} | |
28 | 31 | {% else %} |
29 | 32 | {% render_field field class='form-control' %} |
30 | 33 | {% endif %} | ... | ... |