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

merge

Browse Source
This commit is contained in:
Jesus Herman
2015-12-04 15:09:29 +01:00
parent dda648b43d 09a95fb991
commit 846faf1d42
2 changed files with 14726 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14721
css/toolbox.css Normal file
View File

File diff suppressed because it is too large Load Diff

5
index.html
View File

@@ -10,8 +10,12 @@
<title>Bootstrap Layout</title> <title>Bootstrap Layout</title>
<!-- Le styles --> <!-- Le styles -->
<<<<<<< HEAD
<!-- <link href="css/bootstrap-combined.min.css" rel="stylesheet"> --> <!-- <link href="css/bootstrap-combined.min.css" rel="stylesheet"> -->
<link rel="stylesheet" href="https://d23nuec95rapgw.cloudfront.net/apps/front_end/assets/ui_toolbox/main-67121e1c236c4e6e808a64009b92cc7851813910fee5e66185ebbf45d7ee9756.css"> <link rel="stylesheet" href="https://d23nuec95rapgw.cloudfront.net/apps/front_end/assets/ui_toolbox/main-67121e1c236c4e6e808a64009b92cc7851813910fee5e66185ebbf45d7ee9756.css">
=======
<link href="css/toolbox.css" rel="stylesheet">
>>>>>>> 09a95fb991d265e9eb8ac7eac63c4c6813e244a8
<link href="css/layoutit.css" rel="stylesheet"> <link href="css/layoutit.css" rel="stylesheet">
<link href="css/docs.min.css" rel="stylesheet"> <link href="css/docs.min.css" rel="stylesheet">
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"> <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
@@ -80,6 +84,7 @@
<div class="changeDimension"> <div class="changeDimension">
<div class="row-fluid"> <div class="row-fluid">
<div class=""> <div class="">
<span></span>
<div class="sidebar-nav"> <div class="sidebar-nav">
<ul class="nav nav-list accordion-group"> <ul class="nav nav-list accordion-group">
<li class="nav-header"> <li class="nav-header">