Andreas Gohr
9281ecfa76
fixed line endings CRLF -> LF
2017-02-09 17:48:44 +01:00
Andreas Gohr
6b795a1e14
move msg area down to content area. fixes SPR-792
2017-02-09 17:40:18 +01:00
Andreas Gohr
aef104329a
fix name of toc tab
2017-02-09 17:38:51 +01:00
Andreas Gohr
59568563a3
use new admin.less instead of admin.css
2017-02-09 17:38:15 +01:00
Andreas Gohr
55a903a9da
changed default logo location (and line endings)
2017-02-09 17:37:38 +01:00
Jana Deutschländer
9d282a57d4
debug breadcrumb height vs search toggle icon
2017-02-09 17:06:55 +01:00
Jana Deutschländer
6924827172
merge part 2
2017-02-09 17:03:14 +01:00
Jana Deutschländer
4b8b659179
merge part 2
...
# 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:59:16 +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
3bd1b21aee
sidebar nav reset open toggle areas when switch to wide content view
2017-02-09 11:27:52 +01:00
Jana Deutschländer
28eb39b298
merge styles of prototype beuth hs project
2017-02-09 10:12:50 +01:00
Jana Deutschländer
fbb87b85c4
Merge branch 'spis-master' into 'master'
...
SPR-768: SprintMeeting Anpassungen
See merge request !13
2017-01-18 12:43:07 +01:00
Jana Deutschländer
edabe53b81
trigger defaultcontent in wide-content state main menu on click
2017-01-11 18:06:07 +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
b7592db0de
merge debug
2017-01-11 16:19:20 +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
00c1ebdd53
new var @fix_border-radius for no custom border-radius
2017-01-11 15:21:29 +01:00
Silke Pisulla
acc4acbcf1
new var @fix_border-radius for no custom border-radius
2017-01-11 15:20:15 +01:00
Silke Pisulla
527e72e79a
SPR-768: Anpassungen - SprintMeeting 10.1.2017 - tabbox
2017-01-11 15:18:39 +01:00
Silke Pisulla
bbf124abb2
SPR-768: Anpassungen - SprintMeeting 10.1.2017 - breadcrumb padding
2017-01-11 15:17:39 +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
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
13520a979e
clear content
2017-01-10 14:42:58 +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
e68808297d
Merge branch 'spis-master' into 'master'
...
spis master
See merge request !8
2017-01-09 14:33:18 +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
