Skip to content

Commit

Permalink
update fomantic-ui to 2.8.3 + support fileMaxSize on fileuploader
Browse files Browse the repository at this point in the history
  • Loading branch information
uyab committed Mar 4, 2020
1 parent 79dc174 commit e5afc21
Show file tree
Hide file tree
Showing 173 changed files with 18,820 additions and 15,203 deletions.
2 changes: 1 addition & 1 deletion public/js/all.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"/css/app.css": "/css/app.css?id=84c9515032f958dd16e4",
"/js/all.js": "/js/all.js?id=44dc54f58eb1e7cd60e7",
"/js/all.js": "/js/all.js?id=34709c61a4505a9416fa",
"/css/all.css": "/css/all.css?id=4b3a003417c65cef7fc1",
"/semantic/semantic.min.css": "/semantic/semantic.min.css?id=2a6f167e594f0513e5b8"
}
2 changes: 2 additions & 0 deletions resources/js/init/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,9 @@ $(function () {

$(elm).fileuploader({
theme: 'simple',
enableApi: true,
limit: $(elm).data('limit'),
fileMaxSize: $(elm).data('fileMaxSize'),
extensions: extensions,
addMore: true,
upload: upload,
Expand Down
2 changes: 1 addition & 1 deletion semantic.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
"permission": false,
"autoInstall": false,
"rtl": false,
"version": "2.7.8"
"version": "2.8.3"
}
66 changes: 33 additions & 33 deletions semantic/gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
/*******************************
* Set-up
*******************************/

var
gulp = require('gulp'),

// read user config to know what task to load
config = require('./tasks/config/user')
;


/*******************************
* Tasks
*******************************/

require('./tasks/collections/build')(gulp);
require('./tasks/collections/install')(gulp);

gulp.task('default', gulp.series('watch'));

/*--------------
Docs
---------------*/

require('./tasks/collections/docs')(gulp);

/*--------------
RTL
---------------*/

if (config.rtl) {
require('./tasks/collections/rtl')(gulp);
/*******************************
* Set-up
*******************************/

var
gulp = require('gulp'),

// read user config to know what task to load
config = require('./tasks/config/user')
;


/*******************************
* Tasks
*******************************/

require('./tasks/collections/build')(gulp);
require('./tasks/collections/install')(gulp);

gulp.task('default', gulp.series('watch'));

/*--------------
Docs
---------------*/

require('./tasks/collections/docs')(gulp);

/*--------------
RTL
---------------*/

if (config.rtl) {
require('./tasks/collections/rtl')(gulp);
}
152 changes: 77 additions & 75 deletions semantic/src/theme.less
Original file line number Diff line number Diff line change
@@ -1,75 +1,77 @@
/*******************************
Import Directives
*******************************/

/*------------------
Theme
-------------------*/

@theme: @@element;

/*--------------------
Site Variables
---------------------*/

/* Default site.variables */
@import "@{themesFolder}/default/globals/site.variables";

/* Packaged site.variables */
@import "@{themesFolder}/@{site}/globals/site.variables";

/* Component's site.variables */
@import (optional) "@{themesFolder}/@{theme}/globals/site.variables";

/* Site theme site.variables */
@import (optional) "@{siteFolder}/globals/site.variables";


/*-------------------
Component Variables
---------------------*/

/* Default */
@import "@{themesFolder}/default/@{type}s/@{element}.variables";

/* Packaged Theme */
@import (optional) "@{themesFolder}/@{theme}/@{type}s/@{element}.variables";

/* Site Theme */
@import (optional) "@{siteFolder}/@{type}s/@{element}.variables";


/*-------------------------
Central Color Map
-------------------------*/

/* Default */
@import "@{themesFolder}/default/globals/colors.less";

/* Site Theme */
@import (optional) "@{themesFolder}/@{site}/globals/colors.less";


/*******************************
Mix-ins
*******************************/

/*------------------
Fonts
-------------------*/

.loadFonts() when (@importGoogleFonts) {
@import (css) url('@{googleProtocol}fonts.googleapis.com/css?family=@{googleFontRequest}');
}

/*------------------
Overrides
-------------------*/

.loadUIOverrides() {
& when not (@theme = 'default') {
@import (optional) "@{themesFolder}/default/@{type}s/@{element}.overrides";
}
@import (optional) "@{themesFolder}/@{theme}/@{type}s/@{element}.overrides";
@import (optional) "@{siteFolder}/@{type}s/@{element}.overrides";
}
/*******************************
Import Directives
*******************************/

/*------------------
Theme
-------------------*/

@theme: @@element;

/*--------------------
Site Variables
---------------------*/

/* Default site.variables */
@import "@{themesFolder}/default/globals/site.variables";

/* Packaged site.variables */
@import (optional) "@{themesFolder}/@{site}/globals/site.variables";

/* Component's site.variables */
& when not (@theme = 'default') {
@import (optional) "@{themesFolder}/@{theme}/globals/site.variables";
}

/* Site theme site.variables */
@import (optional) "@{siteFolder}/globals/site.variables";


/*-------------------
Component Variables
---------------------*/

/* Default */
@import "@{themesFolder}/default/@{type}s/@{element}.variables";

/* Packaged Theme */
@import (optional) "@{themesFolder}/@{theme}/@{type}s/@{element}.variables";

/* Site Theme */
@import (optional) "@{siteFolder}/@{type}s/@{element}.variables";


/*-------------------------
Central Color Map
-------------------------*/

/* Default */
@import "@{themesFolder}/default/globals/colors.less";

/* Site Theme */
@import (optional) "@{themesFolder}/@{site}/globals/colors.less";


/*******************************
Mix-ins
*******************************/

/*------------------
Fonts
-------------------*/

.loadFonts() when (@importGoogleFonts) {
@import (css) url('@{googleProtocol}fonts.googleapis.com/css?family=@{googleFontRequest}');
}

/*------------------
Overrides
-------------------*/

.loadUIOverrides() {
& when not (@theme = 'default') {
@import (optional) "@{themesFolder}/default/@{type}s/@{element}.overrides";
}
@import (optional) "@{themesFolder}/@{theme}/@{type}s/@{element}.overrides";
@import (optional) "@{siteFolder}/@{type}s/@{element}.overrides";
}
Binary file modified semantic/src/themes/default/assets/fonts/brand-icons.eot
Binary file not shown.
Loading

0 comments on commit e5afc21

Please sign in to comment.