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
M
memopol
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
32
Issues
32
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
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
Political Memory
memopol
Commits
8ff84b92
Commit
8ff84b92
authored
Dec 06, 2015
by
Jamesie Pic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added fontawesome, removed unused template
parent
1aeac2f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
89 deletions
+1
-89
core/templates/base.html
core/templates/base.html
+1
-0
templates/base.haml
templates/base.haml
+0
-89
No files found.
core/templates/base.html
View file @
8ff84b92
...
...
@@ -13,6 +13,7 @@
{% compress css %}
<link
rel=
"stylesheet"
href=
"{% static 'stylesheets/libs.min.css' %}"
type=
"text/css"
/>
<link
rel=
"stylesheet"
href=
"{% static 'stylesheets/base.min.css' %}"
type=
"text/css"
/>
<link
rel=
"stylesheet"
href=
"{% static 'libs/fontawesome/css/font-awesome.min.css' %}"
type=
"text/css"
/>
{% endcompress %}
{% compress js %}
<script
type=
"text/javascript"
src=
"{% static 'libs/jquery/dist/jquery.js' %}"
></script>
...
...
templates/base.haml
deleted
100644 → 0
View file @
1aeac2f7
-
load
coffeescript
<!DOCTYPE html>
%html
<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
<!--[if gt IE 8]><!-->
<html
class=
"no-js"
lang=
"en"
>
<!--<![endif]-->
%head
%meta
{
"charset"
:
"utf-8"
}
<!-- Set the viewport width to device width for mobile -->
%meta
{
"name"
:
"viewport"
,
"content"
:
"width: device-width"
}
%title
\\o/
<!-- IE Fix for HTML5 Tags -->
<!--[if lt IE 9]>
%script
{
"src"
:
"http://html5shiv.googlecode.com/svn/trunk/html5.js"
}
<![endif]-->
<!-- Included CSS Files (Uncompressed) -->
<!-- %link{"rel": "stylesheet", "href": "{{ STATIC_URL }}stylesheets/foundation.css"} -->
<!-- Included CSS Files (Compressed) -->
%link
{
"rel"
:
"stylesheet"
,
"href"
:
"{{ STATIC_URL }}stylesheets/foundation.min.css"
}
%link
{
"rel"
:
"stylesheet"
,
"href"
:
"{{ STATIC_URL }}stylesheets/app.css"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/modernizr.foundation.js"
}
<!-- IE Fix for HTML5 Tags -->
<!--[if lt IE 9]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
%body
<!-- container -->
%div
.container
%div
.row
%div
.twelve.columns
%h2
%a
{
"style"
:
"color: black"
,
"href"
:
"{% url home %}"
}
Hello world
%hr
-
block
container
%div
.row
%div
.twelve.columns
-
block
content
%footer
.row
%div
{
"style"
:
"text-align: center;"
}
Fouteur
<!-- Included JS Files (Uncompressed) -->
<!--
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/modernizr.foundation.js"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/jquery.js"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/jquery.foundation.mediaQueryToggle.js"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/jquery.foundation.reveal.js"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/jquery.foundation.orbit.js"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/jquery.foundation.navigation.js"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/jquery.foundation.buttons.js"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/jquery.foundation.tabs.js"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/jquery.foundation.forms.js"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/jquery.foundation.tooltips.js"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/jquery.foundation.accordion.js"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/jquery.placeholder.js"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/jquery.foundation.alerts.js"
}
-->
<!-- Included JS Files (Compressed) -->
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/foundation.min.js"
}
-# backbone
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/underscore-min.js"
}
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/backbone-min.js"
}
-# django
%script
{
type:
"text/javascript"
,
src:
"{{ STATIC_URL }}javascripts/ajax_django_magic.js"
}
<!-- Initialize JS Plugins -->
%script
{
"src"
:
"{{ STATIC_URL }}javascripts/app.js"
}
-
block
javascript
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