Commit graph

26 commits

Author SHA1 Message Date
Jana Deutschländer
28eb39b298 merge styles of prototype beuth hs project 2017-02-09 10:12:50 +01:00
Jana Deutschländer
b7592db0de merge debug 2017-01-11 16:19:20 +01:00
Silke Pisulla
555efed804 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master
# Conflicts:
#	css/area_content.less
#	css/area_nav-breadcrumb.less
#	css/area_nav-metabox.less
#	css/area_sidetools.less
#	css/base_design.less
2017-01-11 15:44:24 +01:00
Silke Pisulla
acc4acbcf1 new var @fix_border-radius for no custom border-radius 2017-01-11 15:20:15 +01:00
Jana Deutschländer
fda6466f1a font-size des root reduziert, damit default font size 1rem entspricht 2017-01-11 14:40:43 +01:00
Silke Pisulla
52928b7b4e nav-main new hover for icons 2017-01-10 14:46:56 +01:00
Jana Deutschländer
1b899691a7 Vorbereitung sprint meeting 2017-01-10 09:18:01 +01:00
Silke Pisulla
f13c82a6a8 trace in mac 2017-01-09 11:09:34 +01:00
Silke Pisulla
3417b38564 font-size in responsive 2017-01-06 12:53:18 +01:00
Silke Pisulla
2c70b80910 trace + better padding and font for responsive 2017-01-06 11:53:49 +01:00
Silke Pisulla
1b08ab7c47 linked h6 + add css for trace 2017-01-06 10:20:27 +01:00
Jana Deutschländer
83efa0de01 mobile view part 1 2017-01-05 18:23:56 +01:00
Jana Deutschländer
dedcbe546a Merge branch 'master' into 'spis-master'
# Conflicts:
#   css/area_sidetools.less
2017-01-05 17:15:37 +01:00
Jana Deutschländer
42f5d72185 Format 2017-01-05 17:12:06 +01:00
Jana Deutschländer
d76e83a7bc Format 2017-01-05 17:10:34 +01:00
Jana Deutschländer
19265a3d2c sidebar toggle + scrolltobottom for trace on page load 2017-01-05 17:04:48 +01:00
Silke Pisulla
ad89b29f39 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master
# Conflicts:
#	css/area_sidetools.less
2017-01-05 15:39:15 +01:00
Jana Deutschländer
fb0ec22f42 additional sidebar menus 2017-01-05 15:26:50 +01:00
Silke Pisulla
b6b228b16d em --> rem + font-size in responsive 2017-01-05 15:26:31 +01:00
Silke Pisulla
990dda13aa Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-01-05 14:01:27 +01:00
Jana Deutschländer
0d1087af30 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template 2017-01-05 13:38:43 +01:00
Jana Deutschländer
646345133d side-tools, user links, admin panel 2017-01-05 13:38:12 +01:00
Silke Pisulla
fa90fc6fce button-var reverted 2017-01-05 13:38:10 +01:00
Silke Pisulla
dba38052f8 using button-color + button-background 2017-01-05 10:47:49 +01:00
Jana Deutschländer
5cbfd9f86e main nav counter fallback 2017-01-04 16:37:51 +01:00
Silke Pisulla
51068a2880 css aside prepared 2017-01-04 12:52:57 +01:00