Skip to content

Commit 6173718

Browse files
nicomolletnicomollet
committed
update templates with migration from 2 to 3, plus remove gravity forms php
1 parent b513922 commit 6173718

Some content is hidden

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

47 files changed

+5123
-1269
lines changed

‎404.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<?php get_sidebar(); ?>
44

5-
<div id="content" class="<?php echo apply_filters('stormbringer_content_container_class', 'span9');?>" role="main">
5+
<div id="content" class="<?php echo apply_filters('stormbringer_content_container_class', 'col-md-9');?>" role="main">
66

77
<?php stormbringer_breadcrumb();?>
88

‎archive.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<?php get_header(); ?>
1313

14-
<div id="content" class="<?php echo apply_filters('stormbringer_content_container_class', 'span9');?>" role="main">
14+
<div id="content" class="<?php echo apply_filters('stormbringer_content_container_class', 'col-md-9');?>" role="main">
1515

1616
<?php stormbringer_breadcrumb();?>
1717

‎comments.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@
7575
<ul id="comment-form-elements" class="clearfix">
7676

7777
<li>
78-
<div class="control-group">
78+
<div class="form-group">
7979
<label for="author"><?php _e("Nom","stormbringer"); ?> <?php if ($req) _e("(obligatoire)","stormbringer"); ?></label>
8080
<div class="input-prepend"><span class="add-on"><i class="icon-user"></i></span><input class="input-small" type="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" placeholder="<?php _e("Votre nom","stormbringer"); ?>" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
8181
</div>
8282
</div>
8383
</li>
8484

8585
<li>
86-
<div class="control-group">
86+
<div class="form-group">
8787
<label for="email"><?php _e("Email","stormbringer"); ?> <?php if ($req) _e("(obligatoire)","stormbringer"); ?></label>
8888
<div class="input-prepend"><span class="add-on"><i class="icon-envelope"></i></span><input class="input-small" type="email" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" placeholder="<?php _e("Votre email","stormbringer"); ?>" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
8989
<span class="help-inline">(<?php _e("ne sera pas publié","stormbringer"); ?>)</span>
@@ -92,7 +92,7 @@
9292
</li>
9393

9494
<li>
95-
<div class="control-group">
95+
<div class="form-group">
9696
<label for="url"><?php _e("Site web","stormbringer"); ?></label>
9797
<div class="input-prepend"><span class="add-on"><i class="icon-home"></i></span><input class="input-small" type="url" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" placeholder="<?php _e("Votre site web","stormbringer"); ?>" tabindex="3" />
9898
</div>

‎css/application.css

+108-1
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ a {
275275
}
276276
a:hover,
277277
a:focus {
278+
color: #003d3e;
278279
text-decoration: underline;
279280
}
280281
a:focus {
@@ -2200,6 +2201,7 @@ fieldset[disabled] .btn-link {
22002201
}
22012202
.btn-link:hover,
22022203
.btn-link:focus {
2204+
color: #003d3e;
22032205
text-decoration: underline;
22042206
background-color: transparent;
22052207
}
@@ -3446,6 +3448,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
34463448
background-color: #eeeeee;
34473449
border-color: #006f71;
34483450
}
3451+
.nav .open > a .caret,
3452+
.nav .open > a:hover .caret,
3453+
.nav .open > a:focus .caret {
3454+
border-top-color: #003d3e;
3455+
border-bottom-color: #003d3e;
3456+
}
34493457
.nav .nav-divider {
34503458
height: 1px;
34513459
margin: 9px 0;
@@ -3608,6 +3616,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
36083616
border-top-color: #006f71;
36093617
border-bottom-color: #006f71;
36103618
}
3619+
.nav a:hover .caret {
3620+
border-top-color: #003d3e;
3621+
border-bottom-color: #003d3e;
3622+
}
36113623
.nav-tabs .dropdown-menu {
36123624
margin-top: -1px;
36133625
border-top-right-radius: 0;
@@ -4049,15 +4061,35 @@ textarea.input-group-sm > .input-group-btn > .btn {
40494061
.navbar-default .navbar-link:hover {
40504062
color: #333333;
40514063
}
4064+
.navbar-inverse {
4065+
background-color: #5f084b;
4066+
border-color: #010001;
4067+
}
4068+
.navbar-inverse .navbar-brand {
4069+
color: #ffffff;
4070+
}
40524071
.navbar-inverse .navbar-brand:hover,
40534072
.navbar-inverse .navbar-brand:focus {
40544073
color: #ffffff;
40554074
background-color: transparent;
40564075
}
4076+
.navbar-inverse .navbar-text {
4077+
color: #ffffff;
4078+
}
4079+
.navbar-inverse .navbar-nav > li > a {
4080+
color: #ffffff;
4081+
}
40574082
.navbar-inverse .navbar-nav > li > a:hover,
40584083
.navbar-inverse .navbar-nav > li > a:focus {
4084+
color: #eeeeee;
40594085
background-color: #5f084b;
40604086
}
4087+
.navbar-inverse .navbar-nav > .active > a,
4088+
.navbar-inverse .navbar-nav > .active > a:hover,
4089+
.navbar-inverse .navbar-nav > .active > a:focus {
4090+
color: #eeeeee;
4091+
background-color: #300426;
4092+
}
40614093
.navbar-inverse .navbar-nav > .disabled > a,
40624094
.navbar-inverse .navbar-nav > .disabled > a:hover,
40634095
.navbar-inverse .navbar-nav > .disabled > a:focus {
@@ -4074,18 +4106,61 @@ textarea.input-group-sm > .input-group-btn > .btn {
40744106
.navbar-inverse .navbar-toggle .icon-bar {
40754107
background-color: #ffffff;
40764108
}
4109+
.navbar-inverse .navbar-collapse,
4110+
.navbar-inverse .navbar-form {
4111+
border-color: #3e0531;
4112+
}
4113+
.navbar-inverse .navbar-nav > .open > a,
4114+
.navbar-inverse .navbar-nav > .open > a:hover,
4115+
.navbar-inverse .navbar-nav > .open > a:focus {
4116+
background-color: #300426;
4117+
color: #eeeeee;
4118+
}
4119+
.navbar-inverse .navbar-nav > .dropdown > a:hover .caret {
4120+
border-top-color: #eeeeee;
4121+
border-bottom-color: #eeeeee;
4122+
}
4123+
.navbar-inverse .navbar-nav > .dropdown > a .caret {
4124+
border-top-color: #ffffff;
4125+
border-bottom-color: #ffffff;
4126+
}
4127+
.navbar-inverse .navbar-nav > .open > a .caret,
4128+
.navbar-inverse .navbar-nav > .open > a:hover .caret,
4129+
.navbar-inverse .navbar-nav > .open > a:focus .caret {
4130+
border-top-color: #eeeeee;
4131+
border-bottom-color: #eeeeee;
4132+
}
40774133
@media (max-width: 767px) {
4134+
.navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
4135+
border-color: #010001;
4136+
}
4137+
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
4138+
color: #ffffff;
4139+
}
40784140
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
40794141
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
4142+
color: #eeeeee;
40804143
background-color: #5f084b;
40814144
}
4145+
.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,
4146+
.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
4147+
.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
4148+
color: #eeeeee;
4149+
background-color: #300426;
4150+
}
40824151
.navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
40834152
.navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
40844153
.navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {
40854154
color: #444444;
40864155
background-color: transparent;
40874156
}
40884157
}
4158+
.navbar-inverse .navbar-link {
4159+
color: #ffffff;
4160+
}
4161+
.navbar-inverse .navbar-link:hover {
4162+
color: #eeeeee;
4163+
}
40894164
.breadcrumb {
40904165
padding: 8px 15px;
40914166
margin-bottom: 20px;
@@ -4360,10 +4435,12 @@ a.list-group-item.active > .badge,
43604435
font-size: 21px;
43614436
font-weight: 200;
43624437
line-height: 2.1428571435;
4438+
color: #ffffff;
43634439
background-color: #006f71;
43644440
}
43654441
.jumbotron h1 {
43664442
line-height: 1;
4443+
color: #ffffff;
43674444
}
43684445
.jumbotron p {
43694446
line-height: 1.4;
@@ -5968,7 +6045,11 @@ td.visible-print {
59686045
display: none !important;
59696046
}
59706047
}
6048+
.thumbnail {
6049+
background: #ffffff;
6050+
}
59716051
#footer .container {
6052+
border-top: 1px solid #ffffff;
59726053
padding-top: 20px;
59736054
margin-top: 20px;
59746055
}
@@ -5982,6 +6063,7 @@ td.visible-print {
59826063
/* Gravity forms plugin */
59836064
.help-block,
59846065
.help-inline {
6066+
color: #999999;
59856067
margin-right: 10px;
59866068
}
59876069
.form-wrapper textarea {
@@ -5992,6 +6074,7 @@ td.visible-print {
59926074
}
59936075
.form-wrapper ul {
59946076
margin: 0;
6077+
padding: 0;
59956078
list-style-type: none;
59966079
}
59976080
.form-wrapper ul {
@@ -6016,8 +6099,12 @@ td.visible-print {
60166099
padding-top: 5px;
60176100
}
60186101
.form-required {
6102+
color: #b94a48;
60196103
margin-left: 5px;
60206104
}
6105+
.form-header {
6106+
margin-bottom: 1.428571429;
6107+
}
60216108
.input-mini {
60226109
width: 20%;
60236110
}
@@ -6145,6 +6232,9 @@ fieldset[disabled] .gform_previous_button {
61456232
vertical-align: middle;
61466233
}
61476234
/* Special Fields */
6235+
.field-address textarea {
6236+
height: 4.285714287;
6237+
}
61486238
.field-inline .help-inline,
61496239
.field-inline .help-block {
61506240
padding-left: 0;
@@ -6162,6 +6252,9 @@ fieldset[disabled] .gform_previous_button {
61626252
}
61636253
}
61646254
*/
6255+
.form-horizontal .control-label {
6256+
background: deepskyblue;
6257+
}
61656258
/* Common text styles */
61666259
.underline {
61676260
text-decoration: underline;
@@ -6172,12 +6265,16 @@ fieldset[disabled] .gform_previous_button {
61726265
.thin {
61736266
font-weight: normal;
61746267
}
6175-
/* Variable colors */
6268+
.text-color {
6269+
color: #333333;
6270+
}
61766271
/* Focus */
61776272
::-moz-selection {
6273+
background: #006f71 !important;
61786274
color: #ffffff;
61796275
}
61806276
::selection {
6277+
background: #006f71 !important;
61816278
color: #ffffff;
61826279
}
61836280
/* Fancybox */
@@ -6254,6 +6351,9 @@ iframe {
62546351
vertical-align: top;
62556352
}
62566353
/* Comments */
6354+
.edit-comment {
6355+
color: #ffffff;
6356+
}
62576357
.comment-message .edit-comment {
62586358
display: inline-block;
62596359
}
@@ -6287,6 +6387,9 @@ a.edit-post {
62876387
.post {
62886388
position: relative;
62896389
}
6390+
.post:hover {
6391+
background: #ffffff;
6392+
}
62906393
.post:hover a.edit-post {
62916394
display: inline;
62926395
z-index: 800;
@@ -6381,6 +6484,7 @@ figure {
63816484
margin-bottom: 20px;
63826485
}
63836486
.thumbnail .caption {
6487+
color: #ffffff;
63846488
padding: 5px 9px;
63856489
position: absolute;
63866490
background: rgba(0, 0, 0, 0.5);
@@ -6600,3 +6704,6 @@ video {
66006704
left: 0;
66016705
}
66026706
}
6707+
.form-horizontal .controls {
6708+
background: red;
6709+
}

‎font/icomoon.eot

-4.48 KB
Binary file not shown.

0 commit comments

Comments
 (0)