hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

refatored html code to use proper font-awesome classes

Browse Source
This commit is contained in:
Mike Ng
2018-01-19 13:32:20 +04:00
parent 431d9dc46a
commit 802c52d7ff
51 changed files with 233 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/gulp/components/common.js
View File

@@ -9,12 +9,12 @@ gulp.task('copy-common-images', function(){
});
gulp.task('copy-common-fonts',function(){
return gulp.src([config.paths.vendors + 'font-awesome/font/*'])
.pipe(gulp.dest( config.paths.build + 'common/font'));
return gulp.src([config.paths.nodes + 'font-awesome/fonts/*'])
.pipe(gulp.dest(config.paths.build + 'common/fonts'));
});
gulp.task('build-common-font-css', ['copy-common-fonts'],function(){
return gulp.src([config.paths.vendors + 'font-awesome/css/font-awesome-ie7.min.css'])
return gulp.src([config.paths.nodes + 'font-awesome/css/font-awesome.min.css'])
.pipe(gulp.dest( config.paths.build + 'common/css'));
});

3
resources/www/_shared/styles/_variables.scss
View File

@@ -1,4 +1,5 @@
$FontAwesomePath: '/assets/common/font' !default; // dist path
$FontAwesomePath: '/assets/common/fonts' !default; // dist path
$fa-font-path: "/assets/common/fonts" !default;
$iconsPath: '/assets/common/images/icons/' !default;
$mainMenuHeight: 40px !default;

2
resources/www/account/styles/main.scss
View File

@@ -4,7 +4,7 @@
@import 'variables';
@import '../../vendors/bootstrap/bootstrap';
@import 'skin';
@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss';
@import '../../../../node_modules/font-awesome/scss/font-awesome.scss';
@import '../../../../node_modules/jquery-ui/themes/base/autocomplete'; // not extension for inline import
$mainMenuBackgroundColor: #3b3b3b;

3
resources/www/authentication/styles/main.scss
View File

@@ -2,6 +2,5 @@
@import 'variables';
@import '../../vendors/bootstrap/bootstrap';
@import '../../account/styles/skin';
@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss';
@import '../../../../node_modules/font-awesome/scss/font-awesome.scss';
@import '../../../../node_modules/jquery-ui/themes/base/autocomplete'; // not extension for inline import

2
resources/www/common/styles/main.scss
View File

@@ -1,11 +1,11 @@
/**
* Common stylesheet, builded into assets/common/styles/common.css
*/
@import '../../../../node_modules/font-awesome/scss/font-awesome.scss';
@import '../../_shared/styles/variables';
@import '../../vendors/bootstrap/bootstrap';
@import '../../vendors/bootstrap/responsive';
@import '../../_shared/styles/override-bootstrap';
@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss';
@import '../../_shared/styles/main';
$mainMenuBackgroundColor: #212121; //BFBFBF;

6
resources/www/prod/js/jquery.main-prod.js
View File

@@ -1209,7 +1209,7 @@ $(document).ready(function () {
$('#idFrameC .ui-tabs-nav li').removeClass('ui-state-active');
$('.WZbasketTab').css('background-position', '15px 25px');
$('#idFrameC').addClass('closed');
previousTab = $('#idFrameC .icon-menu').find('li.ui-tabs-active');
previousTab = $('#idFrameC .prod-icon-menu').find('li.ui-tabs-active');
}else{
$(this).find('i').removeClass('icon-double-angle-right').addClass('icon-double-angle-left')
$('#idFrameC').width(360);
@@ -1219,8 +1219,8 @@ $(document).ready(function () {
$('.ui-resizable-handle, #basket_menu_trigger').show();
$('.WZbasketTab').css('background-position', '9px 25px');
$('#idFrameC').removeClass('closed');
$('#idFrameC .icon-menu li').last().find('a').trigger('click');
$('#idFrameC .icon-menu li').first().find('a').trigger('click');
$('#idFrameC .prod-icon-menu li').last().find('a').trigger('click');
$('#idFrameC .prod-icon-menu li').first().find('a').trigger('click');
$(previousTab).find('a').trigger('click');
}

6
resources/www/prod/skins/ui-components/_workzone.scss
View File

@@ -137,10 +137,10 @@ $workzoneTabDisabledTextColor: $mediumTextActiveColor !default;
}
}
ul.icon-menu {
ul.prod-icon-menu {
width: 100%;
}
.icon-menu {
.prod-icon-menu {
.WZtabs, .WZplugins {
display: block;
width: 70px;
@@ -159,7 +159,7 @@ $workzoneTabDisabledTextColor: $mediumTextActiveColor !default;
}
}
.closed {
.icon-menu li {
.prod-icon-menu li {
clear: left;
}
}