Skip to content

Commit 488cde2

Browse files
AktaneeAktanee
committed
Merge 4.0 version into master
2 parents 381ba10 + 5f4408e commit 488cde2

File tree

3,333 files changed

+443906
-35150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,333 files changed

+443906
-35150
lines changed

‎.DS_Store‎

6 KB
Binary file not shown.

‎.babelrc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"presets": [
3+
["es2015", { "modules": false }],
4+
"stage-0"
5+
]
6+
}

‎.eslintrc‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"parser": "babel-eslint",
3+
"extends": ["standard"],
4+
"plugins": ["babel"],
5+
"env": {
6+
"browser": true,
7+
"jquery": true
8+
},
9+
"globals": {
10+
"__DEV__": false,
11+
"__PROD__": false
12+
},
13+
"rules": {
14+
"semi": [2, "never"],
15+
"max-len": [2, 100, 2],
16+
"space-before-function-paren": "off",
17+
"padded-blocks": "off"
18+
}
19+
}

‎.gitignore‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
8+
# Runtime data
9+
pids
10+
*.pid
11+
*.seed
12+
*.pid.lock
13+
14+
# Directory for instrumented libs generated by jscoverage/JSCover
15+
lib-cov
16+
17+
# Coverage directory used by tools like istanbul
18+
coverage
19+
20+
# nyc test coverage
21+
.nyc_output
22+
23+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
24+
.grunt
25+
26+
# Bower dependency directory (https://bower.io/)
27+
bower_components
28+
29+
# node-waf configuration
30+
.lock-wscript
31+
32+
# Compiled binary addons (https://nodejs.org/api/addons.html)
33+
build/Release
34+
35+
# Dependency directories
36+
node_modules/
37+
jspm_packages/
38+
39+
# Typescript v1 declaration files
40+
typings/
41+
42+
# Optional npm cache directory
43+
.npm
44+
45+
# Optional eslint cache
46+
.eslintcache
47+
48+
# Optional REPL history
49+
.node_repl_history
50+
51+
# Output of 'npm pack'
52+
*.tgz
53+
54+
# Yarn Integrity file
55+
.yarn-integrity
56+
57+
# dotenv environment variables file
58+
.env

‎2.3.2/app/index.html‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,15 @@
114114
<li><a href="../index.html" title="bootstrap themes generator presentation">Intro</a></li>
115115
<li class="divider-vertical"></li>
116116
<li ><a href="index.html#!/editor" title="bootstrap themes generator">Editor</a></li>
117-
<li class="divider-vertical"></li>
117+
<li class="dropdown">
118+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Versions<b class="caret"></b></a>
119+
<ul class="dropdown-menu">
120+
<li><a href="../../index.html/app/index.html" title="bootstrap theme responsive design">Bootstrap 3.1</a></li>
121+
<li><a href="../../3.0/app/index.html" title="bootstrap theme responsive design">Bootstrap 3.0</a></li>
122+
<li><a href="#" title="bootstrap theme responsive design">Bootstrap 2.3.2</a></li>
123+
</ul>
124+
</li>
125+
<li><a href="http://en.orson.io/17/build-responsive-website-without-coding/?utm_source=Bootstrap%20Magic%20&utm_medium=referral&utm_content=Header&utm_campaign=Bootstrap" title="bootstrap themes generator">Orson Website Builder</a></li>
118126
</ul>
119127
</div>
120128
</div>
@@ -144,6 +152,19 @@ <h1>It's gonna be magic... wait for it...</h1>
144152
<p>Variables Bootstrap AngularJS Editor: v<span app-version></span></p>
145153
</div>
146154
</footer>-->
147-
155+
<script type="text/javascript">
156+
/* <![CDATA[ */
157+
var google_conversion_id = 977336662;
158+
var google_custom_params = window.google_tag_params;
159+
var google_remarketing_only = true;
160+
/* ]]> */
161+
</script>
162+
<script type="text/javascript" src="//www.googleadservices.com/pagead/conversion.js">
163+
</script>
164+
<noscript>
165+
<div style="display:inline;">
166+
<img height="1" width="1" style="border-style:none;" alt="" src="//googleads.g.doubleclick.net/pagead/viewthroughconversion/977336662/?value=0&amp;guid=ON&amp;script=0"/>
167+
</div>
168+
</noscript>
148169
</body>
149170
</html>

‎2.3.2/app/js/services.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ angular.module('bootstrapVariablesEditor.services', []).
167167
lessEngine.getVariablesToString = function ($scope) {
168168
var string = "" +
169169
"/*\n"+
170-
"* pikock, autreplanete http://www.autreplanete.com/ \n"+
170+
"* orson http://en.orson.io, autreplanete http://www.autreplanete.com/ \n"+
171171
"* \n"+
172172
"**/\n";
173173
for (var i = 0; i < $scope.variables.length; i++ ) {
@@ -180,7 +180,7 @@ angular.module('bootstrapVariablesEditor.services', []).
180180
};
181181

182182
lessEngine.saveLessVar = function(data){
183-
var $form = $('<form>').attr('method', 'POST').attr('action', 'http://bootstrapmagic.pikock.com/').append(
183+
var $form = $('<form>').attr('method', 'POST').attr('action', 'http://www.pikock-unis.com/tools/download.php').append(
184184
$('<input>')
185185
.attr('type', 'hidden')
186186
.attr('name', 'data')
@@ -211,7 +211,7 @@ angular.module('bootstrapVariablesEditor.services', []).
211211
if (err) { return console.error(err) }
212212
var type = ($scope.minified) ? 'mincss' : 'css';
213213
var css = tree.toCSS({ compress: $scope.minified });
214-
var $form = $('<form>').attr('method', 'POST').attr('action', 'http://bootstrapmagic.pikock.com/').
214+
var $form = $('<form>').attr('method', 'POST').attr('action', 'http://www.pikock-unis.com/tools/download.php').
215215
append(
216216
$('<input>')
217217
.attr('type', 'hidden')

‎2.3.2/app/partials/editor.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<li><button class="btn btn-warning" href="#myModal" role="button" data-toggle="modal">Import Less Variables</button></li>
1010
<li><button class="btn" ng-click="resetLessVariables()">Reset</button></li>
1111
</ul>
12-
<span class="sign">Handmade by <a href="http://www.pikock.com" title="create your website easily">Pikock</a> x <a href="http://www.autreplanete.com/" title="web agency paris">Autre planète</a> in Paris.</span>
12+
<span class="sign">Handmade by <a href="http://en.orson.io/17/build-responsive-website-without-coding/?utm_source=Bootstrap%20Magic%20&utm_medium=referral&utm_content=Footer&utm_campaign=Bootstrap" title="create your website easily">Orson Website Builder</a> x <a href="http://www.autreplanete.com/" title="web agency paris">Autre planète</a> in Paris.</span>
1313
</div>
1414
</div>
1515

‎2.3.2/app/preview/links.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<section id="links">
22
<div class="bs-docs-example">
3-
<p><a href="http://www.pikock.com" title="Create your website easily">http://www.pikock.com</a></p>
3+
<p><a href="http://en.orson.io/17/build-responsive-website-without-coding/?utm_source=Bootstrap%20Magic%20&utm_medium=referral&utm_content=Text&utm_campaign=Bootstrap" title="Create your website easily">http://en.orson.io</a></p>
44
</div>
55
</section>

‎2.3.2/app/preview/scaffolding.html‎

Lines changed: 44 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<section class="row-fluid">
2-
<div class="span12">
3-
<h2>Bootstrap Magic <small>made with AngularJS</small></h2>
1+
<section class="row">
2+
<div class="col-md-12">
3+
<h2>Bootstrap Magic <small> featuring Bootstrap 3, made with AngularJS</small></h2>
44
<p>Discover our gitHub project at the following url : <a href="https://github.com/pikock/bootstrap-magic">Bootstrap magic GitHub Project</a>. Everyone can contribute and we would like to hear your feedback.</p>
55
</div>
66
</section>
@@ -25,7 +25,7 @@ <h2>Bootstrap Magic <small>made with AngularJS</small></h2>
2525
</ul>
2626
<div class="tab-content">
2727
<div class="tab-pane active" id="tab1">
28-
<p>For more information on <a href="http://www.pikock.com/" title="Pikock">Pikock</a> please check out <a href="http://www.pikock.com/" title="Pikock create your website easily">http://www.pikock.com/</a></p>
28+
<p>For more information on <a href="http://en.orson.io/17/build-responsive-website-without-coding/?utm_source=Bootstrap%20Magic%20&utm_medium=referral&utm_content=Text&utm_campaign=Bootstrap" title="Orson">Orson</a> please check out <a href="http://en.orson.io/17/build-responsive-website-without-coding/?utm_source=Bootstrap%20Magic%20&utm_medium=referral&utm_content=Text&utm_campaign=Bootstrap" title="Orson create your website easily">http://en.orson.io</a></p>
2929

3030
<p>For more information on <a href="http://www.autreplanete.com/" title="web agency paris">Autre planete</a> please check out <a href="http://www.autreplanete.com/" title="web agency paris">http://www.autreplanete.com/</a></p>
3131

@@ -92,85 +92,83 @@ <h2>Bootstrap Magic <small>made with AngularJS</small></h2>
9292
<tr>
9393
<td>
9494
<div class="btn-group">
95-
<a href="" title="Bootstrap Themes Generator" class="btn dropdown-toggle" data-toggle="dropdown">Base <span class="caret"></span></a>
95+
<a href="" title="Bootstrap 3 Themes Generator" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Base <span class="caret"></span></a>
9696
<ul class="dropdown-menu">
97-
<li><a href="" title="Bootstrap Themes Generator" href="">Action</a></li>
98-
<li><a href="" title="Bootstrap Themes Generator" href="">Another action</a></li>
99-
<li><a href="" title="Bootstrap Themes Generator" href="">Something else here</a></li>
97+
<li><a href="" title="Bootstrap 3 Themes Generator" href="">Action</a></li>
98+
<li><a href="" title="Bootstrap 3 Themes Generator" href="">Another action</a></li>
99+
<li><a href="" title="Bootstrap 3 Themes Generator" href="">Something else here</a></li>
100100
<li class="divider"></li>
101-
<li><a href="" title="Bootstrap Themes Generator" href="">Separated link</a></li>
101+
<li><a href="" title="Bootstrap 3 Themes Generator" href="">Separated link</a></li>
102102
</ul>
103103
</div>
104104
</td>
105105
<td>
106106
<div class="btn-toolbar">
107107
<div class="btn-group">
108-
<a href="" title="Bootstrap Themes Generator" class="btn">Left</a>
109-
<a href="" title="Bootstrap Themes Generator" class="btn">Middle</a>
110-
<a href="" title="Bootstrap Themes Generator" class="btn">Right</a>
108+
<a href="" title="Bootstrap 3 Themes Generator" class="btn btn-default">Left</a>
109+
<a href="" title="Bootstrap 3 Themes Generator" class="btn btn-default">Middle</a>
110+
<a href="" title="Bootstrap 3 Themes Generator" class="btn btn-default">Right</a>
111111
</div>
112112
</div>
113113
</td>
114-
<td>
115-
<div class="controls">
116-
<input type="text" class="input-xlarge" placeholder="your text">
117-
<a href="" title="Bootstrap Themes Generator" class="btn">Default</a>
118-
</div>
114+
<td>
115+
<form class="form-inline" role="form">
116+
<div class="form-group">
117+
<input type="text" class="form-control" placeholder="your text">
118+
<button href="" title="Bootstrap 3 Themes Generator" class="btn btn-default">Default</button>
119+
</div>
120+
</form>
119121
</td>
120122
</tr>
121123
<tr>
122124
<td>
123125
<div class="btn-group">
124-
<a class="btn btn-large large dropdown-toggle" data-toggle="dropdown">Large <span class="caret"></span></a>
126+
<a class="btn btn-default btn-lg large dropdown-toggle" data-toggle="dropdown">Large <span class="caret"></span></a>
125127
<ul class="dropdown-menu">
126-
<li><a href="" title="Bootstrap Themes Generator">Action</a></li>
127-
<li><a href="" title="Bootstrap Themes Generator">Another action</a></li>
128-
<li><a href="" title="Bootstrap Themes Generator">Something else here</a></li>
128+
<li><a href="" title="Bootstrap 3 Themes Generator">Action</a></li>
129+
<li><a href="" title="Bootstrap 3 Themes Generator">Another action</a></li>
130+
<li><a href="" title="Bootstrap 3 Themes Generator">Something else here</a></li>
129131
<li class="divider"></li>
130-
<li><a href="" title="Bootstrap Themes Generator">Separated link</a></li>
132+
<li><a href="" title="Bootstrap 3 Themes Generator">Separated link</a></li>
131133
</ul>
132134
</div>
133135
</td>
134136
<td>
135137
<div class="btn-toolbar">
136138
<div class="btn-group">
137-
<a href="" title="Bootstrap Themes Generator" class="btn btn-large large">Left</a>
138-
<a href="" title="Bootstrap Themes Generator" class="btn btn-large large">Middle</a>
139-
<a href="" title="Bootstrap Themes Generator" class="btn btn-large large">Right</a>
139+
<a href="" title="Bootstrap 3 Themes Generator" class="btn btn-lg btn-default">Left</a>
140+
<a href="" title="Bootstrap 3 Themes Generator" class="btn btn-lg btn-default">Middle</a>
141+
<a href="" title="Bootstrap 3 Themes Generator" class="btn btn-lg btn-default">Right</a>
140142
</div>
141143
</div>
142144
</td>
143145
<td>
144-
<div class="pagination pagination-large">
145-
<ul>
146-
<li class="disabled"><a href="" title="Bootstrap Themes Generator">«</a></li>
147-
<li class="active"><a href="" title="Bootstrap Themes Generator">1</a></li>
148-
<li><a href="" title="Bootstrap Themes Generator">2</a></li>
149-
<li><a href="" title="Bootstrap Themes Generator">3</a></li>
150-
<li><a href="" title="Bootstrap Themes Generator">»</a></li>
151-
</ul>
152-
</div>
146+
<ul class="pagination pagination-lg">
147+
<li class="disabled"><a href="" title="Bootstrap 3 Themes Generator">«</a></li>
148+
<li class="active"><a href="" title="Bootstrap 3 Themes Generator">1</a></li>
149+
<li><a href="" title="Bootstrap 3 Themes Generator">2</a></li>
150+
<li><a href="" title="Bootstrap 3 Themes Generator">3</a></li>
151+
<li><a href="" title="Bootstrap 3 Themes Generator">»</a></li>
152+
</ul>
153153
</td>
154154
</tr>
155155
<tr>
156-
<td><a class="btn btn-small" href="" title="Bootstrap Themes Generator">Small</a></td>
156+
<td><a class="btn btn-sm btn-default" href="" title="Bootstrap 3 Themes Generator">Small</a></td>
157157
<td>
158158
<div class="well well-small">
159159
.well-small component
160160
</div>
161161
</td>
162162
<td>
163-
<div class="pagination pagination-small">
164-
<ul>
165-
<li><a href="" title="Bootstrap Themes Generator">«</a></li>
166-
<li><a href="" title="Bootstrap Themes Generator">1</a></li>
167-
<li><a href="" title="Bootstrap Themes Generator">2</a></li>
168-
<li><a href="" title="Bootstrap Themes Generator">3</a></li>
169-
<li><a href="" title="Bootstrap Themes Generator">4</a></li>
170-
<li><a href="" title="Bootstrap Themes Generator">5</a></li>
171-
<li><a href="" title="Bootstrap Themes Generator">»</a></li>
172-
</ul>
173-
</div>
163+
<ul class="pagination pagination-sm">
164+
<li><a href="" title="Bootstrap 3 Themes Generator">«</a></li>
165+
<li><a href="" title="Bootstrap 3 Themes Generator">1</a></li>
166+
<li><a href="" title="Bootstrap 3 Themes Generator">2</a></li>
167+
<li><a href="" title="Bootstrap 3 Themes Generator">3</a></li>
168+
<li><a href="" title="Bootstrap 3 Themes Generator">4</a></li>
169+
<li><a href="" title="Bootstrap 3 Themes Generator">5</a></li>
170+
<li><a href="" title="Bootstrap 3 Themes Generator">»</a></li>
171+
</ul>
174172
</td>
175173
</tr>
176174
</tbody>

0 commit comments

Comments
 (0)