diff --git a/.docs/images/screenshots/admin-metrics.png b/.docs/images/screenshots/admin-metrics.png new file mode 100644 index 00000000..cc34133a Binary files /dev/null and b/.docs/images/screenshots/admin-metrics.png differ diff --git a/.docs/images/screenshots/admin-users.png b/.docs/images/screenshots/admin-users.png new file mode 100644 index 00000000..9511e5f2 Binary files /dev/null and b/.docs/images/screenshots/admin-users.png differ diff --git a/.docs/images/screenshots/home-labeled.png b/.docs/images/screenshots/home-labeled.png new file mode 100644 index 00000000..8155391d Binary files /dev/null and b/.docs/images/screenshots/home-labeled.png differ diff --git a/.docs/images/screenshots/home.png b/.docs/images/screenshots/home.png new file mode 100644 index 00000000..4fbd8142 Binary files /dev/null and b/.docs/images/screenshots/home.png differ diff --git a/.docs/images/screenshots/mentor-labeled2.png b/.docs/images/screenshots/mentor-labeled2.png new file mode 100644 index 00000000..8d9a2931 Binary files /dev/null and b/.docs/images/screenshots/mentor-labeled2.png differ diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders index 8a761038..61ee3132 100644 --- a/.meteor/.finished-upgraders +++ b/.meteor/.finished-upgraders @@ -6,3 +6,7 @@ notices-for-0.9.0 notices-for-0.9.1 0.9.4-platform-file notices-for-facebook-graph-api-2 +1.2.0-standard-minifiers-package +1.2.0-meteor-platform-split +1.2.0-cordova-changes +1.2.0-breaking-changes diff --git a/.meteor/cordova-plugins b/.meteor/cordova-plugins index 8b137891..e69de29b 100644 --- a/.meteor/cordova-plugins +++ b/.meteor/cordova-plugins @@ -1 +0,0 @@ - diff --git a/.meteor/packages b/.meteor/packages index 57929b82..6b5dbbf5 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -3,7 +3,6 @@ # 'meteor add' and 'meteor remove' will edit this file for you, # but you can also edit it by hand. -meteor-platform accounts-github service-configuration iron:router @@ -18,3 +17,17 @@ chart:chart fourseven:scss semantic:ui flemay:less-autoprefixer +standard-minifiers +meteor-base +mobile-experience +mongo +blaze-html-templates +session +jquery +tracker +logging +reload +random +ejson +spacebars +check diff --git a/.meteor/release b/.meteor/release index 315c635b..3a05e0a2 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.1.0.3 +METEOR@1.2.1 diff --git a/.meteor/versions b/.meteor/versions index adcb27de..5ec75201 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,78 +1,97 @@ -accounts-base@1.2.0 -accounts-facebook@1.0.4 -accounts-github@1.0.4 -accounts-oauth@1.1.5 -accounts-password@1.1.1 -autoupdate@1.2.1 -base64@1.0.3 -binary-heap@1.0.3 -blaze@2.1.2 -blaze-tools@1.0.3 -boilerplate-generator@1.0.3 -callback-hook@1.0.3 +accounts-base@1.2.2 +accounts-facebook@1.0.6 +accounts-github@1.0.6 +accounts-oauth@1.1.8 +accounts-password@1.1.4 +autoupdate@1.2.4 +babel-compiler@5.8.24_1 +babel-runtime@0.1.4 +base64@1.0.4 +binary-heap@1.0.4 +blaze@2.1.3 +blaze-html-templates@1.0.1 +blaze-tools@1.0.4 +boilerplate-generator@1.0.4 +caching-compiler@1.0.0 +caching-html-compiler@1.0.2 +callback-hook@1.0.4 chart:chart@1.0.1-beta.4 -check@1.0.5 -coffeescript@1.0.6 -ddp@1.1.0 -deps@1.0.7 -ejson@1.0.6 -email@1.0.6 -facebook@1.2.1 -fastclick@1.0.3 -flemay:less-autoprefixer@1.1.0 -fourseven:scss@3.2.0 -geojson-utils@1.0.3 -github@1.1.3 -html-tools@1.0.4 -htmljs@1.0.4 -http@1.1.0 -id-map@1.0.3 -iron:controller@1.0.8 -iron:core@1.0.8 -iron:dynamic-template@1.0.8 -iron:layout@1.0.8 -iron:location@1.0.9 -iron:middleware-stack@1.0.9 -iron:router@1.0.9 -iron:url@1.0.9 -jquery@1.11.3_2 -json@1.0.3 -launch-screen@1.0.2 -livedata@1.0.13 -localstorage@1.0.3 -logging@1.0.7 -meteor@1.1.6 -meteor-platform@1.2.2 -minifiers@1.1.5 -minimongo@1.0.8 -mizzao:timesync@0.3.3 -mizzao:user-status@0.6.5 -mobile-status-bar@1.0.3 +check@1.1.0 +coffeescript@1.0.11 +ddp@1.2.2 +ddp-client@1.2.1 +ddp-common@1.2.2 +ddp-rate-limiter@1.0.0 +ddp-server@1.2.2 +deps@1.0.9 +diff-sequence@1.0.1 +ecmascript@0.1.6 +ecmascript-runtime@0.2.6 +ejson@1.0.7 +email@1.0.8 +facebook@1.2.2 +fastclick@1.0.7 +flemay:less-autoprefixer@1.2.0 +fourseven:scss@3.4.1 +geojson-utils@1.0.4 +github@1.1.4 +hot-code-push@1.0.0 +html-tools@1.0.5 +htmljs@1.0.5 +http@1.1.1 +id-map@1.0.4 +iron:controller@1.0.12 +iron:core@1.0.11 +iron:dynamic-template@1.0.12 +iron:layout@1.0.12 +iron:location@1.0.11 +iron:middleware-stack@1.0.11 +iron:router@1.0.12 +iron:url@1.0.11 +jquery@1.11.4 +launch-screen@1.0.4 +livedata@1.0.15 +localstorage@1.0.5 +logging@1.0.8 +meteor@1.1.10 +meteor-base@1.0.1 +minifiers@1.1.7 +minimongo@1.0.10 +mizzao:timesync@0.3.4 +mizzao:user-status@0.6.6 +mobile-experience@1.0.1 +mobile-status-bar@1.0.6 momentjs:moment@2.10.6 -mongo@1.1.0 +mongo@1.1.3 +mongo-id@1.0.1 npm-bcrypt@0.7.8_2 -oauth@1.1.4 -oauth2@1.1.3 -observe-sequence@1.0.6 -ordered-dict@1.0.3 -random@1.0.3 -reactive-dict@1.1.0 -reactive-var@1.0.5 -reload@1.1.3 -retry@1.0.3 -routepolicy@1.0.5 -semantic:ui@2.1.3 -semantic:ui-data@2.1.3 -service-configuration@1.0.4 -session@1.1.0 -sha@1.0.3 -spacebars@1.0.6 -spacebars-compiler@1.0.6 -srp@1.0.3 -templating@1.1.1 -tracker@1.0.7 -ui@1.0.6 -underscore@1.0.3 -url@1.0.4 -webapp@1.2.0 -webapp-hashing@1.0.3 +npm-mongo@1.4.39_1 +oauth@1.1.6 +oauth2@1.1.5 +observe-sequence@1.0.7 +ordered-dict@1.0.4 +promise@0.5.1 +random@1.0.5 +rate-limit@1.0.0 +reactive-dict@1.1.3 +reactive-var@1.0.6 +reload@1.1.4 +retry@1.0.4 +routepolicy@1.0.6 +semantic:ui@2.1.6 +semantic:ui-data@2.1.6 +service-configuration@1.0.5 +session@1.1.1 +sha@1.0.4 +spacebars@1.0.7 +spacebars-compiler@1.0.7 +srp@1.0.4 +standard-minifiers@1.0.2 +templating@1.1.5 +templating-tools@1.0.0 +tracker@1.0.9 +ui@1.0.8 +underscore@1.0.4 +url@1.0.5 +webapp@1.2.3 +webapp-hashing@1.0.5 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..7694ea43 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,31 @@ +Contributing to HELPq +===================== + +Thank you for using HELPq, and we're really excited that you want to help out! + +Development Process +------------------- + +This project is developed mostly by me (Edwin Zhang), but quite a few hackathons have their own forks. Releases to master can be expected to be stable and ready to use (with configuration, of course), but dev will be the most up to date. + +Pull Requests +------------- + +We actively welcome your pull requests! + +However, before you begin, please create an issue so we can determine if the work, feature, or bugfix either has someone is already working on it as a part of the current roadmap, or if the feature is not something that would belong in the HELPq as a core feature. + +This is mostly meant for discussion, so we can discuss things fully and make a really awesome product :) + +Issues +------ + +We use issues to track public bugs. Please make sure your description is clear and has sufficient instructions to be able to reproduce the issue. + +We also use issues to track feature requests and discuss. Please mark your issue as 'Feature Request' in this case! + + +Coding Style +------------ + +Keep it clean, and keep things modular! \ No newline at end of file diff --git a/README.md b/README.md index 272ffb5c..461669c2 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,218 @@ HELPq +====== -An extensible, customizable real-time queue system, built with [Meteor](https://www.meteor.com/). +An extensible, customizable real-time queue system, built with [Meteor](https://www.meteor.com/)! -** This is beta release. This queue is fully functional, but code will move around and features will be added over the next few months. Keep checking back for the most up to date. ** +![Home Screen](./.docs/images/screenshots/home.png) + +What is this? +------------ + +HELPq was originally built for [HackMIT](https://hackmit.org), but has been used at hackathons like [Blueprint](http://blueprint.hackmit.org), [Meteor Summer Hackathon 2015](http://meteorhack.meteor.com/), [WHACK](http://wellesleyhacks.org/), [MakeMIT](http://makemit.org/) and [WildHacks](http://wildhacks.org/) (among others!). + +It is a real-time help queue and mentor management application, targeted at hackathons and classrooms, where there is a need for issues to be claimed and satisfied within minutes. It includes a simple interface for requesting tickets, claiming tickets, administrating users/mentors, and examining metrics. + + +It is built with an emphasis on three fundamental user experiences: + +### Keep it simple + +Students should be able to log in and do exactly what they want - submit a ticket. Nothing more complicated than that. + +### Pull, don't Push + +Mentors should not receive any type of push notifications when tickets are requested. Instead, mentors should be pulling from the mentor view and claiming tickets whenever they see them. That way, mentors will not get annoyed by a feed of requests and instead provide high-quality advice because they are themselves actively seeking out people to help. + +### Encourage in-person interaction + +Mentors can claim tickets, complete tickets, or choose to reopen them. Mentors can only claim a single ticket at any given time. There is no ability to message a student through the app in order to encourage a mentor to find that student and help them in person. A student can, however, choose to include other contact information in case contact is needed to clarify location. + +Features +--------- + +### Home + +![Home Screen Labeled](./.docs/images/screenshots/home-labeled.png) + +#### 1 - Ticket Request + +Users can request a ticket, by providing their problem description, where they are, and how they can best be contacted. This copy can be easily modified in one of the config files! + +Once submitted, users have an option to cancel their ticket ("Nevermind!"). Tickets will also expire based on a value determined by the admin. + +#### 2 - Announcements + +Admin can send out announcements with varying colors through the admin dashboard, which appear on on the home screen. + +#### 3 - Mentor Status + +The mentor status bar shows how many mentors are currently online, and calculates the expected wait time based on historical ticket claim and completion times. + +#### 4 - Current Queue + +The current queue shows who is currently in the queue and which people are currently receiving help. Because the nature of questions available mentors can address are highly variable, tickets will often not be answered in order of submission. + +### Mentor + +![Mentor Screen Labeled](./.docs/images/screenshots/mentor-labeled2.png) + +Mentors should be mobile, and the HELPq is designed for mentors to browse the help tickets on their smart phones. + +If a user is a mentor, they will have an inbox icon in the top right they can click to navigate to the mentor view. If the HELPq is being viewed on mobile or a very narrow window, the app is responsive and will pull up a navigation bar on the bottom for Home, Mentor, and Profile. + + +#### Claim + +You can claim a ticket by selecting "Claim Ticket". This will notify the user that you are on your way! Once a ticket is claimed, you cannot claim another ticket unless you complete or reopen the ticket. + +#### Complete + +Once you are done working with a student, you should mark that ticket as completed. This will give the student an opportunity to rate their experience with you! + +#### Reopen + +You can choose to reopen the ticket if you feel like you could not adequately solve the problem, or think someone would be better at addressing it. + +### Admin + +![Admin Users](./.docs/images/screenshots/admin-metrics.png) + +The admin dashboard has a lot of useful features for hackathon organizers or class staff! Shown above is the Metrics dashboard. + +#### Announce + +The announcement section allows you to create announcements for the home screen, with a variety of different colors. + +#### Users + +The users table lets you see all of the current users, and mark them as mentor or admins. You can also edit other user's information - of course, be responsible with this power! + +#### User Creation + +Login is done through Github or Facebook (which can be enabled or disabled in a config file), but you can manually create user accounts. + +This takes a CSV formatted string, which will then check your format, and create users asynchronously. If a user's account creation fails, the result will be shown. + +This feature was designed for use in classroom settings, or other restricted access settings, so that you can create an account for each student and a password unique to them. + +This feature is also useful for when a user does not want to login with Facebook or GitHub (even though only public information is retrieved). + +#### Tickets + +The tickets table will show you a history of all tickets. + +- Green: tickets have been completed +- Red: tickets that have been cancelled +- Yellow: tickets that have expired +- Grey: tickets that are currently claimed + +#### Metrics + +The metrics pane shows a lot of information regarding the usage of the queue. + +The first is a metrics summary, which includes average, median, and std dev of response time and completion time, as well as the raw average of all ticket ratings. + +The leaderboard also shows the top 10 mentors with ratings. Their rating is not a raw average of their tickets, but instead blurred slightly with weighting. This is to avoid the situation where a user with a single 5 star rating would be listed above another user with four 5 star ratings and a single 4 star rating. + +#### Feedback + +The feedback section is a feed of all mentor feedback, with star rating and a note. Bad ratings are highlighted. + +#### Settings + +Settings allows you to adjust various settings in the queue. Right now, you can open/close the queue and set the time for when tickets expire. + + +Usage Data +---------- + +We've used this at a bunch of hackathons and we have some data on them :) + +| Hackathon | Date | Response time average | median | stddev | Completion Time average | median | stddev | Rating Average | Users | Mentors | Tickets| +|-----------|------|-------------------|--------|---------|---------------------|--------|---------|------------|-------|---------|--------| +|**Blueprint High School Hackathon 2015** | 2/22/2015 | 5:11 | 1:26 | 9:54 | 10:37 | 6:29 | 13:23 | 4.9 | 193 | 64 | 170 | +|**Meteor Summer Hackathon 2015** | 8/8/2015 | 6:21 | 2:29 | 10:58 | 5:46 | 1:26 | 12:03 | 4.09 | 68 | 66| 37 | +|**HackMIT 2015** | 9/19/2015 | 9:37 | 2:48 | 28:00 | 16:30 | 10:01 | 22:59 | 4.7 | 425 | 242 | 502 | +|**WHACK 2015** | 10/3/2015 | 7:55 | 4:56 | 12:30 | 18:19 | 13:02 | 17:27 | 4.9 | 87 | 39 | 94 | + + +Bring HELPq to your hackathon/classroom! +======================================== Requirements ------------ +Make sure that you hate `meteor` installed. +You can install Meteor through their [website.](https://www.meteor.com/) + + Quickstart ---------- + +#### Mac OS X, Linux + ```sh ./create_config meteor ``` +#### Windows: + +Copy the `private/config.json.template` into `private/config.json` + +```sh + meteor +``` + +Deploy +------ +**IMPORTANT** + +Without login configuration, you will only be able to login with the admin username and password specified in `private/config.json`. + +To change the password of the admin account after deployed, you must manually remove the admin user through the meteor mongo shell, and then redeploy with a new admin username/password value. *This will be changed pretty soon* + +Deploy with: + +```sh + meteor deploy .meteor.com +``` + Configuration ------------- -For front end branding, edit `client/stylesheets/scss/_branding.scss` -To edit text, edit `lib/constants.js` +#### Login To configure login, edit `private/config.json` In `private/config.json`, provide the appropriate application id/secret combinations for either facebook or github authentication, or choose to disable them. -This will also contain the admin account username and password you'll use for the initial login. +#### Branding -Deploy ------- +For front end branding, edit `client/stylesheets/scss/_branding.scss` + +In this file, you will find brand variables and classes for the main splash and main banner. + +You can edit these and observe the changes. There are also comments to explain what each setion does. + +#### Copy -Deploy with `meteor deploy .meteor.com` +To edit copy, edit `lib/constants.js`. -Login as an Admin to grant yourself mentor/admin access using the username/password specified in -your `config.json` file. +In this file, you will find a place where you can change various strings across the site, including the title of your app. + +Orientation +----------- + +The queue has been found to be most effective with an orientation with mentors and a tight integration with the way a hackathon/classroom manages mentorship. If you'd like to talk about how this could work for your hackathon/classroom, don't hesitate to email me at [ehzhang@mit.edu](mailto:ehzhang@mit.edu)! + +Feedback +-------- + +Have you used HELPq or are planning to use it at your hackathon? I'd love to hear how effective it was, what kinds of metrics you got, and what kinds of things people wanted. Don't hesitate to email me at [ehzhang@mit.edu](mailto:ehzhang@mit.edu)! + +Contributing +------------ +I'd love to take pull requests! Please read the [Contributing Guide](CONTRIBUTING.md) first! diff --git a/client/components/mentorStatus/mentorStatus.js b/client/components/mentorStatus/mentorStatus.js index c1b8da7a..951048ba 100644 --- a/client/components/mentorStatus/mentorStatus.js +++ b/client/components/mentorStatus/mentorStatus.js @@ -23,7 +23,7 @@ function formatTime(ms){ } if (s >= 60 && s < 3600){ var minutes = Math.floor(s / 60); - return minutes + (minutes == 1 ? "minute" : "minutes"); + return minutes + (minutes == 1 ? " minute" : " minutes"); } if (s >= 3600){ return "1 hour or more"; diff --git a/client/lib/semantic-ui/definitions/behaviors/api.js b/client/lib/semantic-ui/definitions/behaviors/api.js index 9e646f21..4fed1c83 100644 --- a/client/lib/semantic-ui/definitions/behaviors/api.js +++ b/client/lib/semantic-ui/definitions/behaviors/api.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - API @@ -1107,7 +1107,7 @@ $.api.settings = { missingSerialize : 'jquery-serialize-object is required to add form data to an existing data object', missingURL : 'No URL specified for api event', noReturnedValue : 'The beforeSend callback must return a settings object, beforeSend ignored.', - noStorage : 'Caching respopnses locally requires session storage', + noStorage : 'Caching responses locally requires session storage', parseError : 'There was an error parsing your request', requiredParameter : 'Missing a required URL parameter: ', statusMessage : 'Server gave an error: ', @@ -1137,4 +1137,4 @@ $.api.settings = { -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/behaviors/colorize.js b/client/lib/semantic-ui/definitions/behaviors/colorize.js index 8a591fc0..03fca439 100644 --- a/client/lib/semantic-ui/definitions/behaviors/colorize.js +++ b/client/lib/semantic-ui/definitions/behaviors/colorize.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Colorize @@ -275,4 +275,4 @@ }; -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/behaviors/form.js b/client/lib/semantic-ui/definitions/behaviors/form.js index faaae83f..f8a76639 100644 --- a/client/lib/semantic-ui/definitions/behaviors/form.js +++ b/client/lib/semantic-ui/definitions/behaviors/form.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Form Validation @@ -229,13 +229,16 @@ $.fn.form = function(parameters) { }, is: { + bracketedRule: function(rule) { + return (rule.type && rule.type.match(settings.regExp.bracket)); + }, valid: function() { var allValid = true ; module.verbose('Checking if form is valid'); $.each(validation, function(fieldName, field) { - if( !( module.validate.field(field) ) ) { + if( !( module.validate.field(field, fieldName) ) ) { allValid = false; } }); @@ -289,7 +292,7 @@ $.fn.form = function(parameters) { keyup: function() { keyHeldDown = false; }, - blur: function() { + blur: function(event) { var $field = $(this), $fieldGroup = $field.closest($group), @@ -297,13 +300,15 @@ $.fn.form = function(parameters) { ; if( $fieldGroup.hasClass(className.error) ) { module.debug('Revalidating field', $field, validationRules); - module.validate.field( validationRules ); + module.validate.form.call(module, event, true); } else if(settings.on == 'blur' || settings.on == 'change') { - module.validate.field( validationRules ); + if(validationRules) { + module.validate.field( validationRules ); + } } }, - change: function() { + change: function(event) { var $field = $(this), $fieldGroup = $field.closest($group) @@ -312,7 +317,7 @@ $.fn.form = function(parameters) { clearTimeout(module.timer); module.timer = setTimeout(function() { module.debug('Revalidating field', $field, module.get.validation($field)); - module.validate.field( module.get.validation($field) ); + module.validate.form.call(module, event, true); }, settings.delay); } } @@ -321,6 +326,18 @@ $.fn.form = function(parameters) { }, get: { + ancillaryValue: function(rule) { + if(!rule.type || !module.is.bracketedRule(rule)) { + return false; + } + return rule.type.match(settings.regExp.bracket)[1] + ''; + }, + ruleName: function(rule) { + if( module.is.bracketedRule(rule) ) { + return rule.type.replace(rule.type.match(settings.regExp.bracket)[0], ''); + } + return rule.type; + }, changeEvent: function(type, $input) { if(type == 'checkbox' || type == 'radio' || type == 'hidden' || $input.is('select')) { return 'change'; @@ -337,16 +354,46 @@ $.fn.form = function(parameters) { : 'keyup' ; }, - settings: function() { + prompt: function(rule, field) { var - firstProperty + ruleName = module.get.ruleName(rule), + ancillary = module.get.ancillaryValue(rule), + prompt = rule.prompt || settings.prompt[ruleName] || settings.text.unspecifiedRule, + requiresValue = (prompt.search('{value}') !== -1), + requiresName = (prompt.search('{name}') !== -1), + $label, + $field, + name ; + if(requiresName || requiresValue) { + $field = module.get.field(field.identifier); + } + if(requiresValue) { + prompt = prompt.replace('{value}', $field.val()); + } + if(requiresName) { + $label = $field.closest(selector.group).find('label').eq(0); + name = ($label.size() == 1) + ? $label.text() + : $field.prop('placeholder') || settings.text.unspecifiedField + ; + prompt = prompt.replace('{name}', name); + } + prompt = prompt.replace('{identifier}', field.identifier); + prompt = prompt.replace('{ruleValue}', ancillary); + if(!rule.prompt) { + module.verbose('Using default validation prompt for type', prompt, ruleName); + } + return prompt; + }, + settings: function() { if($.isPlainObject(parameters)) { var - keys = Object.keys(parameters), + keys = Object.keys(parameters), isLegacySettings = (keys.length > 0) ? (parameters[keys[0]].identifier !== undefined && parameters[keys[0]].rules !== undefined) - : false + : false, + ruleKeys ; if(isLegacySettings) { // 1.x (ducktyped) @@ -357,6 +404,23 @@ $.fn.form = function(parameters) { } else { // 2.x + if(parameters.fields) { + ruleKeys = Object.keys(parameters.fields); + if( typeof parameters.fields[ruleKeys[0]] == 'string' || $.isArray(parameters.fields[ruleKeys[0]]) ) { + $.each(parameters.fields, function(name, rules) { + if(typeof rules == 'string') { + rules = [rules]; + } + parameters.fields[name] = { + rules: [] + }; + $.each(rules, function(index, rule) { + parameters.fields[name].rules.push({ type: rule }); + }); + }); + } + } + settings = $.extend(true, {}, $.fn.form.settings, parameters); validation = $.extend({}, $.fn.form.settings.defaults, settings.fields); module.verbose('Extending settings', validation, settings); @@ -410,17 +474,20 @@ $.fn.form = function(parameters) { }, validation: function($field) { var - rules + fieldValidation, + identifier ; if(!validation) { return false; } $.each(validation, function(fieldName, field) { - if( module.get.field(field.identifier)[0] == $field[0] ) { - rules = field; + identifier = field.identifier || fieldName; + if( module.get.field(identifier)[0] == $field[0] ) { + field.identifier = identifier; + fieldValidation = field; } }); - return rules || false; + return fieldValidation || false; }, value: function (field) { var @@ -459,7 +526,7 @@ $.fn.form = function(parameters) { } if(isCheckbox) { if(isChecked) { - values[name].push(true); + values[name].push(value || true); } else { values[name].push(false); @@ -477,7 +544,7 @@ $.fn.form = function(parameters) { } else if(isCheckbox) { if(isChecked) { - values[name] = true; + values[name] = value || true; } else { values[name] = false; @@ -559,6 +626,7 @@ $.fn.form = function(parameters) { }, errors: function(errors) { module.debug('Adding form error messages', errors); + module.set.error(); $message .html( settings.templates.error(errors) ) ; @@ -566,9 +634,9 @@ $.fn.form = function(parameters) { }, remove: { - prompt: function(field) { + prompt: function(identifier) { var - $field = module.get.field(field.identifier), + $field = module.get.field(identifier), $fieldGroup = $field.closest($group), $prompt = $fieldGroup.children(selector.prompt) ; @@ -576,7 +644,7 @@ $.fn.form = function(parameters) { .removeClass(className.error) ; if(settings.inline && $prompt.is(':visible')) { - module.verbose('Removing prompt for field', field); + module.verbose('Removing prompt for field', identifier); if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) { $prompt.transition(settings.transition + ' out', settings.duration, function() { $prompt.remove(); @@ -685,7 +753,7 @@ $.fn.form = function(parameters) { validate: { - form: function(event) { + form: function(event, ignoreCallbacks) { var values = module.get.values(), apiRequest @@ -701,7 +769,9 @@ $.fn.form = function(parameters) { if( module.is.valid() ) { module.debug('Form has no validation errors, submitting'); module.set.success(); - return settings.onSuccess.call(element, event, values); + if(ignoreCallbacks !== true) { + return settings.onSuccess.call(element, event, values); + } } else { module.debug('Form has errors'); @@ -713,41 +783,48 @@ $.fn.form = function(parameters) { if($module.data('moduleApi') !== undefined) { event.stopImmediatePropagation(); } - return settings.onFailure.call(element, formErrors, values); + if(ignoreCallbacks !== true) { + return settings.onFailure.call(element, formErrors, values); + } } }, // takes a validation object and returns whether field passes validation - field: function(field) { + field: function(field, fieldName) { var - $field = module.get.field(field.identifier), + identifier = field.identifier || fieldName, + $field = module.get.field(identifier), fieldValid = true, fieldErrors = [] ; + if(!field.identifier) { + module.debug('Using field name as identifier', identifier); + field.identifier = identifier; + } if($field.prop('disabled')) { - module.debug('Field is disabled. Skipping', field.identifier); + module.debug('Field is disabled. Skipping', identifier); fieldValid = true; } else if(field.optional && $.trim($field.val()) === ''){ - module.debug('Field is optional and empty. Skipping', field.identifier); + module.debug('Field is optional and empty. Skipping', identifier); fieldValid = true; } else if(field.rules !== undefined) { $.each(field.rules, function(index, rule) { - if( module.has.field(field.identifier) && !( module.validate.rule(field, rule) ) ) { - module.debug('Field is invalid', field.identifier, rule.type); - fieldErrors.push(rule.prompt); + if( module.has.field(identifier) && !( module.validate.rule(field, rule) ) ) { + module.debug('Field is invalid', identifier, rule.type); + fieldErrors.push(module.get.prompt(rule, field)); fieldValid = false; } }); } if(fieldValid) { - module.remove.prompt(field, fieldErrors); + module.remove.prompt(identifier, fieldErrors); settings.onValid.call($field); } else { formErrors = formErrors.concat(fieldErrors); - module.add.prompt(field.identifier, fieldErrors); + module.add.prompt(identifier, fieldErrors); settings.onInvalid.call($field, fieldErrors); return false; } @@ -755,42 +832,26 @@ $.fn.form = function(parameters) { }, // takes validation rule and returns whether field passes rule - rule: function(field, validation) { + rule: function(field, rule) { var - $field = module.get.field(field.identifier), - type = validation.type, - value = $field.val(), - bracket = type.match(settings.regExp.bracket), - isValid = true, - rule, - ancillary, - functionType + $field = module.get.field(field.identifier), + type = rule.type, + value = $field.val(), + isValid = true, + ancillary = module.get.ancillaryValue(rule), + ruleName = module.get.ruleName(rule), + ruleFunction = settings.rules[ruleName] ; + if( !$.isFunction(ruleFunction) ) { + module.error(error.noRule, ruleName); + return; + } // cast to string avoiding encoding special values value = (value === undefined || value === '' || value === null) ? '' : $.trim(value + '') ; - // if bracket notation is used, pass in extra parameters - if(bracket) { - ancillary = '' + bracket[1]; - functionType = type.replace(bracket[0], ''); - rule = settings.rules[functionType]; - if( !$.isFunction(rule) ) { - module.error(error.noRule, functionType); - return; - } - isValid = rule.call($field, value, ancillary); - } - else { - rule = settings.rules[type]; - if( !$.isFunction(rule) ) { - module.error(error.noRule, type); - return; - } - isValid = rule.call($field, value); - } - return isValid; + return ruleFunction.call($field, value, ancillary); } }, @@ -993,7 +1054,7 @@ $.fn.form.settings = { regExp: { bracket : /\[(.*)\]/i, - decimal : /^\-?\d*(\.\d+)?$/, + decimal : /^\d*(\.)\d+/, email : "[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?", escape : /[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, flags : /^\/(.*)\/(.*)?/, @@ -1002,6 +1063,40 @@ $.fn.form.settings = { url : /(https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})/i }, + text: { + unspecifiedRule : 'Please enter a valid value', + unspecifiedField : 'This field' + }, + + prompt: { + empty : '{name} must have a value', + checked : '{name} must be checked', + email : '{name} must be a valid e-mail', + url : '{name} must be a valid url', + regExp : '{name} is not formatted correctly', + integer : '{name} must be an integer', + decimal : '{name} must be a decimal number', + number : '{name} must be set to a number', + is : '{name} must be "{ruleValue}"', + isExactly : '{name} must be exactly "{ruleValue}"', + not : '{name} cannot be set to "{ruleValue}"', + notExactly : '{name} cannot be set to exactly "{ruleValue}"', + contain : '{name} cannot contain "{ruleValue}"', + containExactly : '{name} cannot contain exactly "{ruleValue}"', + doesntContain : '{name} must contain "{ruleValue}"', + doesntContainExactly : '{name} must contain exactly "{ruleValue}"', + minLength : '{name} must be at least {ruleValue} characters', + length : '{name} must be at least {ruleValue} characters', + exactLength : '{name} must be exactly {ruleValue} characters', + maxLength : '{name} cannot be longer than {ruleValue} characters', + match : '{name} must match {ruleValue} field', + different : '{name} must have a different value than {ruleValue} field', + creditCard : '{name} must be a valid credit card number', + minCount : '{name} must have at least {ruleValue} choices', + exactCount : '{name} must have exactly {ruleValue} choices', + maxCount : '{name} must have {ruleValue} or less choices' + }, + selector : { checkbox : 'input[type="checkbox"], input[type="radio"]', clear : '.clear', @@ -1107,7 +1202,7 @@ $.fn.form.settings = { max, parts ; - if(range === undefined || range === '' || range === '..') { + if( !range || ['', '..'].indexOf(range) !== -1) { // do nothing } else if(range.indexOf('..') == -1) { @@ -1260,6 +1355,32 @@ $.fn.form.settings = { : false ; }, + + // different than another field + different: function(value, identifier) { + // use either id or name of field + var + $form = $(this), + matchingValue + ; + if( $('[data-validate="'+ identifier +'"]').length > 0 ) { + matchingValue = $('[data-validate="'+ identifier +'"]').val(); + } + else if($('#' + identifier).length > 0) { + matchingValue = $('#' + identifier).val(); + } + else if($('[name="' + identifier +'"]').length > 0) { + matchingValue = $('[name="' + identifier + '"]').val(); + } + else if( $('[name="' + identifier +'[]"]').length > 0 ) { + matchingValue = $('[name="' + identifier +'[]"]'); + } + return (matchingValue !== undefined) + ? ( value.toString() !== matchingValue.toString() ) + : false + ; + }, + creditCard: function(cardNumber, cardTypes) { var cards = { @@ -1364,29 +1485,14 @@ $.fn.form.settings = { return (sum % 10 === 0 && sum > 0); }, - // different than another field - different: function(value, identifier) { - // use either id or name of field - var - $form = $(this), - matchingValue - ; - if( $('[data-validate="'+ identifier +'"]').length > 0 ) { - matchingValue = $('[data-validate="'+ identifier +'"]').val(); - } - else if($('#' + identifier).length > 0) { - matchingValue = $('#' + identifier).val(); - } - else if($('[name="' + identifier +'"]').length > 0) { - matchingValue = $('[name="' + identifier + '"]').val(); + minCount: function(value, minCount) { + if(minCount == 0) { + return true; } - else if( $('[name="' + identifier +'[]"]').length > 0 ) { - matchingValue = $('[name="' + identifier +'[]"]'); + if(minCount == 1) { + return (value !== ''); } - return (matchingValue !== undefined) - ? ( value.toString() !== matchingValue.toString() ) - : false - ; + return (value.split(',').length >= minCount); }, exactCount: function(value, exactCount) { @@ -1399,16 +1505,6 @@ $.fn.form.settings = { return (value.split(',').length == exactCount); }, - minCount: function(value, minCount) { - if(minCount == 0) { - return true; - } - if(minCount == 1) { - return (value !== ''); - } - return (value.split(',').length >= minCount); - }, - maxCount: function(value, maxCount) { if(maxCount == 0) { return false; @@ -1422,4 +1518,4 @@ $.fn.form.settings = { }; -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/behaviors/state.js b/client/lib/semantic-ui/definitions/behaviors/state.js index fc9cb2ff..fc04bae5 100644 --- a/client/lib/semantic-ui/definitions/behaviors/state.js +++ b/client/lib/semantic-ui/definitions/behaviors/state.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - State @@ -696,4 +696,4 @@ $.fn.state.settings = { -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/behaviors/visibility.js b/client/lib/semantic-ui/definitions/behaviors/visibility.js index da0a483c..57c42917 100644 --- a/client/lib/semantic-ui/definitions/behaviors/visibility.js +++ b/client/lib/semantic-ui/definitions/behaviors/visibility.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Visibility @@ -1217,4 +1217,4 @@ $.fn.visibility.settings = { }; -})( jQuery, window , document ); \ No newline at end of file +})( jQuery, window, document ); \ No newline at end of file diff --git a/client/lib/semantic-ui/definitions/behaviors/visit.js b/client/lib/semantic-ui/definitions/behaviors/visit.js index 2b3e08b7..1af08e5d 100644 --- a/client/lib/semantic-ui/definitions/behaviors/visit.js +++ b/client/lib/semantic-ui/definitions/behaviors/visit.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Visit @@ -518,4 +518,4 @@ $.fn.visit.settings = { }; -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/collections/breadcrumb.import.less b/client/lib/semantic-ui/definitions/collections/breadcrumb.import.less index 658e0565..41a2451a 100644 --- a/client/lib/semantic-ui/definitions/collections/breadcrumb.import.less +++ b/client/lib/semantic-ui/definitions/collections/breadcrumb.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Breadcrumb diff --git a/client/lib/semantic-ui/definitions/collections/form.import.less b/client/lib/semantic-ui/definitions/collections/form.import.less index d292439b..d79080e9 100644 --- a/client/lib/semantic-ui/definitions/collections/form.import.less +++ b/client/lib/semantic-ui/definitions/collections/form.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Form @@ -250,15 +250,6 @@ width: 0px; } -/*-------------------- - Dividers ----------------------*/ - -.ui.form .divider { - clear: both; - margin: @dividerMargin; -} - /*-------------------- Types of Messages @@ -430,7 +421,7 @@ } /*-------------------- - Warning + Error ---------------------*/ /* On Form */ @@ -855,7 +846,6 @@ /* Sizing Combinations */ - .ui.form .fields .wide.field { width: @oneWide; padding-left: (@gutterWidth / 2); @@ -949,6 +939,16 @@ } } +/*-------------------- + Equal Width +---------------------*/ + +.ui[class*="equal width"].form .fields > .field, +.ui.form [class*="equal width"].fields > .field { + width: 100%; + flex: 1 1 auto; +} + /*-------------------- Inline Fields ---------------------*/ diff --git a/client/lib/semantic-ui/definitions/collections/grid.import.less b/client/lib/semantic-ui/definitions/collections/grid.import.less index 1cc40806..ae1a7598 100644 --- a/client/lib/semantic-ui/definitions/collections/grid.import.less +++ b/client/lib/semantic-ui/definitions/collections/grid.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Grid @@ -133,8 +133,8 @@ } /* Segment inside Aligned Grid */ -.ui.grid .aligned.row > .column > .segment:not(.compact), -.ui.aligned.grid .column > .segment:not(.compact) { +.ui.grid .aligned.row > .column > .segment:not(.compact):not(.attached), +.ui.aligned.grid .column > .segment:not(.compact):not(.attached) { width: 100%; } @@ -1174,6 +1174,7 @@ /* Top Aligned */ .ui[class*="top aligned"].grid > .column:not(.row), +.ui[class*="top aligned"].grid > .row > .column, .ui.grid > [class*="top aligned"].row > .column, .ui.grid > [class*="top aligned"].column:not(.row), .ui.grid > .row > [class*="top aligned"].column { @@ -1184,6 +1185,7 @@ /* Middle Aligned */ .ui[class*="middle aligned"].grid > .column:not(.row), +.ui[class*="middle aligned"].grid > .row > .column, .ui.grid > [class*="middle aligned"].row > .column, .ui.grid > [class*="middle aligned"].column:not(.row), .ui.grid > .row > [class*="middle aligned"].column { @@ -1194,6 +1196,7 @@ /* Bottom Aligned */ .ui[class*="bottom aligned"].grid > .column:not(.row), +.ui[class*="bottom aligned"].grid > .row > .column, .ui.grid > [class*="bottom aligned"].row > .column, .ui.grid > [class*="bottom aligned"].column:not(.row), .ui.grid > .row > [class*="bottom aligned"].column { @@ -1226,7 +1229,8 @@ -----------------------*/ /* Left Aligned */ -.ui[class*="left aligned"].grid .column, +.ui[class*="left aligned"].grid > .column, +.ui[class*="left aligned"].grid > .row > .column, .ui.grid > [class*="left aligned"].row > .column, .ui.grid > [class*="left aligned"].column.column, .ui.grid > .row > [class*="left aligned"].column { @@ -1235,7 +1239,8 @@ } /* Center Aligned */ -.ui[class*="center aligned"].grid .column, +.ui[class*="center aligned"].grid > .column, +.ui[class*="center aligned"].grid > .row > .column, .ui.grid > [class*="center aligned"].row > .column, .ui.grid > [class*="center aligned"].column.column, .ui.grid > .row > [class*="center aligned"].column { @@ -1247,7 +1252,8 @@ } /* Right Aligned */ -.ui[class*="right aligned"].grid .column, +.ui[class*="right aligned"].grid > .column, +.ui[class*="right aligned"].grid > .row > .column, .ui.grid > [class*="right aligned"].row > .column, .ui.grid > [class*="right aligned"].column.column, .ui.grid > .row > [class*="right aligned"].column { @@ -1256,18 +1262,14 @@ } /* Justified */ -.ui.justified.grid, -.ui.justified.grid > .row > .column, .ui.justified.grid > .column, -.ui.grid .justified.column, -.ui.grid > .justified.row > .column { +.ui.justified.grid > .row > .column, +.ui.grid > .justified.row > .column, +.ui.grid > .justified.column.column, +.ui.grid > .row > .justified.column { text-align: justify; hyphens: auto; } -.ui.grid .justified.column { - text-align: justify !important; - hyphens: auto !important; -} /*---------------------- Colored @@ -1792,7 +1794,7 @@ /* Mobile Only Hide */ @media only screen and (max-width: @largestMobileScreen) { - .ui.tablet:not(.mobile).only.grid.grid.grid, + .ui[class*="tablet only"].grid.grid.grid:not(.mobile), .ui.grid.grid.grid > [class*="tablet only"].row:not(.mobile), .ui.grid.grid.grid > [class*="tablet only"].column:not(.mobile), .ui.grid.grid.grid > .row > [class*="tablet only"].column:not(.mobile) { @@ -1810,10 +1812,10 @@ .ui.grid.grid.grid > .row > [class*="large screen only"].column:not(.mobile) { display: none !important; } - .ui[class*="widescreen"].grid.grid.grid:not(.mobile), - .ui.grid.grid.grid > [class*="large screen only"].row:not(.mobile), - .ui.grid.grid.grid > [class*="large screen only"].column:not(.mobile), - .ui.grid.grid.grid > .row > [class*="large screen only"].column:not(.mobile) { + .ui[class*="widescreen only"].grid.grid.grid:not(.mobile), + .ui.grid.grid.grid > [class*="widescreen only"].row:not(.mobile), + .ui.grid.grid.grid > [class*="widescreen only"].column:not(.mobile), + .ui.grid.grid.grid > .row > [class*="widescreen only"].column:not(.mobile) { display: none !important; } } @@ -1837,7 +1839,7 @@ .ui.grid.grid.grid > .row > [class*="large screen only"].column:not(.mobile) { display: none !important; } - .ui[class*="widescreen"].grid.grid.grid:not(.mobile), + .ui[class*="widescreen only"].grid.grid.grid:not(.mobile), .ui.grid.grid.grid > [class*="widescreen only"].row:not(.mobile), .ui.grid.grid.grid > [class*="widescreen only"].column:not(.mobile), .ui.grid.grid.grid > .row > [class*="widescreen only"].column:not(.mobile) { @@ -1865,7 +1867,7 @@ .ui.grid.grid.grid > .row > [class*="large screen only"].column:not(.mobile) { display: none !important; } - .ui[class*="widescreen"].grid.grid.grid:not(.mobile), + .ui[class*="widescreen only"].grid.grid.grid:not(.mobile), .ui.grid.grid.grid > [class*="widescreen only"].row:not(.mobile), .ui.grid.grid.grid > [class*="widescreen only"].column:not(.mobile), .ui.grid.grid.grid > .row > [class*="widescreen only"].column:not(.mobile) { @@ -1887,7 +1889,7 @@ .ui.grid.grid.grid > .row > [class*="tablet only"].column:not(.computer) { display: none !important; } - .ui[class*="widescreen"].grid.grid.grid:not(.mobile), + .ui[class*="widescreen only"].grid.grid.grid:not(.mobile), .ui.grid.grid.grid > [class*="widescreen only"].row:not(.mobile), .ui.grid.grid.grid > [class*="widescreen only"].column:not(.mobile), .ui.grid.grid.grid > .row > [class*="widescreen only"].column:not(.mobile) { diff --git a/client/lib/semantic-ui/definitions/collections/menu.import.less b/client/lib/semantic-ui/definitions/collections/menu.import.less index 8906b745..602cb5b0 100644 --- a/client/lib/semantic-ui/definitions/collections/menu.import.less +++ b/client/lib/semantic-ui/definitions/collections/menu.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /* * # Semantic - Menu @@ -381,7 +381,7 @@ @media only screen and (max-width: @largestMobileScreen) { .ui.menu > .ui.container { - width: 100%; + width: 100% !important; margin-left: 0em !important; margin-right: 0em !important; } diff --git a/client/lib/semantic-ui/definitions/collections/message.import.less b/client/lib/semantic-ui/definitions/collections/message.import.less index df1d3b70..a1845919 100644 --- a/client/lib/semantic-ui/definitions/collections/message.import.less +++ b/client/lib/semantic-ui/definitions/collections/message.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Message @@ -80,33 +80,33 @@ } /* List */ -.ui.message ul.list { +.ui.message .list:not(.ui) { text-align: left; padding: 0em; opacity: @listOpacity; list-style-position: @listStylePosition; margin: @listMargin 0em 0em; } -.ui.message ul.list:first-child { +.ui.message .list:not(.ui):first-child { margin-top: 0em; } -.ui.message ul.list:last-child { +.ui.message .list:not(.ui):last-child { margin-bottom: 0em; } -.ui.message ul.list li { +.ui.message .list:not(.ui) li { position: relative; list-style-type: none; margin: 0em 0em @listItemMargin @listItemIndent; padding: 0em; } -.ui.message ul.list li:before { +.ui.message .list:not(.ui) li:before { position: absolute; content: '•'; left: -1em; height: 100%; vertical-align: baseline; } -.ui.message ul.list li:last-child { +.ui.message .list:not(.ui) li:last-child { margin-bottom: 0em; } diff --git a/client/lib/semantic-ui/definitions/collections/table.import.less b/client/lib/semantic-ui/definitions/collections/table.import.less index 11b9d87f..258d98d7 100644 --- a/client/lib/semantic-ui/definitions/collections/table.import.less +++ b/client/lib/semantic-ui/definitions/collections/table.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Table @@ -485,46 +485,64 @@ /*-------------- - Hoverable + Selectable ---------------*/ -.ui.selectable.table tbody tr:hover { +.ui.selectable.table tbody tr:hover, +.ui.table tbody tr td.selectable:hover { background: @selectableBackground !important; color: @selectableTextColor !important; } -.ui.selectable.inverted.table tbody tr:hover { +.ui.selectable.inverted.table tbody tr:hover, +.ui.inverted.table tbody tr td.selectable:hover { background: @selectableInvertedBackground !important; color: @selectableInvertedTextColor !important; } +/* Selectable Cell Link */ +.ui.table tbody tr td.selectable { + padding: 0em; +} +.ui.table tbody tr td.selectable > a:not(.ui) { + display: block; + color: inherit; + padding: @cellVerticalPadding @cellHorizontalPadding; +} + /* Other States */ .ui.selectable.table tr.error:hover, +.ui.table tr td.selectable.error:hover, .ui.selectable.table tr:hover td.error { background: @errorBackgroundHover !important; color: @errorColorHover !important; } .ui.selectable.table tr.warning:hover, +.ui.table tr td.selectable.warning:hover, .ui.selectable.table tr:hover td.warning { background: @warningBackgroundHover !important; color: @warningColorHover !important; } .ui.selectable.table tr.active:hover, +.ui.table tr td.selectable.active:hover, .ui.selectable.table tr:hover td.active { background: @activeBackgroundColor !important; color: @activeColor !important; } .ui.selectable.table tr.positive:hover, +.ui.table tr td.selectable.positive:hover, .ui.selectable.table tr:hover td.positive { background: @positiveBackgroundHover !important; color: @positiveColorHover !important; } .ui.selectable.table tr.negative:hover, +.ui.table tr td.selectable.negative:hover, .ui.selectable.table tr:hover td.negative { background: @negativeBackgroundHover !important; color: @negativeColorHover !important; } + /*------------------- Attached --------------------*/ diff --git a/client/lib/semantic-ui/definitions/elements/button.import.less b/client/lib/semantic-ui/definitions/elements/button.import.less index 538db3ad..e7ddc027 100644 --- a/client/lib/semantic-ui/definitions/elements/button.import.less +++ b/client/lib/semantic-ui/definitions/elements/button.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Button @@ -838,10 +838,11 @@ border-radius: 0px; border-top-left-radius: inherit; border-bottom-left-radius: inherit; + text-align: center; + margin: @labeledIconMargin; width: @labeledIconWidth; background-color: @labeledIconBackgroundColor; - text-align: center; color: @labeledIconColor; box-shadow: @labeledIconLeftShadow; } diff --git a/client/lib/semantic-ui/definitions/elements/container.import.less b/client/lib/semantic-ui/definitions/elements/container.import.less index b6e7100f..19fd2950 100644 --- a/client/lib/semantic-ui/definitions/elements/container.import.less +++ b/client/lib/semantic-ui/definitions/elements/container.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Container diff --git a/client/lib/semantic-ui/definitions/elements/divider.import.less b/client/lib/semantic-ui/definitions/elements/divider.import.less index 08dfd7a1..adec370f 100644 --- a/client/lib/semantic-ui/definitions/elements/divider.import.less +++ b/client/lib/semantic-ui/definitions/elements/divider.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Divider @@ -136,7 +136,7 @@ } /* Inside grid */ -@media only screen and (max-width : (@tabletBreakpoint - 1px)) { +@media only screen and (max-width : @largestMobileScreen) { .ui.stackable.grid .ui.vertical.divider, .ui.grid .stackable.row .ui.vertical.divider { diff --git a/client/lib/semantic-ui/definitions/elements/flag.import.less b/client/lib/semantic-ui/definitions/elements/flag.import.less index 769e80ab..708fefbc 100644 --- a/client/lib/semantic-ui/definitions/elements/flag.import.less +++ b/client/lib/semantic-ui/definitions/elements/flag.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Flag diff --git a/client/lib/semantic-ui/definitions/elements/header.import.less b/client/lib/semantic-ui/definitions/elements/header.import.less index f960a344..87bbffcc 100644 --- a/client/lib/semantic-ui/definitions/elements/header.import.less +++ b/client/lib/semantic-ui/definitions/elements/header.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Header @@ -52,6 +52,7 @@ ---------------*/ .ui.header .sub.header { + display: block; font-weight: normal; padding: 0em; margin: @subHeaderMargin; diff --git a/client/lib/semantic-ui/definitions/elements/icon.import.less b/client/lib/semantic-ui/definitions/elements/icon.import.less index 98d15387..f445fb1e 100644 --- a/client/lib/semantic-ui/definitions/elements/icon.import.less +++ b/client/lib/semantic-ui/definitions/elements/icon.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Icon diff --git a/client/lib/semantic-ui/definitions/elements/image.import.less b/client/lib/semantic-ui/definitions/elements/image.import.less index 7f8947c0..0cd409f1 100644 --- a/client/lib/semantic-ui/definitions/elements/image.import.less +++ b/client/lib/semantic-ui/definitions/elements/image.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Image diff --git a/client/lib/semantic-ui/definitions/elements/input.import.less b/client/lib/semantic-ui/definitions/elements/input.import.less index c016d681..13ae7290 100644 --- a/client/lib/semantic-ui/definitions/elements/input.import.less +++ b/client/lib/semantic-ui/definitions/elements/input.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Input diff --git a/client/lib/semantic-ui/definitions/elements/label.import.less b/client/lib/semantic-ui/definitions/elements/label.import.less index 42d59bc8..22bc8673 100644 --- a/client/lib/semantic-ui/definitions/elements/label.import.less +++ b/client/lib/semantic-ui/definitions/elements/label.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Label @@ -29,7 +29,6 @@ .ui.label { display: inline-block; - white-space: nowrap; line-height: 1; vertical-align: @verticalAlign; diff --git a/client/lib/semantic-ui/definitions/elements/list.import.less b/client/lib/semantic-ui/definitions/elements/list.import.less index 6efe3eb9..61484b81 100644 --- a/client/lib/semantic-ui/definitions/elements/list.import.less +++ b/client/lib/semantic-ui/definitions/elements/list.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - List @@ -674,7 +674,6 @@ ol.ui.horizontal.list li:before, margin: 0em @horizontalOrderedCountDistance 0em 0em; } - /*------------------- Divided --------------------*/ diff --git a/client/lib/semantic-ui/definitions/elements/loader.import.less b/client/lib/semantic-ui/definitions/elements/loader.import.less index e158992f..2db5aeab 100644 --- a/client/lib/semantic-ui/definitions/elements/loader.import.less +++ b/client/lib/semantic-ui/definitions/elements/loader.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Loader diff --git a/client/lib/semantic-ui/definitions/elements/rail.import.less b/client/lib/semantic-ui/definitions/elements/rail.import.less index c57dd24d..7dad96f4 100644 --- a/client/lib/semantic-ui/definitions/elements/rail.import.less +++ b/client/lib/semantic-ui/definitions/elements/rail.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Rail diff --git a/client/lib/semantic-ui/definitions/elements/reveal.import.less b/client/lib/semantic-ui/definitions/elements/reveal.import.less index 1c25cf74..8c3af21a 100644 --- a/client/lib/semantic-ui/definitions/elements/reveal.import.less +++ b/client/lib/semantic-ui/definitions/elements/reveal.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Reveal diff --git a/client/lib/semantic-ui/definitions/elements/segment.import.less b/client/lib/semantic-ui/definitions/elements/segment.import.less index e170a7e5..ed9fbdcc 100644 --- a/client/lib/semantic-ui/definitions/elements/segment.import.less +++ b/client/lib/semantic-ui/definitions/elements/segment.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Segment @@ -90,7 +90,8 @@ /* Grid */ .ui.page.grid.segment, -.ui.grid .ui.segment.column { +.ui.grid > .row > .ui.segment.column, +.ui.grid > .ui.segment.column { padding-top: @pageGridMargin; padding-bottom: @pageGridMargin; } @@ -373,6 +374,11 @@ box-shadow: none; border-left: @borderWidth solid @borderColor; } + +/* Border Fixes */ +.ui.segments > .horizontal.segments:first-child { + border-top: none; +} .ui.horizontal.segments > .segment:first-child { border-left: none; } diff --git a/client/lib/semantic-ui/definitions/elements/step.import.less b/client/lib/semantic-ui/definitions/elements/step.import.less index dc895607..c823e563 100644 --- a/client/lib/semantic-ui/definitions/elements/step.import.less +++ b/client/lib/semantic-ui/definitions/elements/step.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Step @@ -396,7 +396,7 @@ ---------------*/ /* Tablet Or Below */ -@media only screen and (max-width: @computerBreakpoint) { +@media only screen and (max-width: @largestTabletScreen) { .ui[class*="tablet stackable"].steps { display: inline-flex; diff --git a/client/lib/semantic-ui/definitions/globals/reset.import.less b/client/lib/semantic-ui/definitions/globals/reset.import.less index edcfc6c4..0e151e69 100644 --- a/client/lib/semantic-ui/definitions/globals/reset.import.less +++ b/client/lib/semantic-ui/definitions/globals/reset.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Reset diff --git a/client/lib/semantic-ui/definitions/globals/site.import.less b/client/lib/semantic-ui/definitions/globals/site.import.less index f8a2b17c..0b20596d 100644 --- a/client/lib/semantic-ui/definitions/globals/site.import.less +++ b/client/lib/semantic-ui/definitions/globals/site.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Site diff --git a/client/lib/semantic-ui/definitions/globals/site.js b/client/lib/semantic-ui/definitions/globals/site.js index aa9460fa..317fae79 100644 --- a/client/lib/semantic-ui/definitions/globals/site.js +++ b/client/lib/semantic-ui/definitions/globals/site.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Site @@ -85,7 +85,7 @@ $.site = $.fn.site = function(parameters) { requestAnimationFrame: function() { module.debug('Normalizing requestAnimationFrame'); if(window.requestAnimationFrame === undefined) { - module.debug('RequestAnimationFrame not available, normailizing event'); + module.debug('RequestAnimationFrame not available, normalizing event'); window.requestAnimationFrame = window.requestAnimationFrame || window.mozRequestAnimationFrame || window.webkitRequestAnimationFrame @@ -488,4 +488,4 @@ $.extend($.expr[ ":" ], { }); -})( jQuery, window , document ); \ No newline at end of file +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/modules/accordion.import.less b/client/lib/semantic-ui/definitions/modules/accordion.import.less index 47172e59..d222e670 100644 --- a/client/lib/semantic-ui/definitions/modules/accordion.import.less +++ b/client/lib/semantic-ui/definitions/modules/accordion.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Accordion diff --git a/client/lib/semantic-ui/definitions/modules/accordion.js b/client/lib/semantic-ui/definitions/modules/accordion.js index d15aa544..2ba7d905 100644 --- a/client/lib/semantic-ui/definitions/modules/accordion.js +++ b/client/lib/semantic-ui/definitions/modules/accordion.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Accordion @@ -596,5 +596,5 @@ $.extend( $.easing, { } }); -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/modules/checkbox.import.less b/client/lib/semantic-ui/definitions/modules/checkbox.import.less index 6181aeee..0b35107d 100644 --- a/client/lib/semantic-ui/definitions/modules/checkbox.import.less +++ b/client/lib/semantic-ui/definitions/modules/checkbox.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Checkbox diff --git a/client/lib/semantic-ui/definitions/modules/checkbox.js b/client/lib/semantic-ui/definitions/modules/checkbox.js index 462f53ab..2a6a0e49 100644 --- a/client/lib/semantic-ui/definitions/modules/checkbox.js +++ b/client/lib/semantic-ui/definitions/modules/checkbox.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Checkbox @@ -506,10 +506,15 @@ $.fn.checkbox = function(parameters) { trigger: { change: function() { - module.verbose('Triggering change event from programmatic change'); - $input - .trigger('change') + var + events = document.createEvent('HTMLEvents'), + inputElement = $input[0] ; + if(inputElement) { + module.verbose('Triggering native change event'); + events.initEvent('change', true, false); + inputElement.dispatchEvent(events); + } } }, @@ -805,4 +810,4 @@ $.fn.checkbox.settings = { }; -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/modules/dimmer.import.less b/client/lib/semantic-ui/definitions/modules/dimmer.import.less index 65581942..850f67ff 100644 --- a/client/lib/semantic-ui/definitions/modules/dimmer.import.less +++ b/client/lib/semantic-ui/definitions/modules/dimmer.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Dimmer diff --git a/client/lib/semantic-ui/definitions/modules/dimmer.js b/client/lib/semantic-ui/definitions/modules/dimmer.js index 8b4391c8..d0921f83 100644 --- a/client/lib/semantic-ui/definitions/modules/dimmer.js +++ b/client/lib/semantic-ui/definitions/modules/dimmer.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Dimmer @@ -389,7 +389,7 @@ $.fn.dimmer = function(parameters) { colorArray = color.split(','), isRGBA = (colorArray && colorArray.length == 4) ; - opacity = settings.opacity || opacity; + opacity = settings.opacity === 0 ? 0 : settings.opacity || opacity; if(isRGBA) { colorArray[3] = opacity + ')'; color = colorArray.join(','); @@ -694,4 +694,4 @@ $.fn.dimmer.settings = { }; -})( jQuery, window , document ); \ No newline at end of file +})( jQuery, window, document ); \ No newline at end of file diff --git a/client/lib/semantic-ui/definitions/modules/dropdown.import.less b/client/lib/semantic-ui/definitions/modules/dropdown.import.less index e7444983..73516846 100644 --- a/client/lib/semantic-ui/definitions/modules/dropdown.import.less +++ b/client/lib/semantic-ui/definitions/modules/dropdown.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Dropdown diff --git a/client/lib/semantic-ui/definitions/modules/dropdown.js b/client/lib/semantic-ui/definitions/modules/dropdown.js index 89bf915c..27653b44 100644 --- a/client/lib/semantic-ui/definitions/modules/dropdown.js +++ b/client/lib/semantic-ui/definitions/modules/dropdown.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Dropdown @@ -44,6 +44,7 @@ $.fn.dropdown = function(parameters) { className = settings.className, message = settings.message, fields = settings.fields, + keys = settings.keys, metadata = settings.metadata, namespace = settings.namespace, regExp = settings.regExp, @@ -284,6 +285,7 @@ $.fn.dropdown = function(parameters) { module.verbose('Adding search input'); $search = $('') .addClass(className.search) + .prop('autocomplete', 'off') .insertBefore($text) ; } @@ -325,6 +327,10 @@ $.fn.dropdown = function(parameters) { if($input.is('[multiple]')) { module.set.multiple(); } + if ($input.prop('disabled')) { + module.debug('Disabling dropdown') + $module.addClass(className.disabled) + } $input .removeAttr('class') .detach() @@ -411,7 +417,7 @@ $.fn.dropdown = function(parameters) { if(module.is.multiple() && !module.has.search() && module.is.allFiltered()) { return true; } - if(module.has.message() && !module.has.maxSelections()) { + if(module.has.message() && !(module.has.maxSelections() || module.has.allResultsFiltered()) ) { module.remove.message(); } if(settings.onShow.call(element) !== false) { @@ -666,7 +672,7 @@ $.fn.dropdown = function(parameters) { onSuccess : function(response) { module.remove.message(); module.setup.menu({ - values: response.results + values: response[fields.remoteValues] }); callback(); } @@ -687,15 +693,14 @@ $.fn.dropdown = function(parameters) { searchTerm = (query !== undefined) ? query : module.get.query(), - $results = $(), + results = null, escapedTerm = module.escape.regExp(searchTerm), beginsWithRegExp = new RegExp('^' + escapedTerm, 'igm') ; // avoid loop if we're matching nothing - if( !module.has.query() ) { - $results = $item; - } - else { + if( module.has.query() ) { + results = []; + module.verbose('Searching for matching values', searchTerm); $item .each(function(){ @@ -707,11 +712,11 @@ $.fn.dropdown = function(parameters) { if(settings.match == 'both' || settings.match == 'text') { text = String(module.get.choiceText($choice, false)); if(text.search(beginsWithRegExp) !== -1) { - $results = $results.add($choice); + results.push(this); return true; } else if(settings.fullTextSearch && module.fuzzySearch(searchTerm, text)) { - $results = $results.add($choice); + results.push(this); return true; } } @@ -719,11 +724,11 @@ $.fn.dropdown = function(parameters) { value = String(module.get.choiceValue($choice, text)); if(value.search(beginsWithRegExp) !== -1) { - $results = $results.add($choice); + results.push(this); return true; } else if(settings.fullTextSearch && module.fuzzySearch(searchTerm, value)) { - $results = $results.add($choice); + results.push(this); return true; } } @@ -732,10 +737,12 @@ $.fn.dropdown = function(parameters) { } module.debug('Showing only matched items', searchTerm); module.remove.filteredItem(); - $item - .not($results) - .addClass(className.filtered) - ; + if(results) { + $item + .not(results) + .addClass(className.filtered) + ; + } }, fuzzySearch: function(query, term) { @@ -788,13 +795,17 @@ $.fn.dropdown = function(parameters) { : $activeItem, hasSelected = ($selectedItem.size() > 0) ; - if( hasSelected && module.has.query() ) { - module.debug('Forcing partial selection to selected item', $selectedItem); - module.event.item.click.call($selectedItem); - } - else { - module.hide(); + if( module.has.query() ) { + if(hasSelected) { + module.debug('Forcing partial selection to selected item', $selectedItem); + module.event.item.click.call($selectedItem); + return; + } + else { + module.remove.searchTerm(); + } } + module.hide(); }, event: { @@ -825,7 +836,7 @@ $.fn.dropdown = function(parameters) { module.hide(); } }, - // prevents focus callback from occuring on mousedown + // prevents focus callback from occurring on mousedown mousedown: function() { activated = true; }, @@ -839,6 +850,7 @@ $.fn.dropdown = function(parameters) { module.remove.activeLabel(); } if(settings.showOnFocus) { + module.search(); module.show(); } }, @@ -1019,7 +1031,6 @@ $.fn.dropdown = function(parameters) { keydown: function(event) { var pressedKey = event.which, - keys = module.get.shortcutKeys(), isShortcutKey = module.is.inObject(pressedKey, keys) ; if(isShortcutKey) { @@ -1133,7 +1144,6 @@ $.fn.dropdown = function(parameters) { keydown: function(event) { var pressedKey = event.which, - keys = module.get.shortcutKeys(), isShortcutKey = module.is.inObject(pressedKey, keys) ; if(isShortcutKey) { @@ -1152,16 +1162,16 @@ $.fn.dropdown = function(parameters) { hasSubMenu = ($subMenu.length> 0), hasSelectedItem = ($selectedItem.length > 0), selectedIsSelectable = ($selectedItem.not(selector.unselectable).length > 0), + delimiterPressed = (pressedKey == keys.delimiter && settings.allowAdditions && module.is.multiple()), $nextItem, isSubMenuItem, newIndex ; - // visible menu keyboard shortcuts if( module.is.visible() ) { // enter (select or open sub-menu) - if(pressedKey == keys.enter || pressedKey == keys.delimiter) { + if(pressedKey == keys.enter || delimiterPressed) { if(pressedKey == keys.enter && hasSelectedItem && hasSubMenu && !settings.allowCategorySelection) { module.verbose('Pressed enter on unselectable category, opening sub menu'); pressedKey = keys.rightArrow; @@ -1278,7 +1288,7 @@ $.fn.dropdown = function(parameters) { } else { // delimiter key - if(pressedKey == keys.delimiter) { + if(delimiterPressed) { event.preventDefault(); } // down arrow (open menu) @@ -1297,6 +1307,20 @@ $.fn.dropdown = function(parameters) { } }, + trigger: { + change: function() { + var + events = document.createEvent('HTMLEvents'), + inputElement = $input[0] + ; + if(inputElement) { + module.verbose('Triggering native change event'); + events.initEvent('change', true, false); + inputElement.dispatchEvent(events); + } + } + }, + determine: { selectAction: function(text, value) { module.verbose('Determining action', settings.action); @@ -1478,21 +1502,6 @@ $.fn.dropdown = function(parameters) { return range.text.length - rangeLength; } }, - shortcutKeys: function() { - return { - backspace : 8, - delimiter : 188, // comma - deleteKey : 46, - enter : 13, - escape : 27, - pageUp : 33, - pageDown : 34, - leftArrow : 37, - upArrow : 38, - rightArrow : 39, - downArrow : 40 - }; - }, value: function() { var value = ($input.length > 0) @@ -2010,7 +2019,7 @@ $.fn.dropdown = function(parameters) { } else { module.debug('Added tabindex to dropdown'); - if(!$module.attr('tabindex') ) { + if( $module.attr('tabindex') === undefined) { $module .attr('tabindex', 0) ; @@ -2183,7 +2192,7 @@ $.fn.dropdown = function(parameters) { module.debug('Input native change event ignored on initial load'); } else { - $input.trigger('change'); + module.trigger.change(); } internalChange = false; } @@ -2641,12 +2650,17 @@ $.fn.dropdown = function(parameters) { $labels .each(function(){ var - value = $(this).data(metadata.value), + $label = $(this), + value = $label.data(metadata.value), stringValue = (value !== undefined) ? String(value) : value, isUserValue = module.is.userValue(stringValue) ; + if(settings.onLabelRemove.call($label, value) === false) { + module.debug('Label remove callback cancelled removal'); + return; + } if(isUserValue) { module.remove.value(stringValue); module.remove.label(stringValue); @@ -2662,19 +2676,19 @@ $.fn.dropdown = function(parameters) { if( module.has.search() ) { module.debug('Searchable dropdown initialized'); $search - .attr('tabindex', '-1') + .removeAttr('tabindex') ; $menu - .attr('tabindex', '-1') + .removeAttr('tabindex') ; } else { module.debug('Simple selection dropdown initialized'); $module - .attr('tabindex', '-1') + .removeAttr('tabindex') ; $menu - .attr('tabindex', '-1') + .removeAttr('tabindex') ; } } @@ -3233,7 +3247,7 @@ $.fn.dropdown.settings = { maxSelections : false, // When set to a number limits the number of selections to this count useLabels : true, // whether multiple select should filter currently active selections from choices - delimiter : ',', // when multiselect uses normal the values will be delmited with this character + delimiter : ',', // when multiselect uses normal the values will be delimited with this character showOnFocus : true, // show menu on focus allowTab : true, // add tabindex to element @@ -3268,6 +3282,7 @@ $.fn.dropdown.settings = { onLabelSelect : function($selectedLabels){}, onLabelCreate : function(value, text) { return $(this); }, + onLabelRemove : function(value) { return true; }, onNoResults : function(searchTerm) { return true; }, onShow : function(){}, onHide : function(){}, @@ -3309,9 +3324,24 @@ $.fn.dropdown.settings = { // property names for remote query fields: { - values : 'values', // grouping for all dropdown values - name : 'name', // displayed dropdown text - value : 'value' // actual dropdown value + remoteValues : 'results', // grouping for api results + values : 'values', // grouping for all dropdown values + name : 'name', // displayed dropdown text + value : 'value' // actual dropdown value + }, + + keys : { + backspace : 8, + delimiter : 188, // comma + deleteKey : 46, + enter : 13, + escape : 27, + pageUp : 33, + pageDown : 34, + leftArrow : 37, + upArrow : 38, + rightArrow : 39, + downArrow : 40 }, selector : { @@ -3386,10 +3416,10 @@ $.fn.dropdown.settings.templates = { // generates just menu from select menu: function(response, fields) { var - values = response.values || {}, + values = response[fields.values] || {}, html = '' ; - $.each(response[fields.values], function(index, option) { + $.each(values, function(index, option) { html += '
' + option[fields.name] + '
'; }); return html; @@ -3413,4 +3443,4 @@ $.fn.dropdown.settings.templates = { }; -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/modules/embed.import.less b/client/lib/semantic-ui/definitions/modules/embed.import.less index 938e07ed..70886f6d 100644 --- a/client/lib/semantic-ui/definitions/modules/embed.import.less +++ b/client/lib/semantic-ui/definitions/modules/embed.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Video diff --git a/client/lib/semantic-ui/definitions/modules/embed.js b/client/lib/semantic-ui/definitions/modules/embed.js index 6aa15ad3..814b2914 100644 --- a/client/lib/semantic-ui/definitions/modules/embed.js +++ b/client/lib/semantic-ui/definitions/modules/embed.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Video @@ -660,4 +660,4 @@ $.fn.embed.settings = { -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/modules/modal.import.less b/client/lib/semantic-ui/definitions/modules/modal.import.less index 6712197a..d3d1ddf6 100644 --- a/client/lib/semantic-ui/definitions/modules/modal.import.less +++ b/client/lib/semantic-ui/definitions/modules/modal.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Modal @@ -215,7 +215,7 @@ } /* Tablet and Mobile */ -@media only screen and (max-width : @computerBreakpoint) { +@media only screen and (max-width : @largestTabletScreen) { .ui.modal > .header { padding-right: @closeHitbox; } @@ -317,7 +317,7 @@ } /* Tablet and Mobile */ -@media only screen and (max-width : @computerBreakpoint) { +@media only screen and (max-width : @largestTabletScreen) { .ui.basic.modal > .close { color: @basicInnerCloseColor; } @@ -375,7 +375,7 @@ z-index: auto; } -@media only screen and (max-width : @computerBreakpoint) { +@media only screen and (max-width : @largestTabletScreen) { .modals.dimmer .ui.scrolling.modal { margin-top: @mobileScrollingMargin !important; margin-bottom: @mobileScrollingMargin !important; diff --git a/client/lib/semantic-ui/definitions/modules/modal.js b/client/lib/semantic-ui/definitions/modules/modal.js index 072e35a6..08a6cd0c 100644 --- a/client/lib/semantic-ui/definitions/modules/modal.js +++ b/client/lib/semantic-ui/definitions/modules/modal.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Modal @@ -369,7 +369,10 @@ $.fn.modal = function(parameters) { : function(){} ; module.debug('Hiding modal'); - settings.onHide.call(element); + if(settings.onHide.call(element, $(this)) === false) { + module.verbose('Hide callback returned false cancelling hide'); + return; + } if( module.is.animating() || module.is.active() ) { if(settings.transition && $.fn.transition !== undefined && $module.transition('is supported')) { @@ -858,7 +861,7 @@ $.fn.modal.settings = { onVisible : function(){}, // called before hide animation - onHide : function(){}, + onHide : function(){ return true; }, // called after hide animation onHidden : function(){}, @@ -890,4 +893,4 @@ $.fn.modal.settings = { }; -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/modules/nag.import.less b/client/lib/semantic-ui/definitions/modules/nag.import.less index 0be63cf0..3e112844 100644 --- a/client/lib/semantic-ui/definitions/modules/nag.import.less +++ b/client/lib/semantic-ui/definitions/modules/nag.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Nag diff --git a/client/lib/semantic-ui/definitions/modules/nag.js b/client/lib/semantic-ui/definitions/modules/nag.js index 9f3ec1d3..32bdcfc6 100644 --- a/client/lib/semantic-ui/definitions/modules/nag.js +++ b/client/lib/semantic-ui/definitions/modules/nag.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Nag @@ -487,4 +487,4 @@ $.fn.nag.settings = { }; -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/modules/popup.import.less b/client/lib/semantic-ui/definitions/modules/popup.import.less index 36ab1dc2..54471689 100644 --- a/client/lib/semantic-ui/definitions/modules/popup.import.less +++ b/client/lib/semantic-ui/definitions/modules/popup.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! @@ -42,7 +42,7 @@ border: @border; line-height: @lineHeight; max-width: @maxWidth; - background-color: @background; + background: @background; padding: @verticalPadding @horizontalPadding; font-weight: @fontWeight; @@ -144,6 +144,7 @@ .ui.bottom.left.popup { margin-left: @boxArrowOffset; } +/*rtl:rename*/ .ui.bottom.left.popup:before { top: @arrowOffset; left: @arrowDistanceFromEdge; @@ -156,6 +157,7 @@ .ui.bottom.right.popup { margin-right: @boxArrowOffset; } +/*rtl:rename*/ .ui.bottom.right.popup:before { top: @arrowOffset; right: @arrowDistanceFromEdge; @@ -176,6 +178,7 @@ .ui.top.left.popup { margin-left: @boxArrowOffset; } +/*rtl:rename*/ .ui.top.left.popup:before { bottom: @arrowOffset; left: @arrowDistanceFromEdge; @@ -186,6 +189,7 @@ .ui.top.right.popup { margin-right: @boxArrowOffset; } +/*rtl:rename*/ .ui.top.right.popup:before { bottom: @arrowOffset; right: @arrowDistanceFromEdge; @@ -195,6 +199,7 @@ } /*--- Left Center ---*/ +/*rtl:rename*/ .ui.left.center.popup:before { top: 50%; right: @arrowOffset; @@ -205,6 +210,7 @@ } /*--- Right Center ---*/ +/*rtl:rename*/ .ui.right.center.popup:before { top: 50%; left: @arrowOffset; @@ -214,6 +220,31 @@ box-shadow: @rightArrowBoxShadow; } +/* Arrow Color By Location */ +.ui.bottom.popup:before { + background: @arrowTopBackground; +} +.ui.right.center.popup:before, +.ui.left.center.popup:before { + background: @arrowCenterBackground; +} +.ui.top.popup:before { + background: @arrowBottomBackground; +} + +/* Inverted Arrow Color */ +.ui.inverted.bottom.popup:before { + background: @invertedArrowTopBackground; +} +.ui.inverted.right.center.popup:before, +.ui.inverted.left.center.popup:before { + background: @invertedArrowCenterBackground; +} +.ui.inverted.top.popup:before { + background: @invertedArrowBottomBackground; +} + + /******************************* Coupling *******************************/ @@ -340,4 +371,4 @@ } -.loadUIOverrides(); \ No newline at end of file +.loadUIOverrides(); diff --git a/client/lib/semantic-ui/definitions/modules/popup.js b/client/lib/semantic-ui/definitions/modules/popup.js index 72649f1c..a9fa8737 100644 --- a/client/lib/semantic-ui/definitions/modules/popup.js +++ b/client/lib/semantic-ui/definitions/modules/popup.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Popup @@ -427,6 +427,12 @@ $.fn.popup = function(parameters) { } }, + change: { + content: function(html) { + $popup.html(html); + } + }, + get: { html: function() { $module.removeData(metadata.html); @@ -444,13 +450,16 @@ $.fn.popup = function(parameters) { $module.removeData(metadata.variation); return $module.data(metadata.variation) || settings.variation; }, + popup: function() { + return $popup; + }, popupOffset: function() { return $popup.offset(); }, calculations: function() { var targetElement = $target[0], - targetPosition = (settings.inline || settings.popup) + targetPosition = (settings.inline || (settings.popup && settings.movePopup)) ? $target.position() : $target.offset(), calculations = {}, @@ -692,7 +701,7 @@ $.fn.popup = function(parameters) { popup = calculations.popup; parent = calculations.parent; - if(target.width === 0 && target.height === 0) { + if(target.width === 0 && target.height === 0 && !(target.element instanceof SVGGraphicsElement)) { module.debug('Popup target is hidden, no action taken'); return false; } @@ -1401,4 +1410,4 @@ $.fn.popup.settings = { }; -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/modules/progress.import.less b/client/lib/semantic-ui/definitions/modules/progress.import.less index 57af7a80..131d2c2b 100644 --- a/client/lib/semantic-ui/definitions/modules/progress.import.less +++ b/client/lib/semantic-ui/definitions/modules/progress.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Progress Bar diff --git a/client/lib/semantic-ui/definitions/modules/progress.js b/client/lib/semantic-ui/definitions/modules/progress.js index 1257dd37..7629b8ca 100644 --- a/client/lib/semantic-ui/definitions/modules/progress.js +++ b/client/lib/semantic-ui/definitions/modules/progress.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Progress @@ -93,6 +93,7 @@ $.fn.progress = function(parameters) { reset: function() { module.set.percent(0); + module.set.value(0); }, complete: function() { @@ -795,4 +796,4 @@ $.fn.progress.settings = { }; -})( jQuery, window , document ); \ No newline at end of file +})( jQuery, window, document ); \ No newline at end of file diff --git a/client/lib/semantic-ui/definitions/modules/rating.import.less b/client/lib/semantic-ui/definitions/modules/rating.import.less index c57e895c..57a8210c 100644 --- a/client/lib/semantic-ui/definitions/modules/rating.import.less +++ b/client/lib/semantic-ui/definitions/modules/rating.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Rating diff --git a/client/lib/semantic-ui/definitions/modules/rating.js b/client/lib/semantic-ui/definitions/modules/rating.js index 90eb070c..b7a1a527 100644 --- a/client/lib/semantic-ui/definitions/modules/rating.js +++ b/client/lib/semantic-ui/definitions/modules/rating.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Rating @@ -476,4 +476,4 @@ $.fn.rating.settings = { }; -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/modules/search.import.less b/client/lib/semantic-ui/definitions/modules/search.import.less index e18accaa..1ba7a4d6 100644 --- a/client/lib/semantic-ui/definitions/modules/search.import.less +++ b/client/lib/semantic-ui/definitions/modules/search.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Search diff --git a/client/lib/semantic-ui/definitions/modules/search.js b/client/lib/semantic-ui/definitions/modules/search.js index caa3c8ee..0775a8e6 100644 --- a/client/lib/semantic-ui/definitions/modules/search.js +++ b/client/lib/semantic-ui/definitions/modules/search.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Search @@ -213,9 +213,7 @@ $.fn.search = function(parameters) { // search shortcuts if(keyCode == keys.escape) { module.verbose('Escape key pressed, blurring search field'); - $prompt - .trigger('blur') - ; + module.trigger.blur(); } if( module.is.visible() ) { if(keyCode == keys.enter) { @@ -315,6 +313,20 @@ $.fn.search = function(parameters) { } }, + trigger: { + blur: function() { + var + events = document.createEvent('HTMLEvents'), + promptElement = $prompt[0] + ; + if(promptElement) { + module.verbose('Triggering native blur event'); + events.initEvent('blur', false, false); + promptElement.dispatchEvent(events); + } + } + }, + get: { inputEvent: function() { var @@ -354,7 +366,7 @@ $.fn.search = function(parameters) { $.each(results, function(index, category) { if($.isArray(category.results)) { result = module.search.object(value, category.results, lookupFields)[0]; - // dont continue searching if a result is found + // don't continue searching if a result is found if(result) { return false; } @@ -428,8 +440,8 @@ $.fn.search = function(parameters) { else { module.error(error.source); } - settings.onSearchQuery.call(element, searchTerm); } + settings.onSearchQuery.call(element, searchTerm); } else { module.hideResults(); @@ -1138,6 +1150,7 @@ $.fn.search.settings = { price : 'price', // result price results : 'results', // array of results (standard) title : 'title', // result title + url : 'url', // result url action : 'action', // "view more" object name actionText : 'text', // "view more" text actionURL : 'url' // "view more" url @@ -1215,8 +1228,8 @@ $.fn.search.settings = { // each item inside category $.each(category.results, function(index, result) { - if(response[fields.url]) { - html += ''; + if(result[fields.url]) { + html += ''; } else { html += ''; @@ -1266,8 +1279,8 @@ $.fn.search.settings = { // each result $.each(response[fields.results], function(index, result) { - if(response[fields.url]) { - html += ''; + if(result[fields.url]) { + html += ''; } else { html += ''; @@ -1308,4 +1321,4 @@ $.fn.search.settings = { } }; -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/modules/shape.import.less b/client/lib/semantic-ui/definitions/modules/shape.import.less index d74642ad..7994a9c5 100644 --- a/client/lib/semantic-ui/definitions/modules/shape.import.less +++ b/client/lib/semantic-ui/definitions/modules/shape.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Shape diff --git a/client/lib/semantic-ui/definitions/modules/shape.js b/client/lib/semantic-ui/definitions/modules/shape.js index 0bbaee7b..d2e225fd 100644 --- a/client/lib/semantic-ui/definitions/modules/shape.js +++ b/client/lib/semantic-ui/definitions/modules/shape.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Shape @@ -877,4 +877,4 @@ $.fn.shape.settings = { }; -})( jQuery, window , document ); \ No newline at end of file +})( jQuery, window, document ); \ No newline at end of file diff --git a/client/lib/semantic-ui/definitions/modules/sidebar.import.less b/client/lib/semantic-ui/definitions/modules/sidebar.import.less index cc57eb78..b9542eee 100644 --- a/client/lib/semantic-ui/definitions/modules/sidebar.import.less +++ b/client/lib/semantic-ui/definitions/modules/sidebar.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Sidebar diff --git a/client/lib/semantic-ui/definitions/modules/sidebar.js b/client/lib/semantic-ui/definitions/modules/sidebar.js index 92e357d6..0681a1bf 100644 --- a/client/lib/semantic-ui/definitions/modules/sidebar.js +++ b/client/lib/semantic-ui/definitions/modules/sidebar.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Sidebar @@ -1023,4 +1023,4 @@ $.fn.sidebar.settings = { }; -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/modules/sticky.import.less b/client/lib/semantic-ui/definitions/modules/sticky.import.less index 9bd10617..3aedb396 100644 --- a/client/lib/semantic-ui/definitions/modules/sticky.import.less +++ b/client/lib/semantic-ui/definitions/modules/sticky.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Sticky diff --git a/client/lib/semantic-ui/definitions/modules/sticky.js b/client/lib/semantic-ui/definitions/modules/sticky.js index 889fc9fb..51e74177 100644 --- a/client/lib/semantic-ui/definitions/modules/sticky.js +++ b/client/lib/semantic-ui/definitions/modules/sticky.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Sticky @@ -227,8 +227,8 @@ $.fn.sticky = function(parameters) { }, positions: function() { var - window = { - height: $window.height() + scrollContext = { + height : $scroll.height() }, element = { margin: { @@ -240,17 +240,28 @@ $.fn.sticky = function(parameters) { height : $module.outerHeight() }, context = { - offset : $context.offset(), - height : $context.outerHeight() + offset : $context.offset(), + height : $context.outerHeight() }, container = { height: $container.outerHeight() } ; + if( !module.is.standardScroll() ) { + module.debug('Non-standard scroll. Removing scroll offset from element offset'); + + scrollContext.top = $scroll.scrollTop(); + scrollContext.left = $scroll.scrollLeft(); + + element.offset.top += scrollContext.top; + context.offset.top += scrollContext.top; + element.offset.left += scrollContext.left; + context.offset.left += scrollContext.left; + } module.cache = { - fits : ( element.height < window.height ), - window: { - height: window.height + fits : ( element.height < scrollContext.height ), + scrollContext : { + height : scrollContext.height }, element: { margin : element.margin, @@ -310,9 +321,9 @@ $.fn.sticky = function(parameters) { scroll = scroll || $scroll.scrollTop(); var element = module.cache.element, - window = module.cache.window, + scrollContext = module.cache.scrollContext, delta = module.get.scrollChange(scroll), - maxScroll = (element.height - window.height + settings.offset), + maxScroll = (element.height - scrollContext.height + settings.offset), elementScroll = module.get.currentElementScroll(), possibleScroll = (elementScroll + delta) ; @@ -401,6 +412,9 @@ $.fn.sticky = function(parameters) { }, is: { + standardScroll: function() { + return ($scroll[0] == window); + }, top: function() { return $module.hasClass(className.top); }, @@ -427,14 +441,14 @@ $.fn.sticky = function(parameters) { cache = module.cache, fits = cache.fits, element = cache.element, - window = cache.window, + scrollContext = cache.scrollContext, context = cache.context, offset = (module.is.bottom() && settings.pushing) ? settings.bottomOffset : settings.offset, scroll = { top : cachedPosition + offset, - bottom : cachedPosition + offset + window.height + bottom : cachedPosition + offset + scrollContext.height }, direction = module.get.direction(scroll.top), elementScroll = (fits) @@ -508,16 +522,22 @@ $.fn.sticky = function(parameters) { } } else if( module.is.bottom() ) { - if(settings.pushing) { - if(module.is.bound() && scroll.bottom <= context.bottom ) { - module.debug('Fixing bottom attached element to bottom of browser.'); - module.fixBottom(); - } + if( scroll.top <= element.top ) { + module.debug('Jumped from bottom fixed to top fixed, most likely used home/end button'); + module.setInitialPosition(); } else { - if(module.is.bound() && (scroll.top <= context.bottom - element.height) ) { - module.debug('Fixing bottom attached element to top of browser.'); - module.fixTop(); + if(settings.pushing) { + if(module.is.bound() && scroll.bottom <= context.bottom ) { + module.debug('Fixing bottom attached element to bottom of browser.'); + module.fixBottom(); + } + } + else { + if(module.is.bound() && (scroll.top <= context.bottom - element.height) ) { + module.debug('Fixing bottom attached element to top of browser.'); + module.fixTop(); + } } } } @@ -888,4 +908,4 @@ $.fn.sticky.settings = { }; -})( jQuery, window , document ); +})( jQuery, window, document ); \ No newline at end of file diff --git a/client/lib/semantic-ui/definitions/modules/tab.import.less b/client/lib/semantic-ui/definitions/modules/tab.import.less index 57e9b5d9..e9d8749d 100644 --- a/client/lib/semantic-ui/definitions/modules/tab.import.less +++ b/client/lib/semantic-ui/definitions/modules/tab.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Tab diff --git a/client/lib/semantic-ui/definitions/modules/tab.js b/client/lib/semantic-ui/definitions/modules/tab.js index 18b76f66..7ada9d6c 100644 --- a/client/lib/semantic-ui/definitions/modules/tab.js +++ b/client/lib/semantic-ui/definitions/modules/tab.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Tab @@ -111,7 +111,7 @@ $.fn.tab = function(parameters) { bind: { events: function() { - // if using $.tab dont add events + // if using $.tab don't add events if( !$.isWindow( element ) ) { module.debug('Attaching tab activation events to element', $module); $module @@ -899,4 +899,4 @@ $.fn.tab.settings = { }; -})( jQuery, window , document ); \ No newline at end of file +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/modules/transition.import.less b/client/lib/semantic-ui/definitions/modules/transition.import.less index 571fe5f9..f8c12e68 100644 --- a/client/lib/semantic-ui/definitions/modules/transition.import.less +++ b/client/lib/semantic-ui/definitions/modules/transition.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Transition diff --git a/client/lib/semantic-ui/definitions/modules/transition.js b/client/lib/semantic-ui/definitions/modules/transition.js index 1d5207c3..36607dd0 100644 --- a/client/lib/semantic-ui/definitions/modules/transition.js +++ b/client/lib/semantic-ui/definitions/modules/transition.js @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Transition @@ -232,7 +232,9 @@ $.fn.transition = function() { module.show(); } else { + module.verbose('Static animation completed'); module.restore.conditions(); + settings.onComplete.call(element); } } }, @@ -1073,4 +1075,4 @@ $.fn.transition.settings = { }; -})( jQuery, window , document ); +})( jQuery, window, document ); diff --git a/client/lib/semantic-ui/definitions/views/ad.import.less b/client/lib/semantic-ui/definitions/views/ad.import.less index 16791a48..63d28784 100644 --- a/client/lib/semantic-ui/definitions/views/ad.import.less +++ b/client/lib/semantic-ui/definitions/views/ad.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Ad @@ -229,7 +229,7 @@ display: none; } -@media only screen and (max-width : (@tabletBreakpoint - 1)) { +@media only screen and (max-width : @largestMobileScreen) { .ui.mobile.ad { display: block; } diff --git a/client/lib/semantic-ui/definitions/views/card.import.less b/client/lib/semantic-ui/definitions/views/card.import.less index 42c26750..f4e373be 100644 --- a/client/lib/semantic-ui/definitions/views/card.import.less +++ b/client/lib/semantic-ui/definitions/views/card.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Item diff --git a/client/lib/semantic-ui/definitions/views/comment.import.less b/client/lib/semantic-ui/definitions/views/comment.import.less index 3659d6a0..4ae1e662 100644 --- a/client/lib/semantic-ui/definitions/views/comment.import.less +++ b/client/lib/semantic-ui/definitions/views/comment.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Comment diff --git a/client/lib/semantic-ui/definitions/views/feed.import.less b/client/lib/semantic-ui/definitions/views/feed.import.less index 831d25ca..f774d5a1 100644 --- a/client/lib/semantic-ui/definitions/views/feed.import.less +++ b/client/lib/semantic-ui/definitions/views/feed.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Feed diff --git a/client/lib/semantic-ui/definitions/views/item.import.less b/client/lib/semantic-ui/definitions/views/item.import.less index 910ed155..e1a3d0f5 100644 --- a/client/lib/semantic-ui/definitions/views/item.import.less +++ b/client/lib/semantic-ui/definitions/views/item.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Item diff --git a/client/lib/semantic-ui/definitions/views/statistic.import.less b/client/lib/semantic-ui/definitions/views/statistic.import.less index d1a8411f..126d7430 100644 --- a/client/lib/semantic-ui/definitions/views/statistic.import.less +++ b/client/lib/semantic-ui/definitions/views/statistic.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /*! * # Semantic UI - Statistic diff --git a/client/lib/semantic-ui/semantic.less b/client/lib/semantic-ui/semantic.less index 3940ace8..e57c8800 100644 --- a/client/lib/semantic-ui/semantic.less +++ b/client/lib/semantic-ui/semantic.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /* diff --git a/client/lib/semantic-ui/theme.import.less b/client/lib/semantic-ui/theme.import.less index cf4c4f79..47b926e8 100644 --- a/client/lib/semantic-ui/theme.import.less +++ b/client/lib/semantic-ui/theme.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Import Directives @@ -17,13 +17,13 @@ ---------------------*/ /* Default site.variables */ -@import "@{themesFolder}/default/globals/site.variables"; +@import "@{themesFolder}/default/globals/site.variables.import.less"; /* Packaged site.variables */ -@import "@{themesFolder}/@{site}/globals/site.variables"; +@import "@{themesFolder}/@{site}/globals/site.variables.import.less"; /* Component's site.variables */ -@import "@{themesFolder}/@{theme}/globals/site.variables"; +@import (optional) "@{themesFolder}/@{theme}/globals/site.variables.import.less"; /* Site theme site.variables */ @import (optional) "@{siteFolder}/globals/site.variables.import.less"; @@ -34,10 +34,10 @@ ---------------------*/ /* Default */ -@import "@{themesFolder}/default/@{type}s/@{element}.variables"; +@import "@{themesFolder}/default/@{type}s/@{element}.variables.import.less"; /* Packaged Theme */ -@import (optional) "@{themesFolder}/@{theme}/@{type}s/@{element}.variables"; +@import (optional) "@{themesFolder}/@{theme}/@{type}s/@{element}.variables.import.less"; /* Site Theme */ @import (optional) "@{siteFolder}/@{type}s/@{element}.variables.import.less"; @@ -60,6 +60,6 @@ -------------------*/ .loadUIOverrides() { - @import (optional) "@{themesFolder}/@{theme}/@{type}s/@{element}.overrides"; + @import (optional) "@{themesFolder}/@{theme}/@{type}s/@{element}.overrides.import.less"; @import (optional) "@{siteFolder}/@{type}s/@{element}.overrides.import.less"; } diff --git a/client/lib/semantic-ui/themes/default/collections/breadcrumb.overrides b/client/lib/semantic-ui/themes/default/collections/breadcrumb.overrides.import.less similarity index 88% rename from client/lib/semantic-ui/themes/default/collections/breadcrumb.overrides rename to client/lib/semantic-ui/themes/default/collections/breadcrumb.overrides.import.less index 7e69195e..3ab6f85d 100644 --- a/client/lib/semantic-ui/themes/default/collections/breadcrumb.overrides +++ b/client/lib/semantic-ui/themes/default/collections/breadcrumb.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Theme Overrides diff --git a/client/lib/semantic-ui/themes/default/collections/breadcrumb.variables b/client/lib/semantic-ui/themes/default/collections/breadcrumb.variables.import.less similarity index 97% rename from client/lib/semantic-ui/themes/default/collections/breadcrumb.variables rename to client/lib/semantic-ui/themes/default/collections/breadcrumb.variables.import.less index 15db2e47..55703766 100644 --- a/client/lib/semantic-ui/themes/default/collections/breadcrumb.variables +++ b/client/lib/semantic-ui/themes/default/collections/breadcrumb.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Breadcrumb diff --git a/client/lib/semantic-ui/themes/default/collections/message.overrides b/client/lib/semantic-ui/themes/default/collections/form.overrides.import.less similarity index 88% rename from client/lib/semantic-ui/themes/default/collections/message.overrides rename to client/lib/semantic-ui/themes/default/collections/form.overrides.import.less index 7e69195e..3ab6f85d 100644 --- a/client/lib/semantic-ui/themes/default/collections/message.overrides +++ b/client/lib/semantic-ui/themes/default/collections/form.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Theme Overrides diff --git a/client/lib/semantic-ui/themes/default/collections/form.variables b/client/lib/semantic-ui/themes/default/collections/form.variables.import.less similarity index 98% rename from client/lib/semantic-ui/themes/default/collections/form.variables rename to client/lib/semantic-ui/themes/default/collections/form.variables.import.less index f3ca4197..f7deef50 100644 --- a/client/lib/semantic-ui/themes/default/collections/form.variables +++ b/client/lib/semantic-ui/themes/default/collections/form.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Form @@ -68,9 +68,6 @@ @checkboxLabelFontSize: 1em; @checkboxLabelTextTransform: @labelTextTransform; -/* Divider */ -@dividerMargin: @rowDistance 0em; - /* Inline Validation Prompt */ @promptBackground: @white; @promptBorderColor: @formErrorBorder; diff --git a/client/lib/semantic-ui/themes/default/elements/header.overrides b/client/lib/semantic-ui/themes/default/collections/grid.overrides.import.less similarity index 88% rename from client/lib/semantic-ui/themes/default/elements/header.overrides rename to client/lib/semantic-ui/themes/default/collections/grid.overrides.import.less index ea63b18e..499489ed 100644 --- a/client/lib/semantic-ui/themes/default/elements/header.overrides +++ b/client/lib/semantic-ui/themes/default/collections/grid.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Theme Overrides diff --git a/client/lib/semantic-ui/themes/default/collections/grid.variables b/client/lib/semantic-ui/themes/default/collections/grid.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/collections/grid.variables rename to client/lib/semantic-ui/themes/default/collections/grid.variables.import.less index 1d912d3e..754393ea 100644 --- a/client/lib/semantic-ui/themes/default/collections/grid.variables +++ b/client/lib/semantic-ui/themes/default/collections/grid.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Grid diff --git a/client/lib/semantic-ui/themes/default/collections/form.overrides b/client/lib/semantic-ui/themes/default/collections/menu.overrides.import.less similarity index 88% rename from client/lib/semantic-ui/themes/default/collections/form.overrides rename to client/lib/semantic-ui/themes/default/collections/menu.overrides.import.less index 7e69195e..3ab6f85d 100644 --- a/client/lib/semantic-ui/themes/default/collections/form.overrides +++ b/client/lib/semantic-ui/themes/default/collections/menu.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Theme Overrides diff --git a/client/lib/semantic-ui/themes/default/collections/menu.variables b/client/lib/semantic-ui/themes/default/collections/menu.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/collections/menu.variables rename to client/lib/semantic-ui/themes/default/collections/menu.variables.import.less index b9761f51..57eb8b37 100644 --- a/client/lib/semantic-ui/themes/default/collections/menu.variables +++ b/client/lib/semantic-ui/themes/default/collections/menu.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Menu diff --git a/client/lib/semantic-ui/themes/default/collections/menu.overrides b/client/lib/semantic-ui/themes/default/collections/message.overrides.import.less similarity index 88% rename from client/lib/semantic-ui/themes/default/collections/menu.overrides rename to client/lib/semantic-ui/themes/default/collections/message.overrides.import.less index 7e69195e..3ab6f85d 100644 --- a/client/lib/semantic-ui/themes/default/collections/menu.overrides +++ b/client/lib/semantic-ui/themes/default/collections/message.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Theme Overrides diff --git a/client/lib/semantic-ui/themes/default/collections/message.variables b/client/lib/semantic-ui/themes/default/collections/message.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/collections/message.variables rename to client/lib/semantic-ui/themes/default/collections/message.variables.import.less index 660b9d86..5956ea61 100644 --- a/client/lib/semantic-ui/themes/default/collections/message.variables +++ b/client/lib/semantic-ui/themes/default/collections/message.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Message diff --git a/client/lib/semantic-ui/themes/default/collections/table.overrides b/client/lib/semantic-ui/themes/default/collections/table.overrides.import.less similarity index 78% rename from client/lib/semantic-ui/themes/default/collections/table.overrides rename to client/lib/semantic-ui/themes/default/collections/table.overrides.import.less index 4154d0f6..dfb81243 100644 --- a/client/lib/semantic-ui/themes/default/collections/table.overrides +++ b/client/lib/semantic-ui/themes/default/collections/table.overrides.import.less @@ -1,4 +1,4 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ diff --git a/client/lib/semantic-ui/themes/default/collections/table.variables b/client/lib/semantic-ui/themes/default/collections/table.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/collections/table.variables rename to client/lib/semantic-ui/themes/default/collections/table.variables.import.less index a94ee86f..f3b7f997 100644 --- a/client/lib/semantic-ui/themes/default/collections/table.variables +++ b/client/lib/semantic-ui/themes/default/collections/table.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Table diff --git a/client/lib/semantic-ui/themes/default/elements/button.overrides b/client/lib/semantic-ui/themes/default/elements/button.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/elements/button.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/button.overrides.import.less b/client/lib/semantic-ui/themes/default/elements/button.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/elements/button.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/button.variables b/client/lib/semantic-ui/themes/default/elements/button.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/elements/button.variables rename to client/lib/semantic-ui/themes/default/elements/button.variables.import.less index 80c9c1a2..3a5b6d63 100644 --- a/client/lib/semantic-ui/themes/default/elements/button.variables +++ b/client/lib/semantic-ui/themes/default/elements/button.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Button @@ -171,6 +171,7 @@ @labeledLabelBorderColor: @borderColor; @labeledLabelBorderOffset: -@borderBoxShadowWidth; @labeledTagLabelSize: 1.85em; /* hypotenuse of triangle */ +@labeledIconMargin: 0em; /* Labeled Icon */ @labeledIconWidth: 1em + (@verticalPadding * 2); diff --git a/client/lib/semantic-ui/themes/default/elements/container.overrides b/client/lib/semantic-ui/themes/default/elements/container.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/elements/container.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/container.overrides.import.less b/client/lib/semantic-ui/themes/default/elements/container.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/elements/container.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/container.variables b/client/lib/semantic-ui/themes/default/elements/container.variables.import.less similarity index 98% rename from client/lib/semantic-ui/themes/default/elements/container.variables rename to client/lib/semantic-ui/themes/default/elements/container.variables.import.less index 2f6cb3d2..f8a7f3cf 100644 --- a/client/lib/semantic-ui/themes/default/elements/container.variables +++ b/client/lib/semantic-ui/themes/default/elements/container.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Container diff --git a/client/lib/semantic-ui/themes/default/elements/divider.overrides b/client/lib/semantic-ui/themes/default/elements/divider.overrides.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/elements/divider.overrides rename to client/lib/semantic-ui/themes/default/elements/divider.overrides.import.less index 7d045f36..917f8a40 100644 --- a/client/lib/semantic-ui/themes/default/elements/divider.overrides +++ b/client/lib/semantic-ui/themes/default/elements/divider.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Theme Overrides diff --git a/client/lib/semantic-ui/themes/default/elements/divider.variables b/client/lib/semantic-ui/themes/default/elements/divider.variables.import.less similarity index 98% rename from client/lib/semantic-ui/themes/default/elements/divider.variables rename to client/lib/semantic-ui/themes/default/elements/divider.variables.import.less index 76b48708..aba06703 100644 --- a/client/lib/semantic-ui/themes/default/elements/divider.variables +++ b/client/lib/semantic-ui/themes/default/elements/divider.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Divider diff --git a/client/lib/semantic-ui/themes/default/elements/flag.overrides b/client/lib/semantic-ui/themes/default/elements/flag.overrides.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/elements/flag.overrides rename to client/lib/semantic-ui/themes/default/elements/flag.overrides.import.less index 364dae35..a9629b3b 100644 --- a/client/lib/semantic-ui/themes/default/elements/flag.overrides +++ b/client/lib/semantic-ui/themes/default/elements/flag.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /* Flag Sprite Based On http://www.famfamfam.com/lab/icons/flags/ */ diff --git a/client/lib/semantic-ui/themes/default/elements/flag.variables b/client/lib/semantic-ui/themes/default/elements/flag.variables.import.less similarity index 94% rename from client/lib/semantic-ui/themes/default/elements/flag.variables rename to client/lib/semantic-ui/themes/default/elements/flag.variables.import.less index d07b2d47..10b11c31 100644 --- a/client/lib/semantic-ui/themes/default/elements/flag.variables +++ b/client/lib/semantic-ui/themes/default/elements/flag.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Flag diff --git a/client/lib/semantic-ui/themes/default/collections/grid.overrides b/client/lib/semantic-ui/themes/default/elements/header.overrides.import.less similarity index 88% rename from client/lib/semantic-ui/themes/default/collections/grid.overrides rename to client/lib/semantic-ui/themes/default/elements/header.overrides.import.less index ea63b18e..499489ed 100644 --- a/client/lib/semantic-ui/themes/default/collections/grid.overrides +++ b/client/lib/semantic-ui/themes/default/elements/header.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Theme Overrides diff --git a/client/lib/semantic-ui/themes/default/elements/header.variables b/client/lib/semantic-ui/themes/default/elements/header.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/elements/header.variables rename to client/lib/semantic-ui/themes/default/elements/header.variables.import.less index 4d5ffb0e..80ad7dba 100644 --- a/client/lib/semantic-ui/themes/default/elements/header.variables +++ b/client/lib/semantic-ui/themes/default/elements/header.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Header diff --git a/client/lib/semantic-ui/themes/default/elements/icon.overrides b/client/lib/semantic-ui/themes/default/elements/icon.overrides.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/elements/icon.overrides rename to client/lib/semantic-ui/themes/default/elements/icon.overrides.import.less index d6a0772b..abec75f3 100644 --- a/client/lib/semantic-ui/themes/default/elements/icon.overrides +++ b/client/lib/semantic-ui/themes/default/elements/icon.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /* * Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome @@ -686,6 +686,7 @@ i.icon.triangle.right:before { content: "\f0da"; } i.icon.envelope:before { content: "\f0e0"; } i.icon.conversation:before { content: "\f0e6"; } i.icon.umbrella:before { content: "\f0e9"; } +i.icon.clipboard:before { content: "\f0ea"; } i.icon.lightbulb:before { content: "\f0eb"; } i.icon.ambulance:before { content: "\f0f9"; } i.icon.medkit:before { content: "\f0fa"; } diff --git a/client/lib/semantic-ui/themes/default/elements/icon.variables b/client/lib/semantic-ui/themes/default/elements/icon.variables.import.less similarity index 98% rename from client/lib/semantic-ui/themes/default/elements/icon.variables rename to client/lib/semantic-ui/themes/default/elements/icon.variables.import.less index 1d3f0fdc..853be0d3 100644 --- a/client/lib/semantic-ui/themes/default/elements/icon.variables +++ b/client/lib/semantic-ui/themes/default/elements/icon.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Icon diff --git a/client/lib/semantic-ui/themes/default/elements/image.overrides b/client/lib/semantic-ui/themes/default/elements/image.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/elements/image.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/image.overrides.import.less b/client/lib/semantic-ui/themes/default/elements/image.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/elements/image.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/image.variables b/client/lib/semantic-ui/themes/default/elements/image.variables.import.less similarity index 97% rename from client/lib/semantic-ui/themes/default/elements/image.variables rename to client/lib/semantic-ui/themes/default/elements/image.variables.import.less index 1232f01f..a3449a69 100644 --- a/client/lib/semantic-ui/themes/default/elements/image.variables +++ b/client/lib/semantic-ui/themes/default/elements/image.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Image diff --git a/client/lib/semantic-ui/themes/default/elements/input.overrides b/client/lib/semantic-ui/themes/default/elements/input.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/elements/input.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/input.overrides.import.less b/client/lib/semantic-ui/themes/default/elements/input.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/elements/input.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/input.variables b/client/lib/semantic-ui/themes/default/elements/input.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/elements/input.variables rename to client/lib/semantic-ui/themes/default/elements/input.variables.import.less index 4258890e..cb5960a1 100644 --- a/client/lib/semantic-ui/themes/default/elements/input.variables +++ b/client/lib/semantic-ui/themes/default/elements/input.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Input diff --git a/client/lib/semantic-ui/themes/default/elements/label.overrides b/client/lib/semantic-ui/themes/default/elements/label.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/elements/label.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/label.overrides.import.less b/client/lib/semantic-ui/themes/default/elements/label.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/elements/label.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/label.variables b/client/lib/semantic-ui/themes/default/elements/label.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/elements/label.variables rename to client/lib/semantic-ui/themes/default/elements/label.variables.import.less index 413059f6..42d100b0 100644 --- a/client/lib/semantic-ui/themes/default/elements/label.variables +++ b/client/lib/semantic-ui/themes/default/elements/label.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Label diff --git a/client/lib/semantic-ui/themes/default/elements/list.overrides b/client/lib/semantic-ui/themes/default/elements/list.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/elements/list.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/list.overrides.import.less b/client/lib/semantic-ui/themes/default/elements/list.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/elements/list.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/list.variables b/client/lib/semantic-ui/themes/default/elements/list.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/elements/list.variables rename to client/lib/semantic-ui/themes/default/elements/list.variables.import.less index e28de59d..7e2a5092 100644 --- a/client/lib/semantic-ui/themes/default/elements/list.variables +++ b/client/lib/semantic-ui/themes/default/elements/list.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* List diff --git a/client/lib/semantic-ui/themes/default/elements/loader.overrides b/client/lib/semantic-ui/themes/default/elements/loader.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/elements/loader.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/loader.overrides.import.less b/client/lib/semantic-ui/themes/default/elements/loader.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/elements/loader.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/loader.variables b/client/lib/semantic-ui/themes/default/elements/loader.variables.import.less similarity index 98% rename from client/lib/semantic-ui/themes/default/elements/loader.variables rename to client/lib/semantic-ui/themes/default/elements/loader.variables.import.less index 435165a5..6eb905d8 100644 --- a/client/lib/semantic-ui/themes/default/elements/loader.variables +++ b/client/lib/semantic-ui/themes/default/elements/loader.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Loader diff --git a/client/lib/semantic-ui/themes/default/elements/rail.overrides b/client/lib/semantic-ui/themes/default/elements/rail.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/elements/rail.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/rail.overrides.import.less b/client/lib/semantic-ui/themes/default/elements/rail.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/elements/rail.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/rail.variables b/client/lib/semantic-ui/themes/default/elements/rail.variables.import.less similarity index 97% rename from client/lib/semantic-ui/themes/default/elements/rail.variables rename to client/lib/semantic-ui/themes/default/elements/rail.variables.import.less index be50648c..f273fac2 100644 --- a/client/lib/semantic-ui/themes/default/elements/rail.variables +++ b/client/lib/semantic-ui/themes/default/elements/rail.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Rail diff --git a/client/lib/semantic-ui/themes/default/elements/reveal.overrides b/client/lib/semantic-ui/themes/default/elements/reveal.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/elements/reveal.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/reveal.overrides.import.less b/client/lib/semantic-ui/themes/default/elements/reveal.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/elements/reveal.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/reveal.variables b/client/lib/semantic-ui/themes/default/elements/reveal.variables.import.less similarity index 96% rename from client/lib/semantic-ui/themes/default/elements/reveal.variables rename to client/lib/semantic-ui/themes/default/elements/reveal.variables.import.less index a55475c3..7034ca69 100644 --- a/client/lib/semantic-ui/themes/default/elements/reveal.variables +++ b/client/lib/semantic-ui/themes/default/elements/reveal.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Reveal diff --git a/client/lib/semantic-ui/themes/default/elements/segment.overrides b/client/lib/semantic-ui/themes/default/elements/segment.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/elements/segment.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/segment.overrides.import.less b/client/lib/semantic-ui/themes/default/elements/segment.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/elements/segment.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/elements/segment.variables b/client/lib/semantic-ui/themes/default/elements/segment.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/elements/segment.variables rename to client/lib/semantic-ui/themes/default/elements/segment.variables.import.less index 10584b38..dccf1e75 100644 --- a/client/lib/semantic-ui/themes/default/elements/segment.variables +++ b/client/lib/semantic-ui/themes/default/elements/segment.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Segment diff --git a/client/lib/semantic-ui/themes/default/elements/step.overrides b/client/lib/semantic-ui/themes/default/elements/step.overrides.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/elements/step.overrides rename to client/lib/semantic-ui/themes/default/elements/step.overrides.import.less index 0b6bcbd1..c49fd585 100644 --- a/client/lib/semantic-ui/themes/default/elements/step.overrides +++ b/client/lib/semantic-ui/themes/default/elements/step.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Theme Overrides diff --git a/client/lib/semantic-ui/themes/default/elements/step.variables b/client/lib/semantic-ui/themes/default/elements/step.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/elements/step.variables rename to client/lib/semantic-ui/themes/default/elements/step.variables.import.less index 9f9013ab..a87dfd89 100644 --- a/client/lib/semantic-ui/themes/default/elements/step.variables +++ b/client/lib/semantic-ui/themes/default/elements/step.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Step diff --git a/client/lib/semantic-ui/themes/default/globals/reset.overrides b/client/lib/semantic-ui/themes/default/globals/reset.overrides.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/globals/reset.overrides rename to client/lib/semantic-ui/themes/default/globals/reset.overrides.import.less index dbe02ae1..48b59508 100644 --- a/client/lib/semantic-ui/themes/default/globals/reset.overrides +++ b/client/lib/semantic-ui/themes/default/globals/reset.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Theme Overrides diff --git a/client/lib/semantic-ui/themes/default/globals/reset.variables b/client/lib/semantic-ui/themes/default/globals/reset.variables.import.less similarity index 88% rename from client/lib/semantic-ui/themes/default/globals/reset.variables rename to client/lib/semantic-ui/themes/default/globals/reset.variables.import.less index af4f652d..03b69f45 100644 --- a/client/lib/semantic-ui/themes/default/globals/reset.variables +++ b/client/lib/semantic-ui/themes/default/globals/reset.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Reset diff --git a/client/lib/semantic-ui/themes/default/globals/site.overrides b/client/lib/semantic-ui/themes/default/globals/site.overrides.import.less similarity index 88% rename from client/lib/semantic-ui/themes/default/globals/site.overrides rename to client/lib/semantic-ui/themes/default/globals/site.overrides.import.less index 0bf550ed..a8e2a2e4 100644 --- a/client/lib/semantic-ui/themes/default/globals/site.overrides +++ b/client/lib/semantic-ui/themes/default/globals/site.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Global Overrides diff --git a/client/lib/semantic-ui/themes/default/globals/site.variables b/client/lib/semantic-ui/themes/default/globals/site.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/globals/site.variables rename to client/lib/semantic-ui/themes/default/globals/site.variables.import.less index 2ea0a381..52156b7e 100644 --- a/client/lib/semantic-ui/themes/default/globals/site.variables +++ b/client/lib/semantic-ui/themes/default/globals/site.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Site Settings diff --git a/client/lib/semantic-ui/themes/default/modules/accordion.overrides b/client/lib/semantic-ui/themes/default/modules/accordion.overrides.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/modules/accordion.overrides rename to client/lib/semantic-ui/themes/default/modules/accordion.overrides.import.less index 44f7bfdf..e3530a2d 100644 --- a/client/lib/semantic-ui/themes/default/modules/accordion.overrides +++ b/client/lib/semantic-ui/themes/default/modules/accordion.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Theme Overrides diff --git a/client/lib/semantic-ui/themes/default/modules/accordion.variables b/client/lib/semantic-ui/themes/default/modules/accordion.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/modules/accordion.variables rename to client/lib/semantic-ui/themes/default/modules/accordion.variables.import.less index 1f48a019..093334d1 100644 --- a/client/lib/semantic-ui/themes/default/modules/accordion.variables +++ b/client/lib/semantic-ui/themes/default/modules/accordion.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Accordion diff --git a/client/lib/semantic-ui/themes/default/modules/checkbox.overrides b/client/lib/semantic-ui/themes/default/modules/checkbox.overrides.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/modules/checkbox.overrides rename to client/lib/semantic-ui/themes/default/modules/checkbox.overrides.import.less index 65307d8b..e482cb12 100644 --- a/client/lib/semantic-ui/themes/default/modules/checkbox.overrides +++ b/client/lib/semantic-ui/themes/default/modules/checkbox.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Theme Overrides diff --git a/client/lib/semantic-ui/themes/default/modules/checkbox.variables b/client/lib/semantic-ui/themes/default/modules/checkbox.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/modules/checkbox.variables rename to client/lib/semantic-ui/themes/default/modules/checkbox.variables.import.less index 80985699..c291f596 100644 --- a/client/lib/semantic-ui/themes/default/modules/checkbox.variables +++ b/client/lib/semantic-ui/themes/default/modules/checkbox.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Checkbox diff --git a/client/lib/semantic-ui/themes/default/modules/dimmer.overrides b/client/lib/semantic-ui/themes/default/modules/dimmer.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/modules/dimmer.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/dimmer.overrides.import.less b/client/lib/semantic-ui/themes/default/modules/dimmer.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/modules/dimmer.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/dimmer.variables b/client/lib/semantic-ui/themes/default/modules/dimmer.variables.import.less similarity index 98% rename from client/lib/semantic-ui/themes/default/modules/dimmer.variables rename to client/lib/semantic-ui/themes/default/modules/dimmer.variables.import.less index 121448b8..4ddf743e 100644 --- a/client/lib/semantic-ui/themes/default/modules/dimmer.variables +++ b/client/lib/semantic-ui/themes/default/modules/dimmer.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Dimmer diff --git a/client/lib/semantic-ui/themes/default/modules/dropdown.overrides b/client/lib/semantic-ui/themes/default/modules/dropdown.overrides.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/modules/dropdown.overrides rename to client/lib/semantic-ui/themes/default/modules/dropdown.overrides.import.less index fe7e66ac..3960f336 100644 --- a/client/lib/semantic-ui/themes/default/modules/dropdown.overrides +++ b/client/lib/semantic-ui/themes/default/modules/dropdown.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Theme Overrides diff --git a/client/lib/semantic-ui/themes/default/modules/dropdown.variables b/client/lib/semantic-ui/themes/default/modules/dropdown.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/modules/dropdown.variables rename to client/lib/semantic-ui/themes/default/modules/dropdown.variables.import.less index 30413194..d845f13d 100644 --- a/client/lib/semantic-ui/themes/default/modules/dropdown.variables +++ b/client/lib/semantic-ui/themes/default/modules/dropdown.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Dropdown diff --git a/client/lib/semantic-ui/themes/default/modules/embed.overrides b/client/lib/semantic-ui/themes/default/modules/embed.overrides.import.less similarity index 88% rename from client/lib/semantic-ui/themes/default/modules/embed.overrides rename to client/lib/semantic-ui/themes/default/modules/embed.overrides.import.less index aa06109f..f45282ef 100644 --- a/client/lib/semantic-ui/themes/default/modules/embed.overrides +++ b/client/lib/semantic-ui/themes/default/modules/embed.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Video Overrides diff --git a/client/lib/semantic-ui/themes/default/modules/embed.variables b/client/lib/semantic-ui/themes/default/modules/embed.variables.import.less similarity index 98% rename from client/lib/semantic-ui/themes/default/modules/embed.variables rename to client/lib/semantic-ui/themes/default/modules/embed.variables.import.less index ce39c410..13401cfa 100644 --- a/client/lib/semantic-ui/themes/default/modules/embed.variables +++ b/client/lib/semantic-ui/themes/default/modules/embed.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Video diff --git a/client/lib/semantic-ui/themes/default/modules/modal.overrides b/client/lib/semantic-ui/themes/default/modules/modal.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/modules/modal.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/modal.overrides.import.less b/client/lib/semantic-ui/themes/default/modules/modal.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/modules/modal.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/modal.variables b/client/lib/semantic-ui/themes/default/modules/modal.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/modules/modal.variables rename to client/lib/semantic-ui/themes/default/modules/modal.variables.import.less index c7e60f00..d37295d7 100644 --- a/client/lib/semantic-ui/themes/default/modules/modal.variables +++ b/client/lib/semantic-ui/themes/default/modules/modal.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Modal diff --git a/client/lib/semantic-ui/themes/default/modules/nag.overrides b/client/lib/semantic-ui/themes/default/modules/nag.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/modules/nag.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/nag.overrides.import.less b/client/lib/semantic-ui/themes/default/modules/nag.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/modules/nag.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/nag.variables b/client/lib/semantic-ui/themes/default/modules/nag.variables.import.less similarity index 98% rename from client/lib/semantic-ui/themes/default/modules/nag.variables rename to client/lib/semantic-ui/themes/default/modules/nag.variables.import.less index 66d44dd4..2ea6f293 100644 --- a/client/lib/semantic-ui/themes/default/modules/nag.variables +++ b/client/lib/semantic-ui/themes/default/modules/nag.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Nag diff --git a/client/lib/semantic-ui/themes/default/modules/popup.overrides b/client/lib/semantic-ui/themes/default/modules/popup.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/modules/popup.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/popup.overrides.import.less b/client/lib/semantic-ui/themes/default/modules/popup.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/modules/popup.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/popup.variables b/client/lib/semantic-ui/themes/default/modules/popup.variables.import.less similarity index 82% rename from client/lib/semantic-ui/themes/default/modules/popup.variables rename to client/lib/semantic-ui/themes/default/modules/popup.variables.import.less index 9a29b3fd..77a796da 100644 --- a/client/lib/semantic-ui/themes/default/modules/popup.variables +++ b/client/lib/semantic-ui/themes/default/modules/popup.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Popup @@ -55,6 +55,11 @@ @arrowStroke: @borderWidth; @arrowColor: darken(@borderColor, 10); +/* Arrow color by position */ +@arrowTopBackground: @arrowBackground; +@arrowCenterBackground: @arrowBackground; +@arrowBottomBackground: @arrowBackground; + @arrowBoxShadow: @arrowStroke @arrowStroke 0px 0px @arrowColor; @leftArrowBoxShadow: @arrowStroke -@arrowStroke 0px 0px @arrowColor; @rightArrowBoxShadow: -@arrowStroke @arrowStroke 0px 0px @arrowColor; @@ -90,4 +95,9 @@ @invertedHeaderBackground: none; @invertedHeaderColor: @white; -@invertedArrowColor: @invertedBackground; \ No newline at end of file +@invertedArrowColor: @invertedBackground; + +/* Arrow color by position */ +@invertedArrowTopBackground: @invertedBackground; +@invertedArrowCenterBackground: @invertedBackground; +@invertedArrowBottomBackground: @invertedBackground; diff --git a/client/lib/semantic-ui/themes/default/modules/progress.overrides b/client/lib/semantic-ui/themes/default/modules/progress.overrides.import.less similarity index 88% rename from client/lib/semantic-ui/themes/default/modules/progress.overrides rename to client/lib/semantic-ui/themes/default/modules/progress.overrides.import.less index b71941db..8ee8cf32 100644 --- a/client/lib/semantic-ui/themes/default/modules/progress.overrides +++ b/client/lib/semantic-ui/themes/default/modules/progress.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Progress diff --git a/client/lib/semantic-ui/themes/default/modules/progress.variables b/client/lib/semantic-ui/themes/default/modules/progress.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/modules/progress.variables rename to client/lib/semantic-ui/themes/default/modules/progress.variables.import.less index 5c4cf1c1..dca6f6ae 100644 --- a/client/lib/semantic-ui/themes/default/modules/progress.variables +++ b/client/lib/semantic-ui/themes/default/modules/progress.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Progress diff --git a/client/lib/semantic-ui/themes/default/modules/rating.overrides b/client/lib/semantic-ui/themes/default/modules/rating.overrides.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/modules/rating.overrides rename to client/lib/semantic-ui/themes/default/modules/rating.overrides.import.less index 6c92298f..4ef891af 100644 --- a/client/lib/semantic-ui/themes/default/modules/rating.overrides +++ b/client/lib/semantic-ui/themes/default/modules/rating.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Theme Overrides diff --git a/client/lib/semantic-ui/themes/default/modules/rating.variables b/client/lib/semantic-ui/themes/default/modules/rating.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/modules/rating.variables rename to client/lib/semantic-ui/themes/default/modules/rating.variables.import.less index 262d8126..c92e342f 100644 --- a/client/lib/semantic-ui/themes/default/modules/rating.variables +++ b/client/lib/semantic-ui/themes/default/modules/rating.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Rating diff --git a/client/lib/semantic-ui/themes/default/modules/search.overrides b/client/lib/semantic-ui/themes/default/modules/search.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/modules/search.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/search.overrides.import.less b/client/lib/semantic-ui/themes/default/modules/search.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/modules/search.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/search.variables b/client/lib/semantic-ui/themes/default/modules/search.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/modules/search.variables rename to client/lib/semantic-ui/themes/default/modules/search.variables.import.less index c3134fc4..86f8ad54 100644 --- a/client/lib/semantic-ui/themes/default/modules/search.variables +++ b/client/lib/semantic-ui/themes/default/modules/search.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Search diff --git a/client/lib/semantic-ui/themes/default/modules/shape.overrides b/client/lib/semantic-ui/themes/default/modules/shape.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/modules/shape.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/shape.overrides.import.less b/client/lib/semantic-ui/themes/default/modules/shape.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/modules/shape.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/shape.variables b/client/lib/semantic-ui/themes/default/modules/shape.variables.import.less similarity index 97% rename from client/lib/semantic-ui/themes/default/modules/shape.variables rename to client/lib/semantic-ui/themes/default/modules/shape.variables.import.less index 6262ec49..1f571e3e 100644 --- a/client/lib/semantic-ui/themes/default/modules/shape.variables +++ b/client/lib/semantic-ui/themes/default/modules/shape.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Shape diff --git a/client/lib/semantic-ui/themes/default/modules/sidebar.overrides b/client/lib/semantic-ui/themes/default/modules/sidebar.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/modules/sidebar.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/sidebar.overrides.import.less b/client/lib/semantic-ui/themes/default/modules/sidebar.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/modules/sidebar.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/sidebar.variables b/client/lib/semantic-ui/themes/default/modules/sidebar.variables.import.less similarity index 97% rename from client/lib/semantic-ui/themes/default/modules/sidebar.variables rename to client/lib/semantic-ui/themes/default/modules/sidebar.variables.import.less index 0bfec4f0..36ddcf53 100644 --- a/client/lib/semantic-ui/themes/default/modules/sidebar.variables +++ b/client/lib/semantic-ui/themes/default/modules/sidebar.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Sidebar diff --git a/client/lib/semantic-ui/themes/default/modules/sticky.overrides b/client/lib/semantic-ui/themes/default/modules/sticky.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/modules/sticky.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/sticky.overrides.import.less b/client/lib/semantic-ui/themes/default/modules/sticky.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/modules/sticky.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/modules/sticky.variables b/client/lib/semantic-ui/themes/default/modules/sticky.variables.import.less similarity index 91% rename from client/lib/semantic-ui/themes/default/modules/sticky.variables rename to client/lib/semantic-ui/themes/default/modules/sticky.variables.import.less index 4ab81214..933207a0 100644 --- a/client/lib/semantic-ui/themes/default/modules/sticky.variables +++ b/client/lib/semantic-ui/themes/default/modules/sticky.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Sticky diff --git a/client/lib/semantic-ui/themes/default/modules/tab.overrides b/client/lib/semantic-ui/themes/default/modules/tab.overrides.import.less similarity index 88% rename from client/lib/semantic-ui/themes/default/modules/tab.overrides rename to client/lib/semantic-ui/themes/default/modules/tab.overrides.import.less index 2b8e7d20..1a3d8c90 100644 --- a/client/lib/semantic-ui/themes/default/modules/tab.overrides +++ b/client/lib/semantic-ui/themes/default/modules/tab.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Tab Overrides diff --git a/client/lib/semantic-ui/themes/default/modules/tab.variables b/client/lib/semantic-ui/themes/default/modules/tab.variables.import.less similarity index 93% rename from client/lib/semantic-ui/themes/default/modules/tab.variables rename to client/lib/semantic-ui/themes/default/modules/tab.variables.import.less index 7eb5063c..0a266943 100644 --- a/client/lib/semantic-ui/themes/default/modules/tab.variables +++ b/client/lib/semantic-ui/themes/default/modules/tab.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Tab diff --git a/client/lib/semantic-ui/themes/default/modules/transition.overrides b/client/lib/semantic-ui/themes/default/modules/transition.overrides.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/modules/transition.overrides rename to client/lib/semantic-ui/themes/default/modules/transition.overrides.import.less index e24e4766..fc01e34f 100644 --- a/client/lib/semantic-ui/themes/default/modules/transition.overrides +++ b/client/lib/semantic-ui/themes/default/modules/transition.overrides.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Transitions diff --git a/client/lib/semantic-ui/themes/default/modules/transition.variables b/client/lib/semantic-ui/themes/default/modules/transition.variables.import.less similarity index 94% rename from client/lib/semantic-ui/themes/default/modules/transition.variables rename to client/lib/semantic-ui/themes/default/modules/transition.variables.import.less index 5ee5decc..9759b9b0 100644 --- a/client/lib/semantic-ui/themes/default/modules/transition.variables +++ b/client/lib/semantic-ui/themes/default/modules/transition.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Transition diff --git a/client/lib/semantic-ui/themes/default/views/ad.overrides b/client/lib/semantic-ui/themes/default/views/ad.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/views/ad.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/views/ad.overrides.import.less b/client/lib/semantic-ui/themes/default/views/ad.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/views/ad.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/views/ad.variables b/client/lib/semantic-ui/themes/default/views/ad.variables.import.less similarity index 94% rename from client/lib/semantic-ui/themes/default/views/ad.variables rename to client/lib/semantic-ui/themes/default/views/ad.variables.import.less index 34578d76..1a429c74 100644 --- a/client/lib/semantic-ui/themes/default/views/ad.variables +++ b/client/lib/semantic-ui/themes/default/views/ad.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Advertisement diff --git a/client/lib/semantic-ui/themes/default/views/card.overrides b/client/lib/semantic-ui/themes/default/views/card.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/views/card.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/views/card.overrides.import.less b/client/lib/semantic-ui/themes/default/views/card.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/views/card.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/views/card.variables b/client/lib/semantic-ui/themes/default/views/card.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/views/card.variables rename to client/lib/semantic-ui/themes/default/views/card.variables.import.less index 07044afa..af019fa7 100644 --- a/client/lib/semantic-ui/themes/default/views/card.variables +++ b/client/lib/semantic-ui/themes/default/views/card.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Card diff --git a/client/lib/semantic-ui/themes/default/views/comment.overrides b/client/lib/semantic-ui/themes/default/views/comment.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/views/comment.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/views/comment.overrides.import.less b/client/lib/semantic-ui/themes/default/views/comment.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/views/comment.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/views/comment.variables b/client/lib/semantic-ui/themes/default/views/comment.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/views/comment.variables rename to client/lib/semantic-ui/themes/default/views/comment.variables.import.less index 4a08427a..6b17eb95 100644 --- a/client/lib/semantic-ui/themes/default/views/comment.variables +++ b/client/lib/semantic-ui/themes/default/views/comment.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Comments diff --git a/client/lib/semantic-ui/themes/default/views/feed.overrides b/client/lib/semantic-ui/themes/default/views/feed.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/views/feed.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/views/feed.overrides.import.less b/client/lib/semantic-ui/themes/default/views/feed.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/views/feed.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/views/feed.variables b/client/lib/semantic-ui/themes/default/views/feed.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/views/feed.variables rename to client/lib/semantic-ui/themes/default/views/feed.variables.import.less index 8bed9a17..8e208c29 100644 --- a/client/lib/semantic-ui/themes/default/views/feed.variables +++ b/client/lib/semantic-ui/themes/default/views/feed.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Feed diff --git a/client/lib/semantic-ui/themes/default/views/item.overrides b/client/lib/semantic-ui/themes/default/views/item.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/views/item.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/views/item.overrides.import.less b/client/lib/semantic-ui/themes/default/views/item.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/views/item.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/views/item.variables b/client/lib/semantic-ui/themes/default/views/item.variables.import.less similarity index 99% rename from client/lib/semantic-ui/themes/default/views/item.variables rename to client/lib/semantic-ui/themes/default/views/item.variables.import.less index f097a4a5..0f8d959d 100644 --- a/client/lib/semantic-ui/themes/default/views/item.variables +++ b/client/lib/semantic-ui/themes/default/views/item.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Item diff --git a/client/lib/semantic-ui/themes/default/views/statistic.overrides b/client/lib/semantic-ui/themes/default/views/statistic.overrides deleted file mode 100644 index 7e69195e..00000000 --- a/client/lib/semantic-ui/themes/default/views/statistic.overrides +++ /dev/null @@ -1,7 +0,0 @@ -/* - DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 -*/ -/******************************* - Theme Overrides -*******************************/ diff --git a/client/lib/semantic-ui/themes/default/views/statistic.overrides.import.less b/client/lib/semantic-ui/themes/default/views/statistic.overrides.import.less new file mode 100644 index 00000000..3ab6f85d --- /dev/null +++ b/client/lib/semantic-ui/themes/default/views/statistic.overrides.import.less @@ -0,0 +1,7 @@ +/* + DO NOT MODIFY - This file has been generated and will be regenerated + Semantic UI v2.1.6 +*/ +/******************************* + Theme Overrides +*******************************/ diff --git a/client/lib/semantic-ui/themes/default/views/statistic.variables b/client/lib/semantic-ui/themes/default/views/statistic.variables.import.less similarity index 98% rename from client/lib/semantic-ui/themes/default/views/statistic.variables rename to client/lib/semantic-ui/themes/default/views/statistic.variables.import.less index 26463eee..5139468d 100644 --- a/client/lib/semantic-ui/themes/default/views/statistic.variables +++ b/client/lib/semantic-ui/themes/default/views/statistic.variables.import.less @@ -1,6 +1,6 @@ /* DO NOT MODIFY - This file has been generated and will be regenerated - Semantic UI v2.1.3 + Semantic UI v2.1.6 */ /******************************* Statistic diff --git a/client/stylesheets/scss/_branding.scss b/client/stylesheets/scss/_branding.scss index adf8c47f..76476f68 100644 --- a/client/stylesheets/scss/_branding.scss +++ b/client/stylesheets/scss/_branding.scss @@ -7,10 +7,10 @@ // danger: generally some sort of red to indicate danger //------------------------------ -// Primary color of your brand +// Primary color of your brand (Used for primary buttons, glows, etc.) $brand-primary: #137DC3; -// Secondary color of your brand +// Secondary color of your brand (used for secondary buttons) $brand-secondary: #FFBF0A; // Success Buttons @@ -40,6 +40,9 @@ $github-gray: #e4e4e4; // Change the default fonts. // font-stack: base fonts // logo-font: font for the logo +// +// To use fonts other than Lato/Montserrat, edit client/app.html to include +// the appropriate fonts. //------------------------------ // Styling for the fonts @@ -61,24 +64,41 @@ $github-gray: #e4e4e4; // Set branding here by changing up the color of text and the background images // or background color. //------------------------------ + +// The splash is the login page. #splash { + + // There are a few defaults that are here, which you can comment/uncomment, + // but you should feel free to change this to whatever you want. + + // Font color color: white; - background: $brand-primary; - // Comment these two lines if you want a single image to cover the entire page. - // background: url(/assets/images/background.jpg) no-repeat center center; - // background-size: cover; -// background: $brand-primary; + // Basic white text on brand color: + // background: $brand-primary; + + // Single background image covering the entire page + // background: url(/assets/images/background.jpg) no-repeat center center; + // background-size: cover; + + // Background image that repeats background: url(/assets/images/geometry2.png) repeat; } // Banner which appears under the nav, and on each page. #banner { + // Font color color: white; - // background: url(/assets/images/background.jpg) no-repeat center center; - // background-size: cover; - // background: $brand-primary; + + // Single background image covering + // background: url(/assets/images/background.jpg) no-repeat center center; + // background-size: cover; + + // Basic white on brand color: + // background: $brand-primary; + + // Repeated Background: background: url(/assets/images/geometry2.png) repeat; } diff --git a/private/config.json.template b/private/config.json.template index 4282df54..51a57dae 100644 --- a/private/config.json.template +++ b/private/config.json.template @@ -4,12 +4,12 @@ "password": "hunter2" }, "github": { - "enable": true, + "enable": false, "clientId": "github-client-id", "secret": "github-secret" }, "facebook": { - "enable": true, + "enable": false, "appId": "facebook-client-id", "secret": "facebook-secret" },