Dbrant has submitted this change and it was merged.
Change subject: Remove second copy of abusefilter.css & preview.css
......................................................................
Remove second copy of abusefilter.css & preview.css
These are copied over to assets/ by grunt
Change-Id: I178e9461d112e89997c57b0021327d5798fb4b8f
---
M .gitignore
D www/abusefilter.css
D www/preview.css
3 files changed, 2 insertions(+), 307 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index c94a8d1..be84eaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@
www/node_modules
www/bundle*.js
www/styles.css
+www/abusefilter.css
+www/preview.css
# Should never check in apk files
*.apk
diff --git a/www/abusefilter.css b/www/abusefilter.css
deleted file mode 100644
index f54fe59..0000000
--- a/www/abusefilter.css
+++ /dev/null
@@ -1,151 +0,0 @@
-@font-face {
- font-family: 'Open Sans';
- font-style: normal;
- font-weight: 400;
- src: local('Open Sans'), local('OpenSans'), url(fonts/OpenSans.ttf)
format('truetype');
-}
-@font-face {
- font-family: 'Open Sans';
- font-style: normal;
- font-weight: 700;
- src: local('Open Sans Bold'), local('OpenSans-Bold'),
url(fonts/OpenSans-Bold.ttf) format('truetype');
-}
-@font-face {
- font-family: 'Open Sans';
- font-style: italic;
- font-weight: 400;
- src: local('Open Sans Italic'), local('OpenSans-Italic'),
url(fonts/OpenSans-Italic.ttf) format('truetype');
-}
-@font-face {
- font-family: 'Open Sans';
- font-style: italic;
- font-weight: 700;
- src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'),
url(fonts/OpenSans-BoldItalic.ttf) format('truetype');
-}
-
-/* Should be moved out to the MobileApp extension at some point */
-body {
- background-color: #F2F2F2;
- color: #333;
- font-family: "Open Sans", sans-serif;
- font-size: 16px;
- line-height: 160%;
- margin: 0;
- padding: 0;
- margin-top: 48px;
- word-wrap: break-word;
-}
-#content {
- padding: 8px 24px;
-}
-a {
- color: #347BFF;
- text-decoration: none;
-}
-/* Headers */
-h1 {
- font-family: serif;
- color: #333;
- font-size: 26px;
- line-height: 36px;
- margin-bottom: 24px;
- font-weight: bold;
-}
-h2,
-h3,
-h4,
-h5,
-h6 {
- font-family: "Open Sans", sans-serif;
-}
-h2 {
- font-size: 22px;
-}
-h3 {
- font-size: 20px;
-}
-h4 {
- font-size: 18px;
-}
-h5,
-h6 {
- font-size: 16px;
-}
-/* Basic Thumbnails */
-.thumb {
- /* Don't stick thumbnails to the text above and below it */
- margin: 8px 0px;
- /* Align everything inside a thumbnail to be centered */
- text-align: center;
-}
-.thumb .thumbinner {
- /* Make sure that thumb takes up full width */
- width: 100% !important;
-}
-.thumb .magnify {
- display: none;
- /* Our parser is STUPID */
-}
-.thumb .noresize {
- overflow-x: auto;
- /* Scrollbars for images that shouldn't be squished */
-}
-/* Makes sure that we don't have horizontal scrollbars for the entire page
because
- an image is too wide to fit in to the current viewport */
-img {
- max-width: 100% !important;
- height: auto !important;
-}
-/* Basic tables */
-table {
- width: 100% !important;
- overflow-x: auto;
- display: block;
- border: 1px solid #ccc;
- margin-top: 4px;
- margin-bottom: 4px;
-}
-
-/*
-Imported from MobileFrontend. Should be made into a live link later.
-A file for css that corrects known rendering issues on known Wikimedia wikis.
-
-the following definitions exist to deal with certain inline styles
-present in wikitext.
-This file should not need to exist
-It will become redundant when the following RFC is resolved:
-https://www.mediawiki.org/wiki/Requests_for_comment/Allow_styling_in_templates
-
-FIXME: Review all of these hacks to see if they still apply.
-*/
-/* Hide some on-wiki defined classes
- - Issue boxes, Nav Boxes, co-ordinates are hidden
- - Investigate alternative ways of surfacing those */
-.ambox,
-#coordinates,
-.navbox,
-.vertical-navbox,
-.topicon,
-.metadata {
- display: none !important;
-}
-/* Galleries */
-/* See
https://www.mediawiki.org/wiki/Help:Images#Rendering_a_gallery_of_images */
-ul.gallery {
- width: 100% !important;
- max-width: 100% !important;
-}
-ul.gallery li.gallerybox {
- width: auto !important;
-}
-ul.gallery li.gallerybox > div {
- width: auto !important;
-}
-ul.gallery li.gallerybox > div > div.thumb {
- width: auto !important;
-}
-.hlist > ul li,
-ul.hlist li {
- display: inline-block;
- margin-right: 8px;
-}
diff --git a/www/preview.css b/www/preview.css
deleted file mode 100644
index 35da650..0000000
--- a/www/preview.css
+++ /dev/null
@@ -1,156 +0,0 @@
-@font-face {
- font-family: 'Open Sans';
- font-style: normal;
- font-weight: 400;
- src: local('Open Sans'), local('OpenSans'), url(fonts/OpenSans.ttf)
format('truetype');
-}
-@font-face {
- font-family: 'Open Sans';
- font-style: normal;
- font-weight: 700;
- src: local('Open Sans Bold'), local('OpenSans-Bold'),
url(fonts/OpenSans-Bold.ttf) format('truetype');
-}
-@font-face {
- font-family: 'Open Sans';
- font-style: italic;
- font-weight: 400;
- src: local('Open Sans Italic'), local('OpenSans-Italic'),
url(fonts/OpenSans-Italic.ttf) format('truetype');
-}
-@font-face {
- font-family: 'Open Sans';
- font-style: italic;
- font-weight: 700;
- src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'),
url(fonts/OpenSans-BoldItalic.ttf) format('truetype');
-}
-
-/* Should be moved out to the MobileApp extension at some point */
-body {
- background-color: #F2F2F2;
- color: #333;
- font-family: "Open Sans", sans-serif;
- font-size: 16px;
- line-height: 160%;
- margin: 0;
- padding: 0;
- margin-top: 48px;
- word-wrap: break-word;
-}
-#content {
- padding: 8px 24px;
-}
-a {
- color: #347BFF;
- text-decoration: none;
-}
-/* Headers */
-h1 {
- font-family: serif;
- color: #333;
- font-size: 26px;
- line-height: 36px;
- margin-bottom: 24px;
- font-weight: bold;
-}
-h2,
-h3,
-h4,
-h5,
-h6 {
- font-family: "Open Sans", sans-serif;
-}
-h2 {
- font-size: 22px;
-}
-h3 {
- font-size: 20px;
-}
-h4 {
- font-size: 18px;
-}
-h5,
-h6 {
- font-size: 16px;
-}
-/* Basic Thumbnails */
-.thumb {
- /* Don't stick thumbnails to the text above and below it */
- margin: 8px 0px;
- /* Align everything inside a thumbnail to be centered */
- text-align: center;
-}
-.thumb .thumbinner {
- /* Make sure that thumb takes up full width */
- width: 100% !important;
-}
-.thumb .magnify {
- display: none;
- /* Our parser is STUPID */
-}
-.thumb .noresize {
- overflow-x: auto;
- /* Scrollbars for images that shouldn't be squished */
-}
-/* Makes sure that we don't have horizontal scrollbars for the entire page
because
- an image is too wide to fit in to the current viewport */
-img {
- max-width: 100% !important;
- height: auto !important;
-}
-/* Basic tables */
-table {
- width: 100% !important;
- overflow-x: auto;
- display: block;
- border: 1px solid #ccc;
- margin-top: 4px;
- margin-bottom: 4px;
-}
-
-/* Hide the stupid editlink */
-.edit-page {
- display: none;
-}
-
-/*
-Imported from MobileFrontend. Should be made into a live link later.
-A file for css that corrects known rendering issues on known Wikimedia wikis.
-
-the following definitions exist to deal with certain inline styles
-present in wikitext.
-This file should not need to exist
-It will become redundant when the following RFC is resolved:
-https://www.mediawiki.org/wiki/Requests_for_comment/Allow_styling_in_templates
-
-FIXME: Review all of these hacks to see if they still apply.
-*/
-/* Hide some on-wiki defined classes
- - Issue boxes, Nav Boxes, co-ordinates are hidden
- - Investigate alternative ways of surfacing those */
-.ambox,
-#coordinates,
-.navbox,
-.vertical-navbox,
-.topicon,
-.metadata {
- display: none !important;
-}
-/* Galleries */
-/* See
https://www.mediawiki.org/wiki/Help:Images#Rendering_a_gallery_of_images */
-ul.gallery {
- width: 100% !important;
- max-width: 100% !important;
-}
-ul.gallery li.gallerybox {
- width: auto !important;
-}
-ul.gallery li.gallerybox > div {
- width: auto !important;
-}
-ul.gallery li.gallerybox > div > div.thumb {
- width: auto !important;
-}
-.hlist > ul li,
-ul.hlist li {
- display: inline-block;
- margin-right: 8px;
-}
--
To view, visit https://gerrit.wikimedia.org/r/130474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I178e9461d112e89997c57b0021327d5798fb4b8f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
