Merge branch 'master' into live

* master:
  SPR-815 remove unused roboto font
  SPR-800 remove unused function file
  use simpler striped pattern for section highlight
  activate deployment
  Add fabfile.py
This commit is contained in:
Andreas Gohr 2017-02-21 15:21:50 +01:00
commit f6216bf7c2
74 changed files with 76 additions and 4277 deletions

View file

@ -22,15 +22,13 @@
}
}
div.section_highlight{
margin: 0;
padding: 0 0 1rem 0;
border: 1px solid #abced4;
background-color: #fff;
background-image:
linear-gradient(90deg, transparent 79px, #abced4 79px, #abced4 81px, transparent 81px),
linear-gradient(#eee .1em, transparent .1em);
background-size: 100% 1.2em;
opacity: .7;
background: repeating-linear-gradient(
-45deg,
@ini_background_neu,
@ini_background_neu 10px,
@ini_background 10px,
@ini_background 20px,
);
}
.secedit {
float: right;

View file

@ -4,15 +4,6 @@
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
/* web font */
//.setLocalFontFace('roboto',300,'Roboto Light','Roboto-Light','roboto-light'); /* roboto light */
//.setLocalFontFace('roboto',400,'Roboto','Roboto-Regular','roboto-regular'); /* roboto regular */
//.setLocalFontFace('roboto',500,'Roboto Medium','Roboto-Medium','roboto-medium'); /* roboto medium */
//.setLocalFontFace('roboto',700,'Roboto Bold','Roboto-Bold','roboto-bold'); /* roboto bold */
//.setLocalFontFace('roboto',400,'Roboto Condensed','RobotoCondensed-Regular','roboto-condensed'); /* roboto condensed */
//.setLocalFontFace('roboto',700,'Roboto Condensed Bold','RobotoCondensed-Bold','roboto-boldcondensed'); /* roboto condensed */
/* icon font */
.setIconFontFace('fontello','fontello');