Update icon font

app/assets/fonts/openproject_icon/openproject-icon-font.svg

@@ -275,4 +275,5 @@
 <glyph unicode="&#57605;" d="M256 55l-177 307 354 0z m-177 402l354 0 0-46-354 0z"/>
 <glyph unicode="&#57607;" d="M46 259l210 210 210-210-210-209z"/>
 <glyph unicode="&#57608;" d="M177 326l158 0 0-24-158 0z m0-190l158 0 0-25-158 0z m70 258l25 0 0-159-25 0z m-181 118l32 0 0-512-32 0z m348-118l32 0 0-394-32 0z m-334-361l345 0 0-33-345 0z m0 479l238 0 0-33-238 0z m240 7l126-125-24-24-126 126z"/>
+<glyph unicode="&#57609;" d="M438 390l-48 48-134-137-134 137-48-48 137-134-137-134 48-48 134 137 134-137 48 48-137 134z m0 0"/>
 </font></defs></svg>

app/assets/stylesheets/content/_in_place_editing.lsg

@@ -158,7 +158,7 @@
             <accessible-by-keyboard execute="discardEditing()" >
               <a execute-on-enter="execute()" default-event-handling="defaultEventHandling"  href=""  tabindex="0">
                 <span  >
-                  <span class="icon-context icon-button icon-close2 " title="Description: Cancel" icon-name="close2" icon-title="Description: Cancel">
+                  <span class="icon-context icon-button icon-close " title="Description: Cancel" icon-name="close2" icon-title="Description: Cancel">
                     <span class="hidden-for-sighted ">Description: Cancel</span>
                   </span>
                 </span>
@@ -287,7 +287,7 @@
                       <accessible-by-keyboard execute="discardEditing()" >
                         <a execute-on-enter="execute()" default-event-handling="defaultEventHandling"  href=""  tabindex="0">
                           <span  >
-                            <span class="icon-context icon-button icon-close2 " title="Description: Cancel" icon-name="close2" icon-title="Description: Cancel">
+                            <span class="icon-context icon-button icon-close " title="Description: Cancel" icon-name="close2" icon-title="Description: Cancel">
                               <span class="hidden-for-sighted ">Description: Cancel</span>
                             </span>
                           </span>

app/assets/stylesheets/content/_notifications.lsg

@@ -22,7 +22,7 @@
 
 ```
 <div class="notification-box -error">
-  <a href="#" title="close" class="notification-box--close icon-context icon-close2"></a>
+  <a href="#" title="close" class="notification-box--close icon-context icon-close"></a>
   <div class="notification-box--content">
     <p>An error occured, here are the facts:</p>
     <ul>
@@ -39,7 +39,7 @@
 
 ```
 <div class="notification-box -warning">
-  <a href="#" title="close" class="notification-box--close icon-context icon-close2"></a>
+  <a href="#" title="close" class="notification-box--close icon-context icon-close"></a>
   <div class="notification-box--content">
     <p>This is a warning. You may ignore it, but bad things might happen.</p>
   </div>
@@ -50,7 +50,7 @@
 
 ```
 <div class="notification-box -warning -severe">
-  <a href="#" title="close" class="notification-box--close icon-context icon-close2"></a>
+  <a href="#" title="close" class="notification-box--close icon-context icon-close"></a>
   <div class="notification-box--content">
     <p>This is a warning with severe consequences. You should not ignore it.</p>
   </div>
@@ -61,7 +61,7 @@
 
 ```
 <div class="notification-box -success">
-  <a href="#" title="close" class="notification-box--close icon-context icon-close2"></a>
+  <a href="#" title="close" class="notification-box--close icon-context icon-close"></a>
   <div class="notification-box--content">
     <p>Successful update. <a href="#">A link to the past</a></p>
   </div>

app/assets/stylesheets/fonts/_openproject_icon_font.lsg

@@ -57,8 +57,7 @@
 <li><span class="icon-changeset3"></span> changeset3</li>
 <li><span class="icon-clock-reminder"></span> clock-reminder</li>
 <li><span class="icon-close"></span> close</li>
-<li><span class="icon-close2"></span> close2</li>
-<li><span class="icon-close2"></span> close2</li>
+<li><span class="icon-cross"></span> cross</li>
 <li><span class="icon-code-tag"></span> code-tag</li>
 <li><span class="icon-color-text"></span> color-text</li>
 <li><span class="icon-color-underline"></span> color-underline</li>
@@ -191,6 +190,7 @@
 <li><span class="icon-redo"></span> redo</li>
 <li><span class="icon-reload1"></span> reload1</li>
 <li><span class="icon-reload2"></span> reload2</li>
+<li><span class="icon-remove"></span> remove</li>
 <li><span class="icon-rename"></span> rename</li>
 <li><span class="icon-rss"></span> rss</li>
 <li><span class="icon-rss2"></span> rss2</li>
@@ -247,7 +247,6 @@
 <li><span class="icon-undo"></span> undo</li>
 <li><span class="icon-unit"></span> unit</li>
 <li><span class="icon-unit2"></span> unit2</li>
-<li><span class="icon-unit2"></span> unit2</li>
 <li><span class="icon-unlocked"></span> unlocked</li>
 <li><span class="icon-user-guide-admin"></span> user-guide-admin</li>
 <li><span class="icon-user-guide-user"></span> user-guide-user</li>

app/assets/stylesheets/fonts/_openproject_icon_font.sass

@@ -216,12 +216,9 @@ dt > .icon-changeset:before,
 .icon-changeset:before
   content: "\e006"
 
-.icon-close:before
+.icon-cross:before
   content: "\e007"
 
-.icon-close2:before
-  content: "\e0f6"
-
 .icon-copy:before
   content: "\e008"
 
@@ -950,7 +947,7 @@ dt > .icon-wiki-page:before,
 .icon-glossar:before
   content: "\e0f5"
 
-.icon-close2:before
+.icon-close:before
   content: "\e0f6"
 
 .icon-hosting:before
@@ -1007,6 +1004,9 @@ dt > .icon-wiki-page:before,
 .icon-compare:before
   content: "\e108"
 
+.icon-remove:before
+  content: "\e109"
+
 /* remove once all menu items have an icon */
 .no-icon
   margin-left: 15px

app/views/repositories/_checkout_instructions.html.erb

@@ -27,7 +27,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 <div id="repository--checkout-instructions" class="notification-box -info">
-  <a href="javscript:" title="{{ ::I18n.t('js.close_popup_title') }}" class="notification-box--close icon-context icon-close2"></a>
+  <a href="javscript:" title="{{ ::I18n.t('js.close_popup_title') }}" class="notification-box--close icon-context icon-close"></a>
   <div class="notification-box--content">
     <p>
     <%= simple_format instructions.instructions %>

frontend/app/templates/components/notification-box.html

@@ -31,5 +31,5 @@
       </div>
     </div>
   </div>
-  <a data-ng-click="remove()" data-ng-if="removable()" title="{{ ::I18n.t('js.close_popup_title') }}" class="notification-box--close icon-context icon-close2"></a>
+  <a data-ng-click="remove()" data-ng-if="removable()" title="{{ ::I18n.t('js.close_popup_title') }}" class="notification-box--close icon-context icon-close"></a>
 </div>