Skip to content

Commit f9b4317

Browse files
Jonathan Kimajb
Jonathan Kim
authored andcommitted
Organizing.
1 parent 42470d6 commit f9b4317

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+919
-51
lines changed

Diff for: Gruntfile.coffee

+12-8
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,31 @@ module.exports = (grunt) ->
1818
grunt.initConfig
1919

2020
pkg: '<json:package.json>'
21+
srcFolder: 'src'
22+
compiledFolder: 'compiled' # Temporary holding area.
2123
distFolder: 'dist'
24+
vendorFolder: 'vendor'
2225
testFolder: 'test'
2326

2427
jst:
2528
all:
2629
options:
2730
namespace: 'Formbuilder.templates'
2831
processName: (filename) ->
29-
filename.replace('./templates/', '').replace('.html', '')
32+
filename.replace('<%= srcFolder %>/templates/', '').replace('.html', '')
3033

3134
files:
32-
'templates/compiled.js': ['./templates/**/*.html']
35+
'<%= compiledFolder %>/templates.js': '<%= srcFolder %>/templates/**/*.html'
3336

3437
coffee:
3538
all:
3639
files:
37-
'js/compiled.js': ['coffee/rivets-config.coffee', 'coffee/main.coffee', 'coffee/fields/*.coffee']
40+
'<%= compiledFolder %>/scripts.js': '<%= srcFolder %>/scripts/**/*.coffee'
3841

3942
concat:
4043
all:
41-
'<%= distFolder %>/formbuilder.js': ['js/compiled.js', 'templates/compiled.js']
42-
'vendor/js/vendor.js': [
44+
'<%= distFolder %>/formbuilder.js': '<%= compiledFolder %>/*.js'
45+
'<%= vendorFolder %>/js/vendor.js': [
4346
'bower_components/jquery/jquery.js'
4447
'bower_components/jquery-ui/ui/jquery.ui.core.js'
4548
'bower_components/jquery-ui/ui/jquery.ui.widget.js'
@@ -59,12 +62,13 @@ module.exports = (grunt) ->
5962
dist:
6063
files:
6164
'<%= distFolder %>/formbuilder-min.css': '<%= distFolder %>/formbuilder.css'
62-
'vendor/css/vendor.css': 'bower_components/font-awesome/css/font-awesome.css'
65+
'<%= vendorFolder %>/css/vendor.css': 'bower_components/font-awesome/css/font-awesome.css'
6366

6467
stylus:
6568
all:
6669
files:
67-
'<%= distFolder %>/formbuilder.css': 'styl/formbuilder.styl'
70+
'<%= compiledFolder %>/formbuilder.css': '<%= srcFolder %>/styles/**.styl'
71+
'<%= distFolder %>/formbuilder.css': '<%= compiledFolder %>/**/*.css'
6872

6973
uglify:
7074
dist:
@@ -73,7 +77,7 @@ module.exports = (grunt) ->
7377

7478
watch:
7579
all:
76-
files: ['./coffee/**/*.coffee', 'templates/**/*.html', './styl/**/*.styl']
80+
files: ['<%= srcFolder %>/**/*.(coffee|styl|html)']
7781
tasks: ALL_TASKS
7882

7983
# To test, run `grunt --no-write -v release`

Diff for: compiled/formbuilder.css

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
.fb-button{display:inline-block;margin:0;padding:.563rem .844rem;border:0 none;background:#16a085;color:#fff;text-align:center;text-decoration:none;font-size:12px;line-height:1.5;cursor:pointer;border-radius:.125rem;border:thin solid #19b394;border-bottom:2px solid #16a085}
2+
.fb-button[disabled]{background:#ddd !important;border:thin solid #ccc;color:#777 !important;text-shadow:none !important;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=65)";opacity:.65;cursor:default}
3+
.fb-clear{clear:both}
4+
.fb-main{max-width:1000px;margin:0 auto;padding:0 20px 0 0;position:relative;font-family:'Source Sans Pro','Open Sans',Tahoma}
5+
.fb-save-wrapper{position:absolute;right:20px;top:10px}
6+
.fb-left{width:320px;float:left;padding-top:30px}
7+
.fb-right{padding-top:70px;margin-left:320px;border-left:1px solid #ddd;padding-left:20px;min-height:100%;overflow:hidden}
8+
.fb-no-response-fields{color:#999}
9+
.fb-tabs{list-style:none;margin:0 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #ccc}
10+
.fb-tabs li{display:inline-block}
11+
.fb-tabs li a{display:block;padding:10px;border-radius:5px 5px 0 0;font-size:13px;cursor:pointer;border-left:1px solid transparent;border-right:1px solid transparent}
12+
.fb-tabs li.active a{border:1px solid #ccc;margin-bottom:-1px;border-bottom-color:#fff}
13+
.fb-tab-content .fb-tab-pane{padding:0 20px;display:none}
14+
.fb-tab-content .fb-tab-pane.active{display:block}
15+
.fb-add-field-types .section{padding-bottom:5px;margin-bottom:20px}
16+
.fb-add-field-types{font-size:0;}
17+
.fb-add-field-types a{font-size:13px;display:inline-block;width:48.5%;background-color:#1abc9c;margin-bottom:9px;box-sizing:border-box;}
18+
.fb-add-field-types a:nth-child(odd){margin-right:3%}
19+
.fb-add-field-types a .symbol{opacity:.6;margin:0 .25em 0 -1em}
20+
.fb-response-fields{padding-bottom:150px}
21+
.fb-response-fields a.sortable-placeholder{display:block;border:1px dashed #ddd;min-height:80px;height:80px;width:100%}
22+
.fb-field-wrapper{cursor:pointer;position:relative;margin-bottom:20px;}
23+
.fb-field-wrapper input{border-radius:3px;border:thin solid #ddd}
24+
.fb-field-wrapper:hover .actions-wrapper,.fb-field-wrapper.editing .actions-wrapper{display:block}
25+
.fb-field-wrapper:hover .subtemplate-wrapper{border-color:#ddd;border-radius:3px}
26+
.fb-field-wrapper.editing{background-color:#ecf0f1;border-radius:3px}
27+
.fb-field-wrapper.editing .subtemplate-wrapper{border-color:#d9e1e3;border-style:solid;margin:0;border-radius:3px}
28+
.fb-field-wrapper .actions-wrapper{display:none;position:absolute;bottom:-7px;right:5px;z-index:3}
29+
.fb-field-wrapper .actions-wrapper a{display:inline-block;background-color:#ccc;padding:2px 8px}
30+
.edit-response-field input,.edit-response-field textarea,.edit-response-field select{border:thin solid #ddd;border-radius:.25em;padding:.5em;display:inline-block;height:auto;vertical-align:middle;}
31+
.edit-response-field input:focus,.edit-response-field textarea:focus,.edit-response-field select:focus{outline:none;border:thin solid #1abc9c}
32+
.edit-response-field select{font-size:14px}
33+
.fb-field-wrapper .actions-wrapper a.js-duplicate,.fb-edit-field-wrapper .js-add-option{background-color:#2ecc71;border:none}
34+
.fb-field-wrapper .actions-wrapper a.js-clear,.fb-edit-field-wrapper .js-remove-option{background-color:#e74c3c;border:none}
35+
.fb-field-wrapper .subtemplate-wrapper{border:1px dashed transparent;margin-bottom:10px;padding:10px;position:relative}
36+
.fb-field-wrapper .subtemplate-wrapper .cover{position:absolute;top:0;left:0;height:100%;width:100%;z-index:2}
37+
.fb-field-wrapper .subtemplate-wrapper > label{display:block;border-bottom:thin solid #eee;padding-bottom:3px;margin-bottom:7px}
38+
.fb-field-wrapper .subtemplate-wrapper abbr{color:#f00}
39+
.fb-field-wrapper .input-line{clear:both;margin-bottom:10px}
40+
.fb-field-wrapper .input-line .above-line{margin-top:7px}
41+
.fb-field-wrapper .input-line > span{display:inline-block;vertical-align:top}
42+
.fb-field-wrapper .input-line > span input{width:100%}
43+
.fb-field-wrapper .input-line > span > label{display:block;font-size:13px;margin-left:3px}
44+
.fb-field-wrapper .help-block{display:block;font-size:12px;margin-top:5px}
45+
.fb-edit-field-wrapper{font-size:13px}
46+
.fb-edit-field-wrapper .fb-field-label{font-weight:normal;background:#eee;padding:.75em;color:#666;font-size:1.25em;}
47+
.fb-edit-field-wrapper .fb-field-label .field-type{margin-top:.5em;display:block;font-family:'Source Sans Pro',sans-serif;font-size:1em;}
48+
.fb-edit-field-wrapper .fb-field-label .field-type:before{content:'Type: ';color:#999}
49+
.fb-edit-field-wrapper .fb-field-label .fa.fa-arrow-right{display:none}
50+
.fb-edit-field-wrapper .fb-edit-section-header{border-bottom:1px solid #ddd;margin-top:25px;margin-bottom:10px;padding-bottom:5px;clear:both;font-weight:700}
51+
.fb-edit-field-wrapper .js-add-option,.fb-edit-field-wrapper .js-remove-option{padding:3px 6px}
52+
.fb-edit-field-wrapper .fb-bottom-add{margin-top:8px}
53+
.fb-common-wrapper .fb-label-description{margin-bottom:10px}
54+
.fb-common-wrapper .fb-label-description input,.fb-common-wrapper .fb-label-description textarea{width:100%}
55+
.fb-common-wrapper .fb-label-description textarea{min-height:5em}
56+
.response-field-draggable-helper{border:1px dashed #ddd;background:#eee}
57+
.response-field-text input.rf-size-small{width:130px}
58+
.response-field-text input.rf-size-medium{width:300px}
59+
.response-field-text input.rf-size-large{width:100%}
60+
.response-field-paragraph textarea.rf-size-small{width:200px;min-height:60px}
61+
.response-field-paragraph textarea.rf-size-medium{width:400px;min-height:100px}
62+
.response-field-paragraph textarea.rf-size-large{width:100%;min-height:200px}
63+
.response-field-address .street{width:400px}
64+
.response-field-address .city,.response-field-address .state,.response-field-address .zip,.response-field-address .country{width:198px}
65+
.response-field-date .month,.response-field-date .day,.response-field-date .year{width:50px}
66+
.response-field-time .hours,.response-field-time .minutes,.response-field-time .seconds{width:50px}
67+
.response-field-checkboxes .fb-option,.response-field-radio .fb-option{margin-bottom:5px;display:inline-block}

0 commit comments

Comments
 (0)