Commit 15788c6a authored by Michal Čihař's avatar Michal Čihař

Update Bootstrap to 3.3.5

While doing that, also

- update datepicker and RTL addons
- include bootstrap sources (we no longer ship minified files)
- remove some not used components from bootstrap
- issue #741
Signed-off-by: default avatarMichal Čihař <michal@cihar.com>
parent f36fd86a
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
{% endif %} {% endif %}
{% compress css %} {% compress css %}
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap/css/bootstrap.min.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'bootstrap/css/bootstrap.css' %}" />
{% if LANGUAGE_BIDI %} {% if LANGUAGE_BIDI %}
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap/css/bootstrap-rtl.min.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'bootstrap/css/bootstrap-rtl.css' %}" />
{% endif %} {% endif %}
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap/css/bootstrap-theme.min.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'bootstrap/css/bootstrap-theme.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap/css/bootstrap-datepicker3.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'font-awesome/css/font-awesome.min.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'font-awesome/css/font-awesome.min.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'font-linux/font-linux.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'font-linux/font-linux.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'bootstrap/css/datepicker3.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'chartist.min.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'chartist.min.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'style-bootstrap.css' %}" /> <link rel="stylesheet" type="text/css" href="{% static 'style-bootstrap.css' %}" />
{% endcompress %} {% endcompress %}
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
<script src="{% static 'js/mousetrap.min.js' %}" type="text/javascript"></script> <script src="{% static 'js/mousetrap.min.js' %}" type="text/javascript"></script>
<script src="{% static 'js/mousetrap-global-bind.min.js' %}" type="text/javascript"></script> <script src="{% static 'js/mousetrap-global-bind.min.js' %}" type="text/javascript"></script>
<script src="{% static 'js/chartist.min.js' %}" type="text/javascript"></script> <script src="{% static 'js/chartist.min.js' %}" type="text/javascript"></script>
<script src="{% static 'bootstrap/js/bootstrap.min.js' %}" type="text/javascript"></script> <script src="{% static 'bootstrap/js/bootstrap.js' %}" type="text/javascript"></script>
<script src="{% static 'loader-bootstrap.js' %}" type="text/javascript"></script> <script src="{% static 'loader-bootstrap.js' %}" type="text/javascript"></script>
<script src="{% static 'js/bootstrap-datepicker.js' %}" type="text/javascript"></script> <script src="{% static 'bootstrap/js/bootstrap-datepicker.js' %}" type="text/javascript"></script>
{% endcompress %} {% endcompress %}
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
......
...@@ -82,6 +82,9 @@ ...@@ -82,6 +82,9 @@
"@btn-danger-bg": "@brand-danger", "@btn-danger-bg": "@brand-danger",
"@btn-danger-border": "darken(@btn-danger-bg, 5%)", "@btn-danger-border": "darken(@btn-danger-bg, 5%)",
"@btn-link-disabled-color": "@gray-light", "@btn-link-disabled-color": "@gray-light",
"@btn-border-radius-base": "@border-radius-base",
"@btn-border-radius-large": "@border-radius-large",
"@btn-border-radius-small": "@border-radius-small",
"@input-bg": "#fff", "@input-bg": "#fff",
"@input-bg-disabled": "@gray-lighter", "@input-bg-disabled": "@gray-lighter",
"@input-color": "@gray", "@input-color": "@gray",
...@@ -213,6 +216,7 @@ ...@@ -213,6 +216,7 @@
"@jumbotron-bg": "@gray-lighter", "@jumbotron-bg": "@gray-lighter",
"@jumbotron-heading-color": "inherit", "@jumbotron-heading-color": "inherit",
"@jumbotron-font-size": "ceil((@font-size-base * 1.5))", "@jumbotron-font-size": "ceil((@font-size-base * 1.5))",
"@jumbotron-heading-font-size": "ceil((@font-size-base * 4.5))",
"@state-success-text": "#3c763d", "@state-success-text": "#3c763d",
"@state-success-bg": "#dff0d8", "@state-success-bg": "#dff0d8",
"@state-success-border": "darken(spin(@state-success-bg, -10), 5%)", "@state-success-border": "darken(spin(@state-success-bg, -10), 5%)",
...@@ -394,11 +398,9 @@ ...@@ -394,11 +398,9 @@
"pager.less", "pager.less",
"labels.less", "labels.less",
"badges.less", "badges.less",
"jumbotron.less",
"thumbnails.less", "thumbnails.less",
"alerts.less", "alerts.less",
"progress-bars.less", "progress-bars.less",
"media.less",
"list-group.less", "list-group.less",
"panels.less", "panels.less",
"responsive-embed.less", "responsive-embed.less",
...@@ -406,10 +408,7 @@ ...@@ -406,10 +408,7 @@
"close.less", "close.less",
"component-animations.less", "component-animations.less",
"dropdowns.less", "dropdowns.less",
"tooltip.less", "tooltip.less"
"popovers.less",
"modals.less",
"carousel.less"
], ],
"js": [ "js": [
"alert.js", "alert.js",
...@@ -425,5 +424,5 @@ ...@@ -425,5 +424,5 @@
"scrollspy.js", "scrollspy.js",
"transition.js" "transition.js"
], ],
"customizerUrl": "http://getbootstrap.com/customize/?id=0f2392c1fec32bd3dd18" "customizerUrl": "http://getbootstrap.com/customize/?id=9c39c6b9397a1be74d3c"
} }
\ No newline at end of file
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
.datepicker-dropdown { .datepicker-dropdown {
top: 0; top: 0;
left: 0; left: 0;
padding: 4px;
} }
.datepicker-dropdown:before { .datepicker-dropdown:before {
content: ''; content: '';
...@@ -53,18 +54,18 @@ ...@@ -53,18 +54,18 @@
.datepicker-dropdown.datepicker-orient-right:after { .datepicker-dropdown.datepicker-orient-right:after {
right: 7px; right: 7px;
} }
.datepicker-dropdown.datepicker-orient-top:before { .datepicker-dropdown.datepicker-orient-bottom:before {
top: -7px; top: -7px;
} }
.datepicker-dropdown.datepicker-orient-top:after { .datepicker-dropdown.datepicker-orient-bottom:after {
top: -6px; top: -6px;
} }
.datepicker-dropdown.datepicker-orient-bottom:before { .datepicker-dropdown.datepicker-orient-top:before {
bottom: -7px; bottom: -7px;
border-bottom: 0; border-bottom: 0;
border-top: 7px solid #999; border-top: 7px solid #999;
} }
.datepicker-dropdown.datepicker-orient-bottom:after { .datepicker-dropdown.datepicker-orient-top:after {
bottom: -6px; bottom: -6px;
border-bottom: 0; border-bottom: 0;
border-top: 6px solid #fff; border-top: 6px solid #fff;
...@@ -113,6 +114,10 @@ ...@@ -113,6 +114,10 @@
color: #999999; color: #999999;
cursor: default; cursor: default;
} }
.datepicker table tr td.highlighted {
background: #d9edf7;
border-radius: 0;
}
.datepicker table tr td.today, .datepicker table tr td.today,
.datepicker table tr td.today:hover, .datepicker table tr td.today:hover,
.datepicker table tr td.today.disabled, .datepicker table tr td.today.disabled,
...@@ -701,11 +706,15 @@ fieldset[disabled] .datepicker table tr td span.active.disabled:hover.active { ...@@ -701,11 +706,15 @@ fieldset[disabled] .datepicker table tr td span.active.disabled:hover.active {
.datepicker .datepicker-switch { .datepicker .datepicker-switch {
width: 145px; width: 145px;
} }
.datepicker thead tr:first-child th, .datepicker .datepicker-switch,
.datepicker .prev,
.datepicker .next,
.datepicker tfoot tr th { .datepicker tfoot tr th {
cursor: pointer; cursor: pointer;
} }
.datepicker thead tr:first-child th:hover, .datepicker .datepicker-switch:hover,
.datepicker .prev:hover,
.datepicker .next:hover,
.datepicker tfoot tr th:hover { .datepicker tfoot tr th:hover {
background: #eeeeee; background: #eeeeee;
} }
...@@ -715,10 +724,6 @@ fieldset[disabled] .datepicker table tr td span.active.disabled:hover.active { ...@@ -715,10 +724,6 @@ fieldset[disabled] .datepicker table tr td span.active.disabled:hover.active {
padding: 0 2px 0 5px; padding: 0 2px 0 5px;
vertical-align: middle; vertical-align: middle;
} }
.datepicker thead tr:first-child .cw {
cursor: default;
background-color: transparent;
}
.input-group.date .input-group-addon { .input-group.date .input-group-addon {
cursor: pointer; cursor: pointer;
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment