Commit graph

25 commits

Author SHA1 Message Date
Jana Deutschländer
9d282a57d4 debug breadcrumb height vs search toggle icon 2017-02-09 17:06:55 +01:00
Jana Deutschländer
432353279d Merge remote-tracking branch 'origin/bar_search' part 1
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-02-09 16:53:43 +01:00
Jana Deutschländer
5671e6e5e8 merge jde_bar_search and bar_search branch 2017-02-09 16:48:46 +01:00
Jana Deutschländer
28eb39b298 merge styles of prototype beuth hs project 2017-02-09 10:12:50 +01:00
Jana Deutschländer
d0530116c5 mobile + js: min-height for content > sidebar hight 2017-01-11 17:51:42 +01:00
Jana Deutschländer
863ddc8263 Merge remote-tracking branch 'origin/spis-master' into bar_search
# Conflicts:
#	css/area_content.less
#	css/area_nav-breadcrumb.less
2017-01-11 15:59:24 +01:00
Jana Deutschländer
659ce8325f merge mit spis vorbereiten 2017-01-11 15:51:10 +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
cef85c91a1 SPR-768: Anpassungen - SprintMeeting 10.1.2017 - breadcrumb padding 2017-01-11 15:16:40 +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
9d4d2a1a8c better content-togglelink 2017-01-10 15:28:51 +01:00
Jana Deutschländer
1b899691a7 Vorbereitung sprint meeting 2017-01-10 09:18:01 +01:00
Silke Pisulla
52b93d12e9 hover: bg-color for hover 2017-01-06 11:51:32 +01:00
Silke Pisulla
fa90fc6fce button-var reverted 2017-01-05 13:38:10 +01:00
Silke Pisulla
98c19ec009 color + hover + padding 2017-01-05 11:18:53 +01:00
Silke Pisulla
dba38052f8 using button-color + button-background 2017-01-05 10:47:49 +01:00
Silke Pisulla
fb408e5e99 uniform styles for icon-buttons (+ mixin for prefix added) 2017-01-04 13:21:37 +01:00
Silke Pisulla
865239e692 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-01-04 12:53:30 +01:00
Jana Deutschländer
b79e40e7e0 edit link in page tools 2017-01-04 11:48:43 +01:00
Silke Pisulla
bdad3fbdc3 icon-buttons font-size + padding 2017-01-04 10:36:44 +01:00
Silke Pisulla
acbf1f1210 breadcrumb padding 2017-01-03 15:36:49 +01:00
Silke Pisulla
9a1f716d9a styles for icon-buttons .num with "0"-amount 2017-01-03 15:18:50 +01:00
Silke Pisulla
ed6fc9e542 uniform styles for icon-buttons (+ mixin added) 2017-01-03 14:48:13 +01:00
Jana Deutschländer
035726f000 template redesign 2017-01-02 09:14:38 +01:00
Jana Deutschländer
f414dd9577 template redesign 2017-01-02 08:58:59 +01:00