aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-01 08:02:03 +1000
committerredmatrix <git@macgirvin.com>2016-05-01 08:02:03 +1000
commit9446d0cbb463af6a256efebf97e10618469f1193 (patch)
tree3704de63c7188086ea6a5399094dfde170afaa69 /view/theme/redbasic
parent8a41e2a011bd1c69c138fb75d138ed2bb4bf779f (diff)
parent3fe8fc0aa80a03fc63905e1e80999e6ccb8672e8 (diff)
downloadvolse-hubzilla-9446d0cbb463af6a256efebf97e10618469f1193.tar.gz
volse-hubzilla-9446d0cbb463af6a256efebf97e10618469f1193.tar.bz2
volse-hubzilla-9446d0cbb463af6a256efebf97e10618469f1193.zip
Merge pull request #362 from Treer/fontawesome
Update Font-Awesome to 4.6.1
Diffstat (limited to 'view/theme/redbasic')
-rw-r--r--view/theme/redbasic/css/style.css2
-rw-r--r--view/theme/redbasic/js/redbasic.js4
-rw-r--r--view/theme/redbasic/schema/bluegrid.css6
3 files changed, 6 insertions, 6 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 642455fec..c19005f11 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1848,7 +1848,7 @@ dl.bb-dl > dd > li {
}
.bootstrap-tagsinput .tag:before {
- /* Copied from icon-asterisk, is there a better way to do it? */
+ /* Copied from fa-asterisk, is there a better way to do it? */
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 877bcd840..58c2a9ceb 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -17,7 +17,7 @@ $(document).ready(function() {
$('#css3-calc').remove(); // Remove the test element
$('#expand-aside').click(function() {
- $('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left');
+ $('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
$('main').toggleClass('region_1-on');
});
@@ -29,7 +29,7 @@ $(document).ready(function() {
if(!$('#tabs-collapse-1').hasClass('in')){
$('html, body').animate({ scrollTop: 0 }, 'slow');
}
- $('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up');
+ $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up');
});
if($('#tabs-collapse-1').length === 0) {
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 471bed5e4..591e820a1 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -433,7 +433,7 @@ input {
border-color: #AC2925 !important;
}
-a:hover > .icon-trash {
+a:hover > .fa-trash-o {
color: #C9302C !important;
}
@@ -450,10 +450,10 @@ a:hover > .icon-trash {
.navbar-inverse .navbar-toggle .icon-bar {
background-color: #FFF;
}
- .navbar-inverse .navbar-toggle .icon-circle-arrow-down, .navbar-inverse .navbar-toggle .icon-circle-arrow-right, .navbar-inverse .navbar-toggle .icon-circle-arrow-up, .navbar-inverse .navbar-toggle .icon-circle-arrow-left {
+ .navbar-inverse .navbar-toggle .fa-arrow-circle-down, .navbar-inverse .navbar-toggle .fa-arrow-circle-right, .navbar-inverse .navbar-toggle .fa-arrow-circle-up, .navbar-inverse .navbar-toggle .fa-arrow-circle-left {
color: #FFF;
}
- .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-down, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-down, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-right, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-right, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-up, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-up, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-left, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-left {
+ .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-left, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-left {
color: #43488A;
}
.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {