Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57544
Change subject: WIP - Remove font-related styles from default (non-Vector) CSS.
......................................................................
WIP - Remove font-related styles from default (non-Vector) CSS.
Change-Id: Ie3b30962dee36b43cdb70bd6c9d897317378b861
---
M config.rb
M modules/scss/components/default/_buttons.scss
M modules/scss/components/default/_forms.scss
M modules/scss/mixins/_forms.scss
4 files changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Agora
refs/changes/44/57544/1
diff --git a/config.rb b/config.rb
index d9a0ca2..a5a229a 100644
--- a/config.rb
+++ b/config.rb
@@ -12,7 +12,7 @@
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/modules/scss/components/default/_buttons.scss
b/modules/scss/components/default/_buttons.scss
index b036a2d..fb5a08d 100644
--- a/modules/scss/components/default/_buttons.scss
+++ b/modules/scss/components/default/_buttons.scss
@@ -27,7 +27,6 @@
}
font: {
- family: $baseFontFamily;
size: $baseFontSize;
weight: bold;
}
diff --git a/modules/scss/components/default/_forms.scss
b/modules/scss/components/default/_forms.scss
index 803b014..440669e 100644
--- a/modules/scss/components/default/_forms.scss
+++ b/modules/scss/components/default/_forms.scss
@@ -11,7 +11,6 @@
.mw-ui-vform {
@include box-sizing(border-box);
- @include default-type;
width: $defaultFormWidth;
diff --git a/modules/scss/mixins/_forms.scss b/modules/scss/mixins/_forms.scss
index 7c1d119..77807bf 100644
--- a/modules/scss/mixins/_forms.scss
+++ b/modules/scss/mixins/_forms.scss
@@ -1,6 +1,7 @@
+// Font is not included.
+// That should be layered on top when desired (Vector) with default-type
@mixin agora-field-styling() {
@include reset-focus; // Removes OS field focus
- @include default-type; // Default typography
font: {
size: 1em;
--
To view, visit https://gerrit.wikimedia.org/r/57544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3b30962dee36b43cdb70bd6c9d897317378b861
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Agora
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
