branch develop updated (3f4ab8c -> 7315fb4)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from 3f4ab8c Improve code quality and fix the mixed content errors new 7315fb4 Change some icons which were too similar The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7315fb48c292c5b9dd68e42736bd49f9d1563cd0 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri Jun 19 15:50:14 2015 +0200 Change some icons which were too similar Summary of changes: .../src/main/webapp/WEB-INF/content/browse.jsp | 2 +- .../main/webapp/WEB-INF/content/imageViewer.jsp | 2 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 132 ++++++++++----------- .../main/webapp/codemirror-ui/js/codemirror-ui.js | 2 +- swe-ui-web/src/main/webapp/css/main.css | 13 +- 5 files changed, 78 insertions(+), 73 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 7315fb48c292c5b9dd68e42736bd49f9d1563cd0 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri Jun 19 15:50:14 2015 +0200 Change some icons which were too similar --- .../src/main/webapp/WEB-INF/content/browse.jsp | 2 +- .../main/webapp/WEB-INF/content/imageViewer.jsp | 2 +- .../webapp/WEB-INF/content/modificationViewer.jsp | 132 ++++++++++----------- .../main/webapp/codemirror-ui/js/codemirror-ui.js | 2 +- swe-ui-web/src/main/webapp/css/main.css | 13 +- 5 files changed, 78 insertions(+), 73 deletions(-) diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/browse.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/browse.jsp index 8fd164a..f273e42 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/browse.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/browse.jsp @@ -303,7 +303,7 @@ <span class="fa-stack fa-lg"> <i class="fa fa-file fa-stack-2x"></i> - <i class="fa fa-arrows fa-stack-1x fa-inverse"></i> + <i class="fa fa-arrow-right fa-stack-1x fa-inverse"></i> </span> </s:a> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/imageViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/imageViewer.jsp index d3dd768..3bdc0ab 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/imageViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/imageViewer.jsp @@ -249,7 +249,7 @@ <span class="fa-stack fa-lg"> <i class="fa fa-file fa-stack-2x"></i> - <i class="fa fa-arrows fa-stack-1x fa-inverse"></i> + <i class="fa fa-arrow-right fa-stack-1x fa-inverse"></i> </span> </s:a> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp index 3b36757..af0991a 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp @@ -302,7 +302,7 @@ <span class="fa-stack fa-lg"> <i class="fa fa-file fa-stack-2x"></i> - <i class="fa fa-arrows fa-stack-1x fa-inverse"></i> + <i class="fa fa-arrow-right fa-stack-1x fa-inverse"></i> </span> </s:a> @@ -418,70 +418,6 @@ </li> - <s:if test="format == 'rst' || format == 'md'"> - - <li> - - <div class="menuDescription"> - - <p><s:text name="scm.preview"/></p> - - <ul id="previewButtons" class="buttonsGroup"> - <li id="previewSideButton" class="previewPosSelected"> - <s:set id="previewSide"> - <s:text name="scm.modificationViewer.previewPosition.side"/> - </s:set> - - <s:a - href="javascript:changePreviewPos('side');" - title="%{previewSide}"> - - <span class="fa-stack fa-lg"> - <i class="fa fa-pause fa-stack-2x"></i> - </span> - - </s:a> - </li> - - <li id="previewBelowButton"> - <s:set id="previewBelow"> - <s:text name="scm.modificationViewer.previewPosition.below"/> - </s:set> - - <s:a - href="javascript:changePreviewPos('below');" - title="%{previewBelow}"> - - <span class="fa-stack fa-lg"> - <i class="fa fa-pause fa-stack-2x fa-rotate-90"></i> - </span> - - </s:a> - </li> - - <li id="previewNoneButton"> - <s:set id="previewNone"> - <s:text name="scm.modificationViewer.previewPosition.none"/> - </s:set> - - <s:a - href="javascript:changePreviewPos('none');" - title="%{previewNone}"> - - <span class="fa-stack fa-lg"> - <i class="fa fa-eye-slash fa-2x"></i> - </span> - - </s:a> - </li> - </ul> - - </div> - - </li> - - </s:if> - <li> <div class="menuDescription"> @@ -523,7 +459,7 @@ onclick="document.getElementById('resetIndicator').style.display = 'inline';" > <span id="resetButton" class="fa-stack fa-lg"> - <i class="fa fa-undo fa-2x"></i> + <i class="fa fa-arrow-left fa-2x"></i> </span> </sj:a> </li> @@ -587,6 +523,70 @@ </li> + <s:if test="format == 'rst' || format == 'md'"> + + <li> + + <div class="menuDescription"> + + <p><s:text name="scm.preview"/></p> + + <ul id="previewButtons" class="buttonsGroup"> + <li id="previewSideButton" class="previewPosSelected"> + <s:set id="previewSide"> + <s:text name="scm.modificationViewer.previewPosition.side"/> + </s:set> + + <s:a + href="javascript:changePreviewPos('side');" + title="%{previewSide}"> + + <span class="fa-stack fa-lg"> + <i class="fa fa-pause fa-stack-2x"></i> + </span> + + </s:a> + </li> + + <li id="previewBelowButton"> + <s:set id="previewBelow"> + <s:text name="scm.modificationViewer.previewPosition.below"/> + </s:set> + + <s:a + href="javascript:changePreviewPos('below');" + title="%{previewBelow}"> + + <span class="fa-stack fa-lg"> + <i class="fa fa-pause fa-stack-2x fa-rotate-90"></i> + </span> + + </s:a> + </li> + + <li id="previewNoneButton"> + <s:set id="previewNone"> + <s:text name="scm.modificationViewer.previewPosition.none"/> + </s:set> + + <s:a + href="javascript:changePreviewPos('none');" + title="%{previewNone}"> + + <span class="fa-stack fa-lg"> + <i class="fa fa-eye-slash fa-2x"></i> + </span> + + </s:a> + </li> + </ul> + + </div> + + </li> + + </s:if> + <li> <s:if test="format=='rst'"> diff --git a/swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js b/swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js index 7acd4a7..3512146 100644 --- a/swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js +++ b/swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js @@ -420,7 +420,7 @@ CodeMirrorUI.prototype = { span.appendChild(i); var i2 = document.createElement("i"); - i2.className = "fa fa-arrow-right fa-stack-1x fa-inverse"; + i2.className = "fa fa-arrow-down fa-stack-1x fa-inverse"; span.appendChild(i2); this.jump.appendChild(li); diff --git a/swe-ui-web/src/main/webapp/css/main.css b/swe-ui-web/src/main/webapp/css/main.css index dc177a9..21e5bf8 100644 --- a/swe-ui-web/src/main/webapp/css/main.css +++ b/swe-ui-web/src/main/webapp/css/main.css @@ -404,8 +404,8 @@ ul.buttonsGroup li { color: #4EAD49; } -#sweMenu li ul li:hover .fa-plus, #sweMenu li ul li:hover .fa-minus, #sweMenu li ul li:hover .fa-arrows, - #sweMenu li ul li:hover .fa-refresh { +#sweMenu li ul li:hover .fa-plus, #sweMenu li ul li:hover .fa-minus, #sweMenu li ul li:hover .fa-arrow-right, + #sweMenu li ul li:hover .fa-refresh, #sweMenu li ul li:hover .fa-arrow-right { color: #FFF; } @@ -516,14 +516,19 @@ ul.buttonsGroup li { color: #4EAD49; } -.fa-plus, .fa-minus, .fa-arrows, .fa-arrow-right, .fa-refresh { +.fa-plus, .fa-minus, .fa-arrow-right, .fa-refresh { position: relative; left: 3px; top: 4px; color: #4EAD49; } -#sweBrowseMenu .fa-plus, #sweBrowseMenu .fa-minus, #sweBrowseMenu .fa-arrows { +.fa-arrow-down { + bottom: 3px; + left: -1px; +} + +#sweBrowseMenu .fa-plus, #sweBrowseMenu .fa-minus, #sweBrowseMenu .fa-arrow-right { position: relative; left: 3px; top: 5px; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm