Merge pull request #11 from jezuhke/master

added browser sync to dev dependencies package and missing scss partial
This commit is contained in:
legnaleama
2015-12-04 17:53:26 +01:00
4 changed files with 68 additions and 9 deletions

View File

@@ -44,11 +44,9 @@ body {
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; }
word-wrap: break-word; }
.edit .demo:after {
background-color: #F5F5F5;

View File

@@ -1,13 +1,11 @@
{
"name": "Devex_FE_assets",
"version": "0.0.0",
"dependencies": {
"browser-sync": "^2.10.0"
},
"devDependencies": {
"gulp": "~3.9.0",
"gulp-sass": "^2.0.0",
"gulp-sourcemaps": "^1.5.0"
"gulp-sourcemaps": "^1.5.0",
"browser-sync": "^2.10.0"
},
"engines": {
"node": ">=0.12.0"

View File

@@ -0,0 +1,65 @@
/*
* Stuff we've deleted that comes from the bootstrap-combined.css file
*/
// we wrap everything with the toolbar class
.toolbox-reset {
// modal
.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;
}
.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%;
}
.modal.fade.in {
top: 10%;
display: inherit !important;
}
// sidebar
.accordion-group {
margin-bottom: 2px;
border: 1px solid #e5e5e5;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
}
// screen sizes
#MD {
width:992px;
}
#SM {
width:768px;
}
#XS {
width:480px;
}
#LG {
width:100%
}

View File

@@ -39,11 +39,9 @@ body {
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;
}