diff --git a/app/assets/fonts/FontAwesome.otf b/app/assets/fonts/FontAwesome.otf new file mode 100644 index 00000000..64049bf2 Binary files /dev/null and b/app/assets/fonts/FontAwesome.otf differ diff --git a/app/assets/fonts/entypo.dev.svg b/app/assets/fonts/entypo.dev.svg new file mode 100644 index 00000000..5566ca5c --- /dev/null +++ b/app/assets/fonts/entypo.dev.svg @@ -0,0 +1,980 @@ + + + + +This is a custom SVG font generated by IcoMoon. +1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/fonts/entypo.eot b/app/assets/fonts/entypo.eot index 56d104e9..8633c77d 100644 Binary files a/app/assets/fonts/entypo.eot and b/app/assets/fonts/entypo.eot differ diff --git a/app/assets/fonts/entypo.svg b/app/assets/fonts/entypo.svg index 01ff749d..cc9143e5 100644 --- a/app/assets/fonts/entypo.svg +++ b/app/assets/fonts/entypo.svg @@ -9,43 +9,65 @@ This is a custom SVG font generated by IcoMoon. - - + + + - + - + + - + + - + - + + + + - + - + - - + + + + + + + + - - + + + - - + + - - - + + + + + - + - + + - + + - + - + - - + + - + - + + - + - + - + + + + + + - + - + - - + + + + - + - - - + + + + + + + + - + + + - + - + + - + + + + + + + + + + - + - + - + - + + + + + + + + - + + + - + + - - - - + + + - + + + + + + + - - - - + + + - + - + - - - + + + - + - - - - - - - - + + + + + + - + + + + - + - + - + - + - + - + + + + - - - - - + + + + + + + + - + + - + - - - + + + + + + - - + + - + - + - + - + - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + l 92.186,0.00 L 302.106,230.144 l 57.60,0.00 l-103.68,97.536L 152.32,230.144L 209.92,230.144 L 209.92,125.44 z" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/fonts/entypo.ttf b/app/assets/fonts/entypo.ttf index 0a114e0a..36560704 100644 Binary files a/app/assets/fonts/entypo.ttf and b/app/assets/fonts/entypo.ttf differ diff --git a/app/assets/fonts/entypo.woff b/app/assets/fonts/entypo.woff index 57cf5b47..97980df1 100644 Binary files a/app/assets/fonts/entypo.woff and b/app/assets/fonts/entypo.woff differ diff --git a/app/assets/fonts/fontawesome-webfont.eot b/app/assets/fonts/fontawesome-webfont.eot index 89070c1e..11d2f415 100644 Binary files a/app/assets/fonts/fontawesome-webfont.eot and b/app/assets/fonts/fontawesome-webfont.eot differ diff --git a/app/assets/fonts/fontawesome-webfont.ttf b/app/assets/fonts/fontawesome-webfont.ttf index c17e9f8d..88ef2622 100644 Binary files a/app/assets/fonts/fontawesome-webfont.ttf and b/app/assets/fonts/fontawesome-webfont.ttf differ diff --git a/app/assets/fonts/fontawesome-webfont.woff b/app/assets/fonts/fontawesome-webfont.woff index 09f2469a..7e892f87 100644 Binary files a/app/assets/fonts/fontawesome-webfont.woff and b/app/assets/fonts/fontawesome-webfont.woff differ diff --git a/app/assets/fonts/websymbols-regular-webfont.eot b/app/assets/fonts/websymbols-regular-webfont.eot deleted file mode 100644 index 4bf9c07a..00000000 Binary files a/app/assets/fonts/websymbols-regular-webfont.eot and /dev/null differ diff --git a/app/assets/fonts/websymbols-regular-webfont.svg b/app/assets/fonts/websymbols-regular-webfont.svg deleted file mode 100644 index ecf0e309..00000000 --- a/app/assets/fonts/websymbols-regular-webfont.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Copyright c 2011 by Just Be Nice studio All rights reserved -Designer : Igor Kiselev -Foundry : Just Be Nice studio -Foundry URL : httpwwwjustbenicestudiocom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/assets/fonts/websymbols-regular-webfont.ttf b/app/assets/fonts/websymbols-regular-webfont.ttf deleted file mode 100644 index e7da1ba1..00000000 Binary files a/app/assets/fonts/websymbols-regular-webfont.ttf and /dev/null differ diff --git a/app/assets/fonts/websymbols-regular-webfont.woff b/app/assets/fonts/websymbols-regular-webfont.woff deleted file mode 100644 index a5f7f01c..00000000 Binary files a/app/assets/fonts/websymbols-regular-webfont.woff and /dev/null differ diff --git a/app/assets/stylesheets/font-awesome.css.erb b/app/assets/stylesheets/font-awesome.css.erb old mode 100644 new mode 100755 index 00b36d14..8e86a27e --- a/app/assets/stylesheets/font-awesome.css.erb +++ b/app/assets/stylesheets/font-awesome.css.erb @@ -1,4 +1,4 @@ -/* Font Awesome +/* Font Awesome 3.0 the iconic font designed for use with Twitter Bootstrap ------------------------------------------------------- The full suite of pictographic icons, examples, and documentation @@ -6,298 +6,26 @@ License ------------------------------------------------------- - The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0: - http://creativecommons.org/licenses/by/3.0/ A mention of - 'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable - source code is considered acceptable attribution (most common on the web). - If human readable source code is not available to the end user, a mention in - an 'About' or 'Credits' screen is considered acceptable (most common in desktop - or mobile software). + • The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL + • Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - + http://opensource.org/licenses/mit-license.html + • The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ + • Attribution is no longer required in Font Awesome 3.0, but much appreciated: + "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome" Contact ------------------------------------------------------- Email: dave@davegandy.com Twitter: http://twitter.com/fortaweso_me - Work: http://lemonwi.se co-founder + Work: Lead Product Designer @ http://kyruus.com */ @font-face { - font-family: "FontAwesome"; - src: url(<%= asset_path 'fontawesome-webfont.eot' %>); - src: url(<%= asset_path 'fontawesome-webfont.eot?#iefix' %>) format('eot'), url(<%= asset_path 'fontawesome-webfont.woff' %>) format('woff'), url(<%= asset_path 'fontawesome-webfont.ttf' %>) format('truetype'), url(<%= asset_path 'fontawesome-webfont.svg#FontAwesome' %>) format('svg'); + font-family: 'FontAwesome'; + src:url(<%= asset_path 'fontawesome-webfont.eot' %>); + src:url(<%= asset_path 'fontawesome-webfont.eot?#iefix' %>) format('embedded-opentype'), + url(<%= asset_path 'fontawesome-webfont.woff' %>) format('woff'), + url(<%= asset_path 'fontawesome-webfont.ttf' %>) format('truetype'); font-weight: normal; font-style: normal; -} - -/* Font Awesome styles - ------------------------------------------------------- */ -[class^="icon-"]:before, [class*=" icon-"]:before { - font-family: FontAwesome; - font-weight: normal; - font-style: normal; - display: inline-block; - text-decoration: inherit; -} -a [class^="icon-"], a [class*=" icon-"] { - display: inline-block; - text-decoration: inherit; -} -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: top; - font-size: 1.3333333333333333em; -} -.btn [class^="icon-"], .btn [class*=" icon-"] { - /* keeps button heights with and without icons the same */ - - line-height: .9em; -} -li [class^="icon-"], li [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; -} -li .icon-large[class^="icon-"], li .icon-large[class*=" icon-"] { - /* 1.5 increased font size for icon-large * 1.25 width */ - - width: 1.875em; -} -li[class^="icon-"], li[class*=" icon-"] { - margin-left: 0; - list-style-type: none; -} -li[class^="icon-"]:before, li[class*=" icon-"]:before { - text-indent: -2em; - text-align: center; -} -li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before { - text-indent: -1.3333333333333333em; -} -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { content: "\f000"; } -.icon-music:before { content: "\f001"; } -.icon-search:before { content: "\f002"; } -.icon-envelope:before { content: "\f003"; } -.icon-heart:before { content: "\f004"; } -.icon-star:before { content: "\f005"; } -.icon-star-empty:before { content: "\f006"; } -.icon-user:before { content: "\f007"; } -.icon-film:before { content: "\f008"; } -.icon-th-large:before { content: "\f009"; } -.icon-th:before { content: "\f00a"; } -.icon-th-list:before { content: "\f00b"; } -.icon-ok:before { content: "\f00c"; } -.icon-remove:before { content: "\f00d"; } -.icon-zoom-in:before { content: "\f00e"; } - -.icon-zoom-out:before { content: "\f010"; } -.icon-off:before { content: "\f011"; } -.icon-signal:before { content: "\f012"; } -.icon-cog:before { content: "\f013"; } -.icon-trash:before { content: "\f014"; } -.icon-home:before { content: "\f015"; } -.icon-file:before { content: "\f016"; } -.icon-time:before { content: "\f017"; } -.icon-road:before { content: "\f018"; } -.icon-download-alt:before { content: "\f019"; } -.icon-download:before { content: "\f01a"; } -.icon-upload:before { content: "\f01b"; } -.icon-inbox:before { content: "\f01c"; } -.icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before { content: "\f01e"; } - -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { content: "\f021"; } -.icon-list-alt:before { content: "\f022"; } -.icon-lock:before { content: "\f023"; } -.icon-flag:before { content: "\f024"; } -.icon-headphones:before { content: "\f025"; } -.icon-volume-off:before { content: "\f026"; } -.icon-volume-down:before { content: "\f027"; } -.icon-volume-up:before { content: "\f028"; } -.icon-qrcode:before { content: "\f029"; } -.icon-barcode:before { content: "\f02a"; } -.icon-tag:before { content: "\f02b"; } -.icon-tags:before { content: "\f02c"; } -.icon-book:before { content: "\f02d"; } -.icon-bookmark:before { content: "\f02e"; } -.icon-print:before { content: "\f02f"; } - -.icon-camera:before { content: "\f030"; } -.icon-font:before { content: "\f031"; } -.icon-bold:before { content: "\f032"; } -.icon-italic:before { content: "\f033"; } -.icon-text-height:before { content: "\f034"; } -.icon-text-width:before { content: "\f035"; } -.icon-align-left:before { content: "\f036"; } -.icon-align-center:before { content: "\f037"; } -.icon-align-right:before { content: "\f038"; } -.icon-align-justify:before { content: "\f039"; } -.icon-list:before { content: "\f03a"; } -.icon-indent-left:before { content: "\f03b"; } -.icon-indent-right:before { content: "\f03c"; } -.icon-facetime-video:before { content: "\f03d"; } -.icon-picture:before { content: "\f03e"; } - -.icon-pencil:before { content: "\f040"; } -.icon-map-marker:before { content: "\f041"; } -.icon-adjust:before { content: "\f042"; } -.icon-tint:before { content: "\f043"; } -.icon-edit:before { content: "\f044"; } -.icon-share:before { content: "\f045"; } -.icon-check:before { content: "\f046"; } -.icon-move:before { content: "\f047"; } -.icon-step-backward:before { content: "\f048"; } -.icon-fast-backward:before { content: "\f049"; } -.icon-backward:before { content: "\f04a"; } -.icon-play:before { content: "\f04b"; } -.icon-pause:before { content: "\f04c"; } -.icon-stop:before { content: "\f04d"; } -.icon-forward:before { content: "\f04e"; } - -.icon-fast-forward:before { content: "\f050"; } -.icon-step-forward:before { content: "\f051"; } -.icon-eject:before { content: "\f052"; } -.icon-chevron-left:before { content: "\f053"; } -.icon-chevron-right:before { content: "\f054"; } -.icon-plus-sign:before { content: "\f055"; } -.icon-minus-sign:before { content: "\f056"; } -.icon-remove-sign:before { content: "\f057"; } -.icon-ok-sign:before { content: "\f058"; } -.icon-question-sign:before { content: "\f059"; } -.icon-info-sign:before { content: "\f05a"; } -.icon-screenshot:before { content: "\f05b"; } -.icon-remove-circle:before { content: "\f05c"; } -.icon-ok-circle:before { content: "\f05d"; } -.icon-ban-circle:before { content: "\f05e"; } - -.icon-arrow-left:before { content: "\f060"; } -.icon-arrow-right:before { content: "\f061"; } -.icon-arrow-up:before { content: "\f062"; } -.icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before { content: "\f064"; } -.icon-resize-full:before { content: "\f065"; } -.icon-resize-small:before { content: "\f066"; } -.icon-plus:before { content: "\f067"; } -.icon-minus:before { content: "\f068"; } -.icon-asterisk:before { content: "\f069"; } -.icon-exclamation-sign:before { content: "\f06a"; } -.icon-gift:before { content: "\f06b"; } -.icon-leaf:before { content: "\f06c"; } -.icon-fire:before { content: "\f06d"; } -.icon-eye-open:before { content: "\f06e"; } - -.icon-eye-close:before { content: "\f070"; } -.icon-warning-sign:before { content: "\f071"; } -.icon-plane:before { content: "\f072"; } -.icon-calendar:before { content: "\f073"; } -.icon-random:before { content: "\f074"; } -.icon-comment:before { content: "\f075"; } -.icon-magnet:before { content: "\f076"; } -.icon-chevron-up:before { content: "\f077"; } -.icon-chevron-down:before { content: "\f078"; } -.icon-retweet:before { content: "\f079"; } -.icon-shopping-cart:before { content: "\f07a"; } -.icon-folder-close:before { content: "\f07b"; } -.icon-folder-open:before { content: "\f07c"; } -.icon-resize-vertical:before { content: "\f07d"; } -.icon-resize-horizontal:before { content: "\f07e"; } - -.icon-bar-chart:before { content: "\f080"; } -.icon-twitter-sign:before { content: "\f081"; } -.icon-facebook-sign:before { content: "\f082"; } -.icon-camera-retro:before { content: "\f083"; } -.icon-key:before { content: "\f084"; } -.icon-cogs:before { content: "\f085"; } -.icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { content: "\f087"; } -.icon-thumbs-down:before { content: "\f088"; } -.icon-star-half:before { content: "\f089"; } -.icon-heart-empty:before { content: "\f08a"; } -.icon-signout:before { content: "\f08b"; } -.icon-linkedin-sign:before { content: "\f08c"; } -.icon-pushpin:before { content: "\f08d"; } -.icon-external-link:before { content: "\f08e"; } - -.icon-signin:before { content: "\f090"; } -.icon-trophy:before { content: "\f091"; } -.icon-github-sign:before { content: "\f092"; } -.icon-upload-alt:before { content: "\f093"; } -.icon-lemon:before { content: "\f094"; } -.icon-phone:before { content: "\f095"; } -.icon-check-empty:before { content: "\f096"; } -.icon-bookmark-empty:before { content: "\f097"; } -.icon-phone-sign:before { content: "\f098"; } -.icon-twitter:before { content: "\f099"; } -.icon-facebook:before { content: "\f09a"; } -.icon-github:before { content: "\f09b"; } -.icon-unlock:before { content: "\f09c"; } -.icon-credit-card:before { content: "\f09d"; } -.icon-rss:before { content: "\f09e"; } - -.icon-hdd:before { content: "\f0a0"; } -.icon-bullhorn:before { content: "\f0a1"; } -.icon-bell:before { content: "\f0a2"; } -.icon-certificate:before { content: "\f0a3"; } -.icon-hand-right:before { content: "\f0a4"; } -.icon-hand-left:before { content: "\f0a5"; } -.icon-hand-up:before { content: "\f0a6"; } -.icon-hand-down:before { content: "\f0a7"; } -.icon-circle-arrow-left:before { content: "\f0a8"; } -.icon-circle-arrow-right:before { content: "\f0a9"; } -.icon-circle-arrow-up:before { content: "\f0aa"; } -.icon-circle-arrow-down:before { content: "\f0ab"; } -.icon-globe:before { content: "\f0ac"; } -.icon-wrench:before { content: "\f0ad"; } -.icon-tasks:before { content: "\f0ae"; } - -.icon-filter:before { content: "\f0b0"; } -.icon-briefcase:before { content: "\f0b1"; } -.icon-fullscreen:before { content: "\f0b2"; } - -.icon-group:before { content: "\f0c0"; } -.icon-link:before { content: "\f0c1"; } -.icon-cloud:before { content: "\f0c2"; } -.icon-beaker:before { content: "\f0c3"; } -.icon-cut:before { content: "\f0c4"; } -.icon-copy:before { content: "\f0c5"; } -.icon-paper-clip:before { content: "\f0c6"; } -.icon-save:before { content: "\f0c7"; } -.icon-sign-blank:before { content: "\f0c8"; } -.icon-reorder:before { content: "\f0c9"; } -.icon-list-ul:before { content: "\f0ca"; } -.icon-list-ol:before { content: "\f0cb"; } -.icon-strikethrough:before { content: "\f0cc"; } -.icon-underline:before { content: "\f0cd"; } -.icon-table:before { content: "\f0ce"; } - -.icon-magic:before { content: "\f0d0"; } -.icon-truck:before { content: "\f0d1"; } -.icon-pinterest:before { content: "\f0d2"; } -.icon-pinterest-sign:before { content: "\f0d3"; } -.icon-google-plus-sign:before { content: "\f0d4"; } -.icon-google-plus:before { content: "\f0d5"; } -.icon-money:before { content: "\f0d6"; } -.icon-caret-down:before { content: "\f0d7"; } -.icon-caret-up:before { content: "\f0d8"; } -.icon-caret-left:before { content: "\f0d9"; } -.icon-caret-right:before { content: "\f0da"; } -.icon-columns:before { content: "\f0db"; } -.icon-sort:before { content: "\f0dc"; } -.icon-sort-down:before { content: "\f0dd"; } -.icon-sort-up:before { content: "\f0de"; } - -.icon-envelope-alt:before { content: "\f0e0"; } -.icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before { content: "\f0e2"; } -.icon-legal:before { content: "\f0e3"; } -.icon-dashboard:before { content: "\f0e4"; } -.icon-comment-alt:before { content: "\f0e5"; } -.icon-comments-alt:before { content: "\f0e6"; } -.icon-bolt:before { content: "\f0e7"; } -.icon-sitemap:before { content: "\f0e8"; } -.icon-umbrella:before { content: "\f0e9"; } -.icon-paste:before { content: "\f0ea"; } - -.icon-user-md:before { content: "\f200"; } +} \ No newline at end of file diff --git a/app/assets/stylesheets/icons.css.erb b/app/assets/stylesheets/icons.css.erb index d71b7cf9..f61fef21 100644 --- a/app/assets/stylesheets/icons.css.erb +++ b/app/assets/stylesheets/icons.css.erb @@ -1,519 +1,701 @@ -/* WARNING: Your are using ligatures for your icon font. - Ligatures are not supported in IE 9 (and older). - Use the Private Use Area encoding for best browser support. -==================================================================== */ -@font-face { - font-family: 'entypo'; - src:url(<%= asset_path 'entypo.eot' %>); - src:url(<%= asset_path 'entypo.eot?#iefix' %>) format('embedded-opentype'), - url(<%= asset_path 'entypo.svg#entypo' %>) format('svg'), - url(<%= asset_path 'entypo.woff' %>) format('woff'), - url(<%= asset_path 'entypo.ttf' %>) format('truetype'); - font-weight: normal; - font-style: normal; -} - -/* Use the following CSS code if you want to use data attributes for inserting your icons */ [data-icon]:before { font-family: 'entypo'; content: attr(data-icon); speak: none; - /* Enable Ligatures */ - -webkit-font-feature-settings:"liga","dlig"; - -moz-font-feature-settings:"liga=1, dlig=1"; - -moz-font-feature-settings:"liga","dlig"; - -ms-font-feature-settings:"liga","dlig"; - -o-font-feature-settings:"liga","dlig"; - font-feature-settings:"liga","dlig"; - text-rendering:optimizeLegibility; font-weight: normal; -webkit-font-smoothing: antialiased; } - -/* Use the following CSS code if you want to have a class per icon */ -[class^="icons-"]:before, [class*=" icons-"]:before { - font-size: 1.5em; +@font-face { font-family: 'entypo'; - font-style: normal; - speak: none; - /* Enable Ligatures */ - -webkit-font-feature-settings:"liga","dlig"; - -moz-font-feature-settings:"liga=1, dlig=1"; - -moz-font-feature-settings:"liga","dlig"; - -ms-font-feature-settings:"liga","dlig"; - -o-font-feature-settings:"liga","dlig"; - font-feature-settings:"liga","dlig"; - text-rendering:optimizeLegibility; + src:url(<%= asset_path 'entypo.eot' %>); + src:url(<%= asset_path 'entypo.eot?#iefix' %>) format('embedded-opentype'), + url(<%= asset_path 'entypo.svg#entypo' %>) format('svg'), + url(<%= asset_path 'entypo.woff' %>) format('woff'), + url(<%= asset_path 'entypo.ttf' %>) format('truetype'); font-weight: normal; - -webkit-font-smoothing: antialiased; - display: inline-block; - text-decoration: inherit; + font-style: normal; } -a [class^="icons-"], a [class*=" icons-"] { - display: inline-block; - text-decoration: inherit; +/* Font Awesome styles + ------------------------------------------------------- */ +/* includes sprites.less reset */ +[class^="icon-"], +[class*=" icon-"] { + font-family: FontAwesome; +} +[class^="icons-"], +[class*=" icons-"] { + font-family: 'entypo'; +} +[class^="icon"], +[class*=" icon"] { + font-weight: normal; + font-style: normal; + text-decoration: inherit; + display: inline; + width: auto; + height: auto; + line-height: normal; + vertical-align: baseline; + background-image: none !important; + background-position: 0% 0%; + background-repeat: repeat; +} +[class^="icon"]:before, +[class*=" icon"]:before { + text-decoration: inherit; + display: inline-block; + speak: none; +} +/* makes sure icons active on rollover in links */ +a [class^="icon"], +a [class*=" icon"] { + display: inline-block; } /* makes the font 33% larger relative to the icon container */ -.icons-large:before { - vertical-align: top; - font-size: 1.3333333333333333em; +.icon-large:before { + vertical-align: -10%; + font-size: 1.3333333333333333em; } -.btn [class^="icons-"], .btn [class*=" icons-"] { - /* keeps button heights with and without icons the same */ +.btn [class^="icon"], +.nav [class^="icon"], +.btn [class*=" icon"], +.nav [class*=" icon"] { + display: inline; + /* keeps button heights with and without icons the same */ - line-height: .9em; + line-height: .6em; } -li [class^="icons-"], li [class*=" icons-"] { - display: inline-block; - width: 1.25em; - text-align: center; - margin-right: 10px; +.btn [class^="icon"].icon-spin, +.nav [class^="icon"].icon-spin, +.btn [class*=" icon"].icon-spin, +.nav [class*=" icon"].icon-spin { + display: inline-block; } -li .icons-large[class^="icons-"], li .icons-large[class*=" icons-"] { - /* 1.5 increased font size for icons-large * 1.25 width */ +li [class^="icon"], +li [class*=" icon"] { + display: inline-block; + width: 1.25em; + text-align: center; +} +li [class^="icon"].icon-large, +li [class*=" icon"].icon-large { + /* increased font size for icon-large */ - width: 1.875em; -} -li[class^="icons-"], li[class*=" icons-"] { - margin-left: 0; - list-style-type: none; -} -li[class^="icons-"]:before, li[class*=" icons-"]:before { - text-indent: -2em; - text-align: center; -} -li[class^="icons-"].icons-large:before, li[class*=" icons-"].icons-large:before { - text-indent: -1.3333333333333333em; -} -.icons-phone:before { - content: "\70\68\6f\6e\65"; -} -.icons-directions:before { - content: "\64\69\72\65\63\74\69\6f\6e\73"; -} -.icons-mail:before { - content: "\6d\61\69\6c"; -} -.icons-pencil:before { - content: "\70\65\6e\63\69\6c"; -} -.icons-paperclip:before { - content: "\70\61\70\65\72\63\6c\69\70"; -} -.icons-drawer:before { - content: "\64\72\61\77\65\72"; -} -.icons-member:before { - content: "\6d\65\6d\62\65\72"; -} -.icons-group:before { - content: "\67\72\6f\75\70"; -} -.icons-addmember:before { - content: "\61\64\64\6d\65\6d\62\65\72"; -} -.icons-location:before { - content: "\6c\6f\63\61\74\69\6f\6e"; -} -.icons-share:before { - content: "\73\68\61\72\65"; -} -.icons-heart-full:before { - content: "\68\65\61\72\74\2d\66\75\6c\6c"; -} -.icons-heart-bare:before { - content: "\68\65\61\72\74\2d\62\61\72\65"; -} -.icons-star-full:before { - content: "\73\74\61\72\2d\66\75\6c\6c"; -} -.icons-star-bare:before { - content: "\73\74\61\72\2d\62\61\72\65"; -} -.icons-discuss:before { - content: "\64\69\73\63\75\73\73"; -} -.icons-comment:before { - content: "\63\6f\6d\6d\65\6e\74"; -} -.icons-quote:before { - content: "\71\75\6f\74\65"; -} -.icons-house:before { - content: "\68\6f\75\73\65"; -} -.icons-search:before { - content: "\73\65\61\72\63\68"; -} -.icons-printer:before { - content: "\70\72\69\6e\74\65\72"; -} -.icons-bell:before { - content: "\62\65\6c\6c"; -} -.icons-link:before { - content: "\6c\69\6e\6b"; -} -.icons-flag:before { - content: "\66\61\6c\67"; -} -.icons-cog:before { - content: "\63\6f\67"; -} -.icons-tools:before { - content: "\74\6f\6f\6c\73"; -} -.icons-tag:before { - content: "\74\61\67"; -} -.icons-camera:before { - content: "\63\61\6d\65\72\61"; -} -.icons-megaphone:before { - content: "\6d\65\67\61\70\68\6f\6e\65"; -} -.icons-new:before { - content: "\6e\65\77"; -} -.icons-graduation:before { - content: "\67\72\61\64\75\61\74\69\6f\6e"; -} -.icons-books:before { - content: "\62\6f\6f\6b\73"; -} -.icons-page:before { - content: "\70\61\67\65"; -} -.icons-lifebuoy:before { - content: "\6c\69\66\65\62\75\6f\79"; -} -.icons-eye:before { - content: "\65\79\65"; -} -.icons-clock:before { - content: "\63\6c\6f\63\6b"; -} -.icons-calendar:before { - content: "\63\61\6c\65\6e\64\61\72"; -} -.icons-briefcase:before { - content: "\62\72\69\65\66\63\61\73\65"; -} -.icons-gauge:before { - content: "\67\61\75\67\65"; -} -.icons-language:before { - content: "\6c\61\6e\67\75\61\67\65"; -} -.icons-keys:before { - content: "\6b\65\79\73"; -} -.icons-earth:before { - content: "\65\61\72\74\68"; -} -.icons-keyboard:before { - content: "\6b\65\79\62\6f\61\72\64"; -} -.icons-browser:before { - content: "\62\72\6f\77\73\65\72"; -} -.icons-publish:before { - content: "\70\75\62\6c\69\73\68"; -} -.icons-code:before { - content: "\63\6f\64\65"; -} -.icons-light-bulb:before { - content: "\6c\69\67\68\74\2d\62\75\6c\62"; -} -.icons-database:before { - content: "\64\61\74\61\62\61\73\65"; -} -.icons-box:before { - content: "\62\6f\78"; -} -.icons-rss:before { - content: "\72\73\73"; -} -.icons-clipboard:before { - content: "\63\6c\69\70\62\6f\61\72\64"; -} -.icons-cart:before { - content: "\63\61\72\74"; -} -.icons-template:before { - content: "\75\6e\74\69\74\6c\65\64"; -} -.icons-statistics:before { - content: "\73\74\61\74\69\73\74\69\63\73"; -} -.icons-pie:before { - content: "\70\69\65"; -} -.icons-bars:before { - content: "\62\61\72\73"; -} -.icons-graph:before { - content: "\67\72\61\70\68"; -} -.icons-lock:before { - content: "\6c\6f\63\6b"; -} -.icons-unlock:before { - content: "\75\6e\6c\6f\63\6b"; -} -.icons-outlog:before { - content: "\6f\75\74\6c\6f\67"; -} -.icons-inlog:before { - content: "\69\6e\6c\6f\67"; -} -.icons-checkmark:before { - content: "\63\68\65\63\6b\6d\61\72\6b"; -} -.icons-aminus:before { - content: "\61\6d\69\6e\75\73"; -} -.icons-aplus:before { - content: "\61\70\6c\75\73"; -} -.icons-aclose:before { - content: "\61\63\6c\6f\73\65"; -} -.icons-bminus:before { - content: "\62\6d\69\6e\75\73"; -} -.icons-bplus:before { - content: "\62\70\6c\75\73"; -} -.icons-bclose:before { - content: "\62\63\6c\6f\73\65"; -} -.icons-cminus:before { - content: "\63\6d\69\6e\75\73"; -} -.icons-cplus:before { - content: "\63\70\6c\75\73"; -} -.icons-cross:before { - content: "\63\72\6f\73\73"; -} -.icons-blocked:before { - content: "\62\6c\6f\63\6b\65\64"; -} -.icons-information:before { - content: "\69\6e\66\6f\72\6d\61\74\69\6f\6e"; -} -.icons-binfo:before { - content: "\62\69\6e\66\6f"; -} -.icons-question:before { - content: "\71\75\65\73\74\69\6f\6e"; -} -.icons-help:before { - content: "\68\65\6c\70"; -} -.icons-warning:before { - content: "\77\61\72\6e\69\6e\67"; -} -.icons-shuffle:before { - content: "\73\68\75\66\66\6c\65"; -} -.icons-return:before { - content: "\72\65\74\75\72\6e"; -} -.icons-enter:before { - content: "\65\6e\74\65\72"; -} -.icons-exchange:before { - content: "\65\78\63\68\61\6e\67\65"; -} -.icons-loop:before { - content: "\6c\6f\6f\70"; -} -.icons-th-list:before { - content: "\74\68\2d\6c\69\73\74"; -} -.icons-th-large:before { - content: "\74\68\2d\6c\61\72\67\65"; -} -.icons-align-justify:before { - content: "\61\6c\69\67\6e\2d\6a\75\73\74\69\66\79"; -} -.icons-wtext:before { - content: "\77\74\65\78\74"; -} -.icons-btext:before { - content: "\62\74\65\78\74"; -} -.icons-pictures:before { - content: "\70\69\63\74\75\72\65"; -} -.icons-video:before { - content: "\76\69\64\65\6f"; -} -.icons-music:before { - content: "\6d\6f\75\73\65"; -} -.icons-folder:before { - content: "\66\6f\6c\64\65\72"; -} -.icons-archive:before { - content: "\61\72\63\68\69\76\65"; -} -.icons-trash:before { - content: "\74\72\61\73\68"; -} -.icons-upload:before { - content: "\75\70\6c\6f\61\64"; -} -.icons-download:before { - content: "\64\6f\77\6e\6c\6f\61\64"; -} -.icons-disk:before { - content: "\64\69\73\6b"; -} -.icons-bookmark:before { - content: "\62\6f\6f\6b\6d\61\72\6b"; -} -.icons-booma:before { - content: "\62\6f\6f\6d\61"; -} -.icons-resize-enlarge:before { - content: "\72\65\73\69\7a\65\2d\65\6e\6c\61\72\67\65"; -} -.icons-resize-shrink:before { - content: "\72\65\73\69\7a\65\2d\73\68\72\69\6e\6b"; -} -.icons-flow-tree:before { - content: "\66\6c\6f\77\2d\74\72\65\65"; -} -.icons-arrow-left-a:before { - content: "\61\72\72\6f\77\2d\6c\65\66\74\2d\61"; -} -.icons-arrow-bottom-a:before { - content: "\61\72\72\6f\77\2d\62\6f\74\74\6f\6d\2d\61"; -} -.icons-arrow-top-a:before { - content: "\61\72\72\6f\77\2d\74\6f\70\2d\61"; -} -.icons-arrow-right-a:before { - content: "\61\72\72\6f\77\2d\72\69\67\68\74\2d\61"; -} -.icons-arrow-left-b:before { - content: "\61\72\72\6f\77\2d\6c\65\66\74\2d\62"; -} -.icons-arrow-bottom-b:before { - content: "\61\72\72\6f\77\2d\62\6f\74\74\6f\6d\2d\62"; -} -.icons-arrow-top-b:before { - content: "\61\72\72\6f\77\2d\74\6f\70\2d\62"; -} -.icons-arrow-right-b:before { - content: "\61\72\72\6f\77\2d\72\69\67\68\74\2d\62"; -} -.icons-arrow-left-c:before { - content: "\61\72\72\6f\77\2d\6c\65\66\74\2d\63"; -} -.icons-arrow-bottom-c:before { - content: "\61\72\72\6f\77\2d\62\6f\74\74\6f\6d\2d\63"; -} -.icons-arrow-top-c:before { - content: "\61\72\72\6f\77\2d\74\6f\70\2d\63"; -} -.icons-arrow-right-c:before { - content: "\61\72\72\6f\77\2d\72\69\67\68\74\2d\63"; -} -.icons-arrow-left-d:before { - content: "\61\72\72\6f\77\2d\6c\65\66\74\2d\64"; -} -.icons-arrow-bottom-d:before { - content: "\61\72\72\6f\77\2d\62\6f\74\74\6f\6d\2d\64"; -} -.icons-arrow-top-d:before { - content: "\61\72\72\6f\77\2d\74\6f\70\2d\64"; -} -.icons-arrow-right-d:before { - content: "\61\72\72\6f\77\2d\72\69\67\68\74\2d\64"; -} -.icons-arrow-left-e:before { - content: "\61\72\72\6f\77\2d\6c\65\66\74\2d\65"; -} -.icons-arrow-bottom-e:before { - content: "\61\72\72\6f\77\2d\62\6f\74\74\6f\6d\2d\65"; -} -.icons-arrow-top-e:before { - content: "\61\72\72\6f\77\2d\74\6f\70\2d\65"; -} -.icons-arrow-right-e:before { - content: "\61\72\72\6f\77\2d\72\69\67\68\74\2d\65"; -} -.icons-arrow-left-f:before { - content: "\61\72\72\6f\77\2d\6c\65\66\74\2d\66"; -} -.icons-arrow-bottom-f:before { - content: "\61\72\72\6f\77\2d\62\6f\74\74\6f\6d\2d\66"; -} -.icons-arrow-top-f:before { - content: "\61\72\72\6f\77\2d\74\6f\70\2d\66"; -} -.icons-left-f:before { - content: "\61\72\72\6f\77\2d\72\69\67\68\74\2d\66"; -} -.icons-menu:before { - content: "\6d\65\6e\75"; -} -.icons-ellipsis:before { - content: "\65\6c\6c\69\70\73\69\73"; -} -.icons-dots:before { - content: "\64\6f\74\73"; -} -.icons-dot:before { - content: "\64\6f\74"; -} -.icons-like:before { - content: "\6c\69\6b\65"; -} -.icons-suck:before { - content: "\73\75\63\6b"; -} -.icons-export:before { - content: "\65\78\70\6f\72\74"; -} -.icons-vcard:before { - content: "\76\63\61\72\64"; -} -.icons-flow-cascade:before { - content: "\21"; -} -.icons-landscape:before { - content: "\22"; -} -.icons-brush:before { - content: "\62\72\75\73\68"; -} -.icons-palette:before { - content: "\70\61\6c\65\74\74\65"; -} -.icons-desktop:before { - content: "\64\65\73\6b\74\6f\70"; -} -.icons-plane:before { - content: "\70\6c\61\6e\65"; -} -.icons-booklet:before { - content: "\62\6f\6f\6b\6c\65\74"; -} -.icons-update:before { - content: "\75\70\64\61\74\65"; -} -.icons-reload:before { - content: "\72\65\6c\6f\61\64"; -} -.icons-unload:before { - content: "\75\6e\6c\6f\61\64"; -} -.icons-trophy:before { - content: "\74\72\6f\70\68\79"; -} + width: 1.5625em; +} +ul.icons { + list-style-type: none; + text-indent: -0.75em; +} +ul.icons li [class^="icon"], +ul.icons li [class*=" icon"] { + width: .75em; +} +.icon-muted { + color: #eeeeee; +} +.icon-border { + border: solid 1px #eeeeee; + padding: .2em .25em .15em; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.icon-2x { + font-size: 2em; +} +.icon-2x.icon-border { + border-width: 2px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.icon-3x { + font-size: 3em; +} +.icon-3x.icon-border { + border-width: 3px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} +.icon-4x { + font-size: 4em; +} +.icon-4x.icon-border { + border-width: 4px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.pull-right { + float: right; +} +.pull-left { + float: left; +} +[class^="icon"].pull-left, +[class*=" icon"].pull-left { + margin-right: .35em; +} +[class^="icon"].pull-right, +[class*=" icon"].pull-right { + margin-left: .35em; +} +.btn [class^="icon"].pull-left.icon-2x, +.btn [class*=" icon"].pull-left.icon-2x, +.btn [class^="icon"].pull-right.icon-2x, +.btn [class*=" icon"].pull-right.icon-2x { + margin-top: .35em; +} +.btn [class^="icon"].icon-spin.icon-large, +.btn [class*=" icon"].icon-spin.icon-large { + height: .75em; +} +.btn.btn-small [class^="icon"].pull-left.icon-2x, +.btn.btn-small [class*=" icon"].pull-left.icon-2x, +.btn.btn-small [class^="icon"].pull-right.icon-2x, +.btn.btn-small [class*=" icon"].pull-right.icon-2x { + margin-top: .45em; +} +.btn.btn-large [class^="icon"].pull-left.icon-2x, +.btn.btn-large [class*=" icon"].pull-left.icon-2x, +.btn.btn-large [class^="icon"].pull-right.icon-2x, +.btn.btn-large [class*=" icon"].pull-right.icon-2x { + margin-top: .2em; +} +.icon-spin { + display: inline-block; + -webkit-animation: spin 2s infinite linear; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} +@-moz-keyframes spin { + 0% { -moz-transform: rotate(0deg); } + 100% { -moz-transform: rotate(359deg); } +} +@-webkit-keyframes spin { + 0% { -webkit-transform: rotate(0deg); } + 100% { -webkit-transform: rotate(359deg); } +} +@-o-keyframes spin { + 0% { -o-transform: rotate(0deg); } + 100% { -o-transform: rotate(359deg); } +} +@-ms-keyframes spin { + 0% { -ms-transform: rotate(0deg); } + 100% { -ms-transform: rotate(359deg); } +} +@keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(359deg); } +} +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.icon-glass:before { content: "\f000"; } +.icon-music:before { content: "\f001"; } +.icon-search:before { content: "\f002"; } +.icon-envelope:before { content: "\f003"; } +.icon-heart:before { content: "\f004"; } +.icon-star:before { content: "\f005"; } +.icon-star-empty:before { content: "\f006"; } +.icon-user:before { content: "\f007"; } +.icon-film:before { content: "\f008"; } +.icon-th-large:before { content: "\f009"; } +.icon-th:before { content: "\f00a"; } +.icon-th-list:before { content: "\f00b"; } +.icon-ok:before { content: "\f00c"; } +.icon-remove:before { content: "\f00d"; } +.icon-zoom-in:before { content: "\f00e"; } + +.icon-zoom-out:before { content: "\f010"; } +.icon-off:before { content: "\f011"; } +.icon-signal:before { content: "\f012"; } +.icon-cog:before { content: "\f013"; } +.icon-trash:before { content: "\f014"; } +.icon-home:before { content: "\f015"; } +.icon-file:before { content: "\f016"; } +.icon-time:before { content: "\f017"; } +.icon-road:before { content: "\f018"; } +.icon-download-alt:before { content: "\f019"; } +.icon-download:before { content: "\f01a"; } +.icon-upload:before { content: "\f01b"; } +.icon-inbox:before { content: "\f01c"; } +.icon-play-circle:before { content: "\f01d"; } +.icon-repeat:before { content: "\f01e"; } + +/* \f020 doesn't work in Safari. all shifted one down */ +.icon-refresh:before { content: "\f021"; } +.icon-list-alt:before { content: "\f022"; } +.icon-lock:before { content: "\f023"; } +.icon-flag:before { content: "\f024"; } +.icon-headphones:before { content: "\f025"; } +.icon-volume-off:before { content: "\f026"; } +.icon-volume-down:before { content: "\f027"; } +.icon-volume-up:before { content: "\f028"; } +.icon-qrcode:before { content: "\f029"; } +.icon-barcode:before { content: "\f02a"; } +.icon-tag:before { content: "\f02b"; } +.icon-tags:before { content: "\f02c"; } +.icon-book:before { content: "\f02d"; } +.icon-bookmark:before { content: "\f02e"; } +.icon-print:before { content: "\f02f"; } + +.icon-camera:before { content: "\f030"; } +.icon-font:before { content: "\f031"; } +.icon-bold:before { content: "\f032"; } +.icon-italic:before { content: "\f033"; } +.icon-text-height:before { content: "\f034"; } +.icon-text-width:before { content: "\f035"; } +.icon-align-left:before { content: "\f036"; } +.icon-align-center:before { content: "\f037"; } +.icon-align-right:before { content: "\f038"; } +.icon-align-justify:before { content: "\f039"; } +.icon-list:before { content: "\f03a"; } +.icon-indent-left:before { content: "\f03b"; } +.icon-indent-right:before { content: "\f03c"; } +.icon-facetime-video:before { content: "\f03d"; } +.icon-picture:before { content: "\f03e"; } + +.icon-pencil:before { content: "\f040"; } +.icon-map-marker:before { content: "\f041"; } +.icon-adjust:before { content: "\f042"; } +.icon-tint:before { content: "\f043"; } +.icon-edit:before { content: "\f044"; } +.icon-share:before { content: "\f045"; } +.icon-check:before { content: "\f046"; } +.icon-move:before { content: "\f047"; } +.icon-step-backward:before { content: "\f048"; } +.icon-fast-backward:before { content: "\f049"; } +.icon-backward:before { content: "\f04a"; } +.icon-play:before { content: "\f04b"; } +.icon-pause:before { content: "\f04c"; } +.icon-stop:before { content: "\f04d"; } +.icon-forward:before { content: "\f04e"; } + +.icon-fast-forward:before { content: "\f050"; } +.icon-step-forward:before { content: "\f051"; } +.icon-eject:before { content: "\f052"; } +.icon-chevron-left:before { content: "\f053"; } +.icon-chevron-right:before { content: "\f054"; } +.icon-plus-sign:before { content: "\f055"; } +.icon-minus-sign:before { content: "\f056"; } +.icon-remove-sign:before { content: "\f057"; } +.icon-ok-sign:before { content: "\f058"; } +.icon-question-sign:before { content: "\f059"; } +.icon-info-sign:before { content: "\f05a"; } +.icon-screenshot:before { content: "\f05b"; } +.icon-remove-circle:before { content: "\f05c"; } +.icon-ok-circle:before { content: "\f05d"; } +.icon-ban-circle:before { content: "\f05e"; } + +.icon-arrow-left:before { content: "\f060"; } +.icon-arrow-right:before { content: "\f061"; } +.icon-arrow-up:before { content: "\f062"; } +.icon-arrow-down:before { content: "\f063"; } +.icon-share-alt:before { content: "\f064"; } +.icon-resize-full:before { content: "\f065"; } +.icon-resize-small:before { content: "\f066"; } +.icon-plus:before { content: "\f067"; } +.icon-minus:before { content: "\f068"; } +.icon-asterisk:before { content: "\f069"; } +.icon-exclamation-sign:before { content: "\f06a"; } +.icon-gift:before { content: "\f06b"; } +.icon-leaf:before { content: "\f06c"; } +.icon-fire:before { content: "\f06d"; } +.icon-eye-open:before { content: "\f06e"; } + +.icon-eye-close:before { content: "\f070"; } +.icon-warning-sign:before { content: "\f071"; } +.icon-plane:before { content: "\f072"; } +.icon-calendar:before { content: "\f073"; } +.icon-random:before { content: "\f074"; } +.icon-comment:before { content: "\f075"; } +.icon-magnet:before { content: "\f076"; } +.icon-chevron-up:before { content: "\f077"; } +.icon-chevron-down:before { content: "\f078"; } +.icon-retweet:before { content: "\f079"; } +.icon-shopping-cart:before { content: "\f07a"; } +.icon-folder-close:before { content: "\f07b"; } +.icon-folder-open:before { content: "\f07c"; } +.icon-resize-vertical:before { content: "\f07d"; } +.icon-resize-horizontal:before { content: "\f07e"; } + +.icon-bar-chart:before { content: "\f080"; } +.icon-twitter-sign:before { content: "\f081"; } +.icon-facebook-sign:before { content: "\f082"; } +.icon-camera-retro:before { content: "\f083"; } +.icon-key:before { content: "\f084"; } +.icon-cogs:before { content: "\f085"; } +.icon-comments:before { content: "\f086"; } +.icon-thumbs-up:before { content: "\f087"; } +.icon-thumbs-down:before { content: "\f088"; } +.icon-star-half:before { content: "\f089"; } +.icon-heart-empty:before { content: "\f08a"; } +.icon-signout:before { content: "\f08b"; } +.icon-linkedin-sign:before { content: "\f08c"; } +.icon-pushpin:before { content: "\f08d"; } +.icon-external-link:before { content: "\f08e"; } + +.icon-signin:before { content: "\f090"; } +.icon-trophy:before { content: "\f091"; } +.icon-github-sign:before { content: "\f092"; } +.icon-upload-alt:before { content: "\f093"; } +.icon-lemon:before { content: "\f094"; } +.icon-phone:before { content: "\f095"; } +.icon-check-empty:before { content: "\f096"; } +.icon-bookmark-empty:before { content: "\f097"; } +.icon-phone-sign:before { content: "\f098"; } +.icon-twitter:before { content: "\f099"; } +.icon-facebook:before { content: "\f09a"; } +.icon-github:before { content: "\f09b"; } +.icon-unlock:before { content: "\f09c"; } +.icon-credit-card:before { content: "\f09d"; } +.icon-rss:before { content: "\f09e"; } + +.icon-hdd:before { content: "\f0a0"; } +.icon-bullhorn:before { content: "\f0a1"; } +.icon-bell:before { content: "\f0a2"; } +.icon-certificate:before { content: "\f0a3"; } +.icon-hand-right:before { content: "\f0a4"; } +.icon-hand-left:before { content: "\f0a5"; } +.icon-hand-up:before { content: "\f0a6"; } +.icon-hand-down:before { content: "\f0a7"; } +.icon-circle-arrow-left:before { content: "\f0a8"; } +.icon-circle-arrow-right:before { content: "\f0a9"; } +.icon-circle-arrow-up:before { content: "\f0aa"; } +.icon-circle-arrow-down:before { content: "\f0ab"; } +.icon-globe:before { content: "\f0ac"; } +.icon-wrench:before { content: "\f0ad"; } +.icon-tasks:before { content: "\f0ae"; } + +.icon-filter:before { content: "\f0b0"; } +.icon-briefcase:before { content: "\f0b1"; } +.icon-fullscreen:before { content: "\f0b2"; } + +.icon-group:before { content: "\f0c0"; } +.icon-link:before { content: "\f0c1"; } +.icon-cloud:before { content: "\f0c2"; } +.icon-beaker:before { content: "\f0c3"; } +.icon-cut:before { content: "\f0c4"; } +.icon-copy:before { content: "\f0c5"; } +.icon-paper-clip:before { content: "\f0c6"; } +.icon-save:before { content: "\f0c7"; } +.icon-sign-blank:before { content: "\f0c8"; } +.icon-reorder:before { content: "\f0c9"; } +.icon-list-ul:before { content: "\f0ca"; } +.icon-list-ol:before { content: "\f0cb"; } +.icon-strikethrough:before { content: "\f0cc"; } +.icon-underline:before { content: "\f0cd"; } +.icon-table:before { content: "\f0ce"; } + +.icon-magic:before { content: "\f0d0"; } +.icon-truck:before { content: "\f0d1"; } +.icon-pinterest:before { content: "\f0d2"; } +.icon-pinterest-sign:before { content: "\f0d3"; } +.icon-google-plus-sign:before { content: "\f0d4"; } +.icon-google-plus:before { content: "\f0d5"; } +.icon-money:before { content: "\f0d6"; } +.icon-caret-down:before { content: "\f0d7"; } +.icon-caret-up:before { content: "\f0d8"; } +.icon-caret-left:before { content: "\f0d9"; } +.icon-caret-right:before { content: "\f0da"; } +.icon-columns:before { content: "\f0db"; } +.icon-sort:before { content: "\f0dc"; } +.icon-sort-down:before { content: "\f0dd"; } +.icon-sort-up:before { content: "\f0de"; } + +.icon-envelope-alt:before { content: "\f0e0"; } +.icon-linkedin:before { content: "\f0e1"; } +.icon-undo:before { content: "\f0e2"; } +.icon-legal:before { content: "\f0e3"; } +.icon-dashboard:before { content: "\f0e4"; } +.icon-comment-alt:before { content: "\f0e5"; } +.icon-comments-alt:before { content: "\f0e6"; } +.icon-bolt:before { content: "\f0e7"; } +.icon-sitemap:before { content: "\f0e8"; } +.icon-umbrella:before { content: "\f0e9"; } +.icon-paste:before { content: "\f0ea"; } +.icon-lightbulb:before { content: "\f0eb"; } +.icon-exchange:before { content: "\f0ec"; } +.icon-cloud-download:before { content: "\f0ed"; } +.icon-cloud-upload:before { content: "\f0ee"; } + +.icon-user-md:before { content: "\f0f0"; } +.icon-stethoscope:before { content: "\f0f1"; } +.icon-suitcase:before { content: "\f0f2"; } +.icon-bell-alt:before { content: "\f0f3"; } +.icon-coffee:before { content: "\f0f4"; } +.icon-food:before { content: "\f0f5"; } +.icon-file-alt:before { content: "\f0f6"; } +.icon-building:before { content: "\f0f7"; } +.icon-hospital:before { content: "\f0f8"; } +.icon-ambulance:before { content: "\f0f9"; } +.icon-medkit:before { content: "\f0fa"; } +.icon-fighter-jet:before { content: "\f0fb"; } +.icon-beer:before { content: "\f0fc"; } +.icon-h-sign:before { content: "\f0fd"; } +.icon-plus-sign-alt:before { content: "\f0fe"; } + +.icon-double-angle-left:before { content: "\f100"; } +.icon-double-angle-right:before { content: "\f101"; } +.icon-double-angle-up:before { content: "\f102"; } +.icon-double-angle-down:before { content: "\f103"; } +.icon-angle-left:before { content: "\f104"; } +.icon-angle-right:before { content: "\f105"; } +.icon-angle-up:before { content: "\f106"; } +.icon-angle-down:before { content: "\f107"; } +.icon-desktop:before { content: "\f108"; } +.icon-laptop:before { content: "\f109"; } +.icon-tablet:before { content: "\f10a"; } +.icon-mobile-phone:before { content: "\f10b"; } +.icon-circle-blank:before { content: "\f10c"; } +.icon-quote-left:before { content: "\f10d"; } +.icon-quote-right:before { content: "\f10e"; } + +.icon-spinner:before { content: "\f110"; } +.icon-circle:before { content: "\f111"; } +.icon-reply:before { content: "\f112"; } +.icon-github-alt:before { content: "\f113"; } +.icon-folder-close-alt:before { content: "\f114"; } +.icon-folder-open-alt:before { content: "\f115"; } + +.icons-phone:before { content: "\e000"; } +.icons-mobile:before { content: "\e001"; } +.icons-mouse:before { content: "\e002"; } +.icons-directions:before { content: "\e003"; } +.icons-mail:before { content: "\e004"; } +.icons-paperplane:before { content: "\e005"; } +.icons-pencil:before { content: "\e006"; } +.icons-feather:before { content: "\e007"; } +.icons-paperclip:before { content: "\e008"; } +.icons-drawer:before { content: "\e009"; } +.icons-reply:before { content: "\e00a"; } +.icons-reply-all:before { content: "\e00b"; } +.icons-forward:before { content: "\e00c"; } +.icons-user:before { content: "\e00d"; } +.icons-users:before { content: "\e00e"; } +.icons-user-add:before { content: "\e00f"; } +.icons-vcard:before { content: "\e010"; } +.icons-export:before { content: "\e011"; } +.icons-location:before { content: "\e012"; } +.icons-map:before { content: "\e013"; } +.icons-compass:before { content: "\e014"; } +.icons-location-2:before { content: "\e015"; } +.icons-target:before { content: "\e016"; } +.icons-share:before { content: "\e017"; } +.icons-sharable:before { content: "\e018"; } +.icons-heart:before { content: "\e019"; } +.icons-heart-2:before { content: "\e01a"; } +.icons-star:before { content: "\e01b"; } +.icons-star-2:before { content: "\e01c"; } +.icons-thumbs-up:before { content: "\e01d"; } +.icons-thumbs-down:before { content: "\e01e"; } +.icons-chat:before { content: "\e01f"; } +.icons-comment:before { content: "\e020"; } +.icons-quote:before { content: "\e021"; } +.icons-house:before { content: "\e022"; } +.icons-popup:before { content: "\e023"; } +.icons-search:before { content: "\e024"; } +.icons-flashlight:before { content: "\e025"; } +.icons-printer:before { content: "\e026"; } +.icons-bell:before { content: "\e027"; } +.icons-link:before { content: "\e028"; } +.icons-flag:before { content: "\e029"; } +.icons-cog:before { content: "\e02a"; } +.icons-tools:before { content: "\e02b"; } +.icons-trophy:before { content: "\e02c"; } +.icons-tag:before { content: "\e02d"; } +.icons-camera:before { content: "\e02e"; } +.icons-megaphone:before { content: "\e02f"; } +.icons-moon:before { content: "\e030"; } +.icons-palette:before { content: "\e031"; } +.icons-leaf:before { content: "\e032"; } +.icons-music:before { content: "\e033"; } +.icons-music-2:before { content: "\e034"; } +.icons-new:before { content: "\e035"; } +.icons-graduation:before { content: "\e036"; } +.icons-book:before { content: "\e037"; } +.icons-newspaper:before { content: "\e038"; } +.icons-bag:before { content: "\e039"; } +.icons-airplane:before { content: "\e03a"; } +.icons-lifebuoy:before { content: "\e03b"; } +.icons-eye:before { content: "\e03c"; } +.icons-clock:before { content: "\e03d"; } +.icons-microphone:before { content: "\e03e"; } +.icons-calendar:before { content: "\e03f"; } +.icons-bolt:before { content: "\e040"; } +.icons-thunder:before { content: "\e041"; } +.icons-droplet:before { content: "\e042"; } +.icons-cd:before { content: "\e043"; } +.icons-briefcase:before { content: "\e044"; } +.icons-air:before { content: "\e045"; } +.icons-hourglass:before { content: "\e046"; } +.icons-gauge:before { content: "\e047"; } +.icons-language:before { content: "\e048"; } +.icons-network:before { content: "\e049"; } +.icons-key:before { content: "\e04a"; } +.icons-battery:before { content: "\e04b"; } +.icons-bucket:before { content: "\e04c"; } +.icons-magnet:before { content: "\e04d"; } +.icons-drive:before { content: "\e04e"; } +.icons-cup:before { content: "\e04f"; } +.icons-rocket:before { content: "\e050"; } +.icons-brush:before { content: "\e051"; } +.icons-suitcase:before { content: "\e052"; } +.icons-cone:before { content: "\e053"; } +.icons-earth:before { content: "\e054"; } +.icons-keyboard:before { content: "\e055"; } +.icons-browser:before { content: "\e056"; } +.icons-publish:before { content: "\e057"; } +.icons-progress-3:before { content: "\e058"; } +.icons-progress-2:before { content: "\e059"; } +.icons-brogress-1:before { content: "\e05a"; } +.icons-progress-0:before { content: "\e05b"; } +.icons-sun:before { content: "\e05c"; } +.icons-sun-2:before { content: "\e05d"; } +.icons-adjust:before { content: "\e05e"; } +.icons-code:before { content: "\e05f"; } +.icons-screen:before { content: "\e060"; } +.icons-infinity:before { content: "\e061"; } +.icons-light-bulb:before { content: "\e062"; } +.icons-credit-card:before { content: "\e063"; } +.icons-database:before { content: "\e064"; } +.icons-voicemail:before { content: "\e065"; } +.icons-clipboard:before { content: "\e066"; } +.icons-cart:before { content: "\e067"; } +.icons-box:before { content: "\e068"; } +.icons-ticket:before { content: "\e069"; } +.icons-rss:before { content: "\e06a"; } +.icons-signal:before { content: "\e06b"; } +.icons-thermometer:before { content: "\e06c"; } +.icons-droplets:before { content: "\e06d"; } +.icons-untitled:before { content: "\e06e"; } +.icons-statistics:before { content: "\e06f"; } +.icons-pie:before { content: "\e070"; } +.icons-bars:before { content: "\e071"; } +.icons-graph:before { content: "\e072"; } +.icons-lock:before { content: "\e073"; } +.icons-lock-open:before { content: "\e074"; } +.icons-logout:before { content: "\e075"; } +.icons-login:before { content: "\e076"; } +.icons-checkmark:before { content: "\e077"; } +.icons-cross:before { content: "\e078"; } +.icons-minus:before { content: "\e079"; } +.icons-plus:before { content: "\e07a"; } +.icons-cross-2:before { content: "\e07b"; } +.icons-minus-2:before { content: "\e07c"; } +.icons-plus-2:before { content: "\e07d"; } +.icons-cross-3:before { content: "\e07e"; } +.icons-minus-3:before { content: "\e07f"; } +.icons-plus-3:before { content: "\e080"; } +.icons-erase:before { content: "\e081"; } +.icons-blocked:before { content: "\e082"; } +.icons-info:before { content: "\e083"; } +.icons-info-2:before { content: "\e084"; } +.icons-question:before { content: "\e085"; } +.icons-help:before { content: "\e086"; } +.icons-warning:before { content: "\e087"; } +.icons-cycle:before { content: "\e088"; } +.icons-cw:before { content: "\e089"; } +.icons-ccw:before { content: "\e08a"; } +.icons-shuffle:before { content: "\e08b"; } +.icons-arrow:before { content: "\e08c"; } +.icons-arrow-2:before { content: "\e08d"; } +.icons-retweet:before { content: "\e08e"; } +.icons-loop:before { content: "\e08f"; } +.icons-history:before { content: "\e090"; } +.icons-back:before { content: "\e091"; } +.icons-switch:before { content: "\e092"; } +.icons-list:before { content: "\e093"; } +.icons-add-to-list:before { content: "\e094"; } +.icons-layout:before { content: "\e095"; } +.icons-list-2:before { content: "\e096"; } +.icons-text:before { content: "\e097"; } +.icons-text-2:before { content: "\e098"; } +.icons-document:before { content: "\e099"; } +.icons-docs:before { content: "\e09a"; } +.icons-landscape:before { content: "\e09b"; } +.icons-pictures:before { content: "\e09c"; } +.icons-video:before { content: "\e09d"; } +.icons-music-3:before { content: "\e09e"; } +.icons-folder:before { content: "\e09f"; } +.icons-archive:before { content: "\e0a0"; } +.icons-trash:before { content: "\e0a1"; } +.icons-upload:before { content: "\e0a2"; } +.icons-download:before { content: "\e0a3"; } +.icons-disk:before { content: "\e0a4"; } +.icons-install:before { content: "\e0a5"; } +.icons-cloud:before { content: "\e0a6"; } +.icons-upload-2:before { content: "\e0a7"; } +.icons-bookmark:before { content: "\e0a8"; } +.icons-bookmarks:before { content: "\e0a9"; } +.icons-book-2:before { content: "\e0aa"; } +.icons-play:before { content: "\e0ab"; } +.icons-pause:before { content: "\e0ac"; } +.icons-record:before { content: "\e0ad"; } +.icons-stop:before { content: "\e0ae"; } +.icons-next:before { content: "\e0af"; } +.icons-previous:before { content: "\e0b0"; } +.icons-first:before { content: "\e0b1"; } +.icons-last:before { content: "\e0b2"; } +.icons-resize-enlarge:before { content: "\e0b3"; } +.icons-resize-shrink:before { content: "\e0b4"; } +.icons-volume:before { content: "\e0b5"; } +.icons-sound:before { content: "\e0b6"; } +.icons-mute:before { content: "\e0b7"; } +.icons-flow-cascade:before { content: "\e0b8"; } +.icons-flow-branch:before { content: "\e0b9"; } +.icons-flow-tree:before { content: "\e0ba"; } +.icons-flow-line:before { content: "\e0bb"; } +.icons-flow-parallel:before { content: "\e0bc"; } +.icons-arrow-left:before { content: "\e0bd"; } +.icons-arrow-down:before { content: "\e0be"; } +.icons-arrow-up--upload:before { content: "\e0bf"; } +.icons-arrow-right:before { content: "\e0c0"; } +.icons-arrow-left-2:before { content: "\e0c1"; } +.icons-arrow-down-2:before { content: "\e0c2"; } +.icons-arrow-up:before { content: "\e0c3"; } +.icons-arrow-right-2:before { content: "\e0c4"; } +.icons-arrow-left-3:before { content: "\e0c5"; } +.icons-arrow-down-3:before { content: "\e0c6"; } +.icons-arrow-up-2:before { content: "\e0c7"; } +.icons-arrow-right-3:before { content: "\e0c8"; } +.icons-arrow-left-4:before { content: "\e0c9"; } +.icons-arrow-down-4:before { content: "\e0ca"; } +.icons-arrow-up-3:before { content: "\e0cb"; } +.icons-arrow-right-4:before { content: "\e0cc"; } +.icons-arrow-left-5:before { content: "\e0cd"; } +.icons-arrow-down-5:before { content: "\e0ce"; } +.icons-arrow-up-4:before { content: "\e0cf"; } +.icons-arrow-right-5:before { content: "\e0d0"; } +.icons-arrow-left-6:before { content: "\e0d1"; } +.icons-arrow-down-6:before { content: "\e0d2"; } +.icons-arrow-up-5:before { content: "\e0d3"; } +.icons-arrow-right-6:before { content: "\e0d4"; } +.icons-arrow-left-7:before { content: "\e0d5"; } +.icons-arrow-down-7:before { content: "\e0d6"; } +.icons-arrow-up-6:before { content: "\e0d7"; } +.icons-untitled-2:before { content: "\e0d8"; } +.icons-arrow-left-8:before { content: "\e0d9"; } +.icons-arrow-down-8:before { content: "\e0da"; } +.icons-arrow-up-7:before { content: "\e0db"; } +.icons-arrow-right-7:before { content: "\e0dc"; } +.icons-menu:before { content: "\e0dd"; } +.icons-ellipsis:before { content: "\e0de"; } +.icons-dots:before { content: "\e0df"; } +.icons-dot:before { content: "\e0e0"; } +.icons-cc:before { content: "\e0e1"; } +.icons-cc-by:before { content: "\e0e2"; } +.icons-cc-nc:before { content: "\e0e3"; } +.icons-cc-nc-eu:before { content: "\e0e4"; } +.icons-cc-nc-jp:before { content: "\e0e5"; } +.icons-cc-sa:before { content: "\e0e6"; } +.icons-cc-nd:before { content: "\e0e7"; } +.icons-cc-pd:before { content: "\e0e8"; } +.icons-cc-zero:before { content: "\e0e9"; } +.icons-cc-share:before { content: "\e0ea"; } +.icons-cc-share-2:before { content: "\e0eb"; } +.icons-daniel-bruce:before { content: "\e0ec"; } +.icons-daniel-bruce-2:before { content: "\e0ed"; } diff --git a/app/assets/stylesheets/mobile.css b/app/assets/stylesheets/mobile.css index 96b49179..49425a62 100644 --- a/app/assets/stylesheets/mobile.css +++ b/app/assets/stylesheets/mobile.css @@ -5,6 +5,6 @@ *= require mobile/jquery.mobile-1.2.0.css *= require mobile/add2home *= require mobile/orbit-mobile - *= require mobile/icons - *= require mobile/font-awesome + *= require icons + *= require font-awesome */ \ No newline at end of file diff --git a/app/assets/stylesheets/mobile/font-awesome.css b/app/assets/stylesheets/mobile/font-awesome.css deleted file mode 100644 index 9d59b156..00000000 --- a/app/assets/stylesheets/mobile/font-awesome.css +++ /dev/null @@ -1,303 +0,0 @@ -/* Font Awesome - the iconic font designed for use with Twitter Bootstrap - ------------------------------------------------------- - The full suite of pictographic icons, examples, and documentation - can be found at: http://fortawesome.github.com/Font-Awesome/ - - License - ------------------------------------------------------- - The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0: - http://creativecommons.org/licenses/by/3.0/ A mention of - 'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable - source code is considered acceptable attribution (most common on the web). - If human readable source code is not available to the end user, a mention in - an 'About' or 'Credits' screen is considered acceptable (most common in desktop - or mobile software). - - Contact - ------------------------------------------------------- - Email: dave@davegandy.com - Twitter: http://twitter.com/fortaweso_me - Work: http://lemonwi.se co-founder - - */ -@font-face { - font-family: "FontAwesome"; - src: url('../fonts/fontawesome-webfont.eot'); - src: url('../fonts/fontawesome-webfont.eot?#iefix') format('eot'), url('../fonts/fontawesome-webfont.woff') format('woff'), url('../fonts/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svg#FontAwesome') format('svg'); - font-weight: normal; - font-style: normal; -} - -/* Font Awesome styles - ------------------------------------------------------- */ -[class^="icon-"]:before, [class*=" icon-"]:before { - font-family: FontAwesome; - font-weight: normal; - font-style: normal; - display: inline-block; - text-decoration: inherit; -} -a [class^="icon-"], a [class*=" icon-"] { - display: inline-block; - text-decoration: inherit; -} -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: top; - font-size: 1.3333333333333333em; -} -.btn [class^="icon-"], .btn [class*=" icon-"] { - /* keeps button heights with and without icons the same */ - - line-height: .9em; -} -li [class^="icon-"], li [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; -} -li .icon-large[class^="icon-"], li .icon-large[class*=" icon-"] { - /* 1.5 increased font size for icon-large * 1.25 width */ - - width: 1.875em; -} -li[class^="icon-"], li[class*=" icon-"] { - margin-left: 0; - list-style-type: none; -} -li[class^="icon-"]:before, li[class*=" icon-"]:before { - text-indent: -2em; - text-align: center; -} -li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before { - text-indent: -1.3333333333333333em; -} -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.icon-glass:before { content: "\f000"; } -.icon-music:before { content: "\f001"; } -.icon-search:before { content: "\f002"; } -.icon-envelope:before { content: "\f003"; } -.icon-heart:before { content: "\f004"; } -.icon-star:before { content: "\f005"; } -.icon-star-empty:before { content: "\f006"; } -.icon-user:before { content: "\f007"; } -.icon-film:before { content: "\f008"; } -.icon-th-large:before { content: "\f009"; } -.icon-th:before { content: "\f00a"; } -.icon-th-list:before { content: "\f00b"; } -.icon-ok:before { content: "\f00c"; } -.icon-remove:before { content: "\f00d"; } -.icon-zoom-in:before { content: "\f00e"; } - -.icon-zoom-out:before { content: "\f010"; } -.icon-off:before { content: "\f011"; } -.icon-signal:before { content: "\f012"; } -.icon-cog:before { content: "\f013"; } -.icon-trash:before { content: "\f014"; } -.icon-home:before { content: "\f015"; } -.icon-file:before { content: "\f016"; } -.icon-time:before { content: "\f017"; } -.icon-road:before { content: "\f018"; } -.icon-download-alt:before { content: "\f019"; } -.icon-download:before { content: "\f01a"; } -.icon-upload:before { content: "\f01b"; } -.icon-inbox:before { content: "\f01c"; } -.icon-play-circle:before { content: "\f01d"; } -.icon-repeat:before { content: "\f01e"; } - -/* \f020 doesn't work in Safari. all shifted one down */ -.icon-refresh:before { content: "\f021"; } -.icon-list-alt:before { content: "\f022"; } -.icon-lock:before { content: "\f023"; } -.icon-flag:before { content: "\f024"; } -.icon-headphones:before { content: "\f025"; } -.icon-volume-off:before { content: "\f026"; } -.icon-volume-down:before { content: "\f027"; } -.icon-volume-up:before { content: "\f028"; } -.icon-qrcode:before { content: "\f029"; } -.icon-barcode:before { content: "\f02a"; } -.icon-tag:before { content: "\f02b"; } -.icon-tags:before { content: "\f02c"; } -.icon-book:before { content: "\f02d"; } -.icon-bookmark:before { content: "\f02e"; } -.icon-print:before { content: "\f02f"; } - -.icon-camera:before { content: "\f030"; } -.icon-font:before { content: "\f031"; } -.icon-bold:before { content: "\f032"; } -.icon-italic:before { content: "\f033"; } -.icon-text-height:before { content: "\f034"; } -.icon-text-width:before { content: "\f035"; } -.icon-align-left:before { content: "\f036"; } -.icon-align-center:before { content: "\f037"; } -.icon-align-right:before { content: "\f038"; } -.icon-align-justify:before { content: "\f039"; } -.icon-list:before { content: "\f03a"; } -.icon-indent-left:before { content: "\f03b"; } -.icon-indent-right:before { content: "\f03c"; } -.icon-facetime-video:before { content: "\f03d"; } -.icon-picture:before { content: "\f03e"; } - -.icon-pencil:before { content: "\f040"; } -.icon-map-marker:before { content: "\f041"; } -.icon-adjust:before { content: "\f042"; } -.icon-tint:before { content: "\f043"; } -.icon-edit:before { content: "\f044"; } -.icon-share:before { content: "\f045"; } -.icon-check:before { content: "\f046"; } -.icon-move:before { content: "\f047"; } -.icon-step-backward:before { content: "\f048"; } -.icon-fast-backward:before { content: "\f049"; } -.icon-backward:before { content: "\f04a"; } -.icon-play:before { content: "\f04b"; } -.icon-pause:before { content: "\f04c"; } -.icon-stop:before { content: "\f04d"; } -.icon-forward:before { content: "\f04e"; } - -.icon-fast-forward:before { content: "\f050"; } -.icon-step-forward:before { content: "\f051"; } -.icon-eject:before { content: "\f052"; } -.icon-chevron-left:before { content: "\f053"; } -.icon-chevron-right:before { content: "\f054"; } -.icon-plus-sign:before { content: "\f055"; } -.icon-minus-sign:before { content: "\f056"; } -.icon-remove-sign:before { content: "\f057"; } -.icon-ok-sign:before { content: "\f058"; } -.icon-question-sign:before { content: "\f059"; } -.icon-info-sign:before { content: "\f05a"; } -.icon-screenshot:before { content: "\f05b"; } -.icon-remove-circle:before { content: "\f05c"; } -.icon-ok-circle:before { content: "\f05d"; } -.icon-ban-circle:before { content: "\f05e"; } - -.icon-arrow-left:before { content: "\f060"; } -.icon-arrow-right:before { content: "\f061"; } -.icon-arrow-up:before { content: "\f062"; } -.icon-arrow-down:before { content: "\f063"; } -.icon-share-alt:before { content: "\f064"; } -.icon-resize-full:before { content: "\f065"; } -.icon-resize-small:before { content: "\f066"; } -.icon-plus:before { content: "\f067"; } -.icon-minus:before { content: "\f068"; } -.icon-asterisk:before { content: "\f069"; } -.icon-exclamation-sign:before { content: "\f06a"; } -.icon-gift:before { content: "\f06b"; } -.icon-leaf:before { content: "\f06c"; } -.icon-fire:before { content: "\f06d"; } -.icon-eye-open:before { content: "\f06e"; } - -.icon-eye-close:before { content: "\f070"; } -.icon-warning-sign:before { content: "\f071"; } -.icon-plane:before { content: "\f072"; } -.icon-calendar:before { content: "\f073"; } -.icon-random:before { content: "\f074"; } -.icon-comment:before { content: "\f075"; } -.icon-magnet:before { content: "\f076"; } -.icon-chevron-up:before { content: "\f077"; } -.icon-chevron-down:before { content: "\f078"; } -.icon-retweet:before { content: "\f079"; } -.icon-shopping-cart:before { content: "\f07a"; } -.icon-folder-close:before { content: "\f07b"; } -.icon-folder-open:before { content: "\f07c"; } -.icon-resize-vertical:before { content: "\f07d"; } -.icon-resize-horizontal:before { content: "\f07e"; } - -.icon-bar-chart:before { content: "\f080"; } -.icon-twitter-sign:before { content: "\f081"; } -.icon-facebook-sign:before { content: "\f082"; } -.icon-camera-retro:before { content: "\f083"; } -.icon-key:before { content: "\f084"; } -.icon-cogs:before { content: "\f085"; } -.icon-comments:before { content: "\f086"; } -.icon-thumbs-up:before { content: "\f087"; } -.icon-thumbs-down:before { content: "\f088"; } -.icon-star-half:before { content: "\f089"; } -.icon-heart-empty:before { content: "\f08a"; } -.icon-signout:before { content: "\f08b"; } -.icon-linkedin-sign:before { content: "\f08c"; } -.icon-pushpin:before { content: "\f08d"; } -.icon-external-link:before { content: "\f08e"; } - -.icon-signin:before { content: "\f090"; } -.icon-trophy:before { content: "\f091"; } -.icon-github-sign:before { content: "\f092"; } -.icon-upload-alt:before { content: "\f093"; } -.icon-lemon:before { content: "\f094"; } -.icon-phone:before { content: "\f095"; } -.icon-check-empty:before { content: "\f096"; } -.icon-bookmark-empty:before { content: "\f097"; } -.icon-phone-sign:before { content: "\f098"; } -.icon-twitter:before { content: "\f099"; } -.icon-facebook:before { content: "\f09a"; } -.icon-github:before { content: "\f09b"; } -.icon-unlock:before { content: "\f09c"; } -.icon-credit-card:before { content: "\f09d"; } -.icon-rss:before { content: "\f09e"; } - -.icon-hdd:before { content: "\f0a0"; } -.icon-bullhorn:before { content: "\f0a1"; } -.icon-bell:before { content: "\f0a2"; } -.icon-certificate:before { content: "\f0a3"; } -.icon-hand-right:before { content: "\f0a4"; } -.icon-hand-left:before { content: "\f0a5"; } -.icon-hand-up:before { content: "\f0a6"; } -.icon-hand-down:before { content: "\f0a7"; } -.icon-circle-arrow-left:before { content: "\f0a8"; } -.icon-circle-arrow-right:before { content: "\f0a9"; } -.icon-circle-arrow-up:before { content: "\f0aa"; } -.icon-circle-arrow-down:before { content: "\f0ab"; } -.icon-globe:before { content: "\f0ac"; } -.icon-wrench:before { content: "\f0ad"; } -.icon-tasks:before { content: "\f0ae"; } - -.icon-filter:before { content: "\f0b0"; } -.icon-briefcase:before { content: "\f0b1"; } -.icon-fullscreen:before { content: "\f0b2"; } - -.icon-group:before { content: "\f0c0"; } -.icon-link:before { content: "\f0c1"; } -.icon-cloud:before { content: "\f0c2"; } -.icon-beaker:before { content: "\f0c3"; } -.icon-cut:before { content: "\f0c4"; } -.icon-copy:before { content: "\f0c5"; } -.icon-paper-clip:before { content: "\f0c6"; } -.icon-save:before { content: "\f0c7"; } -.icon-sign-blank:before { content: "\f0c8"; } -.icon-reorder:before { content: "\f0c9"; } -.icon-list-ul:before { content: "\f0ca"; } -.icon-list-ol:before { content: "\f0cb"; } -.icon-strikethrough:before { content: "\f0cc"; } -.icon-underline:before { content: "\f0cd"; } -.icon-table:before { content: "\f0ce"; } - -.icon-magic:before { content: "\f0d0"; } -.icon-truck:before { content: "\f0d1"; } -.icon-pinterest:before { content: "\f0d2"; } -.icon-pinterest-sign:before { content: "\f0d3"; } -.icon-google-plus-sign:before { content: "\f0d4"; } -.icon-google-plus:before { content: "\f0d5"; } -.icon-money:before { content: "\f0d6"; } -.icon-caret-down:before { content: "\f0d7"; } -.icon-caret-up:before { content: "\f0d8"; } -.icon-caret-left:before { content: "\f0d9"; } -.icon-caret-right:before { content: "\f0da"; } -.icon-columns:before { content: "\f0db"; } -.icon-sort:before { content: "\f0dc"; } -.icon-sort-down:before { content: "\f0dd"; } -.icon-sort-up:before { content: "\f0de"; } - -.icon-envelope-alt:before { content: "\f0e0"; } -.icon-linkedin:before { content: "\f0e1"; } -.icon-undo:before { content: "\f0e2"; } -.icon-legal:before { content: "\f0e3"; } -.icon-dashboard:before { content: "\f0e4"; } -.icon-comment-alt:before { content: "\f0e5"; } -.icon-comments-alt:before { content: "\f0e6"; } -.icon-bolt:before { content: "\f0e7"; } -.icon-sitemap:before { content: "\f0e8"; } -.icon-umbrella:before { content: "\f0e9"; } -.icon-paste:before { content: "\f0ea"; } - -.icon-user-md:before { content: "\f200"; } diff --git a/app/assets/stylesheets/mobile/icons.css.erb b/app/assets/stylesheets/mobile/icons.css.erb deleted file mode 100644 index 6f85bd3c..00000000 --- a/app/assets/stylesheets/mobile/icons.css.erb +++ /dev/null @@ -1,519 +0,0 @@ -/* WARNING: Your are using ligatures for your icon font. - Ligatures are not supported in IE 9 (and older). - Use the Private Use Area encoding for best browser support. -==================================================================== */ -@font-face { - font-family: 'entypo'; - src:url(<%= asset_path 'entypo.eot' %>); - src:url(<%= asset_path 'entypo.eot?#iefix' %>) format('embedded-opentype'), - url(<%= asset_path 'entypo.svg#entypo' %>) format('svg'), - url(<%= asset_path 'entypo.woff' %>) format('woff'), - url(<%= asset_path 'entypo.ttf' %>) format('truetype'); - font-weight: normal; - font-style: normal; -} - -/* Use the following CSS code if you want to use data attributes for inserting your icons */ -[data-icons]:before { - font-family: 'entypo'; - content: attr(data-icon); - speak: none; - /* Enable Ligatures */ - -webkit-font-feature-settings:"liga","dlig"; - -moz-font-feature-settings:"liga=1, dlig=1"; - -moz-font-feature-settings:"liga","dlig"; - -ms-font-feature-settings:"liga","dlig"; - -o-font-feature-settings:"liga","dlig"; - font-feature-settings:"liga","dlig"; - text-rendering:optimizeLegibility; - font-weight: normal; - -webkit-font-smoothing: antialiased; -} - -/* Use the following CSS code if you want to have a class per icon */ -[class^="icons-"]:before, [class*=" icons-"]:before { - font-size: 1.5em; - font-family: 'entypo'; - font-style: normal; - speak: none; - /* Enable Ligatures */ - -webkit-font-feature-settings:"liga","dlig"; - -moz-font-feature-settings:"liga=1, dlig=1"; - -moz-font-feature-settings:"liga","dlig"; - -ms-font-feature-settings:"liga","dlig"; - -o-font-feature-settings:"liga","dlig"; - font-feature-settings:"liga","dlig"; - text-rendering:optimizeLegibility; - font-weight: normal; - -webkit-font-smoothing: antialiased; - display: inline-block; - text-decoration: inherit; -} -a [class^="icons-"], a [class*=" icons-"] { - display: inline-block; - text-decoration: inherit; -} -/* makes the font 33% larger relative to the icon container */ -.icons-large:before { - vertical-align: top; - font-size: 1.3333333333333333em; -} -.btn [class^="icons-"], .btn [class*=" icons-"] { - /* keeps button heights with and without icons the same */ - - line-height: .9em; -} -li [class^="icons-"], li [class*=" icons-"] { - display: inline-block; - width: 1.25em; - text-align: center; - margin-right: 10px; -} -li .icons-large[class^="icons-"], li .icons-large[class*=" icons-"] { - /* 1.5 increased font size for icons-large * 1.25 width */ - - width: 1.875em; -} -li[class^="icons-"], li[class*=" icons-"] { - margin-left: 0; - list-style-type: none; -} -li[class^="icons-"]:before, li[class*=" icons-"]:before { - text-indent: -2em; - text-align: center; -} -li[class^="icons-"].icons-large:before, li[class*=" icons-"].icons-large:before { - text-indent: -1.3333333333333333em; -} -.icons-phone:before { - content: "\70\68\6f\6e\65"; -} -.icons-directions:before { - content: "\64\69\72\65\63\74\69\6f\6e\73"; -} -.icons-mail:before { - content: "\6d\61\69\6c"; -} -.icons-pencil:before { - content: "\70\65\6e\63\69\6c"; -} -.icons-paperclip:before { - content: "\70\61\70\65\72\63\6c\69\70"; -} -.icons-drawer:before { - content: "\64\72\61\77\65\72"; -} -.icons-member:before { - content: "\6d\65\6d\62\65\72"; -} -.icons-group:before { - content: "\67\72\6f\75\70"; -} -.icons-addmember:before { - content: "\61\64\64\6d\65\6d\62\65\72"; -} -.icons-location:before { - content: "\6c\6f\63\61\74\69\6f\6e"; -} -.icons-share:before { - content: "\73\68\61\72\65"; -} -.icons-heart-full:before { - content: "\68\65\61\72\74\2d\66\75\6c\6c"; -} -.icons-heart-bare:before { - content: "\68\65\61\72\74\2d\62\61\72\65"; -} -.icons-star-full:before { - content: "\73\74\61\72\2d\66\75\6c\6c"; -} -.icons-star-bare:before { - content: "\73\74\61\72\2d\62\61\72\65"; -} -.icons-discuss:before { - content: "\64\69\73\63\75\73\73"; -} -.icons-comment:before { - content: "\63\6f\6d\6d\65\6e\74"; -} -.icons-quote:before { - content: "\71\75\6f\74\65"; -} -.icons-house:before { - content: "\68\6f\75\73\65"; -} -.icons-search:before { - content: "\73\65\61\72\63\68"; -} -.icons-printer:before { - content: "\70\72\69\6e\74\65\72"; -} -.icons-bell:before { - content: "\62\65\6c\6c"; -} -.icons-link:before { - content: "\6c\69\6e\6b"; -} -.icons-flag:before { - content: "\66\61\6c\67"; -} -.icons-cog:before { - content: "\63\6f\67"; -} -.icons-tools:before { - content: "\74\6f\6f\6c\73"; -} -.icons-tag:before { - content: "\74\61\67"; -} -.icons-camera:before { - content: "\63\61\6d\65\72\61"; -} -.icons-megaphone:before { - content: "\6d\65\67\61\70\68\6f\6e\65"; -} -.icons-new:before { - content: "\6e\65\77"; -} -.icons-graduation:before { - content: "\67\72\61\64\75\61\74\69\6f\6e"; -} -.icons-books:before { - content: "\62\6f\6f\6b\73"; -} -.icons-page:before { - content: "\70\61\67\65"; -} -.icons-lifebuoy:before { - content: "\6c\69\66\65\62\75\6f\79"; -} -.icons-eye:before { - content: "\65\79\65"; -} -.icons-clock:before { - content: "\63\6c\6f\63\6b"; -} -.icons-calendar:before { - content: "\63\61\6c\65\6e\64\61\72"; -} -.icons-briefcase:before { - content: "\62\72\69\65\66\63\61\73\65"; -} -.icons-gauge:before { - content: "\67\61\75\67\65"; -} -.icons-language:before { - content: "\6c\61\6e\67\75\61\67\65"; -} -.icons-keys:before { - content: "\6b\65\79\73"; -} -.icons-earth:before { - content: "\65\61\72\74\68"; -} -.icons-keyboard:before { - content: "\6b\65\79\62\6f\61\72\64"; -} -.icons-browser:before { - content: "\62\72\6f\77\73\65\72"; -} -.icons-publish:before { - content: "\70\75\62\6c\69\73\68"; -} -.icons-code:before { - content: "\63\6f\64\65"; -} -.icons-light-bulb:before { - content: "\6c\69\67\68\74\2d\62\75\6c\62"; -} -.icons-database:before { - content: "\64\61\74\61\62\61\73\65"; -} -.icons-box:before { - content: "\62\6f\78"; -} -.icons-rss:before { - content: "\72\73\73"; -} -.icons-clipboard:before { - content: "\63\6c\69\70\62\6f\61\72\64"; -} -.icons-cart:before { - content: "\63\61\72\74"; -} -.icons-untitled:before { - content: "\75\6e\74\69\74\6c\65\64"; -} -.icons-statistics:before { - content: "\73\74\61\74\69\73\74\69\63\73"; -} -.icons-pie:before { - content: "\70\69\65"; -} -.icons-bars:before { - content: "\62\61\72\73"; -} -.icons-graph:before { - content: "\67\72\61\70\68"; -} -.icons-lock:before { - content: "\6c\6f\63\6b"; -} -.icons-unlock:before { - content: "\75\6e\6c\6f\63\6b"; -} -.icons-outlog:before { - content: "\6f\75\74\6c\6f\67"; -} -.icons-inlog:before { - content: "\69\6e\6c\6f\67"; -} -.icons-checkmark:before { - content: "\63\68\65\63\6b\6d\61\72\6b"; -} -.icons-aminus:before { - content: "\61\6d\69\6e\75\73"; -} -.icons-aplus:before { - content: "\61\70\6c\75\73"; -} -.icons-aclose:before { - content: "\61\63\6c\6f\73\65"; -} -.icons-bminus:before { - content: "\62\6d\69\6e\75\73"; -} -.icons-bplus:before { - content: "\62\70\6c\75\73"; -} -.icons-bclose:before { - content: "\62\63\6c\6f\73\65"; -} -.icons-cminus:before { - content: "\63\6d\69\6e\75\73"; -} -.icons-cplus:before { - content: "\63\70\6c\75\73"; -} -.icons-cross:before { - content: "\63\72\6f\73\73"; -} -.icons-blocked:before { - content: "\62\6c\6f\63\6b\65\64"; -} -.icons-information:before { - content: "\69\6e\66\6f\72\6d\61\74\69\6f\6e"; -} -.icons-binfo:before { - content: "\62\69\6e\66\6f"; -} -.icons-question:before { - content: "\71\75\65\73\74\69\6f\6e"; -} -.icons-help:before { - content: "\68\65\6c\70"; -} -.icons-warning:before { - content: "\77\61\72\6e\69\6e\67"; -} -.icons-shuffle:before { - content: "\73\68\75\66\66\6c\65"; -} -.icons-return:before { - content: "\72\65\74\75\72\6e"; -} -.icons-enter:before { - content: "\65\6e\74\65\72"; -} -.icons-exchange:before { - content: "\65\78\63\68\61\6e\67\65"; -} -.icons-loop:before { - content: "\6c\6f\6f\70"; -} -.icons-th-list:before { - content: "\74\68\2d\6c\69\73\74"; -} -.icons-th-large:before { - content: "\74\68\2d\6c\61\72\67\65"; -} -.icons-align-justify:before { - content: "\61\6c\69\67\6e\2d\6a\75\73\74\69\66\79"; -} -.icons-wtext:before { - content: "\77\74\65\78\74"; -} -.icons-btext:before { - content: "\62\74\65\78\74"; -} -.icons-pictures:before { - content: "\70\69\63\74\75\72\65"; -} -.icons-video:before { - content: "\76\69\64\65\6f"; -} -.icons-music:before { - content: "\6d\6f\75\73\65"; -} -.icons-folder:before { - content: "\66\6f\6c\64\65\72"; -} -.icons-archive:before { - content: "\61\72\63\68\69\76\65"; -} -.icons-trash:before { - content: "\74\72\61\73\68"; -} -.icons-upload:before { - content: "\75\70\6c\6f\61\64"; -} -.icons-download:before { - content: "\64\6f\77\6e\6c\6f\61\64"; -} -.icons-disk:before { - content: "\64\69\73\6b"; -} -.icons-bookmark:before { - content: "\62\6f\6f\6b\6d\61\72\6b"; -} -.icons-booma:before { - content: "\62\6f\6f\6d\61"; -} -.icons-resize-enlarge:before { - content: "\72\65\73\69\7a\65\2d\65\6e\6c\61\72\67\65"; -} -.icons-resize-shrink:before { - content: "\72\65\73\69\7a\65\2d\73\68\72\69\6e\6b"; -} -.icons-flow-tree:before { - content: "\66\6c\6f\77\2d\74\72\65\65"; -} -.icons-arrow-left-a:before { - content: "\61\72\72\6f\77\2d\6c\65\66\74\2d\61"; -} -.icons-arrow-bottom-a:before { - content: "\61\72\72\6f\77\2d\62\6f\74\74\6f\6d\2d\61"; -} -.icons-arrow-top-a:before { - content: "\61\72\72\6f\77\2d\74\6f\70\2d\61"; -} -.icons-arrow-right-a:before { - content: "\61\72\72\6f\77\2d\72\69\67\68\74\2d\61"; -} -.icons-arrow-left-b:before { - content: "\61\72\72\6f\77\2d\6c\65\66\74\2d\62"; -} -.icons-arrow-bottom-b:before { - content: "\61\72\72\6f\77\2d\62\6f\74\74\6f\6d\2d\62"; -} -.icons-arrow-top-b:before { - content: "\61\72\72\6f\77\2d\74\6f\70\2d\62"; -} -.icons-arrow-right-b:before { - content: "\61\72\72\6f\77\2d\72\69\67\68\74\2d\62"; -} -.icons-arrow-left-c:before { - content: "\61\72\72\6f\77\2d\6c\65\66\74\2d\63"; -} -.icons-arrow-bottom-c:before { - content: "\61\72\72\6f\77\2d\62\6f\74\74\6f\6d\2d\63"; -} -.icons-arrow-top-c:before { - content: "\61\72\72\6f\77\2d\74\6f\70\2d\63"; -} -.icons-arrow-right-c:before { - content: "\61\72\72\6f\77\2d\72\69\67\68\74\2d\63"; -} -.icons-arrow-left-d:before { - content: "\61\72\72\6f\77\2d\6c\65\66\74\2d\64"; -} -.icons-arrow-bottom-d:before { - content: "\61\72\72\6f\77\2d\62\6f\74\74\6f\6d\2d\64"; -} -.icons-arrow-top-d:before { - content: "\61\72\72\6f\77\2d\74\6f\70\2d\64"; -} -.icons-arrow-right-d:before { - content: "\61\72\72\6f\77\2d\72\69\67\68\74\2d\64"; -} -.icons-arrow-left-e:before { - content: "\61\72\72\6f\77\2d\6c\65\66\74\2d\65"; -} -.icons-arrow-bottom-e:before { - content: "\61\72\72\6f\77\2d\62\6f\74\74\6f\6d\2d\65"; -} -.icons-arrow-top-e:before { - content: "\61\72\72\6f\77\2d\74\6f\70\2d\65"; -} -.icons-arrow-right-e:before { - content: "\61\72\72\6f\77\2d\72\69\67\68\74\2d\65"; -} -.icons-arrow-left-f:before { - content: "\61\72\72\6f\77\2d\6c\65\66\74\2d\66"; -} -.icons-arrow-bottom-f:before { - content: "\61\72\72\6f\77\2d\62\6f\74\74\6f\6d\2d\66"; -} -.icons-arrow-top-f:before { - content: "\61\72\72\6f\77\2d\74\6f\70\2d\66"; -} -.icons-left-f:before { - content: "\61\72\72\6f\77\2d\72\69\67\68\74\2d\66"; -} -.icons-menu:before { - content: "\6d\65\6e\75"; -} -.icons-ellipsis:before { - content: "\65\6c\6c\69\70\73\69\73"; -} -.icons-dots:before { - content: "\64\6f\74\73"; -} -.icons-dot:before { - content: "\64\6f\74"; -} -.icons-like:before { - content: "\6c\69\6b\65"; -} -.icons-suck:before { - content: "\73\75\63\6b"; -} -.icons-export:before { - content: "\65\78\70\6f\72\74"; -} -.icons-vcard:before { - content: "\76\63\61\72\64"; -} -.icons-flow-cascade:before { - content: "\21"; -} -.icons-landscape:before { - content: "\22"; -} -.icons-brush:before { - content: "\62\72\75\73\68"; -} -.icons-palette:before { - content: "\70\61\6c\65\74\74\65"; -} -.icons-desktop:before { - content: "\64\65\73\6b\74\6f\70"; -} -.icons-plane:before { - content: "\70\6c\61\6e\65"; -} -.icons-booklet:before { - content: "\62\6f\6f\6b\6c\65\74"; -} -.icons-update:before { - content: "\75\70\64\61\74\65"; -} -.icons-reload:before { - content: "\72\65\6c\6f\61\64"; -} -.icons-unload:before { - content: "\75\6e\6c\6f\61\64"; -} -.icons-trophy:before { - content: "\74\72\6f\70\68\79"; -} \ No newline at end of file diff --git a/app/assets/stylesheets/mobile/orbit-mobile.css.erb b/app/assets/stylesheets/mobile/orbit-mobile.css.erb index 86fe763e..302a6013 100644 --- a/app/assets/stylesheets/mobile/orbit-mobile.css.erb +++ b/app/assets/stylesheets/mobile/orbit-mobile.css.erb @@ -128,8 +128,8 @@ div[data-role="page"] { left: 0; } .header .language .ui-btn-text i { - font-size: .83em; - margin-top: .2em; + font-size: 1.1em; + margin-top: .3em; } .header .language .ui-icon { background-image: none; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 128fef23..bbd6063e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -251,7 +251,13 @@ class ApplicationController < ActionController::Base def prepare_for_mobile if @site.mobile_on - session[:mobile_param] = params[:mobile] if params[:mobile] + session[:mobile_param] = if request.path =~ /mobile/ + '1' + elsif params[:mobile] + params[:mobile] + else + session[:mobile_param] + end request.format = :mobile if mobile_device? end end diff --git a/app/helpers/admin/items_helper.rb b/app/helpers/admin/items_helper.rb index 948df59c..fe76e1e0 100644 --- a/app/helpers/admin/items_helper.rb +++ b/app/helpers/admin/items_helper.rb @@ -11,8 +11,7 @@ module Admin::ItemsHelper no_nested = 'no-nest' end ret << "
  • " - # ret << "" - ret << "
    " + ret << "
    " ret << (link_to node.title, dest, :class => 'js_history') ret << "
    " ret << (link_to t(:edit), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page') diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb index 7a1f0830..a925b40b 100644 --- a/app/views/admin/ad_images/_form.html.erb +++ b/app/views/admin/ad_images/_form.html.erb @@ -52,7 +52,7 @@
    -

    <%= t(:type) %>

    +

    <%= t(:type) %>

    <%= f.select :link_open ,AdImage::LINK_OPEN_TYPES%>
    @@ -72,7 +72,7 @@
    -

    <%= t(:link) %>

    +

    <%= t(:link) %>

    <%= f.text_field :out_link ,:class=> 'span3',:placeholder => t('ad.chinese_2') %>
    diff --git a/app/views/admin/dashboards/index.html.erb b/app/views/admin/dashboards/index.html.erb index b0f11474..dcdf5a09 100644 --- a/app/views/admin/dashboards/index.html.erb +++ b/app/views/admin/dashboards/index.html.erb @@ -3,7 +3,7 @@ <% end -%>
    -

    <%= t(:content) %>

    +

    <%= t(:content) %>

    <%= t(:all_content) %><%= @module_app_contents_total %>

    @@ -40,7 +40,7 @@ +
    • +
    • - +
        <% @site_in_use_locales.each do |locale| %> <%= content_tag :li, (link_to t(:_locale, :locale => locale), add_locale(remove_locale((referer rescue request.fullpath)), locale)), :class => (I18n.locale.eql?(locale.to_sym) ? 'active' : nil) %> @@ -22,7 +22,7 @@
    • - +
      @@ -42,8 +42,8 @@