Enhance panelCSS && wysiwyg in admin

parsimony · Jul 1, 2014 · 7a2a479 · 7a2a479
1 parent bf7e4ec
commit 7a2a479
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/modules/admin/blocks/css/block.js b/modules/admin/blocks/css/block.js
@@ -1144,10 +1144,10 @@ blockAdminCSS.prototype.getCSSSelectorForElement = function(node, media, proposa
 		for (var key in proposals) {
 			if (media.length > 0) {
 				ParsimonyAdmin.currentDocument.styleSheets[nbStylesheet].insertRule(media + " { " + proposals[key] + " { } }", nbRules);
-				linkedRules[this.getSpecificity(proposals[key]) + linkedRulesNb] = [CSSTHEMEPATH, proposals[key], "", nbStylesheet, 0, media, nbRules];
+				linkedRules[key + linkedRulesNb] = [CSSTHEMEPATH, proposals[key], "", nbStylesheet, 0, media, nbRules];
 			} else {
 				ParsimonyAdmin.currentDocument.styleSheets[nbStylesheet].insertRule(proposals[key] + "{}", nbRules);
-				linkedRules[this.getSpecificity(proposals[key]) + linkedRulesNb] = [CSSTHEMEPATH, proposals[key], "", nbStylesheet, nbRules, "", ""];
+				linkedRules[key + linkedRulesNb] = [CSSTHEMEPATH, proposals[key], "", nbStylesheet, nbRules, "", ""];
 			}
 			nbRules++;
 			linkedRulesNb++;

diff --git a/modules/admin/css/main.css b/modules/admin/css/main.css
@@ -511,10 +511,6 @@ margin:0}
 #checkmedia:checked + #labelmedia span{margin-left:25px;}
 #checkmedia:checked + #labelmedia #btnmedia{background:#44C5EC;}
 
-/* Fix wysiwyg */
-#HTML5editorToolbar button{min-width: initial !important;}
-.HTML5Editor ul{list-style: disc outside none;padding-left:40px;margin:12px 0 }
-
 /* ################ Hacks tricks ################## */
 [draggable] {-moz-user-select: none;-webkit-user-select: none;user-select: none;}
 

diff --git a/modules/admin/css/ui.css b/modules/admin/css/ui.css
@@ -288,4 +288,8 @@ input[type="range"]::-webkit-slider-thumb {
 .ui-icon-folder-open {background-position: -16px -96px;}
 .ui-icon-trash {background-position: -176px -96px;}
 
-:invalid{background: #fff no-repeat 98% center;box-shadow: 0 0 5px #ffeded;border-color: #ffeded}
+:invalid{background: #fff no-repeat 98% center;box-shadow: 0 0 5px #ffeded;border-color: #ffeded}
+
+/* Fix wysiwyg */
+#HTML5editorToolbar button{min-width: initial !important;}
+.HTML5Editor ul{list-style: disc outside none;padding-left:40px;margin:12px 0 }