From e345e5bbb61ceb7349607470b71a05d4fb6bdc93 Mon Sep 17 00:00:00 2001 From: S Page Date: Fri, 12 Apr 2013 16:37:05 -0700 Subject: [PATCH] Set Agora font stack to mw-ui-container in Vector We moved the language links outside the new compact vertical form layout, hence also need to apply the font stack to mw-ui-container when using Vector skin. Also * a comment-only CSS change * set relative_assets = true in Compass sourcefiles configuration Bug: 47187 Change-Id: Id064dc8ada5c43c33e17d1e66d327ba05e918657 --- resources/mediawiki.special/mediawiki.special.vforms.css | 4 ++-- resources/mediawiki.ui/mediawiki.ui.vector.css | 7 +++++++ resources/mediawiki.ui/sourcefiles/config.rb | 2 +- .../mediawiki.ui/sourcefiles/scss/components/_vector.scss | 3 ++- .../sourcefiles/scss/components/vector/_containers.scss | 5 +++++ 5 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 resources/mediawiki.ui/sourcefiles/scss/components/vector/_containers.scss diff --git a/resources/mediawiki.special/mediawiki.special.vforms.css b/resources/mediawiki.special/mediawiki.special.vforms.css index 4ae06dfc74..db947a9cdb 100644 --- a/resources/mediawiki.special/mediawiki.special.vforms.css +++ b/resources/mediawiki.special/mediawiki.special.vforms.css @@ -1,6 +1,6 @@ /* - * When inside the VForm style, disable the border that Vector puts on the div - * surrounding the login/create account form. + * When inside the VForm style, disable the border that Vector and other skins + * put on the div surrounding the login/create account form. * Also disable the margin and padding that Vector puts around the form. */ .mw-ui-container #userloginForm, diff --git a/resources/mediawiki.ui/mediawiki.ui.vector.css b/resources/mediawiki.ui/mediawiki.ui.vector.css index 4849fb42f6..b830649004 100644 --- a/resources/mediawiki.ui/mediawiki.ui.vector.css +++ b/resources/mediawiki.ui/mediawiki.ui.vector.css @@ -390,3 +390,10 @@ font-size: 1em; line-height: 1.4em; } + +/* line 3, sourcefiles/scss/components/vector/_containers.scss */ +.mw-ui-container { + font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif; + font-size: 1em; + line-height: 1.4em; +} diff --git a/resources/mediawiki.ui/sourcefiles/config.rb b/resources/mediawiki.ui/sourcefiles/config.rb index be96e64759..28c6524093 100644 --- a/resources/mediawiki.ui/sourcefiles/config.rb +++ b/resources/mediawiki.ui/sourcefiles/config.rb @@ -14,7 +14,7 @@ sass_dir = "scss" output_style = :expanded # To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true +relative_assets = true # To disable debugging comments that display the original location of your selectors. Uncomment: line_comments = true diff --git a/resources/mediawiki.ui/sourcefiles/scss/components/_vector.scss b/resources/mediawiki.ui/sourcefiles/scss/components/_vector.scss index e52a1ed28c..d7cb34ae3e 100644 --- a/resources/mediawiki.ui/sourcefiles/scss/components/_vector.scss +++ b/resources/mediawiki.ui/sourcefiles/scss/components/_vector.scss @@ -1,3 +1,4 @@ @import "utilities"; @import "vector/buttons"; -@import "vector/forms"; \ No newline at end of file +@import "vector/forms"; +@import "vector/containers"; diff --git a/resources/mediawiki.ui/sourcefiles/scss/components/vector/_containers.scss b/resources/mediawiki.ui/sourcefiles/scss/components/vector/_containers.scss new file mode 100644 index 0000000000..ed01603d36 --- /dev/null +++ b/resources/mediawiki.ui/sourcefiles/scss/components/vector/_containers.scss @@ -0,0 +1,5 @@ +// No default settings for containers yet. + +.mw-ui-container { + @include vector-type; +} -- 2.20.1