Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Set Agora font stack to mw-ui-container in Vector"

Browse source
This commit is contained in:
jenkins-bot 2013-04-15 22:24:36 +00:00 committed by Gerrit Code Review
commit 1e8a9aba9c
5 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/mediawiki.special/mediawiki.special.vforms.css
View file

@ -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,

7
resources/mediawiki.ui/mediawiki.ui.vector.css
View file

@ -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;
}

2
resources/mediawiki.ui/sourcefiles/config.rb
View file

@ -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

3
resources/mediawiki.ui/sourcefiles/scss/components/_vector.scss
View file

@ -1,3 +1,4 @@
@import "utilities";
@import "vector/buttons";
@import "vector/forms";
@import "vector/forms";
@import "vector/containers";

5
resources/mediawiki.ui/sourcefiles/scss/components/vector/_containers.scss Normal file
View file

@ -0,0 +1,5 @@
// No default settings for containers yet.
.mw-ui-container {
@include vector-type;
}