Skip to content

Commit 241e861

Browse files
committed
finishing touches on some formatting
1 parent 6027cfe commit 241e861

19 files changed

+760
-296
lines changed

app/assets/javascripts/active_admin.js

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#= require active_admin/base

app/assets/javascripts/cable.js

-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
// Action Cable provides the framework to deal with WebSockets in Rails.
2-
// You can generate new channels where WebSocket features live using the `rails generate channel` command.
3-
//
4-
//= require action_cable
5-
//= require_self
6-
//= require_tree ./channels
71

82
(function() {
93
this.App || (this.App = {});

app/assets/javascripts/freelancer.js

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
2+
(function($) {
3+
"use strict"; // Start of use strict
4+
5+
// jQuery for page scrolling feature - requires jQuery Easing plugin
6+
$('.page-scroll a').bind('click', function(event) {
7+
var $anchor = $(this);
8+
$('html, body').stop().animate({
9+
scrollTop: ($($anchor.attr('href')).offset().top - 50)
10+
}, 1250, 'easeInOutExpo');
11+
event.preventDefault();
12+
});
13+
14+
// Highlight the top nav as scrolling occurs
15+
$('body').scrollspy({
16+
target: '.navbar-fixed-top',
17+
offset: 51
18+
});
19+
20+
// Closes the Responsive Menu on Menu Item Click
21+
$('.navbar-collapse ul li a:not(.dropdown-toggle)').click(function() {
22+
$('.navbar-toggle:visible').click();
23+
});
24+
25+
// Offset for Main Navigation
26+
$('#mainNav').affix({
27+
offset: {
28+
top: 100
29+
}
30+
})
31+
32+
// Floating label headings for the contact form
33+
$(function() {
34+
$("body").on("input propertychange", ".floating-label-form-group", function(e) {
35+
$(this).toggleClass("floating-label-form-group-with-value", !!$(e.target).val());
36+
}).on("focus", ".floating-label-form-group", function() {
37+
$(this).addClass("floating-label-form-group-with-focus");
38+
}).on("blur", ".floating-label-form-group", function() {
39+
$(this).removeClass("floating-label-form-group-with-focus");
40+
});
41+
});
42+
43+
})(jQuery); // End of use strict

app/assets/javascripts/freelancer.min.js

-6
This file was deleted.

app/assets/javascripts/jqBootstrapValidation.js

+1-20
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
/* jqBootstrapValidation
2-
* A plugin for automating validation on Twitter Bootstrap formatted forms.
3-
*
4-
* v1.3.6
5-
*
6-
* License: MIT <http://opensource.org/licenses/mit-license.php> - see LICENSE file
7-
*
8-
* http://ReactiveRaven.github.com/jqBootstrapValidation/
9-
*/
10-
111
(function( $ ){
122

133
var createdElements = [];
@@ -478,7 +468,7 @@
478468
// How many errors did we find?
479469
if (settings.options.semanticallyStrict && errorsFound.length === 1) {
480470
// Only one? Being strict? Just output it.
481-
$helpBlock.html(errorsFound[0] +
471+
$helpBlock.html(errorsFound[0] +
482472
( settings.options.prependExistingHelpBlock ? $helpBlock.data("original-contents") : "" ));
483473
} else {
484474
// Multiple? Being sloppy? Glue them together into an UL.
@@ -876,12 +866,6 @@
876866
return new RegExp("^" + inputstring + "$");
877867
}
878868

879-
/**
880-
* Thanks to Jason Bunting via StackOverflow.com
881-
*
882-
* http://stackoverflow.com/questions/359788/how-to-execute-a-javascript-function-when-i-have-its-name-as-a-string#answer-359910
883-
* Short link: http://tinyurl.com/executeFunctionByName
884-
**/
885869
function executeFunctionByName(functionName, context /*, args*/) {
886870
var args = Array.prototype.slice.call(arguments).splice(2);
887871
var namespaces = functionName.split(".");
@@ -902,11 +886,8 @@
902886
$.error( 'Method ' + method + ' does not exist on jQuery.jqBootstrapValidation' );
903887
return null;
904888
}
905-
906889
};
907-
908890
$.jqBootstrapValidation = function (options) {
909891
$(":input").not("[type=image],[type=submit]").jqBootstrapValidation.apply(this,arguments);
910892
};
911-
912893
})( jQuery );
+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
@import "active_admin/mixins";
22
@import "active_admin/base";
3+
4+
// Remove skin logo
35
$skinLogo: none;
46

5-
@import 'active_skin';
7+
@import "active_skin";
+1-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
11
/*
2-
* This is a manifest file that'll be compiled into application.css, which will include all the files
3-
* listed below.
4-
*
5-
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
6-
* vendor/assets/stylesheets directory can be referenced here using a relative path.
7-
*
8-
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
9-
* compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
10-
* files in this directory. Styles in this file should be added after the last require_* statement.
11-
* It is generally better to create a new file per style scope.
12-
*
13-
*= require_tree .
14-
*= require_self
2+
* Currently empty
153
*/

0 commit comments

Comments
 (0)