Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template

# Conflicts:
#	css/area_nav-pagetools.less
#	css/base_mixins.less
This commit is contained in:
Jana Deutschländer 2017-01-02 15:15:47 +01:00
commit 4e16e9e596
15 changed files with 390 additions and 199 deletions

View file

@ -4,10 +4,12 @@
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Fonts */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
.setLocalFontFace(@fontFamily,@fontWeight,@localFontName,@localFontNameVar,@filename){
.setLocalFontFace(@fontFamily,@fontWeight,@localFontName,@localFontNameVar,@filename) {
@font-face {
font-family: @fontFamily;
font-style: normal;
@ -17,7 +19,7 @@
}
}
.setIconFontFace(@fontFamily,@filename){
.setIconFontFace(@fontFamily,@filename) {
@font-face {
font-family: @fontFamily;
src: ~"url('fonts/icons/"~"@{filename}.eot?6762325')";
@ -27,9 +29,8 @@
}
}
.fontello(){
&::before{
.fontello() {
&::before {
font-family: "fontello";
font-style: normal;
font-weight: normal;
@ -62,12 +63,11 @@
/* Uncomment for 3D effect */
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}
}
.fontello-double(){
&::before, &::after{
.fontello-double() {
&::before,
&::after {
font-family: "fontello";
font-style: normal;
font-weight: normal;
@ -100,14 +100,13 @@
/* Uncomment for 3D effect */
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Screenreader / Hide */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
.sr-out() {
display: block;
width: 1px;
@ -118,7 +117,7 @@
left: -200000em;
}
.sr-only(){
.sr-only() {
position: absolute;
width: 1px;
height: 1px;
@ -141,14 +140,15 @@
}
}
.btn-default-size(){
.btn-default-size() {
height: 1rem;
width: 1rem;
min-height: 1.2em;
min-width: 1.4em;
}
.btn-default-height(){
.btn-default-height() {
height: 1rem;
min-height: 1.2em;
min-width: 1.4em;
@ -160,10 +160,16 @@
white-space: nowrap;
text-indent: -9999px;
.btn-default-size();
height: 1rem;
width: 1rem;
min-height: 1.2em;
min-width: 1.4em;
&::before{
text-indent: 0;
float: left;
}
&::after{
text-indent: 0;
float: left;
@ -171,7 +177,7 @@
}
.hide-text-show-after(){
.hide-text-show-after() {
display: inline-block;
overflow: hidden;
white-space: nowrap;
@ -186,25 +192,26 @@
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Screenreader / Hide */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
.reset(){
.reset() {
background: transparent;
border: none 0; outline: 0; vertical-align: baseline;
font-style: normal;
margin: 0; padding: 0;
}
.elementsReset(){
.elementsReset() {
div, span, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote,
a, abbr, em,acronym, img, strong,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
input, select, option, textarea, button{
input, select, option, textarea, button {
.reset();
}
}
@ -213,6 +220,7 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Col Grid */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
.make-grid(@class) {
.float-grid-columns(@class);
.loop-grid-columns(@grid-columns, @class, width);
@ -235,6 +243,3 @@
width: percentage((@index / @grid-columns));
}
}