Skip to content

Commit 9c80868

Browse files
levkowetzlevkowetz
committed
Placed stock bootstrap (which we don't use, but bower pulls in as a dependency) and our customized bootstrap in different directories, to avoid confusion.
 - Legacy-Id: 9905
1 parent 7513908 commit 9c80868

19 files changed

Lines changed: 10178 additions & 8 deletions

bootstrap/static/bootstrap renamed to bootstrap/static/custom-bootstrap

File renamed without changes.

‎ietf/templates/base.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
{% endcomment %}
1919

2020
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.min.css' %}">
21-
<link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap.min.css' %}">
22-
<link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap-theme.min.css' %}">
21+
<link rel="stylesheet" href="{% static 'custom-bootstrap/css/bootstrap.min.css' %}">
22+
<link rel="stylesheet" href="{% static 'custom-bootstrap/css/bootstrap-theme.min.css' %}">
2323
<link rel="stylesheet" href="/css/ietf.css">
2424
<style>
2525
{% block morecss %}{% endblock %}
@@ -156,7 +156,7 @@
156156
<script>$(".visible-nojs").removeClass("visible-nojs");</script>
157157
<script>$(".hidden-nojs").removeClass("hidden-nojs");</script>
158158
<script src="{% static 'jquery.cookie/jquery.cookie.js' %}"></script>
159-
<script src="{% static 'bootstrap/js/bootstrap.min.js' %}"></script>
159+
<script src="{% static 'custom-bootstrap/js/bootstrap.min.js' %}"></script>
160160
<script src="/js/ietf.js"></script>
161161
{% block js %}{% endblock %}
162162
</body>

‎ietf/templates/meeting/room-view.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
{% load origin %}{% origin %}
33
{% load staticfiles %}
44
<html> <head>
5-
<link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap.min.css' %}"> {% comment %} This sets box-sizing: border-box {% endcomment %}
6-
<link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap-theme.min.css' %}">
5+
<link rel="stylesheet" href="{% static 'custom-bootstrap/css/bootstrap.min.css' %}"> {% comment %} This sets box-sizing: border-box {% endcomment %}
6+
<link rel="stylesheet" href="{% static 'custom-bootstrap/css/bootstrap-theme.min.css' %}">
77
<script src="{% static 'jquery/jquery.min.js' %}"></script>
8-
<script src="{% static 'bootstrap/js/bootstrap.min.js' %}"></script>
8+
<script src="{% static 'custom-bootstrap/js/bootstrap.min.js' %}"></script>
99
<script type="text/javascript">
1010

1111
var room_names = [{% for room in rooms %}"{{room.name}}"{% if not forloop.last %},{% endif %}{% endfor %}];

‎static/lib/bootstrap/css/bootstrap.min.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/lib/bootstrap/less/bootstrap.less‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/*!
2+
* Bootstrap v3.3.5 (http://getbootstrap.com)
3+
* Copyright 2011-2015 Twitter, Inc.
4+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
5+
*/
6+
17
// Core variables and mixins
28
@import "variables.less";
39
@import "mixins.less";

0 commit comments

Comments
 (0)