Brion VIBBER has submitted this change and it was merged.
Change subject: No longer use star icon to avoid future conflict w watchlist.
......................................................................
No longer use star icon to avoid future conflict w watchlist.
Also bundled font svg conversion scripts.
Removed cruft.
Change-Id: Ib02e9b74d78d523aa491c7a3f1a87b6a7d3b9d19
---
M Wikipedia.xcodeproj/project.pbxproj
M wikipedia/Categories/Alerts/AlertLabel.m
M wikipedia/Categories/Alerts/UIViewController+Alert.h
M wikipedia/Categories/Alerts/UIViewController+Alert.m
M wikipedia/Defines/WikiGlyph_Chars_iOS.h
M wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf
A wikipedia/Fonts/makeFontFromSvgs.py
A wikipedia/Fonts/makeSvgsFromFont.py
M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png
M wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png
M wikipedia/MenuLabel/WikiGlyphLabel.m
M wikipedia/View Controllers/AccountCreation/AccountCreationViewController.m
M wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
M wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
M wikipedia/View Controllers/Nearby/NearbyViewController.m
M wikipedia/View Controllers/SectionEditor/SectionEditorViewController.m
M wikipedia/assets/abusefilter.css
M wikipedia/assets/preview.css
M wikipedia/assets/styles.css
20 files changed, 380 insertions(+), 137 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index c07e32a..fcc6f92 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -1791,7 +1791,6 @@
buildActionMask = 2147483647;
files = (
04D3082C19991CB60034F106 /*
logo-placeholder-nea...@2x.png in Resources */,
- 0466F44F183A30CC00EA1FD7 /*
logo-search-placeholder.png in Resources */,
D46CD8C418A1AC4F0042959E /* InfoPlist.strings
in Resources */,
045EFF1B19A25FEB00D0EDBB /*
logo-placeholder-sea...@2x.png in Resources */,
D4991454181D51DE00E6073C /* Images.xcassets in
Resources */,
diff --git a/wikipedia/Categories/Alerts/AlertLabel.m
b/wikipedia/Categories/Alerts/AlertLabel.m
index 4b0e0c1..ce30f09 100644
--- a/wikipedia/Categories/Alerts/AlertLabel.m
+++ b/wikipedia/Categories/Alerts/AlertLabel.m
@@ -2,6 +2,8 @@
// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import "AlertLabel.h"
+#import "WMF_Colors.h"
+#import "Defines.h"
@implementation AlertLabel
@@ -16,10 +18,10 @@
self.minimumScaleFactor = 0.2;
self.font = [UIFont systemFontOfSize:10];
self.textAlignment = NSTextAlignmentCenter;
- self.textColor = [UIColor darkGrayColor];
+ self.textColor = [UIColor colorWithWhite:0.0 alpha:1.0];
self.numberOfLines = 0;
self.lineBreakMode = NSLineBreakByWordWrapping;
- self.backgroundColor = [UIColor colorWithWhite:1.0 alpha:0.9];
+ self.backgroundColor = CHROME_COLOR;
self.userInteractionEnabled = YES;
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]
initWithTarget:self action:@selector(tap)];
diff --git a/wikipedia/Categories/Alerts/UIViewController+Alert.h
b/wikipedia/Categories/Alerts/UIViewController+Alert.h
index 63cbf4f..2004bce 100644
--- a/wikipedia/Categories/Alerts/UIViewController+Alert.h
+++ b/wikipedia/Categories/Alerts/UIViewController+Alert.h
@@ -15,12 +15,4 @@
-(void)hideAlert;
-// Shows full screen alert html just beneath the nav bar.
-// Any links open in Safari.
--(void)showHTMLAlert: (NSString *)html
- bannerImage: (UIImage *)bannerImage
- bannerColor: (UIColor *)bannerColor;
-
--(void)hideHTMLAlert;
-
@end
diff --git a/wikipedia/Categories/Alerts/UIViewController+Alert.m
b/wikipedia/Categories/Alerts/UIViewController+Alert.m
index 1f1fa59..7fc20ad 100644
--- a/wikipedia/Categories/Alerts/UIViewController+Alert.m
+++ b/wikipedia/Categories/Alerts/UIViewController+Alert.m
@@ -3,7 +3,6 @@
#import "UIViewController+Alert.h"
#import "AlertLabel.h"
-#import "AlertWebView.h"
#import "UIView+RemoveConstraints.h"
@implementation UIViewController (Alert)
@@ -23,6 +22,8 @@
if (!alertLabel) {
alertLabel = [[AlertLabel alloc] init];
alertLabel.translatesAutoresizingMaskIntoConstraints = NO;
+ //alertLabel.layer.cornerRadius = 3.0f;
+ //alertLabel.clipsToBounds = YES;
[alertContainer addSubview:alertLabel];
[self constrainAlertView:alertLabel fullScreen:NO];
}
@@ -99,61 +100,17 @@
}
*/
--(void)showHTMLAlert: (NSString *)html
- bannerImage: (UIImage *)bannerImage
- bannerColor: (UIColor *)bannerColor
-{
- [[NSOperationQueue mainQueue] addOperationWithBlock: ^ {
- AlertWebView *alertWebView = nil;
-
- //UIView *alertContainer = self.view;
- // Tack html alert on to the view controller's view so html alert
animates sliding
- // offscreen when the view does.
- UIView *alertContainer = self.view;
-
- // Remove existing alert web view if any.
- alertWebView = [self getExistingViewOfClass:[AlertWebView class]
inContainer:alertContainer];
- if (alertWebView) {
- [alertWebView removeFromSuperview];
- alertWebView = nil;
- }
-
- if (!html || html.length == 0){
- if (!bannerImage) {
- return;
- }
- }
-
- alertWebView = [[AlertWebView alloc] initWithHtml: html
- bannerImage: bannerImage
- bannerColor: bannerColor
- ];
-
- alertWebView.translatesAutoresizingMaskIntoConstraints = NO;
-
- if (alertContainer) {
- [alertContainer addSubview:alertWebView];
- [self constrainAlertView:alertWebView fullScreen:YES];
- }
- }];
-}
-
--(void)hideHTMLAlert
-{
- [self showHTMLAlert:nil bannerImage:nil bannerColor:nil];
-}
-
-(void)constrainAlertView:(UIView *)view fullScreen:(BOOL)isFullScreen
{
- CGFloat topMargin = 0;//[self isTopNavHiddenForViewController:self] ? 20 :
0;
+ CGFloat margin = 0;
NSDictionary *views = NSDictionaryOfVariableBindings(view);
- NSDictionary *metrics = @{@"space": @(topMargin)};
+ NSDictionary *metrics = @{@"space": @(margin)};
[self.view addConstraints:
- [NSLayoutConstraint constraintsWithVisualFormat: @"H:|[view]|"
+ [NSLayoutConstraint constraintsWithVisualFormat:
@"H:|-(space)-[view]-(space)-|"
options: 0
- metrics: nil
+ metrics: metrics
views: views
]
];
@@ -171,7 +128,7 @@
-(id)getExistingViewOfClass:(Class)class inContainer:(UIView *)container
{
- for (id view in container.subviews) {
+ for (id view in container.subviews.copy) {
if ([view isMemberOfClass:class]) return view;
}
return nil;
diff --git a/wikipedia/Defines/WikiGlyph_Chars_iOS.h
b/wikipedia/Defines/WikiGlyph_Chars_iOS.h
index 0a04005..ff5af48 100644
--- a/wikipedia/Defines/WikiGlyph_Chars_iOS.h
+++ b/wikipedia/Defines/WikiGlyph_Chars_iOS.h
@@ -7,8 +7,10 @@
#define IOS_WIKIGLYPH_FORWARD @"\ue953"
#define IOS_WIKIGLYPH_BACKWARD @"\ue954"
#define IOS_WIKIGLYPH_DOWN @"\ue955"
-#define IOS_WIKIGLYPH_STAR @"\ue956"
-#define IOS_WIKIGLYPH_STAR_OUTLINE @"\ue957"
+#define IOS_WIKIGLYPH_HEART @"\ue956"
+#define IOS_WIKIGLYPH_HEART_OUTLINE @"\ue957"
#define IOS_WIKIGLYPH_TOC_COLLAPSED @"\ue958"
#define IOS_WIKIGLYPH_TOC_EXPANDED @"\ue959"
#define IOS_WIKIGLYPH_RELOAD @"\ue95a"
+#define IOS_WIKIGLYPH_STAR @"\ue95b"
+#define IOS_WIKIGLYPH_STAR_OUTLINE @"\ue95c"
diff --git a/wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf
b/wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf
index 875f5a1..b42026c 100644
--- a/wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf
+++ b/wikipedia/Fonts/WikiFont-Glyphs-iOS.ttf
Binary files differ
diff --git a/wikipedia/Fonts/makeFontFromSvgs.py
b/wikipedia/Fonts/makeFontFromSvgs.py
new file mode 100755
index 0000000..0b249a8
--- /dev/null
+++ b/wikipedia/Fonts/makeFontFromSvgs.py
@@ -0,0 +1,243 @@
+#!/usr/local/bin/fontforge
+
+# Makes "./font.ttf" from svg files found in "./svgs/".
+# Svg's must be named according to following convention:
+# "UNICODE_CHAR GLYPH_NAME LEFT_BEARING RIGHT_BEARING BASELINE_OFFSET.svg"
+#
+# Example: "e950 MY_GLYPH 80 100 150.svg"
+# This will be mapped to the font character e950 with glyph
+# name "MyGlyph" and left bearing (padding) of 80, right
+# bearing of 100 and will sit 150 above the baseline.
+#
+# Note: running the "makeSvgsFromFont.py" script will generate
+# such an svg (named according to the convention) for each
+# glyph found in font.ttf. It will also generate a font.json file.
+#
+# Run this script with command:
+# fontforge -script makeFontFromSvgs.py
+#
+# References:
+# http://fontforge.org/python.html
+#
http://tex.stackexchange.com/questions/22487/create-a-symbol-font-from-svg-symbols
+# http://fontforge.org/scripting.html
+# http://stderr.org/doc/fontforge/html/scripting-alpha.html#GlyphInfo
+
+import fontforge
+import glob
+import json
+
+# Create font object.
+font = fontforge.font()
+
+# Apply font settings from font.json
+config = json.loads(open('./font.json').read())
+font.fontname = config["fontname"]
+font.fullname = config["fullname"]
+font.familyname = config["familyname"]
+font.weight = config["weight"]
+font.version = config["version"]
+font.encoding = config["encoding"]
+font.copyright = config["copyright"]
+
+# This is the name used when generating the font file.
+fileName = "font"
+
+# Folders!
+svgFolder = "./svgs/"
+outputFolder = "./"
+
+# Build array of glyph info dictionaries.
+print "\nStarted importing glyphs into " + fileName
+glyphDictionaries = []
+for fullName in glob.glob(svgFolder + '*.svg'):
+ fullName = fullName[len(svgFolder):]
+ words = fullName.split()
+ if (len(words) == 5):
+ glyphDictionary = {}
+ glyphDictionary["fullName"] = fullName
+ glyphDictionary["unicodeChar"] = words[0]
+ glyphDictionary["name"] = words[1]
+ glyphDictionary["bearingLeft"] = words[2]
+ glyphDictionary["bearingRight"] = words[3]
+ glyphDictionary["baselineOffset"] = words[4][:-4]
+ glyphDictionaries.append(glyphDictionary)
+
+# Sort it!
+glyphDictionaries.sort(key=lambda x: x['name'])
+
+# Add glyph for each dictionary entry to font object.
+for glyphDictionary in glyphDictionaries:
+ # Put new glyphs in the Private Use Area.
+ glyph =
font.createChar(int("0x{}".format(glyphDictionary["unicodeChar"]),0),
glyphDictionary["name"])
+
+ print "\tImporting \"" + glyphDictionary["fullName"] + "\""
+ # Import svg data into the glyph.
+ glyph.importOutlines(svgFolder + glyphDictionary["fullName"])
+
+ # Make the glyph rest on the baseline + offset from file name.
+ ymin = glyph.boundingBox()[1]
+ glyph.transform([1, 0, 0, 1, 0, -ymin +
int(glyphDictionary["baselineOffset"])])
+
+ # Set glyph side bearings with values from file name.
+ glyph.left_side_bearing = int(glyphDictionary["bearingLeft"])
+ glyph.right_side_bearing = int(glyphDictionary["bearingRight"])
+
+# Run various fontforge methods.
+#font.canonicalContours()
+font.round() # Needed to make simplify more reliable.
+font.simplify()
+font.removeOverlap()
+font.round()
+font.autoHint()
+
+# Generate actual font files.
+#font.generate(outputFolder + fileName + ".pfb", flags=["tfm", "afm"]) # type1
with tfm/afm
+#font.generate(outputFolder + fileName + ".otf") # opentype
+font.generate(outputFolder + fileName + ".ttf") # truetype
+print "Finished generating " + outputFolder + fileName + ".ttf"
+
+# Build css file.
+cssFileContentsHeader = """
+@font-face {
+ font-family: '%s';
+ /* src: url('%s.eot'); */ /* IE9 Compat Modes */
+ src: url('%s.ttf') format('truetype'); /* Safari, Android, iOS */
+
+ /* url('%s.eot?#iefix') format('embedded-opentype'), */ /* IE6-IE8 */
+ /* url('%s.woff') format('woff'), */ /* Modern Browsers */
+ /* url('%s.svg#8088f7bbbdba5c9832b27edb3dfcdf09') format('svg'); */
/* Legacy iOS */
+}
+.glyph {
+ display: inline-block;
+ height: 2.0em;
+ width: 2.0em;
+ text-align:center;
+ font-family: '%s';
+ -webkit-font-smoothing: antialiased;
+ font-size: inherit;
+ font-style: normal;
+ font-weight: normal;
+ line-height: 2.0em;
+ overflow: visible;
+}
+.glyph[dir='rtl'] {
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
+ -webkit-transform: scale(-1, 1);
+ -moz-transform: scale(-1, 1);
+ -ms-transform: scale(-1, 1);
+ -o-transform: scale(-1, 1);
+ transform: scale(-1, 1);
+}
+"""
+
+cssFileContentsHeader = cssFileContentsHeader % (font.familyname, fileName,
fileName, fileName, fileName, fileName, font.familyname)
+
+file = open(outputFolder + "font.css", "w")
+file.write(cssFileContentsHeader)
+for glyphDictionary in glyphDictionaries:
+ cssClassForGlyph = """
+ .%s:before {
+ content:"\%s";
+ }
+ """
+ cssClassForGlyph = cssClassForGlyph % (glyphDictionary["name"],
glyphDictionary["unicodeChar"])
+ file.write(cssClassForGlyph)
+
+file.close()
+
+# Build html file.
+htmlFileContentsHeader = """
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title>%s minimal code</title>
+ <link rel="stylesheet" href="font.css">
+ <meta http-equiv="Cache-Control" content="no-cache, no-store,
must-revalidate" />
+ <meta http-equiv="Pragma" content="no-cache" />
+ <meta http-equiv="Expires" content="0" />
+</head>
+<style>
+ body {
+ margin: 2%% 15%% 2%% 15%%;
+ color: #555;
+ font-family: sans-serif;
+ font-size: 2.0em;
+ }
+
+ hr { color: grey; }
+
+ div {
+ display: block;
+ color: #777;
+ border-bottom: 1px solid #eee;
+ margin: 0.5em 0 0.5em 0;
+ }
+ div:hover {
+ border-bottom-color: #cef;
+ }
+ span {
+ color: #111;
+ }
+</style>
+<body>
+"""
+
+htmlFileContentsHeader = htmlFileContentsHeader % (fileName)
+
+file = open(outputFolder + "font.html", "w")
+file.write(htmlFileContentsHeader)
+
+file.write("<h1>Glyphs</h1>")
+
+# Grid of glyphs for top of html file.
+counter = 0
+for glyphDictionary in glyphDictionaries:
+ divForGlyph = """
+ <span class="glyph %s"></span>
+ """
+ divForGlyph = divForGlyph % (glyphDictionary["name"])
+ file.write(divForGlyph)
+ counter += 1
+ if (counter % 8) == 0:
+ file.write("<br>")
+
+
+
+settingsHTML = """
+<h6>
+Reminder: when you've generated a new font, you may need to close your browser
and re-open this file before you will see your changes!
+</h6>
+
+<h1>Settings</h1>
+<div>Font name = %s</div>
+<div>Full name = %s</div>
+<div>Family name = %s</div>
+<div>Weight = %s</div>
+<div>Version = %s</div>
+<div>Encoding = %s</div>
+<div>Copyright = %s</div>
+""" % (font.fontname, font.fullname, font.familyname, font.weight,
font.version, font.encoding, font.copyright)
+
+file.write(settingsHTML)
+
+
+
+file.write("<h1>Glyph Names</h1>")
+
+# List of glyphs with names beneath grid.
+for glyphDictionary in glyphDictionaries:
+ divForGlyph = """
+ <div><span class="glyph %s"></span> %s</div>
+ """
+ divForGlyph = divForGlyph % (glyphDictionary["name"],
glyphDictionary["name"])
+ file.write(divForGlyph)
+
+file.write("\n</body>\n</html>")
+
+file.close()
+font.close()
+
+print "Finished generating font.html and font.css files\n"
+
+
diff --git a/wikipedia/Fonts/makeSvgsFromFont.py
b/wikipedia/Fonts/makeSvgsFromFont.py
new file mode 100755
index 0000000..582c0b2
--- /dev/null
+++ b/wikipedia/Fonts/makeSvgsFromFont.py
@@ -0,0 +1,60 @@
+#!/usr/local/bin/fontforge
+
+# Extracts svg for each glyph in "./font.ttf" to "./svgs/" folder.
+# Also extracts font settings to "./font.json" file.
+
+# The svgs can then be edited (or added/removed) and the
+# "makeFontFromSvgs.py" script can be run to rebuild the
+# font from the svgs.
+
+# See "makeFontFromSvgs.py" for svg file naming convention.
+
+# Invoke with command:
+# fontforge -script makeSvgsFromFont.py
+#
+
+import fontforge
+import json
+import os
+
+# Ensure the svgs folder exists.
+svgFolder = "./svgs/"
+try:
+ os.makedirs(svgFolder)
+except OSError:
+ if os.path.exists(svgFolder):
+ pass
+ else:
+ raise
+
+# Open the font file.
+font = fontforge.open("font.ttf")
+print font.fontname
+
+# Export font glyphs to svgs.
+print "\nExporting svgs:"
+for g in font.glyphs():
+ if g.unicode != -1:
+ svgPath = "%s%04X %s %d %d %d.svg" % (svgFolder, g.unicode, g.glyphname,
g.left_side_bearing, g.right_side_bearing, g.boundingBox()[1])
+ print "\t%s" % (svgPath)
+ g.export(svgPath)
+
+# Export font settings to json.
+fontInfo = {
+ "fontname": font.fontname,
+ "fullname": font.fullname,
+ "familyname": font.familyname,
+ "weight": font.weight,
+ "version": font.version,
+ "encoding": font.encoding,
+ "copyright": font.copyright
+}
+
+# Write json data.
+file = open("./font.json", "w")
+file.write(json.dumps(fontInfo, indent=4, sort_keys=True))
+
+# Done!
+font.close()
+print "Finished exporting.\n"
+
diff --git
a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png
b/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png
index 1c4d2e2..20a6868 100644
--- a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png
+++ b/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages120.png
Binary files differ
diff --git
a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png
b/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png
index 3f19351..04ddffc 100644
--- a/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png
+++ b/wikipedia/Images.xcassets/SavedPagesEmpty.imageset/savedpages240.png
Binary files differ
diff --git a/wikipedia/MenuLabel/WikiGlyphLabel.m
b/wikipedia/MenuLabel/WikiGlyphLabel.m
index 535fac0..c1c1907 100644
--- a/wikipedia/MenuLabel/WikiGlyphLabel.m
+++ b/wikipedia/MenuLabel/WikiGlyphLabel.m
@@ -58,6 +58,8 @@
[text isEqualToString:IOS_WIKIGLYPH_BACKWARD] ||
[text isEqualToString:IOS_WIKIGLYPH_STAR] ||
[text isEqualToString:IOS_WIKIGLYPH_STAR_OUTLINE] ||
+ [text isEqualToString:IOS_WIKIGLYPH_HEART_OUTLINE] ||
+ [text isEqualToString:IOS_WIKIGLYPH_HEART] ||
[text isEqualToString:IOS_WIKIGLYPH_RELOAD]
) {
isIOSFontChar = YES;
diff --git a/wikipedia/View
Controllers/AccountCreation/AccountCreationViewController.m b/wikipedia/View
Controllers/AccountCreation/AccountCreationViewController.m
index 708d94a..8f71c1c 100644
--- a/wikipedia/View Controllers/AccountCreation/AccountCreationViewController.m
+++ b/wikipedia/View Controllers/AccountCreation/AccountCreationViewController.m
@@ -254,7 +254,7 @@
[self highlightProgressiveButton:NO];
- [self showAlert:@""];
+ [self fadeAlert];
[[NSNotificationCenter defaultCenter] removeObserver: self
name:
@"UITextFieldTextDidChangeNotification"
@@ -297,7 +297,7 @@
}else{
dispatch_async(dispatch_get_main_queue(), ^(void){
- [self showAlert:@""];
+ [self fadeAlert];
[UIView animateWithDuration:duration animations:^{
self.captchaContainer.alpha = 0;
[self.scrollView setContentOffset:CGPointZero animated:NO];
diff --git a/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m b/wikipedia/View
Controllers/Navigation/Bottom/BottomMenuViewController.m
index 36c4367..f820e84 100644
--- a/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Bottom/BottomMenuViewController.m
@@ -20,6 +20,7 @@
#import "Article+Convenience.h"
#import "Defines.h"
#import "WikipediaAppUtils.h"
+#import "WMF_Colors.h"
typedef NS_ENUM(NSInteger, BottomMenuItemTag) {
BOTTOM_MENU_BUTTON_UNKNOWN,
@@ -84,7 +85,7 @@
self.rightButton.tag = BOTTOM_MENU_BUTTON_SHARE;
self.rightButton.accessibilityLabel =
MWLocalizedString(@"menu-share-accessibility-label", nil);
- [self.saveButton.label setWikiText: IOS_WIKIGLYPH_STAR_OUTLINE
+ [self.saveButton.label setWikiText: IOS_WIKIGLYPH_HEART_OUTLINE
color: buttonColor
size: buttonTextSize
baselineOffset: 0
@@ -286,8 +287,15 @@
self.forwardButton.enabled = (self.adjacentHistoryIDs[@"after"]) ? YES :
NO;
self.backButton.enabled = (self.adjacentHistoryIDs[@"before"]) ? YES : NO;
- [self.saveButton.label setWikiText: [self isCurrentArticleSaved] ?
IOS_WIKIGLYPH_STAR : IOS_WIKIGLYPH_STAR_OUTLINE
- color: [UIColor blackColor]
+ NSString *saveIconString = IOS_WIKIGLYPH_HEART_OUTLINE;
+ UIColor *saveIconColor = [UIColor blackColor];
+ if([self isCurrentArticleSaved]){
+ saveIconString = IOS_WIKIGLYPH_HEART;
+ saveIconColor = UIColorFromRGBWithAlpha(0xf27072, 1.0);
+ }
+
+ [self.saveButton.label setWikiText: saveIconString
+ color: saveIconColor
size: 34
baselineOffset: 0];
}
diff --git a/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
b/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
index b201952..55e53e3 100644
--- a/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
+++ b/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.h
@@ -6,7 +6,6 @@
typedef enum {
NAVBAR_BUTTON_UNKNOWN,
NAVBAR_BUTTON_X,
- NAVBAR_BUTTON_PENCIL,
NAVBAR_BUTTON_CHECK,
NAVBAR_BUTTON_ARROW_LEFT,
NAVBAR_BUTTON_ARROW_RIGHT,
@@ -37,7 +36,6 @@
NAVBAR_MODE_EDIT_WIKITEXT_PREVIEW,
NAVBAR_MODE_EDIT_WIKITEXT_CAPTCHA,
NAVBAR_MODE_EDIT_WIKITEXT_SUMMARY,
- NAVBAR_MODE_EDIT_WIKITEXT_SAVE,
NAVBAR_MODE_SEARCH,
NAVBAR_MODE_X_WITH_LABEL,
NAVBAR_MODE_X_WITH_TEXT_FIELD,
diff --git a/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
b/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
index c6fc4ea..1683588 100644
--- a/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
+++ b/wikipedia/View Controllers/Navigation/Top/TopMenuViewController.m
@@ -243,7 +243,6 @@
BOOL isRTL = [WikipediaAppUtils isDeviceLanguageRTL];
NSString *caret = !isRTL ? WIKIGLYPH_CARET_LEFT: IOS_WIKIGLYPH_FORWARD;
- self.buttonPencil = getWikiGlyphButton(WIKIGLYPH_PENCIL,
MWLocalizedString(@"menu-edit-accessibility-label", nil),
NAVBAR_BUTTON_PENCIL, size);
self.buttonX = getWikiGlyphButton(WIKIGLYPH_X,
MWLocalizedString(@"menu-close-accessibility-label", nil), NAVBAR_BUTTON_X,
size);
self.buttonEye = getWikiGlyphButton(WIKIGLYPH_EYE,
MWLocalizedString(@"menu-preview-accessibility-label", nil), NAVBAR_BUTTON_EYE,
size);
self.buttonArrowLeft = getWikiGlyphButton(caret,
MWLocalizedString(@"menu-back-accessibility-label", nil),
NAVBAR_BUTTON_ARROW_LEFT, size);
@@ -349,7 +348,6 @@
{
return @{
@"NAVBAR_BUTTON_X": self.buttonX,
- @"NAVBAR_BUTTON_PENCIL": self.buttonPencil,
@"NAVBAR_BUTTON_CHECK": self.buttonCheck,
@"NAVBAR_BUTTON_ARROW_LEFT": self.buttonArrowLeft,
@"NAVBAR_BUTTON_ARROW_RIGHT": self.buttonArrowRight,
@@ -412,11 +410,6 @@
@"H:|-(4)-[NAVBAR_BUTTON_X(50)]-(16)-[NAVBAR_LABEL]-(10)-[NAVBAR_BUTTON_DONE(50@250)]|";
//}
break;
- case NAVBAR_MODE_EDIT_WIKITEXT_SAVE:
- self.label.text =
MWLocalizedString(@"navbar-title-mode-edit-wikitext-save", nil);
- self.navBarSubViewsHorizontalVFLString =
-
@"H:|[NAVBAR_BUTTON_PENCIL(50)]-(10)-[NAVBAR_LABEL]-(10)-[NAVBAR_BUTTON_SAVE(50@250)]|";
- break;
case NAVBAR_MODE_CREATE_ACCOUNT:
self.label.text = @"";
//if(loginVC){
@@ -457,7 +450,6 @@
self.label.text = @"";
self.navBarSubViewsHorizontalVFLString =
@"H:|-(4)-[NAVBAR_BUTTON_X(50)]-(10)-[NAVBAR_LABEL]-(10)-[NAVBAR_BUTTON_DONE(50@250)]|";
-
//@"H:|[NAVBAR_BUTTON_PENCIL(50)]-(10)-[NAVBAR_LABEL]-(10)-[NAVBAR_BUTTON_ARROW_RIGHT(50)]|";
break;
case NAVBAR_MODE_EDIT_WIKITEXT_CAPTCHA:
@@ -768,7 +760,6 @@
switch (view.tag) {
case NAVBAR_BUTTON_X:
- case NAVBAR_BUTTON_PENCIL:
case NAVBAR_BUTTON_CHECK:
case NAVBAR_BUTTON_ARROW_LEFT:
case NAVBAR_BUTTON_ARROW_RIGHT:
diff --git a/wikipedia/View Controllers/Nearby/NearbyViewController.m
b/wikipedia/View Controllers/Nearby/NearbyViewController.m
index 347adca..a1aca85 100644
--- a/wikipedia/View Controllers/Nearby/NearbyViewController.m
+++ b/wikipedia/View Controllers/Nearby/NearbyViewController.m
@@ -245,7 +245,7 @@
[[NSOperationQueue mainQueue] addOperationWithBlock: ^ {
//[self showAlert:MWLocalizedString(@"nearby-loaded", nil)];
- [self showAlert:@""];
+ [self fadeAlert];
self.nearbyDataArray = @[result];
[self calculateDistances];
diff --git a/wikipedia/View
Controllers/SectionEditor/SectionEditorViewController.m b/wikipedia/View
Controllers/SectionEditor/SectionEditorViewController.m
index a73fcbc..055dfbe 100644
--- a/wikipedia/View Controllers/SectionEditor/SectionEditorViewController.m
+++ b/wikipedia/View Controllers/SectionEditor/SectionEditorViewController.m
@@ -153,14 +153,6 @@
case NAVBAR_BUTTON_ARROW_LEFT:
[self cancelPushed:nil];
break;
- case NAVBAR_LABEL:
- case NAVBAR_BUTTON_PENCIL:
- [self showHTMLAlert: @""
- bannerImage: nil
- bannerColor: nil
- ];
- break;
-
default:
break;
}
diff --git a/wikipedia/assets/abusefilter.css b/wikipedia/assets/abusefilter.css
index 07bf36d..7015256 100644
--- a/wikipedia/assets/abusefilter.css
+++ b/wikipedia/assets/abusefilter.css
@@ -199,7 +199,7 @@
font-size: .8em;
line-height: 1.5;
padding: 0 !important;
- color: #777;
+ color: #555;
width: auto !important;
}
.content .thumbborder {
@@ -283,7 +283,7 @@
}
a.external {
background-image:
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAVElEQVR42n3PgQkAIAhEUXdqJ3dqJ3e6IoTPUSQcgj4EQ5IlUiLE0Jil3PECXhcHGBhZ8kg4hwxAu3MZeCGeyFnAXp4hqNQPnt7QL0nADpD6wHccLvnAKksq8iiaAAAAAElFTkSuQmCC);
- background-image:
url(//bits.wikimedia.org/static-1.24wmf15/extensions/MobileApp/../MobileFrontend/less/content/images/external-link-ltr-icon.png?2014-07-24T17:20:00Z)!ie;
+ background-image:
url(//bits.wikimedia.org/static-1.24wmf18/extensions/MobileApp/../MobileFrontend/less/content/images/external-link-ltr-icon.png?2014-08-21T15:38:20Z)!ie;
/* We don't need the !ie hack because this old IE uses the fallback already
*/
background-image: -webkit-linear-gradient(transparent,transparent),
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCI+PGRlZnM+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNLS45NTgtNC4yNTljLTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2IDAgLjM5NC4xNDMuNzM2LjMzNiAxLjA0OWwtLjA3LjA1NmMtLjM3My0uNTEzLS45NTQtLjg2Ny0xLjYzNi0uODY3LTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2cy45MjIgMi4wNTYgMi4wNTYgMi4wNTZjLjU5NiAwIDEuMTIxLS4yNjUgMS40OTYtLjY3MS0uMDc1LjIxMy0uMTI2LjQzMy0uMTI2LjY3MSAwIDEuMTM0LjkyMiAyLjA1NiAyLjA1NiAyLjA1NnMyLjA1Ni0uOTIyIDIuMDU2LTIuMDU2YzAtLjQ3Ni0uMTg5LS44OTYtLjQ2Mi0xLjI0NS44MTMuMTU4IDEuNjI3LjQ3NyAyLjIyNCAxLjM5OS0uNDQzLS40NDMtLjcyNy0xLjI0OC0uNzI3LTIuMzM2bC0uMzc4LS4wMjguMzUtLjAxNGMwLTEuMDg3LjI3LTEuODkzLjcxMy0yLjMzNi0uNTc1Ljg4OS0xLjM1NCAxLjIxNi0yLjE0IDEuMzg1LjI0My0uMzM3LjQyLS43MjguNDItMS4xNzUgMC0xLjEzNC0uOTIyLTIuMDU2LTIuMDU2LTIuMDU2eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNMC0yLjgyOGwtMi44MjggMi44MjggMi44MjggMi44MjggMi44MjgtMi44MjgtMi44MjgtMi44Mjh6IiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLXdpZHRoPSJOYU4iLz48L21hcmtlcj48bWFya2VyIG9yaWVudD0iYXV0byIgb3ZlcmZsb3c9InZpc2libGUiPjxwYXRoIGQ9Ik0xMCAwbDQtNC0xNCA0IDE0IDQtNC00eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PC9kZWZzPjxwYXRoIGZpbGw9IiNmZmYiIHN0cm9rZT0iIzA2YyIgZD0iTS41IDMuNTE4aDUuOTgydjUuOTgyaC01Ljk4MnoiLz48cGF0aCBkPSJNNC43NTUtLjE2aDUuMjM0djUuMzlsLTEuNTcxIDEuNTQ0LTEuMzEtMS4zMS0yLjcyNSAyLjcyNS0yLjY4OC0yLjY4OCAyLjgwOC0yLjgwOC0xLjMxLTEuMzF6IiBmaWxsPSIjMDZmIi8+PHBhdGggZD0iTTguOTg0Ljg0NWwuMDIyIDQuODg0LTEuODE3LTEuODE3LTIuODgxIDIuODgxLTEuMjI3LTEuMjI3IDIuODgxLTIuODgxLTEuODUtMS44NTF6IiBmaWxsPSIjZmZmIi8+PC9zdmc+);
background-image: linear-gradient(transparent,transparent),
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCI+PGRlZnM+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNLS45NTgtNC4yNTljLTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2IDAgLjM5NC4xNDMuNzM2LjMzNiAxLjA0OWwtLjA3LjA1NmMtLjM3My0uNTEzLS45NTQtLjg2Ny0xLjYzNi0uODY3LTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2cy45MjIgMi4wNTYgMi4wNTYgMi4wNTZjLjU5NiAwIDEuMTIxLS4yNjUgMS40OTYtLjY3MS0uMDc1LjIxMy0uMTI2LjQzMy0uMTI2LjY3MSAwIDEuMTM0LjkyMiAyLjA1NiAyLjA1NiAyLjA1NnMyLjA1Ni0uOTIyIDIuMDU2LTIuMDU2YzAtLjQ3Ni0uMTg5LS44OTYtLjQ2Mi0xLjI0NS44MTMuMTU4IDEuNjI3LjQ3NyAyLjIyNCAxLjM5OS0uNDQzLS40NDMtLjcyNy0xLjI0OC0uNzI3LTIuMzM2bC0uMzc4LS4wMjguMzUtLjAxNGMwLTEuMDg3LjI3LTEuODkzLjcxMy0yLjMzNi0uNTc1Ljg4OS0xLjM1NCAxLjIxNi0yLjE0IDEuMzg1LjI0My0uMzM3LjQyLS43MjguNDItMS4xNzUgMC0xLjEzNC0uOTIyLTIuMDU2LTIuMDU2LTIuMDU2eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNMC0yLjgyOGwtMi44MjggMi44MjggMi44MjggMi44MjggMi44MjgtMi44MjgtMi44MjgtMi44Mjh6IiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLXdpZHRoPSJOYU4iLz48L21hcmtlcj48bWFya2VyIG9yaWVudD0iYXV0byIgb3ZlcmZsb3c9InZpc2libGUiPjxwYXRoIGQ9Ik0xMCAwbDQtNC0xNCA0IDE0IDQtNC00eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PC9kZWZzPjxwYXRoIGZpbGw9IiNmZmYiIHN0cm9rZT0iIzA2YyIgZD0iTS41IDMuNTE4aDUuOTgydjUuOTgyaC01Ljk4MnoiLz48cGF0aCBkPSJNNC43NTUtLjE2aDUuMjM0djUuMzlsLTEuNTcxIDEuNTQ0LTEuMzEtMS4zMS0yLjcyNSAyLjcyNS0yLjY4OC0yLjY4OCAyLjgwOC0yLjgwOC0xLjMxLTEuMzF6IiBmaWxsPSIjMDZmIi8+PHBhdGggZD0iTTguOTg0Ljg0NWwuMDIyIDQuODg0LTEuODE3LTEuODE3LTIuODgxIDIuODgxLTEuMjI3LTEuMjI3IDIuODgxLTIuODgxLTEuODUtMS44NTF6IiBmaWxsPSIjZmZmIi8+PC9zdmc+);
@@ -541,7 +541,7 @@
height: 32px;
width: 32px;
background-image:
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAMAAAC5zwKfAAAANlBMVEUAAAD///9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW+FiFraAAAAEXRSTlMAABAgMEBQYHCAkKCwwNDg8InUWv0AAAGfSURBVHhe7djBjsIgFIXhOwjFeltK3/9lJ4J6SG5dHGgyyaRn1dUXlb8slJ+T9//AC7zACxRiLu37EqXsDPCW9ue2cBLo8/7a/RQwFK9OTwDj3k6Hwbk6Mb/EeRDUojyaHzKMgG4pRmy/ehoAXcklT3h+buoGffU8vDJlQJtfuuG5busEY/Xc28N4EPkp7EHwUaODjSkLIr8Iu/VIELkE2Bj9psDzSBuLQoLIxX1sLEfhQHirQ9rwvLAgcoHdejx4b3IJ8PDOcCBysfklJzToipc9Piu2OKFA5LL5o/xUhAZ9Qi7W40Dkspj8as48OGXkYj0ORH73w/yC8OCMXA5y5sE2lwgPh86Bbi3h+i8506Brc3kYjwb9VkL7lh8N+jaXxXg0GBGayW8WCoSXq+dNzjyIXGx+UXhQm1yCyZkHA8JAfvBosF6h21RvU3vb86B+4lCTcxf4rkTV3PZ9IAiTcxcYvnm94P3Qi9IN6rHXDybL5SAD4IHnZQAMxtu8jIA4E+Q8BKr1xkCcybrOcwhOBsE3JOT+4G+WC7zAC7zAXxMIT+qGYJfyAAAAAElFTkSuQmCC);
- background-image:
url(//bits.wikimedia.org/static-1.24wmf15/extensions/MobileApp/less/../images/edit.png?2014-07-24T17:20:00Z)!ie;
+ background-image:
url(//bits.wikimedia.org/static-1.24wmf18/extensions/MobileApp/less/../images/edit.png?2014-08-21T15:38:20Z)!ie;
background-size: 32px 32px;
float: right;
display: inline-float;
@@ -551,7 +551,7 @@
}
.page-protected a.edit_section_button {
background-image:
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAMAAAC5zwKfAAAAXVBMVEUAAAD////Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW/Pz8/Pz8/Pz89sbW/Pz89sbW/Pz8/Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW+fZUWwAAAAHXRSTlMAABAQICAwMEBAUFBgYHBwgJCgoLDAwNDQ4ODw8PGFG8cAAAHOSURBVHhe7dTLcoMwDAVQxVCXJAoByiPUEf//mcW0Gh5KFrbojrtidUYM9wKnnfOP4AEe4AGCT3JvmuHR3BOAXcDrc/jN87wLeBvmnCUIATnZEUyeC/A7UYHWjeDdQ48PSL68eNOA6GgEH9Nh3m9GsFGASOTB6S7wufrHeLCkGfycwLMKrGgBwm8UoKknD/cCTffn7QSmk+cup51A6ybP+hsGmUCQvd7CTiCST2dAB0pPAcr6VQY0oPRgCqpB005eydvTglxnPlYLWvZ4ezqQ65zxsVrwwvPg7SlBJJ4HH6sDc64ze0qwWnroSAHKeSDRDL6JBGX9eB4FKUH2Sj5WC9p+PQ8lyA1BPnYVZ4NBnOssvS4NvhBp4dl+45nAV+Yv2q3nwakMBICyztnWAwgEzcpDWgchABR1Fp5DCAXTlVdtPAuBINevEB5/pQBQ1rneeAZCQaTVPERdQsGMVn97UZdgMJ89UeccIsDaA7V55SHEgD0vDtCJukSAKQM5kvBiwAtxRF3iwPKtFwm2TIi6RIJvvGgwe+UhxIO55ByCAqylZ0ED9luvt6ABU1kXUIHLWru2LVoDOrAk6tu6KLKMJSVohaMAtTnA4BzgAf4Asb6U9nmPcP4AAAAASUVORK5CYII=);
- background-image:
url(//bits.wikimedia.org/static-1.24wmf15/extensions/MobileApp/less/../images/edit-locked.png?2014-07-24T17:20:00Z)!ie;
+ background-image:
url(//bits.wikimedia.org/static-1.24wmf18/extensions/MobileApp/less/../images/edit-locked.png?2014-08-21T15:38:20Z)!ie;
}
#mainpage a.edit_section_button {
display: none;
@@ -833,23 +833,22 @@
display: none;
}
#li-coordinates {
- background-image: url("float: right;
- display: none;
- -webkit-background-size: auto 30px;
- background-size: auto 30px;
+ background-image:
url(//upload.wikimedia.org/wikipedia/commons/thumb/5/57/Edge-firefox.png/80px-Edge-firefox.png);
+ float: right;
+ display: none;
+ -webkit-background-size: auto 30px;
+ background-size: auto 30px;
}
-
.client-js .content_block.coordinates {
- display: none;
- text-align: right;
- margin-bottom: 0.5em;
- font-size: smaller;
+ display: none;
+ text-align: right;
+ margin-bottom: 0.5em;
+ font-size: smaller;
}
-
.client-js .content_block.coordinates .latitude {
- display:none;
- padding-left: 20px;
- background-image:
url(//upload.wikimedia.org/wikipedia/commons/thumb/5/57/Edge-firefox.png/50px-Edge-firefox.png");
+ display: none;
+ padding-left: 20px;
+ background-image:
url(//upload.wikimedia.org/wikipedia/commons/thumb/5/57/Edge-firefox.png/50px-Edge-firefox.png);
background-repeat: no-repeat;
-webkit-background-size: auto 15px;
background-size: auto 15px;
diff --git a/wikipedia/assets/preview.css b/wikipedia/assets/preview.css
index 09fccec..d5a9f70 100644
--- a/wikipedia/assets/preview.css
+++ b/wikipedia/assets/preview.css
@@ -199,7 +199,7 @@
font-size: .8em;
line-height: 1.5;
padding: 0 !important;
- color: #777;
+ color: #555;
width: auto !important;
}
.content .thumbborder {
@@ -283,7 +283,7 @@
}
a.external {
background-image:
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAVElEQVR42n3PgQkAIAhEUXdqJ3dqJ3e6IoTPUSQcgj4EQ5IlUiLE0Jil3PECXhcHGBhZ8kg4hwxAu3MZeCGeyFnAXp4hqNQPnt7QL0nADpD6wHccLvnAKksq8iiaAAAAAElFTkSuQmCC);
- background-image:
url(//bits.wikimedia.org/static-1.24wmf15/extensions/MobileApp/../MobileFrontend/less/content/images/external-link-ltr-icon.png?2014-07-24T17:20:00Z)!ie;
+ background-image:
url(//bits.wikimedia.org/static-1.24wmf18/extensions/MobileApp/../MobileFrontend/less/content/images/external-link-ltr-icon.png?2014-08-21T15:38:20Z)!ie;
/* We don't need the !ie hack because this old IE uses the fallback already
*/
background-image: -webkit-linear-gradient(transparent,transparent),
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCI+PGRlZnM+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNLS45NTgtNC4yNTljLTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2IDAgLjM5NC4xNDMuNzM2LjMzNiAxLjA0OWwtLjA3LjA1NmMtLjM3My0uNTEzLS45NTQtLjg2Ny0xLjYzNi0uODY3LTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2cy45MjIgMi4wNTYgMi4wNTYgMi4wNTZjLjU5NiAwIDEuMTIxLS4yNjUgMS40OTYtLjY3MS0uMDc1LjIxMy0uMTI2LjQzMy0uMTI2LjY3MSAwIDEuMTM0LjkyMiAyLjA1NiAyLjA1NiAyLjA1NnMyLjA1Ni0uOTIyIDIuMDU2LTIuMDU2YzAtLjQ3Ni0uMTg5LS44OTYtLjQ2Mi0xLjI0NS44MTMuMTU4IDEuNjI3LjQ3NyAyLjIyNCAxLjM5OS0uNDQzLS40NDMtLjcyNy0xLjI0OC0uNzI3LTIuMzM2bC0uMzc4LS4wMjguMzUtLjAxNGMwLTEuMDg3LjI3LTEuODkzLjcxMy0yLjMzNi0uNTc1Ljg4OS0xLjM1NCAxLjIxNi0yLjE0IDEuMzg1LjI0My0uMzM3LjQyLS43MjguNDItMS4xNzUgMC0xLjEzNC0uOTIyLTIuMDU2LTIuMDU2LTIuMDU2eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNMC0yLjgyOGwtMi44MjggMi44MjggMi44MjggMi44MjggMi44MjgtMi44MjgtMi44MjgtMi44Mjh6IiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLXdpZHRoPSJOYU4iLz48L21hcmtlcj48bWFya2VyIG9yaWVudD0iYXV0byIgb3ZlcmZsb3c9InZpc2libGUiPjxwYXRoIGQ9Ik0xMCAwbDQtNC0xNCA0IDE0IDQtNC00eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PC9kZWZzPjxwYXRoIGZpbGw9IiNmZmYiIHN0cm9rZT0iIzA2YyIgZD0iTS41IDMuNTE4aDUuOTgydjUuOTgyaC01Ljk4MnoiLz48cGF0aCBkPSJNNC43NTUtLjE2aDUuMjM0djUuMzlsLTEuNTcxIDEuNTQ0LTEuMzEtMS4zMS0yLjcyNSAyLjcyNS0yLjY4OC0yLjY4OCAyLjgwOC0yLjgwOC0xLjMxLTEuMzF6IiBmaWxsPSIjMDZmIi8+PHBhdGggZD0iTTguOTg0Ljg0NWwuMDIyIDQuODg0LTEuODE3LTEuODE3LTIuODgxIDIuODgxLTEuMjI3LTEuMjI3IDIuODgxLTIuODgxLTEuODUtMS44NTF6IiBmaWxsPSIjZmZmIi8+PC9zdmc+);
background-image: linear-gradient(transparent,transparent),
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCI+PGRlZnM+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNLS45NTgtNC4yNTljLTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2IDAgLjM5NC4xNDMuNzM2LjMzNiAxLjA0OWwtLjA3LjA1NmMtLjM3My0uNTEzLS45NTQtLjg2Ny0xLjYzNi0uODY3LTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2cy45MjIgMi4wNTYgMi4wNTYgMi4wNTZjLjU5NiAwIDEuMTIxLS4yNjUgMS40OTYtLjY3MS0uMDc1LjIxMy0uMTI2LjQzMy0uMTI2LjY3MSAwIDEuMTM0LjkyMiAyLjA1NiAyLjA1NiAyLjA1NnMyLjA1Ni0uOTIyIDIuMDU2LTIuMDU2YzAtLjQ3Ni0uMTg5LS44OTYtLjQ2Mi0xLjI0NS44MTMuMTU4IDEuNjI3LjQ3NyAyLjIyNCAxLjM5OS0uNDQzLS40NDMtLjcyNy0xLjI0OC0uNzI3LTIuMzM2bC0uMzc4LS4wMjguMzUtLjAxNGMwLTEuMDg3LjI3LTEuODkzLjcxMy0yLjMzNi0uNTc1Ljg4OS0xLjM1NCAxLjIxNi0yLjE0IDEuMzg1LjI0My0uMzM3LjQyLS43MjguNDItMS4xNzUgMC0xLjEzNC0uOTIyLTIuMDU2LTIuMDU2LTIuMDU2eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNMC0yLjgyOGwtMi44MjggMi44MjggMi44MjggMi44MjggMi44MjgtMi44MjgtMi44MjgtMi44Mjh6IiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLXdpZHRoPSJOYU4iLz48L21hcmtlcj48bWFya2VyIG9yaWVudD0iYXV0byIgb3ZlcmZsb3c9InZpc2libGUiPjxwYXRoIGQ9Ik0xMCAwbDQtNC0xNCA0IDE0IDQtNC00eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PC9kZWZzPjxwYXRoIGZpbGw9IiNmZmYiIHN0cm9rZT0iIzA2YyIgZD0iTS41IDMuNTE4aDUuOTgydjUuOTgyaC01Ljk4MnoiLz48cGF0aCBkPSJNNC43NTUtLjE2aDUuMjM0djUuMzlsLTEuNTcxIDEuNTQ0LTEuMzEtMS4zMS0yLjcyNSAyLjcyNS0yLjY4OC0yLjY4OCAyLjgwOC0yLjgwOC0xLjMxLTEuMzF6IiBmaWxsPSIjMDZmIi8+PHBhdGggZD0iTTguOTg0Ljg0NWwuMDIyIDQuODg0LTEuODE3LTEuODE3LTIuODgxIDIuODgxLTEuMjI3LTEuMjI3IDIuODgxLTIuODgxLTEuODUtMS44NTF6IiBmaWxsPSIjZmZmIi8+PC9zdmc+);
@@ -812,23 +812,22 @@
display: none;
}
#li-coordinates {
- background-image: url("float: right;
- display: none;
- -webkit-background-size: auto 30px;
- background-size: auto 30px;
+ background-image:
url(//upload.wikimedia.org/wikipedia/commons/thumb/5/57/Edge-firefox.png/80px-Edge-firefox.png);
+ float: right;
+ display: none;
+ -webkit-background-size: auto 30px;
+ background-size: auto 30px;
}
-
.client-js .content_block.coordinates {
- display: none;
- text-align: right;
- margin-bottom: 0.5em;
- font-size: smaller;
+ display: none;
+ text-align: right;
+ margin-bottom: 0.5em;
+ font-size: smaller;
}
-
.client-js .content_block.coordinates .latitude {
- display:none;
- padding-left: 20px;
- background-image:
url(//upload.wikimedia.org/wikipedia/commons/thumb/5/57/Edge-firefox.png/50px-Edge-firefox.png");
+ display: none;
+ padding-left: 20px;
+ background-image:
url(//upload.wikimedia.org/wikipedia/commons/thumb/5/57/Edge-firefox.png/50px-Edge-firefox.png);
background-repeat: no-repeat;
-webkit-background-size: auto 15px;
background-size: auto 15px;
diff --git a/wikipedia/assets/styles.css b/wikipedia/assets/styles.css
index 07bf36d..7015256 100644
--- a/wikipedia/assets/styles.css
+++ b/wikipedia/assets/styles.css
@@ -199,7 +199,7 @@
font-size: .8em;
line-height: 1.5;
padding: 0 !important;
- color: #777;
+ color: #555;
width: auto !important;
}
.content .thumbborder {
@@ -283,7 +283,7 @@
}
a.external {
background-image:
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAVElEQVR42n3PgQkAIAhEUXdqJ3dqJ3e6IoTPUSQcgj4EQ5IlUiLE0Jil3PECXhcHGBhZ8kg4hwxAu3MZeCGeyFnAXp4hqNQPnt7QL0nADpD6wHccLvnAKksq8iiaAAAAAElFTkSuQmCC);
- background-image:
url(//bits.wikimedia.org/static-1.24wmf15/extensions/MobileApp/../MobileFrontend/less/content/images/external-link-ltr-icon.png?2014-07-24T17:20:00Z)!ie;
+ background-image:
url(//bits.wikimedia.org/static-1.24wmf18/extensions/MobileApp/../MobileFrontend/less/content/images/external-link-ltr-icon.png?2014-08-21T15:38:20Z)!ie;
/* We don't need the !ie hack because this old IE uses the fallback already
*/
background-image: -webkit-linear-gradient(transparent,transparent),
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCI+PGRlZnM+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNLS45NTgtNC4yNTljLTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2IDAgLjM5NC4xNDMuNzM2LjMzNiAxLjA0OWwtLjA3LjA1NmMtLjM3My0uNTEzLS45NTQtLjg2Ny0xLjYzNi0uODY3LTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2cy45MjIgMi4wNTYgMi4wNTYgMi4wNTZjLjU5NiAwIDEuMTIxLS4yNjUgMS40OTYtLjY3MS0uMDc1LjIxMy0uMTI2LjQzMy0uMTI2LjY3MSAwIDEuMTM0LjkyMiAyLjA1NiAyLjA1NiAyLjA1NnMyLjA1Ni0uOTIyIDIuMDU2LTIuMDU2YzAtLjQ3Ni0uMTg5LS44OTYtLjQ2Mi0xLjI0NS44MTMuMTU4IDEuNjI3LjQ3NyAyLjIyNCAxLjM5OS0uNDQzLS40NDMtLjcyNy0xLjI0OC0uNzI3LTIuMzM2bC0uMzc4LS4wMjguMzUtLjAxNGMwLTEuMDg3LjI3LTEuODkzLjcxMy0yLjMzNi0uNTc1Ljg4OS0xLjM1NCAxLjIxNi0yLjE0IDEuMzg1LjI0My0uMzM3LjQyLS43MjguNDItMS4xNzUgMC0xLjEzNC0uOTIyLTIuMDU2LTIuMDU2LTIuMDU2eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNMC0yLjgyOGwtMi44MjggMi44MjggMi44MjggMi44MjggMi44MjgtMi44MjgtMi44MjgtMi44Mjh6IiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLXdpZHRoPSJOYU4iLz48L21hcmtlcj48bWFya2VyIG9yaWVudD0iYXV0byIgb3ZlcmZsb3c9InZpc2libGUiPjxwYXRoIGQ9Ik0xMCAwbDQtNC0xNCA0IDE0IDQtNC00eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PC9kZWZzPjxwYXRoIGZpbGw9IiNmZmYiIHN0cm9rZT0iIzA2YyIgZD0iTS41IDMuNTE4aDUuOTgydjUuOTgyaC01Ljk4MnoiLz48cGF0aCBkPSJNNC43NTUtLjE2aDUuMjM0djUuMzlsLTEuNTcxIDEuNTQ0LTEuMzEtMS4zMS0yLjcyNSAyLjcyNS0yLjY4OC0yLjY4OCAyLjgwOC0yLjgwOC0xLjMxLTEuMzF6IiBmaWxsPSIjMDZmIi8+PHBhdGggZD0iTTguOTg0Ljg0NWwuMDIyIDQuODg0LTEuODE3LTEuODE3LTIuODgxIDIuODgxLTEuMjI3LTEuMjI3IDIuODgxLTIuODgxLTEuODUtMS44NTF6IiBmaWxsPSIjZmZmIi8+PC9zdmc+);
background-image: linear-gradient(transparent,transparent),
url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMCIgaGVpZ2h0PSIxMCI+PGRlZnM+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNLS45NTgtNC4yNTljLTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2IDAgLjM5NC4xNDMuNzM2LjMzNiAxLjA0OWwtLjA3LjA1NmMtLjM3My0uNTEzLS45NTQtLjg2Ny0xLjYzNi0uODY3LTEuMTM0IDAtMi4wNTYuOTIyLTIuMDU2IDIuMDU2cy45MjIgMi4wNTYgMi4wNTYgMi4wNTZjLjU5NiAwIDEuMTIxLS4yNjUgMS40OTYtLjY3MS0uMDc1LjIxMy0uMTI2LjQzMy0uMTI2LjY3MSAwIDEuMTM0LjkyMiAyLjA1NiAyLjA1NiAyLjA1NnMyLjA1Ni0uOTIyIDIuMDU2LTIuMDU2YzAtLjQ3Ni0uMTg5LS44OTYtLjQ2Mi0xLjI0NS44MTMuMTU4IDEuNjI3LjQ3NyAyLjIyNCAxLjM5OS0uNDQzLS40NDMtLjcyNy0xLjI0OC0uNzI3LTIuMzM2bC0uMzc4LS4wMjguMzUtLjAxNGMwLTEuMDg3LjI3LTEuODkzLjcxMy0yLjMzNi0uNTc1Ljg4OS0xLjM1NCAxLjIxNi0yLjE0IDEuMzg1LjI0My0uMzM3LjQyLS43MjguNDItMS4xNzUgMC0xLjEzNC0uOTIyLTIuMDU2LTIuMDU2LTIuMDU2eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PG1hcmtlciBvcmllbnQ9ImF1dG8iIG92ZXJmbG93PSJ2aXNpYmxlIj48cGF0aCBkPSJNMC0yLjgyOGwtMi44MjggMi44MjggMi44MjggMi44MjggMi44MjgtMi44MjgtMi44MjgtMi44Mjh6IiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLXdpZHRoPSJOYU4iLz48L21hcmtlcj48bWFya2VyIG9yaWVudD0iYXV0byIgb3ZlcmZsb3c9InZpc2libGUiPjxwYXRoIGQ9Ik0xMCAwbDQtNC0xNCA0IDE0IDQtNC00eiIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiMwMDAiIHN0cm9rZS13aWR0aD0iTmFOIi8+PC9tYXJrZXI+PC9kZWZzPjxwYXRoIGZpbGw9IiNmZmYiIHN0cm9rZT0iIzA2YyIgZD0iTS41IDMuNTE4aDUuOTgydjUuOTgyaC01Ljk4MnoiLz48cGF0aCBkPSJNNC43NTUtLjE2aDUuMjM0djUuMzlsLTEuNTcxIDEuNTQ0LTEuMzEtMS4zMS0yLjcyNSAyLjcyNS0yLjY4OC0yLjY4OCAyLjgwOC0yLjgwOC0xLjMxLTEuMzF6IiBmaWxsPSIjMDZmIi8+PHBhdGggZD0iTTguOTg0Ljg0NWwuMDIyIDQuODg0LTEuODE3LTEuODE3LTIuODgxIDIuODgxLTEuMjI3LTEuMjI3IDIuODgxLTIuODgxLTEuODUtMS44NTF6IiBmaWxsPSIjZmZmIi8+PC9zdmc+);
@@ -541,7 +541,7 @@
height: 32px;
width: 32px;
background-image:
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAMAAAC5zwKfAAAANlBMVEUAAAD///9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW9sbW+FiFraAAAAEXRSTlMAABAgMEBQYHCAkKCwwNDg8InUWv0AAAGfSURBVHhe7djBjsIgFIXhOwjFeltK3/9lJ4J6SG5dHGgyyaRn1dUXlb8slJ+T9//AC7zACxRiLu37EqXsDPCW9ue2cBLo8/7a/RQwFK9OTwDj3k6Hwbk6Mb/EeRDUojyaHzKMgG4pRmy/ehoAXcklT3h+buoGffU8vDJlQJtfuuG5busEY/Xc28N4EPkp7EHwUaODjSkLIr8Iu/VIELkE2Bj9psDzSBuLQoLIxX1sLEfhQHirQ9rwvLAgcoHdejx4b3IJ8PDOcCBysfklJzToipc9Piu2OKFA5LL5o/xUhAZ9Qi7W40Dkspj8as48OGXkYj0ORH73w/yC8OCMXA5y5sE2lwgPh86Bbi3h+i8506Brc3kYjwb9VkL7lh8N+jaXxXg0GBGayW8WCoSXq+dNzjyIXGx+UXhQm1yCyZkHA8JAfvBosF6h21RvU3vb86B+4lCTcxf4rkTV3PZ9IAiTcxcYvnm94P3Qi9IN6rHXDybL5SAD4IHnZQAMxtu8jIA4E+Q8BKr1xkCcybrOcwhOBsE3JOT+4G+WC7zAC7zAXxMIT+qGYJfyAAAAAElFTkSuQmCC);
- background-image:
url(//bits.wikimedia.org/static-1.24wmf15/extensions/MobileApp/less/../images/edit.png?2014-07-24T17:20:00Z)!ie;
+ background-image:
url(//bits.wikimedia.org/static-1.24wmf18/extensions/MobileApp/less/../images/edit.png?2014-08-21T15:38:20Z)!ie;
background-size: 32px 32px;
float: right;
display: inline-float;
@@ -551,7 +551,7 @@
}
.page-protected a.edit_section_button {
background-image:
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAMAAAC5zwKfAAAAXVBMVEUAAAD////Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW/Pz8/Pz8/Pz89sbW/Pz89sbW/Pz8/Pz89sbW/Pz89sbW/Pz89sbW/Pz89sbW+fZUWwAAAAHXRSTlMAABAQICAwMEBAUFBgYHBwgJCgoLDAwNDQ4ODw8PGFG8cAAAHOSURBVHhe7dTLcoMwDAVQxVCXJAoByiPUEf//mcW0Gh5KFrbojrtidUYM9wKnnfOP4AEe4AGCT3JvmuHR3BOAXcDrc/jN87wLeBvmnCUIATnZEUyeC/A7UYHWjeDdQ48PSL68eNOA6GgEH9Nh3m9GsFGASOTB6S7wufrHeLCkGfycwLMKrGgBwm8UoKknD/cCTffn7QSmk+cup51A6ybP+hsGmUCQvd7CTiCST2dAB0pPAcr6VQY0oPRgCqpB005eydvTglxnPlYLWvZ4ezqQ65zxsVrwwvPg7SlBJJ4HH6sDc64ze0qwWnroSAHKeSDRDL6JBGX9eB4FKUH2Sj5WC9p+PQ8lyA1BPnYVZ4NBnOssvS4NvhBp4dl+45nAV+Yv2q3nwakMBICyztnWAwgEzcpDWgchABR1Fp5DCAXTlVdtPAuBINevEB5/pQBQ1rneeAZCQaTVPERdQsGMVn97UZdgMJ89UeccIsDaA7V55SHEgD0vDtCJukSAKQM5kvBiwAtxRF3iwPKtFwm2TIi6RIJvvGgwe+UhxIO55ByCAqylZ0ED9luvt6ABU1kXUIHLWru2LVoDOrAk6tu6KLKMJSVohaMAtTnA4BzgAf4Asb6U9nmPcP4AAAAASUVORK5CYII=);
- background-image:
url(//bits.wikimedia.org/static-1.24wmf15/extensions/MobileApp/less/../images/edit-locked.png?2014-07-24T17:20:00Z)!ie;
+ background-image:
url(//bits.wikimedia.org/static-1.24wmf18/extensions/MobileApp/less/../images/edit-locked.png?2014-08-21T15:38:20Z)!ie;
}
#mainpage a.edit_section_button {
display: none;
@@ -833,23 +833,22 @@
display: none;
}
#li-coordinates {
- background-image: url("float: right;
- display: none;
- -webkit-background-size: auto 30px;
- background-size: auto 30px;
+ background-image:
url(//upload.wikimedia.org/wikipedia/commons/thumb/5/57/Edge-firefox.png/80px-Edge-firefox.png);
+ float: right;
+ display: none;
+ -webkit-background-size: auto 30px;
+ background-size: auto 30px;
}
-
.client-js .content_block.coordinates {
- display: none;
- text-align: right;
- margin-bottom: 0.5em;
- font-size: smaller;
+ display: none;
+ text-align: right;
+ margin-bottom: 0.5em;
+ font-size: smaller;
}
-
.client-js .content_block.coordinates .latitude {
- display:none;
- padding-left: 20px;
- background-image:
url(//upload.wikimedia.org/wikipedia/commons/thumb/5/57/Edge-firefox.png/50px-Edge-firefox.png");
+ display: none;
+ padding-left: 20px;
+ background-image:
url(//upload.wikimedia.org/wikipedia/commons/thumb/5/57/Edge-firefox.png/50px-Edge-firefox.png);
background-repeat: no-repeat;
-webkit-background-size: auto 15px;
background-size: auto 15px;
--
To view, visit https://gerrit.wikimedia.org/r/157320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib02e9b74d78d523aa491c7a3f1a87b6a7d3b9d19
Gerrit-PatchSet: 2
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
