easylinux/BootstrapPageGenerator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

live reload = navbar = conflicts

Browse Source
This commit is contained in:
Angel Ordax
2015-12-04 17:38:32 +01:00
parent 75dafbe466
commit 1da3c3e9fa
3 changed files with 1 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
index.html
View File

@@ -20,7 +20,7 @@
<![endif]-->
<!-- Fav and touch icons -->
<link rel="shortcut icon" href="img/favicon.png">
<script type="text/javascript" src="js/jquery-2.0.0.min.js"></script>
<!--[if lt IE 9]>
<script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
@@ -39,12 +39,10 @@
</style>
</head>
<body style="cursor: auto;" class="edit toolbox-reset">
<<<<<<< HEAD
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="container">
<ul class="nav" id="menu-layoutit">
<span>test push 2</span>
<li class="divider-vertical"></li>
<li>
<div class="btn-group">
@@ -67,37 +65,6 @@
</div>
</li>
</ul>
=======
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid">
<div class="nav-collapse collapse">
<ul class="nav" id="menu-layoutit">
<li class="divider-vertical"></li>
<li>
<div class="btn-group">
<button onclick="resizeCanvas('lg')" class="btn btn-primary"><i class="fa fa-desktop"></i> </button>
<button onclick="resizeCanvas('md')" class="btn btn-primary"><i class="fa fa-laptop"></i> </button>
<button onclick="resizeCanvas('sm')" class="btn btn-primary"><i class="fa fa-tablet"></i> </button>
<button onclick="resizeCanvas('xs')" class="btn btn-primary"><i class="fa fa-mobile-phone"></i> </button>
</div>
<div class="btn-group">
<a class="btn btn-primary" href="/" target="_blank"><i class="icon-home icon-white"></i>Home</a>
</div>
<div class="btn-group" data-toggle="buttons-radio">
<button type="button" id="edit" class="btn btn-primary active"><i class="icon-edit icon-white"></i>Edit</button>
<button type="button" class="btn btn-primary" id="devpreview"><i class="icon-eye-close icon-white"></i>Developer</button>
<button type="button" class="btn btn-primary" id="sourcepreview"><i class="icon-eye-open icon-white"></i>Preview</button>
</div>
<div class="btn-group">
<button type="button" class="btn btn-primary" data-target="#downloadModal" rel="/build/downloadModal" role="button" data-toggle="modal"><i class="icon-chevron-down icon-white"></i>Download</button>
<button class="btn btn-primary" href="#clear" id="clear"><i class="icon-trash icon-white"></i>Clear</button>
</div>
</li>
</ul>
</div>
</div>
>>>>>>> 2462a40a2d7a4cae869411dfe34fea43c3048101
</div>
</div>
</nav>