Browse Source

No margin after last element

crobi 10 years ago
parent
commit
39a64aea0e
2 changed files with 10 additions and 6 deletions
  1. 4
    0
      generator/css/cards.css
  2. 6
    6
      generator/js/cards.js

+ 4
- 0
generator/css/cards.css View File

194
     margin-bottom: 0;
194
     margin-bottom: 0;
195
     margin-top: 0;
195
     margin-top: 0;
196
     font-size: inherit;
196
     font-size: inherit;
197
+}
198
+
199
+.card-element:last-of-type{
200
+    margin-bottom: 0;
197
 }
201
 }

+ 6
- 6
generator/js/cards.js View File

72
 
72
 
73
 function card_element_subtitle(params, card_data, options) {
73
 function card_element_subtitle(params, card_data, options) {
74
     var subtitle = params[0] || "";
74
     var subtitle = params[0] || "";
75
-    return '<div class="card-subtitle">' + subtitle + '</div>';
75
+    return '<div class="card-element card-subtitle">' + subtitle + '</div>';
76
 }
76
 }
77
 
77
 
78
 function card_element_ruler(params, card_data, options) {
78
 function card_element_ruler(params, card_data, options) {
89
 
89
 
90
 function card_element_property(params, card_data, options) {
90
 function card_element_property(params, card_data, options) {
91
     var result = "";
91
     var result = "";
92
-    result += '<div class="card-property-line">';
92
+    result += '<div class="card-element card-property-line">';
93
     result += '   <h4 class="card-property-name">' + params[0] + '</h4>';
93
     result += '   <h4 class="card-property-name">' + params[0] + '</h4>';
94
     result += '   <p class="card-p card-property-text">' + params[1] + '</p>';
94
     result += '   <p class="card-p card-property-text">' + params[1] + '</p>';
95
     result += '</div>';
95
     result += '</div>';
98
 
98
 
99
 function card_element_description(params, card_data, options) {
99
 function card_element_description(params, card_data, options) {
100
     var result = "";
100
     var result = "";
101
-    result += '<div class="card-description-line">';
101
+    result += '<div class="card-element card-description-line">';
102
     result += '   <h4 class="card-description-name">' + params[0] + '</h4>';
102
     result += '   <h4 class="card-description-name">' + params[0] + '</h4>';
103
     result += '   <p class="card-p card-description-text">' + params[1] + '</p>';
103
     result += '   <p class="card-p card-description-text">' + params[1] + '</p>';
104
     result += '</div>';
104
     result += '</div>';
107
 
107
 
108
 function card_element_text(params, card_data, options) {
108
 function card_element_text(params, card_data, options) {
109
     var result = "";
109
     var result = "";
110
-    result += '<div class="card-description-line">';
110
+    result += '<div class="card-element card-description-line">';
111
     result += '   <p class="card-p card-description-text">' + params[0] + '</p>';
111
     result += '   <p class="card-p card-description-text">' + params[0] + '</p>';
112
     result += '</div>';
112
     result += '</div>';
113
     return result;
113
     return result;
115
 
115
 
116
 function card_element_bullet(params, card_data, options) {
116
 function card_element_bullet(params, card_data, options) {
117
     var result = "";
117
     var result = "";
118
-    result += '<ul class="card-bullet-line">';
118
+    result += '<ul class="card-element card-bullet-line">';
119
     result += '   <li class="card-bullet">' + params[0] + '</li>';
119
     result += '   <li class="card-bullet">' + params[0] + '</li>';
120
     result += '</ul>';
120
     result += '</ul>';
121
     return result;
121
     return result;
129
 
129
 
130
 function card_element_fill(params, card_data, options) {
130
 function card_element_fill(params, card_data, options) {
131
     var flex = params[0] || "1";
131
     var flex = params[0] || "1";
132
-    return '<div class="card-fill" style="flex:' + flex + '"></div>';
132
+    return '<span class="card-fill" style="flex:' + flex + '"></span>';
133
 }
133
 }
134
 
134
 
135
 function card_element_unknown(params, card_data, options) {
135
 function card_element_unknown(params, card_data, options) {

Loading…
Cancel
Save