Commit 4e79ee6f authored by Phil Höfer's avatar Phil Höfer

Merge branch '813-glyphicons-entfernen' into 'development'

Resolve "Glyphicons entfernen"

Closes #813

See merge request !1334
parents 39367513 cb4c9749
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -11,7 +11,6 @@
// Reset and dependencies
@import "normalize.less";
@import "print.less";
@import "glyphicons.less";
// Core CSS
@import "scaffolding.less";
......
......@@ -126,22 +126,18 @@
// Toggles
.icon-prev,
.icon-next,
.glyphicon-chevron-left,
.glyphicon-chevron-right {
.icon-next {
position: absolute;
top: 50%;
margin-top: -10px;
z-index: 5;
display: inline-block;
}
.icon-prev,
.glyphicon-chevron-left {
.icon-prev {
left: 50%;
margin-left: -10px;
}
.icon-next,
.glyphicon-chevron-right {
.icon-next {
right: 50%;
margin-right: -10px;
}
......@@ -237,8 +233,6 @@
// Scale up the controls a smidge
.carousel-control {
.glyphicon-chevron-left,
.glyphicon-chevron-right,
.icon-prev,
.icon-next {
width: (@carousel-control-font-size * 1.5);
......@@ -246,11 +240,9 @@
margin-top: (@carousel-control-font-size / -2);
font-size: (@carousel-control-font-size * 1.5);
}
.glyphicon-chevron-left,
.icon-prev {
margin-left: (@carousel-control-font-size / -2);
}
.glyphicon-chevron-right,
.icon-next {
margin-right: (@carousel-control-font-size / -2);
}
......
This diff is collapsed.
......@@ -71,18 +71,6 @@
@headings-color: inherit;
//== Iconography
//
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
//** Load fonts from this directory.
@icon-font-path: "/fonts/";
//** File name for all font files.
@icon-font-name: "glyphicons-halflings-regular";
//** Element ID within SVG icon file.
@icon-font-svg-id: "glyphicons_halflingsregular";
//== Components
//
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
......
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