Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
site-gala
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Krophil
site-gala
Commits
db1a08f4
Commit
db1a08f4
authored
Jan 12, 2017
by
Krophil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Few changes in css for conv
parent
74667c4f
Changes
14
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
4749 additions
and
72 deletions
+4749
-72
blog/static/blog/css/base.css
blog/static/blog/css/base.css
+24
-24
blog/static/blog/css/nav.css
blog/static/blog/css/nav.css
+9
-9
blog/static/blog/img/background.png
blog/static/blog/img/background.png
+0
-0
blog/static/blog/img/background.svg
blog/static/blog/img/background.svg
+2616
-0
blog/static/blog/img/troll.png
blog/static/blog/img/troll.png
+0
-0
blog/static/blog/img/troll.svg
blog/static/blog/img/troll.svg
+2076
-0
blog/static/blog/img/troll_color_school.png
blog/static/blog/img/troll_color_school.png
+0
-0
blog/static/blog/img/troll_color_school_logo.png
blog/static/blog/img/troll_color_school_logo.png
+0
-0
blog/static/blog/img/troll_color_school_test.png
blog/static/blog/img/troll_color_school_test.png
+0
-0
blog/static/blog/js/chrono.js
blog/static/blog/js/chrono.js
+2
-2
blog/static/blog/json/chrono.json
blog/static/blog/json/chrono.json
+3
-3
blog/templates/blog/chrono.html
blog/templates/blog/chrono.html
+0
-11
blog/templates/blog/media.html
blog/templates/blog/media.html
+4
-4
templates/BaseBlog.html
templates/BaseBlog.html
+15
-19
No files found.
blog/static/blog/css/base.css
View file @
db1a08f4
...
...
@@ -9,15 +9,18 @@
@import
'https://fonts.googleapis.com/css?family=Cinzel'
;
body
{
//
background-image
:
url("/gala/static/blog/img/background.jpg")
;
background-image
:
linear-gradient
(
to
top
left
,
rgb
(
8
,
58
,
117
),
rgb
(
13
,
26
,
41
));
background-repeat
:
repeat
;
background-attachment
:
fixed
;
background-image
:
url("/gala/static/blog/img/background.svg")
;
//
background-image
:
linear-gradient
(
to
top
left
,
rgb
(
8
,
58
,
117
),
rgb
(
13
,
26
,
41
));
background-attachment
:
no-repeat
center
center
fixed
;
-webkit-background-size
:
cover
;
-moz-background-size
:
cover
;
-o-background-size
:
cover
;
background-size
:
cover
;
font-family
:
'Roboto'
,
sans-serif
;
}
.content
{
background-color
:
#
eee
;
background-color
:
#
DEDEB1
;
border-radius
:
10px
;
//
border
:
3px
#b2810e
solid
;
}
...
...
@@ -57,13 +60,6 @@ hr {
margin-bottom
:
25%
;
}
.chronoBloc
{
padding-top
:
10px
;
padding-bottom
:
10px
;
text-align
:
center
;
display
:
block
;
}
@media
(
min-width
:
1200px
)
{
.chronoBloc
{
margin-top
:
10px
;
...
...
@@ -79,6 +75,17 @@ hr {
}
}
.main-title
{
text-align
:
center
;
font-family
:
'Cinzel'
,
serif
;
color
:
#ffffff
;
font-size
:
4em
;
}
h1
{
font-size
:
1em
;
}
.chrono
{
//
background-color
:
#5A6AFF
;
font-family
:
'Cinzel'
,
serif
;
...
...
@@ -96,8 +103,10 @@ hr {
.logo
{
//
background-color
:
rgba
(
255
,
255
,
255
,
0.8
);
min-width
:
100%
;
max-height
:
350px
;
max-height
:
300px
;
max-width
:
100%
;
height
:
200px
;
width
:
auto
;
}
#logo-mini
{
...
...
@@ -106,6 +115,7 @@ hr {
}
#logo-mobile
{
margin
:
auto
;
margin-bottom
:
10px
;
}
...
...
@@ -122,16 +132,6 @@ hr {
display
:
block
;
}
.youtube
{
background-color
:
#EB9388
;
color
:
#ffffff
;
}
.youtube
:hover
{
background-color
:
#ffffff
;
color
:
#DD4B39
;
}
.twitter
{
background-color
:
#66CDF4
;
color
:
#ffffff
;
...
...
blog/static/blog/css/nav.css
View file @
db1a08f4
...
...
@@ -6,7 +6,7 @@
*/
#navbar
{
border-radius
:
10px
10px
0
0
;
border-radius
:
0
;
font-size
:
20px
;
}
#navbar
li
{
...
...
@@ -16,8 +16,8 @@
line-height
:
35px
;
}
.navbar-default
{
background-color
:
#
0a0c12
;
border-color
:
#
0a0c12
;
;
background-color
:
#
CAC291
;
border-color
:
#
CAC291
;
}
.navbar-default
.navbar-brand
{
color
:
#ffffff
;
...
...
@@ -30,31 +30,31 @@
color
:
#ffffff
;
}
.navbar-default
.navbar-nav
>
li
>
a
{
color
:
#
ffffff
;
color
:
#
0a0c12
;
}
.navbar-default
.navbar-nav
>
li
>
a
:hover
,
.navbar-default
.navbar-nav
>
li
>
a
:focus
{
color
:
#0a0c12
;
background-color
:
#
ffffff
;
background-color
:
#
CAC291
;
}
.navbar-default
.navbar-nav
>
.active
>
a
,
.navbar-default
.navbar-nav
>
.active
>
a
:hover
,
.navbar-default
.navbar-nav
>
.active
>
a
:focus
{
color
:
#
0a0c12
;
background-color
:
#
ffffff
;
color
:
#
ffffff
;
background-color
:
#
CAC291
;
}
.navbar-default
.navbar-nav
>
.open
>
a
,
.navbar-default
.navbar-nav
>
.open
>
a
:hover
,
.navbar-default
.navbar-nav
>
.open
>
a
:focus
{
color
:
#0a0c12
;
background-color
:
#
ffffff
;
background-color
:
#
CAC291
;
}
.navbar-default
.navbar-toggle
{
border-color
:
#ffffff
;
}
.navbar-default
.navbar-toggle
:hover
,
.navbar-default
.navbar-toggle
:focus
{
background-color
:
#
ffffff
;
background-color
:
#
BCBC95
;
}
.navbar-default
.navbar-toggle
.icon-bar
{
background-color
:
#ffffff
;
...
...
blog/static/blog/img/background.png
0 → 100644
View file @
db1a08f4
58.8 KB
blog/static/blog/img/background.svg
0 → 100755
View file @
db1a08f4
This diff is collapsed.
Click to expand it.
blog/static/blog/img/troll.png
0 → 100644
View file @
db1a08f4
116 KB
blog/static/blog/img/troll.svg
0 → 100644
View file @
db1a08f4
This diff is collapsed.
Click to expand it.
blog/static/blog/img/troll_color_school.png
0 → 100644
View file @
db1a08f4
871 KB
blog/static/blog/img/troll_color_school_logo.png
0 → 100644
View file @
db1a08f4
619 KB
blog/static/blog/img/troll_color_school_test.png
0 → 100644
View file @
db1a08f4
557 KB
blog/static/blog/js/chrono.js
View file @
db1a08f4
...
...
@@ -12,10 +12,10 @@ function SetChrono(file) {
var
now
=
new
Date
();
var
gala
=
new
Date
();
var
diff
=
0
;
$
.
getJSON
(
file
,
function
(
data
)
{
alert
(
"
test
"
);
gala
.
setFullYear
(
data
.
year
,
data
.
month
-
1
,
data
.
day
);
alert
(
gala
);
diff
=
gala
.
getTime
()
-
now
.
getTime
();
// Il faut retirer 1 au mois puisque l'indice commence à 0
diff
=
Math
.
floor
(
diff
/
(
1000
*
60
*
60
*
24
));
...
...
blog/static/blog/json/chrono.json
View file @
db1a08f4
{
"day"
:
1
9
,
"month"
:
11
,
"year"
:
201
6
"day"
:
1
7
,
"month"
:
02
,
"year"
:
201
7
}
\ No newline at end of file
blog/templates/blog/chrono.html
deleted
100644 → 0
View file @
74667c4f
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-lg-offset-2 col-lg-8 col-lg-offset-2"
>
<div
class=
"chronoBloc chrono"
>
<div
align=
"center"
class=
"row"
>
<i>
J-
<span
class=
"days"
>
0
</span></i>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
blog/templates/blog/media.html
View file @
db1a08f4
<div
class=
"row"
>
<div
class=
"row"
>
<
!--<
div class="row">
<div class="col-md-offset-2 col-md-8 col-md-offset-2">
<a target="_blank" href="https://www.youtube.com/channel/UCCovZ5tiZnfAwkR-NP7uBmw" rel="nofollow">
<div class="socialBloc youtube">
...
...
@@ -9,10 +9,10 @@
</div>
</a>
</div>
</div>
</div>
-->
<div
class=
"row"
>
<div
class=
"col-md-offset-2 col-md-8 col-md-offset-2"
>
<a
target=
"_blank"
href=
"https://twitter.com/
galautbm
"
rel=
"nofollow"
>
<a
target=
"_blank"
href=
"https://twitter.com/
ConvTroll
"
rel=
"nofollow"
>
<div
class=
"socialBloc twitter"
>
<div
align=
"center"
class=
"row"
>
<i
class=
"fa fa-twitter fa-2x"
></i>
...
...
@@ -23,7 +23,7 @@
</div>
<div
class=
"row"
>
<div
class=
"col-md-offset-2 col-md-8 col-md-offset-2"
>
<a
target=
"_blank"
href=
"https://www.facebook.com/
GalaDePrestigeUTBM
"
rel=
"nofollow"
>
<a
target=
"_blank"
href=
"https://www.facebook.com/
convTroll
"
rel=
"nofollow"
>
<div
class=
"socialBloc facebook"
>
<div
align=
"center"
class=
"row"
>
<i
class=
"fa fa-facebook fa-2x"
></i>
...
...
templates/BaseBlog.html
View file @
db1a08f4
...
...
@@ -5,7 +5,10 @@
<html
lang=
"fr"
>
<head>
<meta
charset=
"utf-8"
>
<title>
Gala 2016
</title>
<title>
XXIIIe Convention du Troll Penché
</title>
<link
rel=
"stylesheet"
href=
"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
integrity=
"sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7"
crossorigin=
"anonymous"
>
<link
href=
"{% static "
blog
/
css
/
base.css
"
%}"
rel=
"stylesheet"
>
...
...
@@ -18,21 +21,21 @@
<body>
<div
class=
"row"
>
<div
class=
"col-
md-2 col-xs-1 col-lg-2
"
>
<div
class=
"col-
xs-1 col-md-3 col-lg-3
"
>
<div
class=
"hidden-xs hidden-sm hidden-md"
>
<img
class=
"img-responsive logo"
id=
"logo-mini"
src=
"{% static "
blog
/
img
/
banderole.png
"
%}"
>
<img
class=
"img-responsive logo"
id=
"logo-mini"
src=
"{% static "
blog
/
img
/
troll.png
"
%}"
>
</div>
</div>
<div
class=
"col-xs-10 col-md-8 col-lg-8"
>
{# Décompte petit écran #}
<div
class=
"col-lg-offset-6 container-fluid hidden-lg"
>
{% include "blog/chrono.html" %}
</div>
<div
class =
"col-xs-12 col-md-6 col-lg-6 main-title"
>
<h1><em>
Convention du Troll Penché
</em></h1>
</div>
<div
class=
"col-xs-10 col-md-3 col-lg-3"
>
{# Bannière #}
<div
class=
"row-fluid hidden-lg"
>
<img
class=
"img-responsive logo"
id=
"logo-mobile"
src=
"{% static "
blog
/
img
/
banderole.png
"
%}"
>
<img
class=
"img-responsive logo"
id=
"logo-mobile"
src=
"{% static "
blog
/
img
/
troll.png
"
%}"
>
</div>
<div
class=
"visible-lg-inline"
>
...
...
@@ -41,20 +44,13 @@
</div>
{# Décompte grand écran #}
<span
class=
"visible-lg-inline"
>
<div
class=
"col-lg-2"
>
{% include "blog/chrono.html" %}
</div>
</span>
</div>
<div
class=
"row"
>
{# Liens sociaux desktop #}
<div
class=
"col-md-
2
col-sm-1"
>
<div
class=
"col-md-
1
col-sm-1"
>
<div
class=
"hidden-sm hidden-xs"
>
<div
class=
"social-mini"
>
...
...
@@ -65,7 +61,7 @@
</div>
{# contenu #}
<div
class=
"col-xs-offset-1 col-sm-offset-0 col-md-
8
col-xs-10"
>
<div
class=
"col-xs-offset-1 col-sm-offset-0 col-md-
10
col-xs-10"
>
<div
class=
"container-fluid content"
>
<div
class=
"row"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment