Commit graph

46 commits

Author SHA1 Message Date
Michael Große
3f9d4d521a
Merge branch 'master' into pageattributes
Adjusted some more files to account for changes in the over 100 commits
in master since the creation of this branch.

SPR-869
2017-04-11 16:13:02 +02:00
Silke Pisulla
14705c4ea4 SPR-908: rgb code qs 2017-04-03 13:32:35 +02:00
Silke Pisulla
eeaa70e6b8 SPR-908: QS - margin, padding, font-size 2017-03-30 10:39:12 +02:00
Silke Pisulla
2d623f4b2e SPR-742: Konfigurierbarkeit check, neuzuordnung 2017-03-28 15:10:27 +02:00
Silke Pisulla
efa1155dc8 SPR-910: var rename - background (site, page, header, footer) button (bg, color), link (existing) + box-shadow as fix var 2017-03-23 15:38:57 +01:00
Silke Pisulla
5f18c8954f SPR-742: Konfigurierbarkeit content-width 2017-03-23 12:56:55 +01:00
Silke Pisulla
3cdc9fcb67 SPR-910: var rename - nav_menu_color, nav_menu_hover_color, nav_menu_hover_bg 2017-03-23 12:55:46 +01:00
Silke Pisulla
38bfc8bb62 SPR-910: var rename - border-color 2017-03-22 15:20:49 +01:00
Silke Pisulla
ef4640f4d7 SPR-910: var rename - border-radius 2017-03-22 15:02:45 +01:00
Silke Pisulla
7fb6106290 SPR-742: Konfigurierbarkeit - additional fix vars for number in usertools 2017-03-17 15:18:05 +01:00
Silke Pisulla
cb25c44ba1 SPR-866: Title and Claim prepared 2017-03-10 15:17:13 +01:00
Andreas Gohr
80573eb884 do not break the C in CSS
Non-explicitly styled elements are supposed to inherit their parent's
font and colors!
2017-03-09 16:18:15 +01:00
Silke Pisulla
1466b31431 SPR-863: Function "logged in as" css for anchor + qs all icons in header 2017-03-09 15:30:27 +01:00
Silke Pisulla
8ed4f142b7 SPR-843: Fontello Icons uniform size 2017-03-03 10:58:14 +01:00
Silke Pisulla
c27edccc74 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-03-03 09:24:27 +01:00
Jana Deutschländer
b10c27f3f2 SPR-840: debug sidebar script IE10, styling for mobile menu
debug background-color: qc
2017-03-02 16:45:22 +01:00
Silke Pisulla
d2177fbfc2 bug in mediaqueries 2017-02-10 13:33:28 +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
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
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
Jana Deutschländer
54bed87c4e clear content 2017-01-10 14:43:13 +01:00
Jana Deutschländer
1b899691a7 Vorbereitung sprint meeting 2017-01-10 09:18:01 +01:00
Jana Deutschländer
742a706335 magic matcher mobile 2017-01-05 19:01:19 +01:00
Silke Pisulla
14fc5f24f9 added var 2017-01-05 10:46:02 +01:00
Silke Pisulla
062754f880 some vars for button 2017-01-03 14:44:50 +01:00
Silke Pisulla
522fc138e1 link-hover added 2017-01-03 11:42:09 +01:00
Jana Deutschländer
dc03f1aa3e Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template 2017-01-02 16:17:26 +01:00
Silke Pisulla
f3f931da21 search: css 2017-01-02 15:59:57 +01:00
Jana Deutschländer
4e16e9e596 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template
# Conflicts:
#	css/area_nav-pagetools.less
#	css/base_mixins.less
2017-01-02 15:15:47 +01:00
Jana Deutschländer
18001ee40c page tools part 1 2017-01-02 15:12:27 +01:00
Silke Pisulla
f7538454c1 some font-sizes 2017-01-02 14:19:23 +01:00
Silke Pisulla
d82747f4ba some font-sizes 2017-01-02 13:45:20 +01:00
Silke Pisulla
0159f7fd96 code cleaning 2017-01-02 13:11:41 +01:00
Jana Deutschländer
f414dd9577 template redesign 2017-01-02 08:58:59 +01:00
Jana Deutschländer
77d4a15da5 sidebar 2016-12-20 18:02:26 +01:00
Jana Deutschländer
42f8e89c3c template basis structure 2016-12-19 17:15:27 +01:00
Jana Deutschländer
da7e18f852 nav-tools menu icons 2016-12-13 17:13:23 +01:00
Jana Deutschländer
3f601ccaf4 fontello icons added 2016-12-06 12:05:57 +01:00
Jana Deutschländer
cf24d7da37 structure 2016-11-22 17:24:51 +01:00
Jana Deutschländer
c58aab2fe3 font files renamed
direct link to user tools added
2016-11-22 09:47:37 +01:00
Jana Deutschländer
ca90ebc1c0 magic matcher / direct nav / reset styles 2016-11-03 17:21:39 +01:00
Jana Deutschländer
40e8d24498 roboto and roboto condensed font
nav-direct and magicMatcher
2016-11-02 17:39:50 +01:00
Jana Deutschländer
ccbb71de8d basic less structure, template main doc head changes 2016-10-31 17:07:38 +01:00