Commit graph

114 commits

Author SHA1 Message Date
Jana Deutschländer
659ce8325f merge mit spis vorbereiten 2017-01-11 15:51:10 +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
Jana Deutschländer
2fc1643265 wide content ohne logo 2017-01-10 17:16:57 +01:00
Jana Deutschländer
b25b2fb7b6 struct font sizes, page tool icons 2017-01-10 17:14:13 +01:00
Jana Deutschländer
43d4ee93fa Merge branch 'spis-master' into 'master'
better content-togglelink

See merge request !10
2017-01-10 16:05:21 +01:00
Jana Deutschländer
ccf1b0eac9 message area + admin part 1 2017-01-10 16:04:58 +01:00
Silke Pisulla
9d4d2a1a8c better content-togglelink 2017-01-10 15:28:51 +01:00
Silke Pisulla
52928b7b4e nav-main new hover for icons 2017-01-10 14:46:56 +01:00
Jana Deutschländer
54bed87c4e clear content 2017-01-10 14:43:13 +01:00
Jana Deutschländer
a67033a090 Merge branch 'spis-master' into 'master'
num in metabox + togglelink for sitebar

See merge request !9
2017-01-10 10:03:22 +01:00
Jana Deutschländer
4ab8bced93 toggler 2017-01-10 10:02:01 +01:00
Silke Pisulla
5584fcd5ad togglelink für content 2017-01-10 10:00:03 +01:00
Silke Pisulla
ca5760c2ba Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-01-10 09:57:49 +01:00
Silke Pisulla
33b4a53199 togglelink für content 2017-01-10 09:57:35 +01:00
Jana Deutschländer
3569264837 wide content toggler 2017-01-10 09:41:22 +01:00
Silke Pisulla
a1671cb1d0 num in metabox 2017-01-10 09:38:13 +01:00
Jana Deutschländer
1b899691a7 Vorbereitung sprint meeting 2017-01-10 09:18:01 +01:00
Jana Deutschländer
92c91ef8b0 metabox part 3 2017-01-09 17:08:44 +01:00
Jana Deutschländer
d62df8bdbf metabox part 2 2017-01-09 16:31:32 +01:00
Jana Deutschländer
6d48db2727 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template 2017-01-09 14:34:14 +01:00
Jana Deutschländer
38297711ab metabox part 1 2017-01-09 14:32:43 +01:00
Silke Pisulla
754aa1ca30 image position in jiralink 2017-01-09 11:09:49 +01:00
Silke Pisulla
f13c82a6a8 trace in mac 2017-01-09 11:09:34 +01:00
Silke Pisulla
6ea8b72ee3 delete styles after changing base_design 2017-01-06 13:55:56 +01:00
Silke Pisulla
746025d20b font-size + custom vars 2017-01-06 13:55:20 +01:00
Silke Pisulla
3417b38564 font-size in responsive 2017-01-06 12:53:18 +01:00
Silke Pisulla
784809336d better padding and font for responsive 2017-01-06 11:53:57 +01:00
Silke Pisulla
2c70b80910 trace + better padding and font for responsive 2017-01-06 11:53:49 +01:00
Silke Pisulla
80a8597571 deleted margin-bottom for main-content (for optional bg-color without white space) 2017-01-06 11:52:51 +01:00
Silke Pisulla
52b93d12e9 hover: bg-color for hover 2017-01-06 11:51:32 +01:00
Silke Pisulla
1b08ab7c47 linked h6 + add css for trace 2017-01-06 10:20:27 +01:00
Silke Pisulla
04289d080f sidebar: last LI without border-bottom 2017-01-06 10:05:54 +01:00
Silke Pisulla
b965719e3c code cleaning + hover for logo only 2px border 2017-01-06 10:05:27 +01:00
Jana Deutschländer
742a706335 magic matcher mobile 2017-01-05 19:01:19 +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
56e5a149e0 font-size in responsive 2017-01-05 15:55:17 +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
Silke Pisulla
1d7ed72f93 css moved from main-content to base-design 2017-01-05 14:01:12 +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
fba5a49e49 forms 2017-01-05 13:37:11 +01:00
Silke Pisulla
98c19ec009 color + hover + padding 2017-01-05 11:18:53 +01:00