diff options
author | Treer <treer.git@the-bordello.com> | 2016-04-30 21:36:19 +1000 |
---|---|---|
committer | Treer <treer.git@the-bordello.com> | 2016-04-30 21:36:19 +1000 |
commit | 45654ffc5cc4532c2189c88d46a0374038b53c9f (patch) | |
tree | fc1c9949dcabd360c120d318c9fe3181d47c8f42 /library/font_awesome/scss/_bootstrap.scss | |
parent | 931a4fafe316b23bacf92ac1ff35f9b8467415dd (diff) | |
download | volse-hubzilla-45654ffc5cc4532c2189c88d46a0374038b53c9f.tar.gz volse-hubzilla-45654ffc5cc4532c2189c88d46a0374038b53c9f.tar.bz2 volse-hubzilla-45654ffc5cc4532c2189c88d46a0374038b53c9f.zip |
update font-awesome library to 4.6.1
Perhaps this should be done as a submodule instead?
Diffstat (limited to 'library/font_awesome/scss/_bootstrap.scss')
-rw-r--r-- | library/font_awesome/scss/_bootstrap.scss | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/library/font_awesome/scss/_bootstrap.scss b/library/font_awesome/scss/_bootstrap.scss deleted file mode 100644 index 837d2df65..000000000 --- a/library/font_awesome/scss/_bootstrap.scss +++ /dev/null @@ -1,84 +0,0 @@ -/* BOOTSTRAP SPECIFIC CLASSES - * -------------------------- */ - -/* Bootstrap 2.0 sprites.less reset */ -[class^="icon-"], -[class*=" icon-"] { - display: inline; - width: auto; - height: auto; - line-height: normal; - vertical-align: baseline; - background-image: none; - background-position: 0% 0%; - background-repeat: repeat; - margin-top: 0; -} - -/* more sprites.less reset */ -.icon-white, -.nav-pills > .active > a > [class^="icon-"], -.nav-pills > .active > a > [class*=" icon-"], -.nav-list > .active > a > [class^="icon-"], -.nav-list > .active > a > [class*=" icon-"], -.navbar-inverse .nav > .active > a > [class^="icon-"], -.navbar-inverse .nav > .active > a > [class*=" icon-"], -.dropdown-menu > li > a:hover > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: none; -} - - -/* keeps Bootstrap styles with and without icons the same */ -.btn, .nav { - [class^="icon-"], - [class*=" icon-"] { - // display: inline; - &.icon-large { line-height: .9em; } - &.icon-spin { display: inline-block; } - } -} -.nav-tabs, .nav-pills { - [class^="icon-"], - [class*=" icon-"] { - &, &.icon-large { line-height: .9em; } - } -} -.btn { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .18em; } - } - &.icon-spin.icon-large { line-height: .8em; } - } -} -.btn.btn-small { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .25em; } - } - } -} -.btn.btn-large { - [class^="icon-"], - [class*=" icon-"] { - margin-top: 0; // overrides bootstrap default - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .05em; } - } - &.pull-left.icon-2x { margin-right: .2em; } - &.pull-right.icon-2x { margin-left: .2em; } - } -} - -/* Fixes alignment in nav lists */ -.nav-list [class^="icon-"], -.nav-list [class*=" icon-"] { - line-height: inherit; -} |