Merge pull request #15 from iCAPLyon1/5.x

Minor update design
iCAPLyon1 · Sep 9, 2015 · e23c787 · e23c787
2 parents d2f7f7e + f14c4ae
commit e23c787
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/Resources/public/css/style.css b/Resources/public/css/style.css
@@ -97,3 +97,21 @@ span.invisible-section-text {font-style: italic;}
     margin-top: -25px;
     text-align: right;
 }
+
+.wiki-contents-inner.well ul.sortable-list.sortable-enable li{
+    padding: 5px 5px 5px 15px;
+    font-size: 0.9em;
+}
+
+/* Grip */
+.wiki-contents-inner.well ul.sortable-list.sortable-enable li::before{
+    content: "..\A ..\A ..\A ..\A ";
+    display: inline-block;
+    line-height: 5px;
+    margin-left: -11px;
+    margin-top: -5px;
+    position: absolute;
+    width: 5px;
+}
+
+
diff --git a/Resources/translations/icap_wiki.fr.yml b/Resources/translations/icap_wiki.fr.yml
@@ -20,7 +20,7 @@ back_to_history: "Retour à l'historique"
 edit: 'Modifier'
 delete: 'Supprimer'
 Delete: 'Supprimer'
-Create: 'Creer'
+Create: 'Créer'
 Confirm: 'Confirmer'
 Cancel: 'Annuler'
 Save: 'Sauvegarder'

diff --git a/Resources/views/Wiki/view.html.twig b/Resources/views/Wiki/view.html.twig
@@ -51,9 +51,9 @@
                 <div class="wiki-contents-title">
                     {{ 'wiki_contents'|trans({},'icap_wiki') }}
                     {% if isAdmin %}
-                    <a id="move-contents-trigger" class="btn btn-default btn-xs pull-right">
-                        <i class="fa fa-resize-vertical"></i> <i class="fa fa-reorder"></i>
-                    </a>
+                    <span id="move-contents-trigger" class="btn btn-default btn-xs pull-right">
+                        <i class="fa fa-resize-vertical"></i> <span class="fa fa-arrows"></span>
+                    </span>
                     {% endif %}
                 </div>
                 {% include "IcapWikiBundle:Wiki:wikiContents.html.twig" with {'sections' : tree[0].__children, 'isAdmin' : isAdmin, 'delimeter' : '.', 'rootId' : tree[0].id } %}