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

rebase

Browse Source
This commit is contained in:
Angel Ordax
2015-12-04 17:33:52 +01:00
parent db16164626 2462a40a2d
commit 75dafbe466
6 changed files with 143 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
css/layoutit.css → css/editor.css
View File

@@ -47,7 +47,8 @@ body {
border: 1px solid #DDDDDD; border: 1px solid #DDDDDD;
border-radius: 4px; border-radius: 4px;
position: relative; position: relative;
word-wrap: break-word; } word-wrap: break-word;
padding-left: 220px; }
.edit .demo:after { .edit .demo:after {
background-color: #F5F5F5; background-color: #F5F5F5;
@@ -323,10 +324,59 @@ a.language-selected {
background: inherit; background: inherit;
color: inherit; color: inherit;
display: inherit; display: inherit;
/*font-family: inherit;*/
/*font-size: inherit;*/
line-height: inherit; line-height: inherit;
margin: inherit; margin: inherit;
padding: inherit; padding: inherit;
-webkit-text-size-adjust: inherit; -webkit-text-size-adjust: inherit;
-ms-text-size-adjust: inherit; } -ms-text-size-adjust: inherit; }
.toolbox-reset .collapse {
display: block; }
.toolbox-reset .modal {
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%; }

3
gulpfile.js
View File

@@ -7,8 +7,6 @@ var sass = require('gulp-sass');
gulp.task('sass', function () { gulp.task('sass', function () {
gulp.src('scss/**/*.scss') gulp.src('scss/**/*.scss')
.pipe(sass().on('error', sass.logError)) .pipe(sass().on('error', sass.logError))
@@ -37,6 +35,7 @@ gulp.task('serve', ['sass'], function () {
}); });
gulp.watch(['./scss/**/*.scss'], ['sass']); gulp.watch(['./scss/**/*.scss'], ['sass']);
gulp.watch(['css/**/*.css'], reload); gulp.watch(['css/**/*.css'], reload);
gulp.watch(['./*.html'], reload); gulp.watch(['./*.html'], reload);

62
index.html
View File

@@ -11,7 +11,7 @@
<!-- Le styles --> <!-- Le styles -->
<!-- <link href="css/bootstrap-combined.min.css" rel="stylesheet"> --> <!-- <link href="css/bootstrap-combined.min.css" rel="stylesheet"> -->
<link href="css/toolbox.css" rel="stylesheet"> <link href="css/toolbox.css" rel="stylesheet">
<link href="css/layoutit.css" rel="stylesheet"> <link href="css/editor.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">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
@@ -39,6 +39,7 @@
</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">
@@ -66,6 +67,37 @@
</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>
@@ -240,11 +272,11 @@
<a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">Emphasis <span class="caret"></span></a> <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">Emphasis <span class="caret"></span></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li class="active"><a href="#" rel="">Default</a></li> <li class="active"><a href="#" rel="">Default</a></li>
<li class=""><a href="#" rel="muted">Muted</a></li> <li class=""><a href="#" rel="emphasized">Emphasized</a></li>
<li class=""><a href="#" rel="text-warning">Warning</a></li> <li class=""><a href="#" rel="emphasized2">Emphasized 2</a></li>
<li class=""><a href="#" rel="text-error">Error</a></li> <li class=""><a href="#" rel="emphasized3">Emphasized 3</a></li>
<li class=""><a href="#" rel="text-info">Info</a></li> <li class=""><a href="#" rel="emphasized4">Emphasized 4</a></li>
<li class=""><a href="#" rel="text-success">Success</a></li> <li class=""><a href="#" rel="emphasized-orange">Emphasized orange</a></li>
</ul> </ul>
</span> </span>
</span> </span>
@@ -308,7 +340,23 @@
</div> </div>
</div> </div>
<div class="box box-element ui-draggable"> <div class="box box-element ui-draggable">
<a href="#close" class="remove label label-important"><i class="icon-remove icon-white"></i>Remove</a> <span class="drag label"><i class="icon-move"></i>Drag</span> <span class="configuration"><button type="button" class="btn btn-mini" data-target="#editorModal" role="button" data-toggle="modal">Editor</button> <a class="btn btn-mini" href="#" rel="unstyled">Unstyled</a> <a class="btn btn-mini" href="#" rel="inline">Inline</a> </span> <a href="#close" class="remove label label-important">
<i class="icon-remove icon-white"></i>Remove
</a>
<span class="drag label"><i class="icon-move"></i>Drag</span>
<span class="configuration">
<button type="button" class="btn btn-mini" data-target="#editorModal" role="button" data-toggle="modal">Editor</button>
<span class="btn-group">
<a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">Bullets <span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="active"><a href="#" rel="">Default</a></li>
<li class=""><a href="#" rel="list-unstyled">list-unstyled</a></li>
<li class=""><a href="#" rel="list-arrows">list-rrows</a></li>
<li class=""><a href="#" rel="list-arrows small">.list-arrows.small</a></li>
</ul>
</span>
<a class="btn btn-mini" href="#" rel="inline">Inline</a>
</span>
<div class="preview">Unordered List</div> <div class="preview">Unordered List</div>
<div class="view"> <div class="view">
<ul contenteditable="true"> <ul contenteditable="true">

3
scss/editor.scss Normal file
View File

@@ -0,0 +1,3 @@
@import 'partials/legacy';
@import 'partials/overwrites';
@import 'partials/editor';

27
scss/layoutit.scss → scss/partials/_legacy.scss
View File

@@ -35,7 +35,19 @@ body {
box-shadow: inset 1px 1px 3px rgba(0, 0, 0, 0.7); box-shadow: inset 1px 1px 3px rgba(0, 0, 0, 0.7);
} }
.edit .demo { margin-left:0px; margin-top:10px; padding:30px 15px 15px; border: 1px solid #DDDDDD; border-radius: 4px; position:relative; word-wrap: break-word;} .edit .demo {
margin-left:0px;
margin-top:10px;
padding:30px 15px 15px;
border: 1px solid #DDDDDD;
border-radius: 4px;
position:relative;
word-wrap: break-word;
padding-left: 220px;
}
.edit .demo:after { .edit .demo:after {
background-color: #F5F5F5; background-color: #F5F5F5;
border: 1px solid #DDDDDD; border: 1px solid #DDDDDD;
@@ -200,16 +212,3 @@ body.devpreview { margin-left:0px;}
#downloadModal textarea { width:100%;height:280px;resize: none;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box; } #downloadModal textarea { width:100%;height:280px;resize: none;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box; }
#editorModal {width:640px;} #editorModal {width:640px;}
a.language-selected { font-style: italic; font-weight: bold; } a.language-selected { font-style: italic; font-weight: bold; }
.toolbox-reset {
background: inherit;
color: inherit;
display: inherit;
/*font-family: inherit;*/
/*font-size: inherit;*/
line-height: inherit;
margin: inherit;
padding: inherit;
-webkit-text-size-adjust: inherit;
-ms-text-size-adjust: inherit;
}

18
scss/partials/_overwrites.scss Normal file
View File

@@ -0,0 +1,18 @@
.toolbox-reset {
background: inherit;
color: inherit;
display: inherit;
line-height: inherit;
margin: inherit;
padding: inherit;
-webkit-text-size-adjust: inherit;
-ms-text-size-adjust: inherit;
.collapse {
display: block;
}
.modal {
left: inherit;
}
}