Commit graph

83 commits

Author SHA1 Message Date
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
Jana Deutschländer
7ee8c3ecb7 Merge branch 'spis-master' into 'master'
spis master

See merge request !6
2017-01-05 10:51:20 +01:00
Silke Pisulla
dba38052f8 using button-color + button-background 2017-01-05 10:47:49 +01:00
Silke Pisulla
ea4d64f5ed img as inline-block 2017-01-05 10:46:21 +01:00
Silke Pisulla
14fc5f24f9 added var 2017-01-05 10:46:02 +01:00
Silke Pisulla
4a6674ad6f position + hover 2017-01-05 09:39:18 +01:00
Silke Pisulla
a4152dcdb3 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-01-05 08:15:04 +01:00
Silke Pisulla
158656e27e css content + struct-plugin prepared 2017-01-05 08:14:09 +01:00
Jana Deutschländer
4fca1d16bb language handling for js 2017-01-04 18:09:30 +01:00
Jana Deutschländer
c39e94e4e3 main nav effects 2017-01-04 17:37:57 +01:00
Jana Deutschländer
5cbfd9f86e main nav counter fallback 2017-01-04 16:37:51 +01:00
Jana Deutschländer
605f78d818 debug show or hide sidebar in edit mode 2017-01-04 16:04:15 +01:00
Jana Deutschländer
42f51ec5ba ignore unzipped fontello folder 2017-01-04 15:28:47 +01:00
Jana Deutschländer
3f78608ebd Merge branch 'patch-1' into 'master'
fix some smaller typos / variable names

See merge request !5
2017-01-04 15:27:09 +01:00
Jana Deutschländer
378cb41cd4 metabox for hightlightparent 2017-01-04 15:26:19 +01:00
Michael Große
e44e33a6d7 fix: fix some smaller typos / variable names 2017-01-04 15:16:26 +01:00
Jana Deutschländer
de9f7e8a3c tilde removed for font string (caused space in icon path) 2017-01-04 14:51:19 +01:00
Jana Deutschländer
fcff5aeafb Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template 2017-01-04 13:40:03 +01:00
Jana Deutschländer
f2ce71d425 Merge remote-tracking branch 'origin/spis-master'
# 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-01-04 13:39:23 +01:00
Jana Deutschländer
bdd5990e04 Merge branch 'spis-master' into 'master'
spis master

See merge request !4
2017-01-04 13:37:04 +01:00
Jana Deutschländer
c5368b49aa debug page tools in admin view 2017-01-04 13:33:05 +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
Silke Pisulla
51068a2880 css aside prepared 2017-01-04 12:52:57 +01:00
Jana Deutschländer
63fc1542a1 edit svgs for page tools 2017-01-04 12:29:19 +01:00
Jana Deutschländer
b79e40e7e0 edit link in page tools 2017-01-04 11:48:43 +01:00
Jana Deutschländer
3f2afacb5e fixme comment 2017-01-04 10:54:54 +01:00
Silke Pisulla
9008d561d8 jiralinks in content 2017-01-04 10:38:40 +01:00
Silke Pisulla
bdad3fbdc3 icon-buttons font-size + padding 2017-01-04 10:36:44 +01:00
Jana Deutschländer
36a92dc238 page tool icons responsive 2017-01-03 18:10:26 +01:00
Jana Deutschländer
9efccdad5f page tools, doc infos text.align right 2017-01-03 18:03:38 +01:00
Jana Deutschländer
2ea8cf15ce Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template 2017-01-03 16:44:02 +01:00
Jana Deutschländer
e15f331cf8 page tools svg 2017-01-03 16:43:44 +01:00
Jana Deutschländer
e3ba171902 Merge branch 'spis-master' into 'master'
spis master

See merge request !3
2017-01-03 16:25:03 +01:00
Silke Pisulla
a2b6ba855e responsive behaviour 2017-01-03 15:58:22 +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
5a16f4f4f5 new searchsubmitbutton design 2017-01-03 14:48:35 +01:00
Silke Pisulla
ed6fc9e542 uniform styles for icon-buttons (+ mixin added) 2017-01-03 14:48:13 +01:00
Silke Pisulla
e4e1e8685d some vars for button 2017-01-03 14:46:18 +01:00
Silke Pisulla
8de9d2c986 mixins for "num" and li as wrapper for icon-buttons 2017-01-03 14:45:51 +01:00
Silke Pisulla
062754f880 some vars for button 2017-01-03 14:44:50 +01:00
Silke Pisulla
c04d41f357 ie11: logo to large 2017-01-03 14:44:25 +01:00
Silke Pisulla
522fc138e1 link-hover added 2017-01-03 11:42:09 +01:00
Silke Pisulla
9638f4f044 code cleaning 2017-01-03 11:41:28 +01:00
Silke Pisulla
a9c24a5f58 page-footer, main-footer 2017-01-03 11:40:39 +01:00
Silke Pisulla
569e12b7cf code cleaning 2017-01-03 11:40:12 +01:00
Jana Deutschländer
9883344795 page tools with icon fonts 2017-01-02 18:09:35 +01:00
Jana Deutschländer
dc03f1aa3e Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template 2017-01-02 16:17:26 +01:00