Skip to content

Commit 86da672

Browse files
pikockpikock
committed
new name
1 parent ce7b1b7 commit 86da672

12 files changed

Lines changed: 32 additions & 36 deletions

File tree

‎2.3.2/app/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<li><a href="#" title="bootstrap theme responsive design">Bootstrap 2.3.2</a></li>
123123
</ul>
124124
</li>
125-
<li><a href="http://www.pikock.com/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Header%20EN&utm_campaign=Bootstrap" title="bootstrap themes generator">Pikock Website Builder</a></li>
125+
<li><a href="http://en.orson.io/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Header%20EN&utm_campaign=Bootstrap" title="bootstrap themes generator">Orson Website Builder</a></li>
126126
</ul>
127127
</div>
128128
</div>

‎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/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Footer%20EN&utm_campaign=Bootstrap" title="create your website easily">Pikock Website Builder</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/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Footer%20EN&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/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<li><a href="app/index.html" title="bootstrap theme responsive design">Bootstrap 2.3.2</a></li>
4949
</ul>
5050
</li>
51-
<li><a href="http://www.pikock.com/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Header%20EN&utm_campaign=Bootstrap" title="bootstrap themes generator">Pikock Website Builder</a></li>
51+
<li><a href="http://en.orson.io/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Header%20EN&utm_campaign=Bootstrap" title="bootstrap themes generator">Orson Website Builder</a></li>
5252
<li class="divider-vertical"></li>
5353
</ul>
5454
</div>
@@ -62,10 +62,10 @@
6262
<section class="row">
6363
<div class="span12">
6464
<div class="introHeader">
65-
<div class="alert alert-success">
65+
<!-- <div class="alert alert-success">
6666
Ruby on Rails and JS Framework champion ?
6767
Want to develop Awesome WebApp ? Join us at <a href="http://www.pikock.com/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Divers%20EN&utm_campaign=Bootstrap" title="Pikock create your website easily">Pikock</a> in Paris, France. We are <a href="http://www.pikock.com/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Divers%20EN&utm_campaign=Bootstrap" title="Pikock Recruitment">hiring !</a>
68-
</div>
68+
</div> -->
6969
<h1><span itemprop="name">Bootstrap Magic </span><small>made with AngularJS</small></h1>
7070
<p class="lead"><span itemprop="description">Create simply your own <a href="http://twitter.github.com/bootstrap/index.html" title="Twitter Bootstrap themes generator">Twitter Bootstrap</a> theme.</span> Like it ? Save it !</p>
7171
<p class="buttonsBlocks">
@@ -182,7 +182,7 @@ <h2 class="centerTitle">They talked about it.</h2>
182182
<div class="container">
183183
<div class="span12 ">
184184
<p class="pull-left">Code licensed under <a href="http://opensource.org/licenses/MIT" title="MIT licence">MIT licence</a></p>
185-
<p class="pull-right">Handmade by <span itemprop="author" itemscope itemtype="http://schema.org/Organization"><a itemprop="url" href="http://www.pikock.com/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Footer%20EN&utm_campaign=Bootstrap" title="create your website easily"><span itemprop="name">Pikock Website Builder <span></a> </span>x <a href="http://www.autreplanete.com/" title="web agency paris">Autre planète</a> in Paris.</p>
185+
<p class="pull-right">Handmade by <span itemprop="author" itemscope itemtype="http://schema.org/Organization"><a itemprop="url" href="http://en.orson.io/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Footer%20EN&utm_campaign=Bootstrap" title="create your website easily"><span itemprop="name">Orson Website Builder <span></a> </span>x <a href="http://www.autreplanete.com/" title="web agency paris">Autre planète</a> in Paris.</p>
186186
</div>
187187
</div>
188188
</div>

‎3.0/app/css/app.css‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,7 @@ div.colorpicker div.colorpicker-hue {
281281
.protected .socialButtons li {
282282
margin-left: 5px;
283283
}
284-
.protected .socialButtons li.twitter {
285-
margin-right: -25px;
286-
}
284+
287285
.protected .introHeader {
288286
padding: 180px 90px;
289287
}

‎3.0/app/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
</ul>
120120
</li>
121121
<li class="divider-vertical"></li>
122-
<li ><a href="http://www.pikock.com/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Header%20EN&utm_campaign=Bootstrap" title="create website easily">Pikock Website Builder</a></li>
122+
<li ><a href="http://en.orson.io/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Header%20EN&utm_campaign=Bootstrap" title="create website easily">Orson Website Builder</a></li>
123123
<li class="divider-vertical"></li>
124124
</ul>
125125

‎3.0/app/less/app.less‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,7 @@ div.colorpicker{
298298
padding-top: 15px;
299299
li{
300300
margin-left: 5px;
301-
&.twitter{
302-
margin-right: -25px;
303-
}
301+
304302
}
305303
}
306304

‎3.0/app/partials/editor.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<li><button class="btn" ng-click="resetLessVariables()">Reset</button></li>
1212
</ul>
1313
</form>
14-
<span class="sign">Handmade by <a href="http://www.pikock.com/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Footer%20EN&utm_campaign=Bootstrap" 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>
14+
<span class="sign">Handmade by <a href="http://en.orson.io/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Footer%20EN&utm_campaign=Bootstrap" title="create your website easily">Orson</a> x <a href="http://www.autreplanete.com/" title="web agency paris">Autre planète</a> in Paris.</span>
1515
</div>
1616
</div>
1717

‎3.0/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</ul>
5454
</li>
5555
<li class="divider-vertical"></li>
56-
<li ><a href="http://www.pikock.com/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Header%20EN&utm_campaign=Bootstrap" title="create website easily">Pikock Website Builder</a></li>
56+
<li ><a href="http://en.orson.io/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Header%20EN&utm_campaign=Bootstrap" title="create website easily">Orson Website Builder</a></li>
5757
</ul>
5858

5959
<ul class="nav navbar-nav navbar-right socialButtons">
@@ -152,7 +152,7 @@ <h4><span class="apico media apico-doc-out"></span>Download</h4>
152152
</div>
153153
<div class="col-md-4">
154154
<h4><span class="apico games apico-atoms"></span>AngularJS Project</h4>
155-
<p><a href="http://angularjs.org/" title="angular js framework">Awesome framework</a> for an awesome project. Check out our main Project Pikock, all made with AngularJS and Rails : <a href="http://www.pikock.com/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Divers%20EN&utm_campaign=Bootstrap" title="create your website easily"> Pikock.</a></p>
155+
<p><a href="http://angularjs.org/" title="angular js framework">Awesome framework</a> for an awesome project. Check out our main Project Orson, all made with AngularJS and Rails : <a href="http://en.orson.io/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Divers%20EN&utm_campaign=Bootstrap" title="create your website easily"> Orson.</a></p>
156156
</div>
157157

158158
</section>
@@ -214,7 +214,7 @@ <h2 class="centerTitle">They talked about it.</h2>
214214
<div class="col-md-12 ">
215215
<p class="pull-left">Code licensed under <a href="http://opensource.org/licenses/MIT" title="MIT licence">MIT licence</a></p>
216216
<div class="pull-left" xmlns:cc="http://creativecommons.org/ns#" xmlns:dct="http://purl.org/dc/terms/" about="http://subtlepatterns.com/inspiration-geometry/"><span property="dct:title">/ Subtle Patterns</span> (<a rel="cc:attributionURL" property="cc:attributionName" href="http://subtlepatterns.com">Subtle Patterns</a>) / <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA 3.0</a></div>
217-
<p class="pull-right">Handmade by <span itemprop="author" itemscope itemtype="http://schema.org/Organization"><a itemprop="url" href="http://www.pikock.com/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Footer%20EN&utm_campaign=Bootstrap" title="create your website easily"><span itemprop="name">Pikock Website Builder <span></a> </span>x <a href="http://www.autreplanete.com/" title="web agency paris">Autre planète</a> in Paris.</p>
217+
<p class="pull-right">Handmade by <span itemprop="author" itemscope itemtype="http://schema.org/Organization"><a itemprop="url" href="http://en.orson.io/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Footer%20EN&utm_campaign=Bootstrap" title="create your website easily"><span itemprop="name">Orson Website Builder <span></a> </span>x <a href="http://www.autreplanete.com/" title="web agency paris">Autre planète</a> in Paris.</p>
218218
</div>
219219
</div>
220220
</div>

‎app/index.html‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,17 +118,18 @@
118118
</ul>
119119
</li>
120120
<!-- <li ><a href="index.html#!/submit-theme" title="bootstrap 3.1 themes generator">Submit your theme</a></li>
121-
--> <li ><a href="http://www.pikock.com/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Header%20EN&utm_campaign=Bootstrap" title="Create website easily">Website builder Pikock</a></li>
122-
<li ><a href="https://medium.com/@tsifei/recrutement-stage-ux-et-webdesign-511c71815546" title="Recruit Web & UX Webdesigner in Paris">Recruit Web & UX Webdesigner in Paris</a></li>
123-
</ul>
121+
--> <li ><a href="http://en.orson.io/?utm_source=Bootstrap%20EN&utm_medium=Bootstrap%20Header%20EN&utm_campaign=Bootstrap" title="Create website easily">Website builder Orson</a></li>
122+
<!-- <li ><a href="https://medium.com/@tsifei/recrutement-stage-ux-et-webdesign-511c71815546" title="Recruit Web & UX Webdesigner in Paris">Recruit Web & UX Webdesigner in Paris</a></li>
123+
--> </ul>
124124

125125
<ul class="nav navbar-nav navbar-right socialButtons">
126-
<li>
127-
<div class="fb-like" data-href="http://pikock.github.io/bootstrap-magic/" data-send="false" data-layout="button_count" data-width="50" data-show-faces="false" data-action="like"></div>
128-
</li>
129126
<li class="twitter">
130127
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://pikock.github.io/bootstrap-magic/" data-text="Bootstrap Magic feat Bootstrap 3.1 : Awesome theme generator with live preview" data-lang="en" data-hashtags="bootstrap, angularjs">Tweeter</a>
131128
</li>
129+
<li>
130+
<div class="fb-like" data-href="http://pikock.github.io/bootstrap-magic/" data-send="false" data-layout="button_count" data-width="50" data-show-faces="false" data-action="like"></div>
131+
</li>
132+
132133
<li><div class="g-plusone" data-size="medium" data-href="http://pikock.github.io/bootstrap-magic/"></div></li>
133134
</ul>
134135

‎app/less/app.less‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,7 @@ div.colorpicker{
311311
padding-top: 15px;
312312
li{
313313
margin-left: 5px;
314-
&.twitter{
315-
margin-right: -25px;
316-
}
314+
317315
}
318316
}
319317

0 commit comments

Comments
 (0)