beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse source
This commit is contained in:
David Baldwynn 2015-11-12 18:27:51 -08:00
parent 23dced3edf f606c12242
commit a996e4216b
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/layout.server.view.html
View file

@ -61,7 +61,7 @@
</head> </head>
<body ng-cloak> <body ng-cloak>
<div class="github-fork-ribbon-wrapper right-bottom hidden-xs hidden-sm"> <div class="github-fork-ribbon-wrapper right-bottom hidden-xs">
<div class="github-fork-ribbon"> <div class="github-fork-ribbon">
<a href="https://github.com/whitef0x0/nodeforms">Fork me on GitHub</a> <a href="https://github.com/whitef0x0/nodeforms">Fork me on GitHub</a>
</div> </div>

4
package.json
View file

@ -14,7 +14,7 @@
}, },
"engines": { "engines": {
"node": "~5.0.0", "node": "~5.0.0",
"npm": "~3.3.6" "npm": "~2.11.2"
}, },
"scripts": { "scripts": {
"start": "grunt", "start": "grunt",
@ -87,7 +87,7 @@
"swig": "~1.4.1", "swig": "~1.4.1",
"then-fs": "~2.0.0", "then-fs": "~2.0.0",
"useragent": "~2.1.7", "useragent": "~2.1.7",
"express-device" "~0.4.2" "express-device": "~0.4.2"
}, },
"devDependencies": { "devDependencies": {
"node-mandrill": "^1.0.1", "node-mandrill": "^1.0.1",

2
public/modules/forms/css/form.css
View file

@ -332,7 +332,7 @@ div.config-form .row.field {
/* Styles for form list view (/forms) */ /* Styles for form list view (/forms) */
section > section.public-form { section > section.public-form {
padding: 0 6em 7em 6em; padding: 0 10% 10%;
} }
.form-item { .form-item {

2
public/modules/forms/views/directiveViews/form/submit-form.client.view.html
View file

@ -51,7 +51,7 @@
</button> </button>
</div> </div>
<section ng-if="!myform.hideFooter" class="navbar navbar-fixed-bottom" style="background-color:rgba(242,242,242,0.5); padding-top:15px;"> <section ng-if="!myform.hideFooter" class="navbar navbar-fixed-bottom hidden-xs" style="background-color:rgba(242,242,242,0.5); padding-top:15px;">
<div class="container" > <div class="container" >
<div class="row"> <div class="row">
<div class="col-xs-4 col-xs-offset-4 col-sm-4 col-sm-offset-4 text-center col-md-3 col-md-offset-0" ng-show="!myform.submitted"> <div class="col-xs-4 col-xs-offset-4 col-sm-4 col-sm-offset-4 text-center col-md-3 col-md-offset-0" ng-show="!myform.submitted">