Merge pull request #1308 from opf/release/fix/7623_replace_remaining_icons_by_icon_font

[Release 3.0][Fix] 7623 replace remaining icons by icon font
pull/1319/head
kgalli 11 years ago
commit 63cd2b0459
  1. 23
      app/assets/stylesheets/content/_forms.css.sass
  2. 5
      app/assets/stylesheets/default/main.css.erb
  3. 14
      app/assets/stylesheets/layout/_top_menu.css.sass
  4. 1
      app/views/search/_mini_form.html.erb

@ -193,11 +193,24 @@ hr.form_separator
.form-space .form-space
padding-top: 10px padding-top: 10px
fieldset.with-legend-control fieldset
legend legend:after
float: left @include icon-common
background-color: white float: right
margin-top: -15px padding:
right: 5px
top: 4px
&.collapsible
legend:after
content: "\e0d4"
&.collapsed
legend:after
content: "\e0d2"
&.with-legend-control
legend
float: left
background-color: white
margin-top: -15px
div.legend-control div.legend-control
margin-top: -15px margin-top: -15px

@ -236,7 +236,7 @@ fieldset.collapsible.header_collapsible > * {
padding-left: 6px; padding-left: 6px;
} }
fieldset.collapsible.header_collapsible legend { fieldset.collapsible.header_collapsible legend {
background: #E6E6E6 url(<%= asset_path 'projectnavi_arrow_up.png' %>) no-repeat 99% 50%; cursor: pointer; background: #E6E6E6; cursor: pointer;
width: 100%; width: 100%;
height: 23px; height: 23px;
line-height: 24px; line-height: 24px;
@ -245,9 +245,6 @@ fieldset.collapsible.header_collapsible legend {
fieldset.collapsible.header_collapsible legend:hover { fieldset.collapsible.header_collapsible legend:hover {
background-color: #d8d8d8; background-color: #d8d8d8;
} }
fieldset.collapsible.collapsed.header_collapsible legend {
background-image: url(<%= asset_path 'projectnavi_arrow_down.png' %>);
}
fieldset.collapsible { border-width: 1px 0 0 0; } fieldset.collapsible { border-width: 1px 0 0 0; }
fieldset.collapsible.borders { border-width: 1px; } fieldset.collapsible.borders { border-width: 1px; }
fieldset.collapsible.collapsed.borders { border-width: 1px 0 0 0; } fieldset.collapsible.collapsed.borders { border-width: 1px 0 0 0; }

@ -57,7 +57,6 @@
border: $header_search_field_border border: $header_search_field_border
border-radius: 25px border-radius: 25px
-webkit-border-radius: 25px -webkit-border-radius: 25px
background: $header_search_field_bg_color url(image-path('magnifier.png')) no-repeat 94% center
top: 6px top: 6px
width: 140px width: 140px
outline: 0px outline: 0px
@ -68,6 +67,19 @@
color: $header_search_field_font_color color: $header_search_field_font_color
:-moz-placeholder :-moz-placeholder
color: $header_search_field_font_color color: $header_search_field_font_color
span#magnifier
@include icon-common
position: relative
top: 10px
right: 27px
&:after
display: inline-block
content: "\e0a1"
-webkit-transform: scaleX(-1)
-moz-transform: scaleX(-1)
-o-transform: scaleX(-1)
-ms-transform: scaleX(-1)
transform: scaleX(-1)
ul ul
margin: 0 margin: 0
padding: 0 padding: 0

@ -35,6 +35,7 @@ See doc/COPYRIGHT.rdoc for more details.
<div id='search_wrap'> <div id='search_wrap'>
<%= text_field_tag 'q', @question, :size => 20, :class => 'search_field', :placeholder => l(:search_input_placeholder), :accesskey => accesskey(:quick_search) %> <%= text_field_tag 'q', @question, :size => 20, :class => 'search_field', :placeholder => l(:search_input_placeholder), :accesskey => accesskey(:quick_search) %>
<span id="magnifier"></span>
</div> </div>

Loading…
Cancel
Save