Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #577

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Dev #577

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdd8ddd
Merge pull request #299 from puikinsh/master
puikinsh Jan 24, 2017
b0c222b
Remove conflicts on merge #375
edudepetris Mar 22, 2017
94cc865
Merge pull request #433 from edudepetris/fix-merge-375
AndreiCN Mar 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 3 additions & 11 deletions production/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">


<title>Gentelella Alela! | </title>
<<<<<<< HEAD
=======


<title>Gentelella Alela! | </title>

>>>>>>> refs/remotes/puikinsh/Development

<!-- Bootstrap -->
<link href="../vendors/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
Expand Down Expand Up @@ -161,7 +153,7 @@ <h3>Live On</h3>
<li><a href="#level1_2">Level One</a>
</li>
</ul>
</li>
</li>
<li><a href="javascript:void(0)"><i class="fa fa-laptop"></i> Landing Page <span class="label label-success pull-right">Coming Soon</span></a></li>
</ul>
</div>
Expand Down Expand Up @@ -1075,7 +1067,7 @@ <h2>Text areas<small>Sessions</small></h2>
<div id="editor-one" class="editor-wrapper"></div>

<textarea name="descr" id="descr" style="display:none;"></textarea>

<br />

<div class="ln_solid"></div>
Expand Down Expand Up @@ -1370,6 +1362,6 @@ <h4>Inline Form </h4>
<script src="../vendors/starrr/dist/starrr.js"></script>
<!-- Custom Theme Scripts -->
<script src="../build/js/custom.min.js"></script>

</body>
</html>