Merge pull request #8 from RITSI/develop

Revisión del core y el html
RITSI · Dec 3, 2024 · 4e69d26 · 4e69d26
2 parents 71127b9 + a73f1e7
commit 4e69d26
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/css/some.css b/css/some.css
@@ -55,17 +55,33 @@ input[type=text]:focus {
 }
 
 .progress-bar-success {
-    --bs-progress-bar-bg: var(--bs-green)!important;
+    --bs-progress-bar-bg: var(--bs-green);
 }
 
 .progress-bar-danger {
-    --bs-progress-bar-bg: var(--ritsi-red)!important;
+    --bs-progress-bar-bg: var(--ritsi-red);
 }
 
 .progress-bar-warning {
-    --bs-progress-bar-bg: var(--bs-yellow)!important;
+    --bs-progress-bar-bg: var(--bs-yellow);
 }
 
 .progress-bar-info {
-    --bs-progress-bar-bg: var(--bs-blue)!important;
+    --bs-progress-bar-bg: var(--bs-blue);
+}
+
+.color-success {
+    color: var(--bs-green);
+}
+
+.color-danger {
+    color: var(--ritsi-red);
+}
+
+.color-warning {
+    color: var(--bs-yellow);
+}
+
+.color-info {
+    color: var(--bs-blue);
 }
diff --git a/index.html b/index.html
@@ -54,10 +54,10 @@ <h1 id="question" class="ritsi-red"></h1>
           </div>
       </div>
       <div class="col-lg-12" id="col-lg-12" style="display:none">
-        <h3>Votos emitidos
+        <h4>Votos emitidos
           <span id="votos-emitidos">0</span>
-        </h3>
-        <div id="option-container">
+        </h4>
+        <div id="option-container" class="mt-4">
 
         </div>
       </div>

diff --git a/js/core-dyn.js b/js/core-dyn.js
@@ -45,7 +45,7 @@ function generatePoll(){
 
 function generateTopList( options ){
 	jQuery.each(options.slots, function (i, slot) {
-		var htmlModel = "<li> Tecla \'" + (i+1) + "\' o click en el contador: " + slot.slotlabel;
+		var htmlModel = "<li style='margin-left: 1vh'> Tecla \'" + (i+1) + "\' o click en el contador: " + slot.slotlabel;
 		$('#lista').append(htmlModel);
 	});
 	var htmlModel = '<p id="deshacer" style="margin-top:2em;font-size: 1.2em;text-align:center;"> Tecla r o click aquí: Deshacer voto <p>';
@@ -108,7 +108,7 @@ function buildOptions(options) {
 	$('#question').text(options.question);
 
 	jQuery.each(options.slots, function (i, slot) {
-		var htmlModel = '<h2 id="slot-' + i + '-superlabel">' + slot.slotlabel + ' <span id="slot-' + i + '-label">0</span></h2><div class="progress"><div id="slot-' + i + '" class="progress-bar progress-bar-' + slot.barType + '" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="0" style="width: 0%;"><span class="sr-only"></span></div></div>';
+		var htmlModel = '<h2 id="slot-' + i + '-superlabel">' + slot.slotlabel + ' - <span id="slot-' + i + '-label">0</span></h2><div class="progress mb-2"><div id="slot-' + i + '" class="progress-bar progress-bar-' + slot.barType + '" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="0" style="width: 0%;"><span class="sr-only"></span></div></div>';
 		$('#option-container').append(htmlModel);
 		$('#slot-' + i + '-superlabel').click(function() {
 			var e = jQuery.Event("keypress");