live reload = navbar = conflicts
This commit is contained in:
Angel Ordax
@@ -333,50 +333,3 @@ a.language-selected {
|
|||||||
display: block; }
|
display: block; }
|
||||||
.toolbox-reset .modal {
|
.toolbox-reset .modal {
|
||||||
left: inherit; }
|
left: inherit; }
|
||||||
|
|
||||||
/*
|
|
||||||
* Stuff we've deleted that comes from the bootstrap-combined.css file
|
|
||||||
*/
|
|
||||||
.toolbox-reset .modal {
|
|
||||||
position: fixed;
|
|
||||||
top: 10%;
|
|
||||||
left: 50%;
|
|
||||||
z-index: 1050;
|
|
||||||
width: 560px;
|
|
||||||
margin-left: -280px;
|
|
||||||
background-color: #ffffff;
|
|
||||||
border: 1px solid #999;
|
|
||||||
border: 1px solid rgba(0, 0, 0, 0.3);
|
|
||||||
-webkit-border-radius: 6px;
|
|
||||||
-moz-border-radius: 6px;
|
|
||||||
border-radius: 6px;
|
|
||||||
-webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
|
|
||||||
-moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
|
|
||||||
box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
|
|
||||||
-webkit-background-clip: padding-box;
|
|
||||||
-moz-background-clip: padding-box;
|
|
||||||
background-clip: padding-box;
|
|
||||||
outline: none; }
|
|
||||||
|
|
||||||
.toolbox-reset .modal.fade {
|
|
||||||
-webkit-transition: opacity .3s linear, top .3s ease-out;
|
|
||||||
-moz-transition: opacity .3s linear, top .3s ease-out;
|
|
||||||
-o-transition: opacity .3s linear, top .3s ease-out;
|
|
||||||
transition: opacity .3s linear, top .3s ease-out;
|
|
||||||
top: -25%; }
|
|
||||||
|
|
||||||
.toolbox-reset .modal.fade.in {
|
|
||||||
top: 10%;
|
|
||||||
display: inherit !important; }
|
|
||||||
|
|
||||||
#MD {
|
|
||||||
width: 992px; }
|
|
||||||
|
|
||||||
#SM {
|
|
||||||
width: 768px; }
|
|
||||||
|
|
||||||
#XS {
|
|
||||||
width: 480px; }
|
|
||||||
|
|
||||||
#LG {
|
|
||||||
width: 100%; }
|
|
||||||
|
|||||||
35
index.html
35
index.html
@@ -20,7 +20,7 @@
|
|||||||
<![endif]-->
|
<![endif]-->
|
||||||
<!-- Fav and touch icons -->
|
<!-- Fav and touch icons -->
|
||||||
<link rel="shortcut icon" href="img/favicon.png">
|
<link rel="shortcut icon" href="img/favicon.png">
|
||||||
|
|
||||||
<script type="text/javascript" src="js/jquery-2.0.0.min.js"></script>
|
<script type="text/javascript" src="js/jquery-2.0.0.min.js"></script>
|
||||||
<!--[if lt IE 9]>
|
<!--[if lt IE 9]>
|
||||||
<script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
|
<script type="text/javascript" src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
|
||||||
@@ -39,12 +39,10 @@
|
|||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body style="cursor: auto;" class="edit toolbox-reset">
|
<body style="cursor: auto;" class="edit toolbox-reset">
|
||||||
<<<<<<< HEAD
|
|
||||||
<nav class="navbar navbar-inverse navbar-fixed-top">
|
<nav class="navbar navbar-inverse navbar-fixed-top">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<ul class="nav" id="menu-layoutit">
|
<ul class="nav" id="menu-layoutit">
|
||||||
<span>test push 2</span>
|
|
||||||
<li class="divider-vertical"></li>
|
<li class="divider-vertical"></li>
|
||||||
<li>
|
<li>
|
||||||
<div class="btn-group">
|
<div class="btn-group">
|
||||||
@@ -67,37 +65,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</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>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|||||||
@@ -1,3 +1,2 @@
|
|||||||
@import 'partials/legacy';
|
@import 'partials/legacy';
|
||||||
@import 'partials/overwrites';
|
@import 'partials/overwrites';
|
||||||
@import 'partials/editor';
|
|
||||||
|
|||||||
Reference in New Issue
Block a user