Download as
Browse Code »

Commit 247bfeeed72bf38d9de99fde5906610d343f1e6d

Authored by Zambom
1 parent 7aaf5472
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Webpages list style adjusts

Showing 3 changed files with 34 additions and 16 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @247bfee
... ... @@ -752,29 +752,21 @@ a.add-row {
752 752 }
753 753  
754 754 .resource_list {
755   - margin-left: 30px;
  755 + margin-left: 20px;
756 756 border-top: none !important;
757 757 }
758 758  
759   -.resource_list > .list-group-item:first-child {
760   - border-top-left-radius: 4px !important;
761   - border-top-right-radius: 4px !important;
762   -}
763   -
764 759 .resource_list > .list-group-item {
765 760 position: relative;
766 761 display: block;
767   - padding: 10px 15px;
  762 + padding: 10px 0px 10px 15px;
768 763 margin-bottom: -1px;
769   - border-width: 1px !important;
770 764 overflow: inherit;
771 765 cursor: pointer;
772 766 }
773 767  
774 768 .resource_list > .list-group-item:last-child {
775 769 margin-bottom: 0;
776   - border-bottom-right-radius: 4px !important;
777   - border-bottom-left-radius: 4px !important;
778 770 }
779 771  
780 772 .resource_list .list-group-item .list-group-item-heading {
... ... @@ -786,6 +778,28 @@ a.add-row {
786 778 margin: 0px;
787 779 }
788 780  
  781 +.resource_list .btn-group button {
  782 + margin-top: -5px;
  783 + padding-right: 15px;
  784 + padding-left: 15px;
  785 +}
  786 +
  787 +.resource_list .btn-group button:focus {
  788 + outline: none;
  789 +}
  790 +
  791 +.resource_list .btn-group button:active {
  792 + margin-top: -5px;
  793 +}
  794 +
  795 +.resource_list .btn-group button i {
  796 + margin-right: 0px;
  797 +}
  798 +
  799 +.resource_list .fa-arrows {
  800 + margin-right: 0px;
  801 +}
  802 +
789 803 .resource_list > .disabled a {
790 804 cursor: not-allowed;
791 805 }
... ...
amadeus/static/css/themes/green.css
  Diff comments   View file @247bfee
... ... @@ -393,6 +393,10 @@ a.add-row {
393 393 color: inherit;
394 394 }
395 395  
  396 +.resource_list .btn-group button:active, .resource_list .btn-group button:focus, .resource_list .btn-group button:hover {
  397 + background-color: initial !important;
  398 +}
  399 +
396 400 @media(max-width: 768px) {
397 401 .navbar .navbar-nav .dropdown .dropdown-menu li > a {
398 402 color: #333333 !important;
... ...
webpage/templates/webpages/list.html
  Diff comments   View file @247bfee
... ... @@ -20,10 +20,10 @@
20 20 {% if has_subject_permissions %}
21 21 <div class="pull-right category-card-items">
22 22 <a><i class="fa fa-arrows" aria-hidden="true"></i></a>
23   - <span class="btn-group">
24   - <a href="" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
25   - <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
26   - </a>
  23 + <span class="btn-group pull-right">
  24 + <button class="btn btn-sm btn_menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  25 + <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
  26 + </button>
27 27 <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="moreResources">
28 28 <li><a href="{% url 'webpages:update' topic.slug resource.slug %}" class="edit"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
29 29 <li><a href="javascript:delete_resource('{% url 'webpages:delete' resource.slug %}')" class="delete"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>{% trans 'Remove' %}</a></li>
... ... @@ -53,11 +53,11 @@
53 53 $(".list-group-item").unbind().on('click', function (e) {
54 54 var arrow = $(this).find('i.fa-arrows').is(e.target),
55 55 menu = $(this).find('i.fa-ellipsis-v').is(e.target),
  56 + btn = $(this).find('button.btn_menu').is(e.target),
56 57 del = $(this).find('a.delete').is(e.target),
57 58 upd = $(this).find('a.edit').is(e.target);
58 59  
59   -
60   - if (!arrow && !menu && !del && !upd) {
  60 + if (!arrow && !menu && !del && !upd && !btn) {
61 61 var link = $(this).find('.resource_link').attr('href'),
62 62 target = $(this).find('.resource_link').attr('target');
63 63  
... ...