Commit 615652db7c6d17fbd861f32d11d63d76125408ad
1 parent
38f14a80
Exists in
master
and in
3 other branches
modified right side align on cards
Showing
2 changed files
with
31 additions
and
6 deletions
Show diff stats
amadeus/static/css/base/amadeus.css
@@ -27,14 +27,19 @@ | @@ -27,14 +27,19 @@ | ||
27 | 27 | ||
28 | .category-header > h4{ | 28 | .category-header > h4{ |
29 | float:left; | 29 | float:left; |
30 | - | ||
31 | margin-top: 0.5%; | 30 | margin-top: 0.5%; |
32 | } | 31 | } |
33 | 32 | ||
33 | + | ||
34 | +.category-card-items i{ | ||
35 | + font-size: 25px !important; | ||
36 | + margin-right: 5%; | ||
37 | + margin-top: 1%; | ||
38 | +} | ||
34 | .category-header i{ | 39 | .category-header i{ |
35 | color: white; | 40 | color: white; |
36 | - margin-right: 10px; | ||
37 | - font-size:16px; | 41 | + |
42 | + font-size: 20px; | ||
38 | float: right; | 43 | float: right; |
39 | 44 | ||
40 | 45 | ||
@@ -101,6 +106,13 @@ | @@ -101,6 +106,13 @@ | ||
101 | float:left; | 106 | float:left; |
102 | } | 107 | } |
103 | 108 | ||
109 | +.create-subject-btn{ | ||
110 | + width: 100%; | ||
111 | + background-color: #26A69A; | ||
112 | + color: white; | ||
113 | + border: 0px; | ||
114 | +} | ||
115 | + | ||
104 | /* category app ends */ | 116 | /* category app ends */ |
105 | 117 | ||
106 | .clearfix{ | 118 | .clearfix{ |
@@ -643,6 +655,7 @@ ul, li { | @@ -643,6 +655,7 @@ ul, li { | ||
643 | /* Icon Topic */ | 655 | /* Icon Topic */ |
644 | .divMoreActions { | 656 | .divMoreActions { |
645 | text-align: right; height: 30px; float: right; | 657 | text-align: right; height: 30px; float: right; |
658 | + width: 3%; | ||
646 | } | 659 | } |
647 | 660 | ||
648 | .divMoreActions > .btn-group { | 661 | .divMoreActions > .btn-group { |
@@ -663,7 +676,11 @@ ul, li { | @@ -663,7 +676,11 @@ ul, li { | ||
663 | .dropdown-menu .pull-right { | 676 | .dropdown-menu .pull-right { |
664 | right: 0; | 677 | right: 0; |
665 | } | 678 | } |
666 | -.cards-content{ padding-left: 0px; padding-right: 0px; } | 679 | +.cards-content{ |
680 | + padding-left: 0px; padding-right: 0px; | ||
681 | + font-family: Roboto; | ||
682 | + font-size: 18px; | ||
683 | +} | ||
667 | .cards-detail{margin-left: 4%;} | 684 | .cards-detail{margin-left: 4%;} |
668 | .cards-detail .panel .panel-heading{/*background-color:;*/} | 685 | .cards-detail .panel .panel-heading{/*background-color:;*/} |
669 | .cards-detail .panel .panel-heading h4{color:black;} | 686 | .cards-detail .panel .panel-heading h4{color:black;} |
categories/templates/categories/list.html
@@ -49,7 +49,7 @@ | @@ -49,7 +49,7 @@ | ||
49 | </a> | 49 | </a> |
50 | </h4> | 50 | </h4> |
51 | {% if user.is_staff or user in category.coordinators.all %} | 51 | {% if user.is_staff or user in category.coordinators.all %} |
52 | - <div class="col-xs-1 col-md-1 divMoreActions"> | 52 | + <div class=" divMoreActions"> |
53 | <div class="btn-group"> | 53 | <div class="btn-group"> |
54 | <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> | 54 | <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
55 | <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> | 55 | <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> |
@@ -63,9 +63,12 @@ | @@ -63,9 +63,12 @@ | ||
63 | </ul> | 63 | </ul> |
64 | </div> | 64 | </div> |
65 | </div> | 65 | </div> |
66 | + {% else %} | ||
67 | + <div class=" divMoreActions"> | ||
68 | + </div> | ||
66 | {% endif %} | 69 | {% endif %} |
67 | {% if not user.is_staff %} | 70 | {% if not user.is_staff %} |
68 | - <div class="col-md-5 pull-right"> | 71 | + <div class="col-md-5 pull-right category-card-items"> |
69 | <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> | 72 | <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> |
70 | <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a> | 73 | <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a> |
71 | <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a> | 74 | <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a> |
@@ -82,7 +85,12 @@ | @@ -82,7 +85,12 @@ | ||
82 | {% endfor %} | 85 | {% endfor %} |
83 | </h4> | 86 | </h4> |
84 | {{category.description|safe}} | 87 | {{category.description|safe}} |
88 | + {% if user in category.coordinators.all %} | ||
89 | + <button class="create-subject-btn"> {% trans "create new subject" %} </button> | ||
90 | + {% endif %} | ||
85 | </div> | 91 | </div> |
92 | + | ||
93 | + | ||
86 | {% comment %} | 94 | {% comment %} |
87 | <div id="{{category.slug}}" class="panel-collapse collapse"> | 95 | <div id="{{category.slug}}" class="panel-collapse collapse"> |
88 | {% for subject in subjects %} | 96 | {% for subject in subjects %} |