Permalink
Browse files

remove Iconic

  • Loading branch information...
1 parent 567e7a4 commit 6ebb4a7d98cca2c9c3d082c3a474cb76eacc09fa @timoschilling timoschilling committed Nov 2, 2014
View
@@ -18,8 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Iconic Icons are designed by P.J. Onori and are shared under
-the Creative Commons Attribution-Share Alike 3.0 license:
-http://creativecommons.org/licenses/by-sa/3.0/us
-http://somerandomdude.com/projects/iconic/
View
@@ -84,15 +84,13 @@ Tool | Description
[Arbre] | Ruby -> HTML, just like that.
[Devise] | Powerful, extensible user authentication
[Formtastic] | A Rails form builder plugin with semantically rich and accessible markup
-[Iconic Icons] | An excellent SVG icon set designed by P.J. Onori
[Inherited Resources] | Simplifies controllers with pre-built RESTful controller actions
[Kaminari] | Elegant pagination for any sort of collection
[Ransack] | Provides a simple search API to query your data
[Arbre]: https://github.com/activeadmin/arbre
[Devise]: https://github.com/plataformatec/devise
[Formtastic]: https://github.com/justinfrench/formtastic
-[Iconic Icons]: http://somerandomdude.com/projects/iconic
[Inherited Resources]: https://github.com/josevalim/inherited_resources
[Kaminari]: https://github.com/amatsuda/kaminari
[Ransack]: https://github.com/activerecord-hackery/ransack
@@ -59,7 +59,6 @@ form {
.has_many_container {
.handle {
position: absolute;
- @include icon-size(3em);
top: calc(50% - 3em / 2);
right: 2px;
padding: 0;
@@ -245,12 +244,6 @@ form {
fieldset.buttons li, fieldset.actions li {
float:left;
padding: 0;
-
- &.cancel {
- a {
- @include light-button; @include icon(#777, 9px);
- }
- }
}
}
@@ -1,8 +1,3 @@
-td, p {
- @include icon(#B3BCC1, 0.8em);
- span.icon { margin: 0 3px; }
-}
-
a.member_link {
margin-right: 7px;
white-space: nowrap;
@@ -2,7 +2,6 @@
@import "active_admin/mixins/reset";
@import "active_admin/mixins/gradients";
@import "active_admin/mixins/shadows";
-@import "active_admin/mixins/icons";
@import "active_admin/mixins/rounded";
@import "active_admin/mixins/buttons";
@import "active_admin/mixins/sections";
@@ -1,20 +0,0 @@
-span.icon { vertical-align: middle; display: inline-block; }
-span.icon svg { vertical-align: baseline; }
-
-
-@mixin icon-color ($color) {
- span.icon svg {
- path, polygon, rect, circle { fill: $color; }
- }
-}
-
-@mixin icon-size ($size) {
- span.icon { width: $size; height: $size; }
-}
-
-@mixin icon($color, $size) {
- @include icon-color($color);
- @include icon-size($size);
-}
-
-@include icon-size(0.8em);
@@ -10,7 +10,6 @@
line-height: 18px;
margin-bottom: 0.5em;
color: $section-header-text-color;
- @include icon($section-header-text-color, 1.0em);
padding: 5px 10px 3px 10px;
}
@@ -34,12 +34,7 @@
& > a, & > .dropdown_menu > a {
@include light-button;
padding: 12px 17px 10px;
- span.icon { vertical-align: bottom; margin-right: 4px;}
margin: 0px;
-
- &:hover{
- @include icon-color(#000);
- }
}
}
}
View
@@ -35,7 +35,6 @@ module ActiveAdmin
autoload :Event, 'active_admin/event'
autoload :FormBuilder, 'active_admin/form_builder'
autoload :Inputs, 'active_admin/inputs'
- autoload :Iconic, 'active_admin/iconic'
autoload :Menu, 'active_admin/menu'
autoload :MenuCollection, 'active_admin/menu_collection'
autoload :MenuItem, 'active_admin/menu_item'
@@ -93,7 +93,7 @@ def has_many_actions(has_many_form, builder_options, contents)
has_many_form.input builder_options[:sortable], as: :hidden
contents << template.content_tag(:li, class: 'handle') do
- Iconic.icon :move_vertical
+ "MOVE"
end
end
@@ -1,53 +0,0 @@
-require 'active_admin/iconic/icons'
-
-module ActiveAdmin
- module Iconic
-
- # Default color to use for icons
- @@default_color = "#5E6469"
- mattr_accessor :default_color
-
-
- # Render an icon:
- # Iconic.icon :loop, width: 100, height: 100, color: "#5E6469"
- # Iconic.icon :loop, width: "1em", height: "1em", color: "#5E6469"
- # NOTE: you can omit the dimensions if they are specified in css
- def self.icon(name, options = {})
- options = {
- color: default_color,
- id: ""
- }.merge(options)
-
- options[:style] = "fill:#{options[:color]};"
- options[:fill] = options.delete(:color)
-
- css = options.delete(:css) || {}
-
- # extract desired dimensions to be used as the wrapper's inline styles
- # Convert to strings representations of pixels
- [:width, :height].each do |key|
- value = options.delete key
- css[key] ||= "#{value}px" unless value.blank? || value.is_a?(String)
- end
- css_str = css.map {|k,v| "#{k}:#{v}"}.join(";")
- css_str = "style=\"#{css_str}\"" if css_str.present?
-
- # make the svg itself expand to its parent
- options[:width] = options[:height] = "100%"
-
- template = ICONS[name.to_sym]
-
- if template
- svg = template.dup
- options.each do |key, value|
- svg.gsub!("{#{key}}", value)
- end
-
- "<span class=\"icon icon_#{name}\" #{css_str}>#{svg}</span>".html_safe
- else
- raise "Could not find the icon named #{name}"
- end
- end
-
- end
-end
Oops, something went wrong.

0 comments on commit 6ebb4a7

Please sign in to comment.