diff --git a/spa/views.py b/spa/views.py index 6cc75eb..d172928 100755 --- a/spa/views.py +++ b/spa/views.py @@ -27,11 +27,11 @@ def app(request): 'bust': uuid.uuid1() } - if request.user_agent.browser.family != 'aaaFirefox': + if request.user_agent.browser.family == 'Firefox': context['ua_html'] = \ """
Hello Firefox user. If you are having any problems with the site, please do a diff --git a/static/css/ace/uncompressed/ace.css b/static/css/ace/uncompressed/ace.css index e74eb32..684c236 100644 --- a/static/css/ace/uncompressed/ace.css +++ b/static/css/ace/uncompressed/ace.css @@ -78,8 +78,8 @@ body.breadcrumbs-fixed { color: #8089a0; } /* elements */ -[class*=" icon-"], -[class^="icon-"] { +[class*=" fa-"], +[class^="fa-"] { display: inline-block; text-align: center; } @@ -202,8 +202,8 @@ li > ol { .list-inline { margin-left: 0; } -.list-unstyled > li > [class*="icon-"]:first-child, -.list-inline > li > [class*="icon-"]:first-child { +.list-unstyled > li > [class*="fa-"]:first-child, +.list-inline > li > [class*="fa-"]:first-child { width: 18px; text-align: center; } @@ -1088,7 +1088,7 @@ blockquote.pull-right { .header.brown { border-bottom-color: #df9393; } -.header > [class*="icon-"] { +.header > [class*="fa-"] { margin-right: 2px; } .no-radius { @@ -1198,7 +1198,7 @@ blockquote.pull-right { padding: 0 8px; position: relative; } -.ace-nav > li > a > [class*="icon-"] { +.ace-nav > li > a > [class*="fa-"] { font-size: 16px; color: #FFF; display: inline-block; @@ -1376,7 +1376,7 @@ blockquote.pull-right { border: 2px solid #FFF; max-width: 40px; } -.ace-nav li:last-child a [class^="icon-"] { +.ace-nav li:last-child a [class^="fa-"] { /* the arrow indicating "See more" on each dropdown , and the icons of user menu */ display: inline-block; @@ -1504,7 +1504,7 @@ blockquote.pull-right { .user-menu > li > a { padding: 4px 12px; } -.user-menu > li > a > [class*="icon-"] { +.user-menu > li > a > [class*="fa-"] { margin-right: 6px; font-size: 120%; } @@ -1893,10 +1893,10 @@ blockquote.pull-right { right: auto; } /* side navigation */ -li [class^="icon-"], -li [class*=" icon-"], -.nav-list li [class^="icon-"], -.nav-list li [class*=" icon-"] { +li [class^="fa-"], +li [class*=" fa-"], +.nav-list li [class^="fa-"], +.nav-list li [class*=" fa-"] { width: auto; } .nav-list { @@ -1947,7 +1947,7 @@ li [class*=" icon-"], font-size: 13px; text-decoration: none; } -.nav-list > li > a > [class*="icon-"]:first-child { +.nav-list > li > a > [class*="fa-"]:first-child { display: inline-block; vertical-align: middle; min-width: 30px; @@ -2018,7 +2018,7 @@ li [class*=" icon-"], font-weight: bold; font-size: 13px; } -.nav-list > li.active > a > [class*="icon-"] { +.nav-list > li.active > a > [class*="fa-"] { font-weight: normal; } .nav-list > li.active > a:hover:before { @@ -2078,7 +2078,7 @@ li [class*=" icon-"], .nav-list > li .submenu > li.active > a { color: #2b7dbc; } -.nav-list > li .submenu > li a > [class*="icon-"]:first-child { +.nav-list > li .submenu > li a > [class*="fa-"]:first-child { display: none; font-size: 12px; font-weight: normal; @@ -2092,11 +2092,11 @@ li [class*=" icon-"], z-index: 1; background-color: #FFF; } -.nav-list > li .submenu > li.active > a > [class*="icon-"]:first-child, -.nav-list > li .submenu > li:hover > a > [class*="icon-"]:first-child { +.nav-list > li .submenu > li.active > a > [class*="fa-"]:first-child, +.nav-list > li .submenu > li:hover > a > [class*="fa-"]:first-child { display: inline-block; } -.nav-list > li .submenu > li.active > a > [class*="icon-"]:first-child { +.nav-list > li .submenu > li.active > a > [class*="fa-"]:first-child { color: #c86139; } .nav-list > li > .submenu > li:before { @@ -2180,8 +2180,8 @@ li [class*=" icon-"], right: 11px; opacity: 0.88; } -.nav-list a .badge [class*="icon-"], -.nav-list a .label [class*="icon-"] { +.nav-list a .badge [class*="fa-"], +.nav-list a .label [class*="fa-"] { vertical-align: middle; margin: 0; } @@ -2205,7 +2205,7 @@ li [class*=" icon-"], padding: 3px 0; position: relative; } -.sidebar-collapse > [class*="icon-"] { +.sidebar-collapse > [class*="fa-"] { display: inline-block; cursor: pointer; font-size: 14px; @@ -2247,7 +2247,7 @@ li [class*=" icon-"], border-width: 4px; text-align: center; } -.sidebar-shortcuts-large > .btn > [class*="icon-"] { +.sidebar-shortcuts-large > .btn > [class*="fa-"] { margin: 0; } .sidebar-shortcuts-mini { @@ -2317,7 +2317,7 @@ li [class*=" icon-"], margin-left: 20px; padding-left: 38px; } -.nav-list > li > .submenu li > .submenu > li a > [class*="icon-"]:first-child { +.nav-list > li > .submenu li > .submenu > li a > [class*="fa-"]:first-child { display: inline-block; color: inherit; font-size: 14px; @@ -2333,14 +2333,14 @@ li [class*=" icon-"], color: #316292; text-decoration: underline; } -.nav-list > li > .submenu li > .submenu > li a:hover [class*="icon-"] { +.nav-list > li > .submenu li > .submenu > li a:hover [class*="fa-"] { text-decoration: none; color: #316292; } .nav-list > li > .submenu li.open > a { color: #25639e; } -.nav-list > li > .submenu li.open > a > [class*="icon-"]:first-child { +.nav-list > li > .submenu li.open > a > [class*="fa-"]:first-child { display: inline-block; } .nav-list > li > .submenu li.open > a .arrow { @@ -2349,7 +2349,7 @@ li [class*=" icon-"], .nav-list > li > .submenu li > .submenu li.open > a { color: #25639e; } -.nav-list > li > .submenu li > .submenu li.open > a > [class*="icon-"]:first-child { +.nav-list > li > .submenu li > .submenu li.open > a > [class*="fa-"]:first-child { display: inline-block; color: #1963aa; } @@ -2359,7 +2359,7 @@ li [class*=" icon-"], .nav-list > li > .submenu li > .submenu li.active > a { color: #347cb3; } -.nav-list > li > .submenu li > .submenu li.active > a > [class*="icon-"]:first-child { +.nav-list > li > .submenu li > .submenu li.active > a > [class*="fa-"]:first-child { display: inline-block; color: #347cb3; } @@ -2489,7 +2489,7 @@ li [class*=" icon-"], margin-left: 0; padding-left: 24px; } -.menu-min .nav-list > li > .submenu li > a > [class*="icon-"]:first-child { +.menu-min .nav-list > li > .submenu li > a > [class*="fa-"]:first-child { left: 4px; } .menu-min .nav-list > li:hover > .submenu { @@ -2528,7 +2528,7 @@ li [class*=" icon-"], left: 5px; right: 5px; } -.menu-min .sidebar-collapse > [class*="icon-"] { +.menu-min .sidebar-collapse > [class*="fa-"] { font-size: 13px; padding: 0 4px; line-height: 15px; @@ -2571,7 +2571,7 @@ li [class*=" icon-"], bottom: auto; top: auto !important; /*so that it's applied even if it's .sidebar-fixed */ - + margin-top: 40px; border: 1px solid #CCC; border-left-width: 0; @@ -2720,7 +2720,7 @@ li [class*=" icon-"], float:none; position:absolute; border-width:0 1px 1px 0; - + border-left:none; box-shadow:none; margin-top:0; @@ -3407,40 +3407,40 @@ fieldset[disabled] .btn-light.active { border-bottom-color: #B5B5B5; } /* icons inside buttons */ -.btn > [class*="icon-"] { +.btn > [class*="fa-"] { display: inline; margin-right: 4px; } -.btn > [class*="icon-"].icon-on-right { +.btn > [class*="fa-"].fa-on-right { margin-right: 0; margin-left: 4px; } -.btn > .icon-only[class*="icon-"] { +.btn > .fa-only[class*="fa-"] { margin: 0; vertical-align: middle; text-align: center; padding: 0; } -.btn-large > [class*="icon-"] { +.btn-large > [class*="fa-"] { margin-right: 6px; } -.btn-large > [class*="icon-"].icon-on-right { +.btn-large > [class*="fa-"].fa-on-right { margin-right: 0; margin-left: 6px; } -.btn-sm > [class*="icon-"] { +.btn-sm > [class*="fa-"] { margin-right: 3px; } -.btn-sm > [class*="icon-"].icon-on-right { +.btn-sm > [class*="fa-"].fa-on-right { margin-right: 0; margin-left: 3px; } -.btn-xs > [class*="icon-"], -.btn-minier > [class*="icon-"] { +.btn-xs > [class*="fa-"], +.btn-minier > [class*="fa-"] { margin-right: 2px; } -.btn-xs > [class*="icon-"].icon-on-right, -.btn-minier > [class*="icon-"].icon-on-right { +.btn-xs > [class*="fa-"].fa-on-right, +.btn-minier > [class*="fa-"].fa-on-right { margin-right: 0; margin-left: 2px; } @@ -4395,28 +4395,28 @@ fieldset[disabled] .btn-light.active { border-width: 9px 4px; } .label > span, -.label > [class*="icon-"] { +.label > [class*="fa-"] { line-height: 1; vertical-align: bottom; } /* dropdown menus */ -.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:focus > [class^="icon-"], -.dropdown-menu > li > a:hover > [class*=" icon-"], -.dropdown-menu > li > a:focus > [class*=" icon-"], -.dropdown-menu > .active > a > [class^="icon-"], -.dropdown-menu > .active > a > [class*=" icon-"], -.dropdown-submenu:hover > a > [class^="icon-"], -.dropdown-submenu:focus > a > [class^="icon-"], -.dropdown-submenu:hover > a > [class*=" icon-"], -.dropdown-submenu:focus > a > [class*=" icon-"] { +.fa-white, +.nav-pills > .active > a > [class^="fa-"], +.nav-pills > .active > a > [class*=" fa-"], +.nav-list > .active > a > [class^="fa-"], +.nav-list > .active > a > [class*=" fa-"], +.navbar-inverse .nav > .active > a > [class^="fa-"], +.navbar-inverse .nav > .active > a > [class*=" fa-"], +.dropdown-menu > li > a:hover > [class^="fa-"], +.dropdown-menu > li > a:focus > [class^="fa-"], +.dropdown-menu > li > a:hover > [class*=" fa-"], +.dropdown-menu > li > a:focus > [class*=" fa-"], +.dropdown-menu > .active > a > [class^="fa-"], +.dropdown-menu > .active > a > [class*=" fa-"], +.dropdown-submenu:hover > a > [class^="fa-"], +.dropdown-submenu:focus > a > [class^="fa-"], +.dropdown-submenu:hover > a > [class*=" fa-"], +.dropdown-submenu:focus > a > [class*=" fa-"] { background-image: none; } .dropdown-menu { @@ -4438,11 +4438,11 @@ fieldset[disabled] .btn-light.active { float: left; margin: 0 4px; } -.dropdown-menu.dropdown-only-icon > li > a [class*="icon-"] { +.dropdown-menu.dropdown-only-icon > li > a [class*="fa-"] { width: 18px; display: inline-block; } -.dropdown-menu.dropdown-only-icon > li > a .icon-2x { +.dropdown-menu.dropdown-only-icon > li > a .fa-2x { width: 36px; } .dropdown-menu li a:hover, @@ -4725,8 +4725,8 @@ fieldset[disabled] .btn-light.active { text-transform: none; border-bottom: 1px solid; } -.dropdown-navbar > li > [class*="icon-"], -.dropdown-navbar > li > a > [class*="icon-"] { +.dropdown-navbar > li > [class*="fa-"], +.dropdown-navbar > li > a > [class*="fa-"] { margin-right: 5px !important; color: #555; font-size: 14px; @@ -4767,7 +4767,7 @@ fieldset[disabled] .btn-light.active { color: #4F99C6; text-decoration: underline; } -.dropdown-navbar > li:last-child > a:hover > [class*="icon-"] { +.dropdown-navbar > li:last-child > a:hover > [class*="fa-"] { text-decoration: none; } .dropdown-navbar > li:hover { @@ -4778,7 +4778,7 @@ fieldset[disabled] .btn-light.active { color: #8090a0; border-bottom-color: #bcd4e5; } -.dropdown-navbar > li.dropdown-header > [class*="icon-"] { +.dropdown-navbar > li.dropdown-header > [class*="fa-"] { color: #8090a0; } .dropdown-navbar > li > a { @@ -4795,7 +4795,7 @@ fieldset[disabled] .btn-light.active { color: #b471a0; border-bottom-color: #e5bcd4; } -.dropdown-navbar.navbar-pink > li.dropdown-header > [class*="icon-"] { +.dropdown-navbar.navbar-pink > li.dropdown-header > [class*="fa-"] { color: #c06090; } .dropdown-navbar.navbar-pink > li > a { @@ -4812,7 +4812,7 @@ fieldset[disabled] .btn-light.active { color: #3a87ad; border-bottom-color: #e5e5e5; } -.dropdown-navbar.navbar-grey > li.dropdown-header > [class*="icon-"] { +.dropdown-navbar.navbar-grey > li.dropdown-header > [class*="fa-"] { color: #3a87ad; } .dropdown-navbar.navbar-grey > li > a { @@ -4829,13 +4829,13 @@ fieldset[disabled] .btn-light.active { color: #88aa66; border-bottom-color: #b4d5ac; } -.dropdown-navbar.navbar-green > li.dropdown-header > [class*="icon-"] { +.dropdown-navbar.navbar-green > li.dropdown-header > [class*="fa-"] { color: #90c060; } .dropdown-navbar.navbar-green > li > a { border-bottom-color: #ecf3e4; } -.dropdown-navbar [class*="btn"][class*="icon-"] { +.dropdown-navbar [class*="btn"][class*="fa-"] { display: inline-block; margin: 0 5px 0 0; width: 24px; @@ -4863,7 +4863,7 @@ fieldset[disabled] .btn-light.active { font-size: 11px; color: #777; } -.dropdown-navbar .msg-time > [class*="icon-"] { +.dropdown-navbar .msg-time > [class*="fa-"] { font-size: 14px; color: #555; } @@ -5120,11 +5120,11 @@ span.input-icon { padding-left: 24px; padding-right: 6px; } -.input-icon.input-icon-right > input { +.input-icon.input-fa-right > input { padding-left: 6px; padding-right: 24px; } -.input-icon > [class*="icon-"] { +.input-icon > [class*="fa-"] { padding: 0 3px; z-index: 2; position: absolute; @@ -5136,11 +5136,11 @@ span.input-icon { color: #909090; font-size: 16px; } -.input-icon.input-icon-right > [class*="icon-"] { +.input-icon.input-fa-right > [class*="fa-"] { left: auto; right: 3px; } -.input-icon > input:focus + [class*="icon-"] { +.input-icon > input:focus + [class*="fa-"] { color: #579; } .input-icon ~ .help-inline { @@ -5710,7 +5710,7 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { .ace-file-input .file-label.selected .file-name { color: #666666; } -.ace-file-input .file-label [class*="icon-"] { +.ace-file-input .file-label [class*="fa-"] { display: inline-block; position: absolute; left: 0; @@ -5727,19 +5727,19 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { transition: all 0.1s; background-color: #d1d1d1; } -.ace-file-input .file-label.selected .file-name [class*="icon-"] { +.ace-file-input .file-label.selected .file-name [class*="fa-"] { background-color: #efad62; } -.ace-file-input .file-label.selected .file-name .icon-picture { +.ace-file-input .file-label.selected .file-name .fa-picture { background-color: #bd7a9d; } -.ace-file-input .file-label.selected .file-name .icon-film { +.ace-file-input .file-label.selected .file-name .fa-film { background-color: #87b87f; } -.ace-file-input .file-label.selected .file-name .icon-music { +.ace-file-input .file-label.selected .file-name .fa-music { background-color: #8b7ac9; } -.ace-file-input .file-label.selected .file-name .icon-archive { +.ace-file-input .file-label.selected .file-name .fa-archive { background-color: #efad62; } .ace-file-input .file-label.hide-placeholder:before { @@ -5795,7 +5795,7 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { font-weight: bold; border: none; } -.ace-file-multiple .file-label.selected .file-name [class*="icon-"] { +.ace-file-multiple .file-label.selected .file-name [class*="fa-"] { display: inline-block; position: absolute; left: 0; @@ -5848,8 +5848,8 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { display: inline-block; white-space: pre; } -.ace-file-multiple .file-label .file-name img + [class*="icon-"], -.ace-file-multiple .file-label.selected .file-name img + [class*="icon-"] { +.ace-file-multiple .file-label .file-name img + [class*="fa-"], +.ace-file-multiple .file-label.selected .file-name img + [class*="fa-"] { display: none; } .ace-file-multiple .remove { @@ -5866,7 +5866,7 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { .ace-file-multiple .file-label.selected + .remove:hover { border-color: #f4c0b1; } -.ace-file-multiple .file-label .file-name [class*="icon-"] { +.ace-file-multiple .file-label .file-name [class*="fa-"] { position: relative; display: block; text-align: center; @@ -5881,7 +5881,7 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { .ace-file-multiple .file-label.selected:after { display: none; } -.ace-file-multiple .file-label.selected .file-name [class*="icon-"] { +.ace-file-multiple .file-label.selected .file-name [class*="fa-"] { position: relative; margin-right: 4px; margin-left: 2px; @@ -5947,9 +5947,9 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { .ace-file-multiple input[type=file][readonly] + .file-label:before { background-color: transparent; } -.ace-file-multiple input[type=file].disabled + .file-label [class*="icon-"], -.ace-file-multiple input[type=file][disabled] + .file-label [class*="icon-"], -.ace-file-multiple input[type=file][readonly] + .file-label [class*="icon-"] { +.ace-file-multiple input[type=file].disabled + .file-label [class*="fa-"], +.ace-file-multiple input[type=file][disabled] + .file-label [class*="fa-"], +.ace-file-multiple input[type=file][readonly] + .file-label [class*="fa-"] { border-color: #EEE; } /* IE9 needs this like IE8 to prevent "ACCESS denied" errors! */ @@ -6007,15 +6007,15 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { color: #778866; border-color: #81a85a; } -.form-group.has-success input:focus + [class*="icon-"], -.form-group.has-success select:focus + [class*="icon-"], -.form-group.has-success textarea:focus + [class*="icon-"] { +.form-group.has-success input:focus + [class*="fa-"], +.form-group.has-success select:focus + [class*="fa-"], +.form-group.has-success textarea:focus + [class*="fa-"] { color: #8bad4c; } -.form-group.has-success [class*="icon-"] { +.form-group.has-success [class*="fa-"] { color: #8bad4c; } -.form-group.has-success .btn [class*="icon-"] { +.form-group.has-success .btn [class*="fa-"] { color: inherit; } .form-group.has-success .control-label, @@ -6039,15 +6039,15 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { color: #667788; border-color: #5a81a8; } -.form-group.has-info input:focus + [class*="icon-"], -.form-group.has-info select:focus + [class*="icon-"], -.form-group.has-info textarea:focus + [class*="icon-"] { +.form-group.has-info input:focus + [class*="fa-"], +.form-group.has-info select:focus + [class*="fa-"], +.form-group.has-info textarea:focus + [class*="fa-"] { color: #4b89aa; } -.form-group.has-info [class*="icon-"] { +.form-group.has-info [class*="fa-"] { color: #4b89aa; } -.form-group.has-info .btn [class*="icon-"] { +.form-group.has-info .btn [class*="fa-"] { color: inherit; } .form-group.has-info .control-label, @@ -6071,15 +6071,15 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { color: #886666; border-color: #db8978; } -.form-group.has-error input:focus + [class*="icon-"], -.form-group.has-error select:focus + [class*="icon-"], -.form-group.has-error textarea:focus + [class*="icon-"] { +.form-group.has-error input:focus + [class*="fa-"], +.form-group.has-error select:focus + [class*="fa-"], +.form-group.has-error textarea:focus + [class*="fa-"] { color: #d68273; } -.form-group.has-error [class*="icon-"] { +.form-group.has-error [class*="fa-"] { color: #d68273; } -.form-group.has-error .btn [class*="icon-"] { +.form-group.has-error .btn [class*="fa-"] { color: inherit; } .form-group.has-error .control-label, @@ -6103,15 +6103,15 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { color: #887755; border-color: #d8bc41; } -.form-group.has-warning input:focus + [class*="icon-"], -.form-group.has-warning select:focus + [class*="icon-"], -.form-group.has-warning textarea:focus + [class*="icon-"] { +.form-group.has-warning input:focus + [class*="fa-"], +.form-group.has-warning select:focus + [class*="fa-"], +.form-group.has-warning textarea:focus + [class*="fa-"] { color: #d3bd50; } -.form-group.has-warning [class*="icon-"] { +.form-group.has-warning [class*="fa-"] { color: #d3bd50; } -.form-group.has-warning .btn [class*="icon-"] { +.form-group.has-warning .btn [class*="fa-"] { color: inherit; } .form-group.has-warning .control-label, @@ -6513,15 +6513,15 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { line-height: 15px; opacity: 0.7; } -.nav-tabs > li > a > [class*="icon-"] { +.nav-tabs > li > a > [class*="fa-"] { opacity: 0.75; } .nav-tabs > li.active > a > .badge, -.nav-tabs > li.active > a > [class*="icon-"] { +.nav-tabs > li.active > a > [class*="fa-"] { opacity: 1; } -.nav-tabs li [class*=" icon-"], -.nav-tabs li [class^="icon-"] { +.nav-tabs li [class*=" fa-"], +.nav-tabs li [class^="fa-"] { width: 1.25em; display: inline-block; text-align: center; @@ -6533,7 +6533,7 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { border-color: #4F99C6; color: #FFF; } -.nav-tabs > li.open .dropdown-toggle > [class*="icon-"] { +.nav-tabs > li.open .dropdown-toggle > [class*="fa-"] { color: #FFF !important; } .tabs-left .tab-content, @@ -6547,13 +6547,13 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { border-color: #4F99C6; color: #FFFFFF; } -.nav-pills .open .dropdown-toggle > [class*="icon-"], -.nav > li.dropdown.open.active > a:hover > [class*="icon-"], -.nav > li.dropdown.open.active > a:focus > [class*="icon-"] { +.nav-pills .open .dropdown-toggle > [class*="fa-"], +.nav > li.dropdown.open.active > a:hover > [class*="fa-"], +.nav > li.dropdown.open.active > a:focus > [class*="fa-"] { color: #FFF !important; } /* bigger tab buttons */ -.nav-tabs > li:not(.active):not(.open) > a:not(:hover) > [class*="icon-"]:first-child.disabled { +.nav-tabs > li:not(.active):not(.open) > a:not(:hover) > [class*="fa-"]:first-child.disabled { color: #909090 !important; } /* bigger tab buttons */ @@ -6561,7 +6561,7 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { padding-left: 14px; padding-right: 14px; } -.nav-tabs.tab-size-bigger > li > a > [class*="icon-"]:first-child { +.nav-tabs.tab-size-bigger > li > a > [class*="fa-"]:first-child { display: block; margin-bottom: 6px; width: auto; @@ -6595,7 +6595,7 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { border-color: rgba(0, 0, 0, 0.15); border-bottom-color: transparent; } -.nav-tabs[class*="tab-color-"] > li:not(.active) > a > [class*="icon-"]:first-child { +.nav-tabs[class*="tab-color-"] > li:not(.active) > a > [class*="fa-"]:first-child { color: #FFF !important; } .nav-tabs[class*="tab-color-"] > li:not(.active) > a > .badge { @@ -6687,10 +6687,10 @@ input[type=checkbox].ace.ace-switch.ace-switch-7:checked + .lbl::after { outline: none; text-decoration: none; } -.accordion-style1.panel-group .panel-heading .accordion-toggle > [class*="icon-"]:first-child { +.accordion-style1.panel-group .panel-heading .accordion-toggle > [class*="fa-"]:first-child { width: 16px; } -.accordion-style1.panel-group .panel-heading .accordion-toggle:hover > [class*="icon-"]:first-child { +.accordion-style1.panel-group .panel-heading .accordion-toggle:hover > [class*="fa-"]:first-child { text-decoration: none; } .accordion-style1.panel-group .panel-body, @@ -6774,7 +6774,7 @@ td, border-color: #DDD; font-weight: bold; } -.table thead tr th [class*="icon-"]:first-child { +.table thead tr th [class*="fa-"]:first-child { margin-right: 2px; } .table thead tr th:first-child { @@ -6993,8 +6993,8 @@ td .lbl:only-child { margin: 0; display: inline; } -.widget-header > .widget-caption > [class*="icon-"], -.widget-header > :first-child > [class*="icon-"] { +.widget-header > .widget-caption > [class*="fa-"], +.widget-header > :first-child > [class*="fa-"] { margin-right: 5px; font-weight: normal; display: inline-block; @@ -7131,7 +7131,7 @@ td .lbl:only-child { background: rgba(255, 255, 255, 0.85); } /* widget-toolbar buttons*/ -.widget-toolbar > [data-action] > [class*="icon-"] { +.widget-toolbar > [data-action] > [class*="fa-"] { margin-right: 0; } .widget-toolbar > [data-action]:focus { @@ -7628,17 +7628,17 @@ td .lbl:only-child { background-color: rgba(0, 0, 0, 0.3); z-index: 21; } -.widget-box-overlay > [class*="icon-"] { +.widget-box-overlay > [class*="fa-"] { position: absolute; top: 15%; left: 0; right: 0; text-align: center; } -.widget-box.collapsed .widget-box-overlay > [class*="icon-"] { +.widget-box.collapsed .widget-box-overlay > [class*="fa-"] { top: 5%; } -.widget-box-overlay > .icon-spin { +.widget-box-overlay > .fa-spin { -moz-animation-duration: 1.2s; -webkit-animation-duration: 1.2s; -o-animation-duration: 1.2s; @@ -8084,7 +8084,7 @@ td .lbl:only-child { vertical-align: top; width: 44px; } -.infobox > .infobox-icon > [class*="icon-"] { +.infobox > .infobox-icon > [class*="fa-"] { display: inline-block; height: 42px; margin: 0; @@ -8097,7 +8097,7 @@ td .lbl:only-child { -webkit-box-shadow: 1px 1px 0 rgba(0,0,0,0.2); box-shadow: 1px 1px 0 rgba(0,0,0,0.2); } -.infobox > .infobox-icon > [class*="icon-"]:before { +.infobox > .infobox-icon > [class*="fa-"]:before { font-size: 24px; display: block; padding: 6px 0 7px; @@ -8156,7 +8156,7 @@ td .lbl:only-child { color: #6f3cc4; border-color: #6f3cc4; } -.infobox-purple > .infobox-icon > [class*="icon-"] { +.infobox-purple > .infobox-icon > [class*="fa-"] { background-color: #6f3cc4; } .infobox-purple.infobox-dark { @@ -8167,7 +8167,7 @@ td .lbl:only-child { color: #5f47b0; border-color: #5f47b0; } -.infobox-purple2 > .infobox-icon > [class*="icon-"] { +.infobox-purple2 > .infobox-icon > [class*="fa-"] { background-color: #5f47b0; } .infobox-purple2.infobox-dark { @@ -8178,7 +8178,7 @@ td .lbl:only-child { color: #cb6fd7; border-color: #cb6fd7; } -.infobox-pink > .infobox-icon > [class*="icon-"] { +.infobox-pink > .infobox-icon > [class*="fa-"] { background-color: #cb6fd7; } .infobox-pink.infobox-dark { @@ -8189,7 +8189,7 @@ td .lbl:only-child { color: #6fb3e0; border-color: #6fb3e0; } -.infobox-blue > .infobox-icon > [class*="icon-"] { +.infobox-blue > .infobox-icon > [class*="fa-"] { background-color: #6fb3e0; } .infobox-blue.infobox-dark { @@ -8200,7 +8200,7 @@ td .lbl:only-child { color: #3983c2; border-color: #3983c2; } -.infobox-blue2 > .infobox-icon > [class*="icon-"] { +.infobox-blue2 > .infobox-icon > [class*="fa-"] { background-color: #3983c2; } .infobox-blue2.infobox-dark { @@ -8211,7 +8211,7 @@ td .lbl:only-child { color: #1144eb; border-color: #1144eb; } -.infobox-blue3 > .infobox-icon > [class*="icon-"] { +.infobox-blue3 > .infobox-icon > [class*="fa-"] { background-color: #1144eb; } .infobox-blue3.infobox-dark { @@ -8222,7 +8222,7 @@ td .lbl:only-child { color: #d53f40; border-color: #d53f40; } -.infobox-red > .infobox-icon > [class*="icon-"] { +.infobox-red > .infobox-icon > [class*="fa-"] { background-color: #d53f40; } .infobox-red.infobox-dark { @@ -8233,7 +8233,7 @@ td .lbl:only-child { color: #c67a3e; border-color: #c67a3e; } -.infobox-brown > .infobox-icon > [class*="icon-"] { +.infobox-brown > .infobox-icon > [class*="fa-"] { background-color: #c67a3e; } .infobox-brown.infobox-dark { @@ -8244,7 +8244,7 @@ td .lbl:only-child { color: #7b3f25; border-color: #7b3f25; } -.infobox-wood > .infobox-icon > [class*="icon-"] { +.infobox-wood > .infobox-icon > [class*="fa-"] { background-color: #7b3f25; } .infobox-wood.infobox-dark { @@ -8255,7 +8255,7 @@ td .lbl:only-child { color: #cebea5; border-color: #cebea5; } -.infobox-light-brown > .infobox-icon > [class*="icon-"] { +.infobox-light-brown > .infobox-icon > [class*="fa-"] { background-color: #cebea5; } .infobox-light-brown.infobox-dark { @@ -8266,7 +8266,7 @@ td .lbl:only-child { color: #e8b110; border-color: #e8b110; } -.infobox-orange > .infobox-icon > [class*="icon-"] { +.infobox-orange > .infobox-icon > [class*="fa-"] { background-color: #e8b110; } .infobox-orange.infobox-dark { @@ -8277,7 +8277,7 @@ td .lbl:only-child { color: #f79263; border-color: #f79263; } -.infobox-orange2 > .infobox-icon > [class*="icon-"] { +.infobox-orange2 > .infobox-icon > [class*="fa-"] { background-color: #f79263; } .infobox-orange2.infobox-dark { @@ -8288,7 +8288,7 @@ td .lbl:only-child { color: #9abc32; border-color: #9abc32; } -.infobox-green > .infobox-icon > [class*="icon-"] { +.infobox-green > .infobox-icon > [class*="fa-"] { background-color: #9abc32; } .infobox-green.infobox-dark { @@ -8299,7 +8299,7 @@ td .lbl:only-child { color: #0490a6; border-color: #0490a6; } -.infobox-green2 > .infobox-icon > [class*="icon-"] { +.infobox-green2 > .infobox-icon > [class*="fa-"] { background-color: #0490a6; } .infobox-green2.infobox-dark { @@ -8310,7 +8310,7 @@ td .lbl:only-child { color: #999999; border-color: #999999; } -.infobox-grey > .infobox-icon > [class*="icon-"] { +.infobox-grey > .infobox-icon > [class*="fa-"] { background-color: #999999; } .infobox-grey.infobox-dark { @@ -8321,7 +8321,7 @@ td .lbl:only-child { color: #393939; border-color: #393939; } -.infobox-black > .infobox-icon > [class*="icon-"] { +.infobox-black > .infobox-icon > [class*="fa-"] { background-color: #393939; } .infobox-black.infobox-dark { @@ -8335,15 +8335,15 @@ td .lbl:only-child { color: #FFF; padding: 4px; } -.infobox-dark > .infobox-icon > [class*="icon-"], -.infobox-dark > .infobox-icon > [class*="icon-"]:before { +.infobox-dark > .infobox-icon > [class*="fa-"], +.infobox-dark > .infobox-icon > [class*="fa-"]:before { background-color: transparent; box-shadow: none; text-shadow: none; border-radius: 0; font-size: 30px; } -.infobox-dark > .infobox-icon > [class*="icon-"]:before { +.infobox-dark > .infobox-icon > [class*="fa-"]:before { opacity: 1; filter: alpha(opacity=100); } @@ -8482,13 +8482,13 @@ td .lbl:only-child { top: 2px; right: 2px; } -.infobox.infobox-dark > .badge.badge-success > [class*="icon-"] { +.infobox.infobox-dark > .badge.badge-success > [class*="fa-"] { color: #C6E9A1; } -.infobox.infobox-dark > .badge.badge-important > [class*="icon-"] { +.infobox.infobox-dark > .badge.badge-important > [class*="fa-"] { color: #ECB792; } -.infobox.infobox-dark > .badge.badge-warning > [class*="icon-"] { +.infobox.infobox-dark > .badge.badge-warning > [class*="fa-"] { color: #ECB792; } .infobox-small { @@ -8810,7 +8810,7 @@ td .lbl:only-child { margin: 0 1px; border: none; } -.login-box .social-login a > [class*="icon-"] { +.login-box .social-login a > [class*="fa-"] { font-size: 24px; margin: 0; } @@ -9055,7 +9055,7 @@ td .lbl:only-child { right: 9px; top: 0; } -.itemdiv > .body > .time [class*="icon-"] { +.itemdiv > .body > .time [class*="fa-"] { font-size: 14px; font-weight: normal; } @@ -9086,7 +9086,7 @@ td .lbl:only-child { margin-top: 9px; border-top: 1px solid #E4ECF3; } -.itemdiv > .body > .text > [class*="icon-quote-"]:first-child { +.itemdiv > .body > .text > [class*="fa-quote-"]:first-child { color: #DCE3ED; margin-right: 4px; } @@ -9446,15 +9446,15 @@ li.item-default { border: 1px solid #E0E2E5; background-color: #F8FAFC; } -.profile-contact-info .btn-link:hover > [class*="icon-"], -.profile-contact-info .btn-link:focus > [class*="icon-"] { +.profile-contact-info .btn-link:hover > [class*="fa-"], +.profile-contact-info .btn-link:focus > [class*="fa-"] { text-decoration: none; } .profile-social-links > a { text-decoration: none; margin: 0 1px; } -.profile-social-links > a:hover > [class*="icon-"] { +.profile-social-links > a:hover > [class*="fa-"] { text-decoration: none; } .profile-skills .progress { @@ -9498,7 +9498,7 @@ li.item-default { text-align: center; margin: 0 8px 24px; } -.profile-users .memberdiv .name a:hover [class*="icon-"] { +.profile-users .memberdiv .name a:hover [class*="fa-"] { text-decoration: none; } .profile-users .memberdiv .body { @@ -9642,7 +9642,7 @@ li.item-default { padding: 5px 15px 7px; font-size: 14px; } -.inbox-tabs.nav-tabs.tab-size-bigger > li > a > [class*="icon-"]:first-child { +.inbox-tabs.nav-tabs.tab-size-bigger > li > a > [class*="fa-"]:first-child { margin-bottom: 5px; } .inbox-tabs.nav-tabs.tab-size-bigger > li > a.btn-new-mail > .btn { @@ -9970,7 +9970,7 @@ li.item-default { background-color: rgba(255, 255, 255, 0.5); text-align: center; } -.message-loading-overlay > [class*="icon-"] { +.message-loading-overlay > [class*="fa-"] { position: absolute; top: 15%; left: 0; @@ -10006,7 +10006,7 @@ ul.attachment-list > li { color: #777; width: 200px; } -.attached-file > [class*="icon-"] { +.attached-file > [class*="fa-"] { display: inline-block; width: 16px; margin-right: 2px; @@ -10128,7 +10128,7 @@ ul.attachment-list > li { background-color: #EFEFEF !important; color: #6092C4 !important; } -.inbox-folders .btn > [class*="icon-"]:first-child { +.inbox-folders .btn > [class*="fa-"]:first-child { display: inline-block; width: 14px; text-align: left; @@ -10460,7 +10460,7 @@ ul.attachment-list > li { .external-event.ui-draggable-dragging { cursor: move; } -.external-event > [class*="icon-"]:first-child { +.external-event > [class*="fa-"]:first-child { /* the move & drag icon */ display: inline-block; @@ -11009,7 +11009,7 @@ ul.attachment-list > li { background: #FFF none !important; text-align: center; } -#cboxLoadingGraphic > [class*="icon-"] { +#cboxLoadingGraphic > [class*="fa-"] { display: inline-block; background-color: #FFF; border-radius: 8px; @@ -11045,7 +11045,7 @@ ul.attachment-list > li { .ace-spinner .spinner-buttons > .btn:first-child { margin-top: 0; } -.ace-spinner .spinner-buttons > .btn > [class*="icon-"] { +.ace-spinner .spinner-buttons > .btn > [class*="fa-"] { margin: 0; padding: 0; } @@ -11078,7 +11078,7 @@ ul.attachment-list > li { vertical-align: sub; margin: 0 1px; } -.ace-spinner.touch-spinner .spinner-buttons > .btn > [class*="icon-"] { +.ace-spinner.touch-spinner .spinner-buttons > .btn > [class*="fa-"] { vertical-align: middle; display: inline-block; } @@ -11256,8 +11256,8 @@ ul.attachment-list > li { display: inline; z-index: 2; } -.tree .tree-folder .tree-folder-header > [class*="icon-"]:first-child, -.tree .tree-item > [class*="icon-"]:first-child { +.tree .tree-folder .tree-folder-header > [class*="fa-"]:first-child, +.tree .tree-item > [class*="fa-"]:first-child { display: inline-block; position: relative; z-index: 2; @@ -11266,7 +11266,7 @@ ul.attachment-list > li { .tree .tree-folder .tree-folder-header .tree-folder-name { margin-left: 2px; } -.tree .tree-folder .tree-folder-header > [class*="icon-"]:first-child { +.tree .tree-folder .tree-folder-header > [class*="fa-"]:first-child { margin: -2px 0 0 -2px; } .tree .tree-folder:last-child:after { @@ -11306,10 +11306,10 @@ ul.attachment-list > li { .tree .tree-item .tree-item-name { margin-left: 3px; } -.tree .tree-item .tree-item-name > [class*="icon-"]:first-child { +.tree .tree-item .tree-item-name > [class*="fa-"]:first-child { margin-right: 3px; } -.tree .tree-item > [class*="icon-"]:first-child { +.tree .tree-item > [class*="fa-"]:first-child { margin-top: -1px; } .tree .tree-folder, @@ -11351,7 +11351,7 @@ ul.attachment-list > li { -moz-box-sizing: content-box; box-sizing: content-box; } -.tree .tree-item > [class*="icon-"]:first-child { +.tree .tree-item > [class*="fa-"]:first-child { color: #F9E8CE; width: 13px; height: 13px; @@ -11366,13 +11366,13 @@ ul.attachment-list > li { border: 1px solid #CCC; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } -.tree .tree-selected > [class*="icon-"]:first-child { +.tree .tree-selected > [class*="fa-"]:first-child { background-color: #F9A021; border-color: #F9A021; color: #FFF; } -.tree .icon-plus[class*="icon-"]:first-child, -.tree .icon-minus[class*="icon-"]:first-child { +.tree .fa-plus[class*="fa-"]:first-child, +.tree .fa-minus[class*="fa-"]:first-child { border: 1px solid #DDD; vertical-align: middle; height: 11px; @@ -11387,7 +11387,7 @@ ul.attachment-list > li { position: relative; z-index: 1; } -.tree .icon-plus[class*="icon-"]:first-child:before { +.tree .fa-plus[class*="fa-"]:first-child:before { display: block; content: "+"; font-family: "Open Sans"; @@ -11395,7 +11395,7 @@ ul.attachment-list > li { position: relative; z-index: 1; } -.tree .icon-minus[class*="icon-"]:first-child:before { +.tree .fa-minus[class*="fa-"]:first-child:before { content: ""; display: block; width: 7px; @@ -11405,7 +11405,7 @@ ul.attachment-list > li { top: 5px; left: 2px; } -.tree .tree-unselectable .tree-item > [class*="icon-"]:first-child { +.tree .tree-unselectable .tree-item > [class*="fa-"]:first-child { color: #5084A0; width: 13px; height: 13px; @@ -11417,10 +11417,10 @@ ul.attachment-list > li { border: none; box-shadow: none; } -.tree [class*="icon-"][class*="-down"] { +.tree [class*="fa-"][class*="-down"] { transform: rotate(-45deg); } -.tree .icon-spin { +.tree .fa-spin { height: auto; } .tree .tree-loading { @@ -11590,16 +11590,16 @@ ul.attachment-list > li { border-width: 2px; margin-left: 1px; } -.wysiwyg-toolbar .btn-group > .btn > [class*="icon-"]:first-child, -.wysiwyg-toolbar .btn-group > .inline > .btn > [class*="icon-"]:first-child { +.wysiwyg-toolbar .btn-group > .btn > [class*="fa-"]:first-child, +.wysiwyg-toolbar .btn-group > .inline > .btn > [class*="fa-"]:first-child { font-size: 14px; width: 25px; max-width: 25px; display: inline-block; border-width: 1px !important; } -.wysiwyg-toolbar .btn-group > .btn.dropdown-toggle > [class*="icon-"]:last-child, -.wysiwyg-toolbar .btn-group > .inline > .btn.dropdown-toggle > [class*="icon-"]:last-child { +.wysiwyg-toolbar .btn-group > .btn.dropdown-toggle > [class*="fa-"]:last-child, +.wysiwyg-toolbar .btn-group > .inline > .btn.dropdown-toggle > [class*="fa-"]:last-child { margin-right: 4px; } .wysiwyg-toolbar .btn-group > .btn.active:after, @@ -11749,7 +11749,7 @@ ul.attachment-list > li { border: 1px dotted #D00; overflow: visible !important; /* because it's image only, so it's ok */ - + display: inline-block !important; vertical-align: middle; } @@ -11818,7 +11818,7 @@ ul.attachment-list > li { padding-top: 2px; padding-bottom: 4px; } -.widget-body .md-header .btn > [class*="icon-"] { +.widget-body .md-header .btn > [class*="fa-"] { font-size: 14px; width: 25px; max-width: 25px; @@ -11880,7 +11880,7 @@ img.editable-click:hover { font-size: 12px; margin: 0 1px 0 0; } -.editable-buttons .btn > [class*="icon-"] { +.editable-buttons .btn > [class*="fa-"] { margin: 0; } .editable-clear-x { @@ -11952,7 +11952,7 @@ img.editable-click:hover { .editableform-loading { background: none; } -.editableform-loading [class*="icon-"], +.editableform-loading [class*="fa-"], .editableform-loading .progress { position: relative; top: 35%; @@ -12452,7 +12452,7 @@ img.editable-click:hover { text-align: center; padding: 0; } -.ui-spinner-button > [class*="icon-"] { +.ui-spinner-button > [class*="fa-"] { width: 18px; display: inline-block; } @@ -12712,7 +12712,7 @@ th[aria-selected=true] .ui-jqgrid-sortable { font-family: FontAwesome; font-size: 12px; } -.ui-icon-asc:before { +.ui-fa-asc:before { content: "\f0d8"; } .ui-state-disabled { @@ -12793,28 +12793,28 @@ th[aria-selected=true] .ui-jqgrid-sortable { font-family: FontAwesome; display: inline; } -.ui-icon-pencil { +.ui-fa-pencil { color: #478FCA; } -.ui-icon-pencil:before { +.ui-fa-pencil:before { content: "\f040"; } -.ui-icon-trash { +.ui-fa-trash { color: #DD5A43; } -.ui-icon-trash:before { +.ui-fa-trash:before { content: "\f014"; } -.ui-icon-disk { +.ui-fa-disk { color: #69AA46; } -.ui-icon-disk:before { +.ui-fa-disk:before { content: "\f00c"; } -.ui-icon-cancel { +.ui-fa-cancel { color: #DD5A43; } -.ui-icon-cancel:before { +.ui-fa-cancel:before { content: "\f00d"; } .ui-jqdialog-content, @@ -12884,7 +12884,7 @@ th[aria-selected=true] .ui-jqgrid-sortable { .EditTable .navButton .fm-button:focus { outline: none; } -.EditTable .navButton .fm-button [class*="icon-"] { +.EditTable .navButton .fm-button [class*="fa-"] { display: inline-block; color: #999; border: 1px solid #AAA; @@ -12895,12 +12895,12 @@ th[aria-selected=true] .ui-jqgrid-sortable { border-radius: 100%; background-color: #FFF; } -.EditTable .navButton .fm-button:hover [class*="icon-"] { +.EditTable .navButton .fm-button:hover [class*="fa-"] { color: #699AB5; border-color: #699AB5; } -.EditTable .navButton .fm-button.ui-state-disabled [class*="icon-"], -.EditTable .navButton .fm-button.ui-state-disabled:hover [class*="icon-"] { +.EditTable .navButton .fm-button.ui-state-disabled [class*="fa-"], +.EditTable .navButton .fm-button.ui-state-disabled:hover [class*="fa-"] { color: #BBB; border-color: #CCC; -moz-transform: scale(0.88); @@ -13364,7 +13364,7 @@ th[aria-selected=true] .ui-jqgrid-sortable { display: none; } /* custom animated icons */ -.icon-animated-bell { +.fa-animated-bell { display: inline-block; -moz-animation: ringing 2.0s 5 ease 1.0s; -webkit-animation: ringing 2.0s 5 ease 1.0s; @@ -13517,7 +13517,7 @@ th[aria-selected=true] .ui-jqgrid-sortable { transform: rotate(0deg); } } -.icon-animated-vertical { +.fa-animated-vertical { display: inline-block; -moz-animation: vertical 2.0s 5 ease 2.0s; -webkit-animation: vertical 2.0s 5 ease 2.0s; @@ -13617,7 +13617,7 @@ th[aria-selected=true] .ui-jqgrid-sortable { transform: translate(0, 0); } } -.icon-animated-hand-pointer { +.fa-animated-hand-pointer { display: inline-block; -moz-animation: hand-pointer 2.0s 4 ease 2.0s; -webkit-animation: hand-pointer 2.0s 4 ease 2.0s; @@ -13648,7 +13648,7 @@ th[aria-selected=true] .ui-jqgrid-sortable { -moz-transform: translate(0, 0); } } -.icon-animated-wrench { +.fa-animated-wrench { display: inline-block; -moz-animation: wrenching 2.5s 4 ease; -webkit-animation: wrenching 2.5s 4 ease; diff --git a/static/css/dss.main.css b/static/css/dss.main.css index 217cb6e..12d3658 100644 --- a/static/css/dss.main.css +++ b/static/css/dss.main.css @@ -796,4 +796,10 @@ img.mix-listing-image { .dss-player-wrapper{ margin-top: 4px; -} \ No newline at end of file +} + +[class^="fa-"] { + display: inline-block; + text-align: center; +} + diff --git a/templates/base.html b/templates/base.html index 00547bb..e1f05cc 100755 --- a/templates/base.html +++ b/templates/base.html @@ -6,6 +6,7 @@ {% load compress %} {% load static %} + {% compress css %} diff --git a/templates/inc/bitsnbobs/moodymanc.html b/templates/inc/bitsnbobs/moodymanc.html index cbc6b52..e2205ff 100644 --- a/templates/inc/bitsnbobs/moodymanc.html +++ b/templates/inc/bitsnbobs/moodymanc.html @@ -87,27 +87,27 @@
<% } else { %>

- +   <%= display_name %>

@@ -89,18 +89,18 @@
-  Joined: <%= humanise(date_joined) %> -  Last Seen: <%= humanise(last_login) %> +  Joined: <%= humanise(date_joined) %> +  Last Seen: <%= humanise(last_login) %>
{% if user.is_authenticated %} {% else %} {% endif %}
diff --git a/templates/views/UserListItemViewFancy.html b/templates/views/UserListItemViewFancy.html index e40faf6..1bd4ad6 100644 --- a/templates/views/UserListItemViewFancy.html +++ b/templates/views/UserListItemViewFancy.html @@ -6,13 +6,13 @@ {% else %} {% endif %} @@ -39,16 +39,16 @@

- | Joined: <%= humanise(date_joined) %> - | Last Seen: <%= humanise(last_login) %> + | Joined: <%= humanise(date_joined) %> + | Last Seen: <%= humanise(last_login) %>

- | <%= mix_count%> Mixes - | <%= favourite_count %> Favourites - | <%= like_count %> Likes - | <%= followers.length %> Followers - | <%= following.length %> Following + | <%= mix_count%> Mixes + | <%= favourite_count %> Favourites + | <%= like_count %> Likes + | <%= followers.length %> Followers + | <%= following.length %> Following

diff --git a/templates/views/UserListView.html b/templates/views/UserListView.html index 2b2457f..070216f 100755 --- a/templates/views/UserListView.html +++ b/templates/views/UserListView.html @@ -3,7 +3,7 @@ - + diff --git a/templates/views/UserProfileView.html b/templates/views/UserProfileView.html index bc80cca..96d1b73 100644 --- a/templates/views/UserProfileView.html +++ b/templates/views/UserProfileView.html @@ -15,7 +15,7 @@
- +   <%= display_name %> @@ -23,21 +23,21 @@
  • Change Status
  • - +   Available
  • - +   Busy
  • - +   Invisible @@ -51,12 +51,12 @@
    {% if user.is_authenticated %} - + <% if (is_following) { %>Unfollow<% } else { %>Follow<%}%> {% else %} - + Login to follow {% endif %} @@ -64,12 +64,12 @@
    {% comment %} - + Send a message {% endcomment %} - + Profile Link
    @@ -77,15 +77,15 @@ {% comment %}
    - + - + - +
    {% endcomment %} @@ -95,27 +95,27 @@
    - + Mixes <%= mix_count%> - + Favourites <%= favourite_count %> - + Likes <%= like_count %> - + Followers <%= followers.length %> - + Following <%= following.length %> @@ -125,7 +125,7 @@
    Location
    - + <%= city %> <%= country %>
    diff --git a/templates/views/_MixItemInsert.html b/templates/views/_MixItemInsert.html index d7ae390..1d30900 100755 --- a/templates/views/_MixItemInsert.html +++ b/templates/views/_MixItemInsert.html @@ -7,7 +7,7 @@
    -  <%= user_name %> +  <%= user_name %>
    @@ -15,8 +15,8 @@
    • @@ -84,36 +84,36 @@
      Favourite<% if (favourited) { %>d<% } %> + data-id="<%= id %>"> Favourite<% if (favourited) { %>d<% } %>
      {% endif %}
      • - <%= play_count %>
      • - <%= download_count %>
      • - <%= comment_count %>
      • - <%= like_count %> @@ -123,23 +123,23 @@ <% if(can_edit) { %>
        Edit + data-id="<%= id %>">Edit
        Delete + data-id="<%= id %>">Delete
        <% } %> <% if (download_allowed) { %> {% if user.is_authenticated %}
        - Download + Download
        {% else %} {% endif %} <% } %> diff --git a/templates/views/dlg/Donate.html b/templates/views/dlg/Donate.html index 925cba1..5e1bc48 100644 --- a/templates/views/dlg/Donate.html +++ b/templates/views/dlg/Donate.html @@ -24,13 +24,13 @@
    @@ -41,10 +41,10 @@

    {% endblock %}